Commit 617d4db3622879377f90aadaa037a53af76f2dc1
1 parent
492c107d
Exists in
master
and in
4 other branches
Implementing popup menus.
Showing
1 changed file
with
70 additions
and
56 deletions
Show diff stats
ui/window.xml
@@ -72,97 +72,111 @@ | @@ -72,97 +72,111 @@ | ||
72 | 72 | ||
73 | <menu id="popup-over-selected-area"> | 73 | <menu id="popup-over-selected-area"> |
74 | 74 | ||
75 | - <section> | 75 | + <item> |
76 | + <attribute name="label" translatable="yes">Save selected</attribute> | ||
77 | + <attribute name="action">win.save_selected</attribute> | ||
78 | + </item> | ||
79 | + | ||
80 | + <item> | ||
81 | + <attribute name="label" translatable="yes">Print selected</attribute> | ||
82 | + <attribute name="action">win.print_selected</attribute> | ||
83 | + </item> | ||
84 | + | ||
85 | + <submenu> | ||
86 | + | ||
87 | + <attribute name='label' translatable='yes'>Options</attribute> | ||
76 | 88 | ||
77 | <item> | 89 | <item> |
78 | - <attribute name="label" translatable="yes">Save selected</attribute> | ||
79 | - <attribute name="action">win.save_selected</attribute> | 90 | + <attribute name="label" translatable="yes">Show toolbar</attribute> |
91 | + <attribute name="action">win.toolbar</attribute> | ||
80 | </item> | 92 | </item> |
81 | 93 | ||
82 | <item> | 94 | <item> |
83 | - <attribute name="label" translatable="yes">Print selected</attribute> | ||
84 | - <attribute name="action">win.print_selected</attribute> | 95 | + <attribute name="label" translatable="yes">Show menu</attribute> |
96 | + <attribute name="action">win.menubar</attribute> | ||
85 | </item> | 97 | </item> |
86 | 98 | ||
87 | - </section> | ||
88 | - | ||
89 | - <section> | 99 | + <item> |
100 | + <attribute name="label" translatable="yes">Full screen</attribute> | ||
101 | + <attribute name="action">win.fullscreen</attribute> | ||
102 | + </item> | ||
90 | 103 | ||
91 | - <item> | ||
92 | - <attribute name="label" translatable="yes">Show toolbar</attribute> | ||
93 | - <attribute name="action">win.toolbar</attribute> | ||
94 | - </item> | 104 | + </submenu> |
95 | 105 | ||
96 | - <item> | ||
97 | - <attribute name="label" translatable="yes">Show menu</attribute> | ||
98 | - <attribute name="action">win.menubar</attribute> | ||
99 | - </item> | ||
100 | - | ||
101 | - </section> | 106 | + <item> |
107 | + <attribute name="label" translatable="yes">Disconnect</attribute> | ||
108 | + <attribute name="action">win.disconnect</attribute> | ||
109 | + </item> | ||
102 | 110 | ||
103 | </menu> | 111 | </menu> |
104 | 112 | ||
105 | <menu id="popup-over-unselected-area"> | 113 | <menu id="popup-over-unselected-area"> |
106 | 114 | ||
107 | - <section> | 115 | + <item> |
116 | + <attribute name="label" translatable="yes">Send/Receive files</attribute> | ||
117 | + <attribute name="action">win.file.transfer</attribute> | ||
118 | + </item> | ||
119 | + | ||
120 | + <submenu> | ||
121 | + | ||
122 | + <attribute name='label' translatable='yes'>Options</attribute> | ||
108 | 123 | ||
109 | <item> | 124 | <item> |
110 | - <attribute name="label" translatable="yes">Send/Receive files</attribute> | ||
111 | - <attribute name="action">win.file.transfer</attribute> | 125 | + <attribute name="label" translatable="yes">Show toolbar</attribute> |
126 | + <attribute name="action">win.toolbar</attribute> | ||
112 | </item> | 127 | </item> |
113 | 128 | ||
114 | <item> | 129 | <item> |
115 | - <attribute name="label" translatable="yes">Disconnect</attribute> | ||
116 | - <attribute name="action">win.disconnect</attribute> | 130 | + <attribute name="label" translatable="yes">Show menu</attribute> |
131 | + <attribute name="action">win.menubar</attribute> | ||
117 | </item> | 132 | </item> |
118 | 133 | ||
119 | - </section> | ||
120 | - | ||
121 | - <section> | ||
122 | - | ||
123 | - <item> | ||
124 | - <attribute name="label" translatable="yes">Show toolbar</attribute> | ||
125 | - <attribute name="action">win.toolbar</attribute> | ||
126 | - </item> | 134 | + <item> |
135 | + <attribute name="label" translatable="yes">Full screen</attribute> | ||
136 | + <attribute name="action">win.fullscreen</attribute> | ||
137 | + </item> | ||
127 | 138 | ||
128 | - <item> | ||
129 | - <attribute name="label" translatable="yes">Show menu</attribute> | ||
130 | - <attribute name="action">win.menubar</attribute> | ||
131 | - </item> | 139 | + </submenu> |
132 | 140 | ||
133 | - </section> | 141 | + <item> |
142 | + <attribute name="label" translatable="yes">Disconnect</attribute> | ||
143 | + <attribute name="action">win.disconnect</attribute> | ||
144 | + </item> | ||
134 | 145 | ||
135 | </menu> | 146 | </menu> |
136 | 147 | ||
137 | <menu id="popup-when-offline"> | 148 | <menu id="popup-when-offline"> |
138 | 149 | ||
139 | - <section> | 150 | + <item> |
151 | + <attribute name="label" translatable="yes">_Connect</attribute> | ||
152 | + <attribute name="action">win.connect</attribute> | ||
153 | + </item> | ||
140 | 154 | ||
141 | - <item> | ||
142 | - <attribute name="label" translatable="yes">_Connect</attribute> | ||
143 | - <attribute name="action">win.connect</attribute> | ||
144 | - </item> | 155 | + <item> |
156 | + <attribute name="label" translatable="yes">Configure host</attribute> | ||
157 | + <attribute name="action">win.set.host</attribute> | ||
158 | + </item> | ||
145 | 159 | ||
146 | - <item> | ||
147 | - <attribute name="label" translatable="yes">Configure host</attribute> | ||
148 | - <attribute name="action">win.set.host</attribute> | ||
149 | - </item> | 160 | + <submenu> |
150 | 161 | ||
151 | - </section> | 162 | + <attribute name='label' translatable='yes'>Options</attribute> |
152 | 163 | ||
153 | - <section> | 164 | + <item> |
165 | + <attribute name="label" translatable="yes">Show toolbar</attribute> | ||
166 | + <attribute name="action">win.toolbar</attribute> | ||
167 | + </item> | ||
154 | 168 | ||
155 | - <item> | ||
156 | - <attribute name="label" translatable="yes">Show toolbar</attribute> | ||
157 | - <attribute name="action">win.toolbar</attribute> | ||
158 | - </item> | 169 | + <item> |
170 | + <attribute name="label" translatable="yes">Show menu</attribute> | ||
171 | + <attribute name="action">win.menubar</attribute> | ||
172 | + </item> | ||
159 | 173 | ||
160 | - <item> | ||
161 | - <attribute name="label" translatable="yes">Show menu</attribute> | ||
162 | - <attribute name="action">win.menubar</attribute> | ||
163 | - </item> | 174 | + <item> |
175 | + <attribute name="label" translatable="yes">Full screen</attribute> | ||
176 | + <attribute name="action">win.fullscreen</attribute> | ||
177 | + </item> | ||
164 | 178 | ||
165 | - </section> | 179 | + </submenu> |
166 | 180 | ||
167 | <item> | 181 | <item> |
168 | <attribute name="label" translatable="yes">Quit application</attribute> | 182 | <attribute name="label" translatable="yes">Quit application</attribute> |