Commit e266a9bceca929fa331b365caeb1c6250c81da91

Authored by Perry Werneck
1 parent fd2ff06e

Adjustments in the gnome UI.

src/objects/application/application.c
@@ -264,8 +264,7 @@ @@ -264,8 +264,7 @@
264 if(gtk_application_prefers_app_menu(GTK_APPLICATION(application))) 264 if(gtk_application_prefers_app_menu(GTK_APPLICATION(application)))
265 gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu"))); 265 gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu")));
266 266
267 - if(pw3270_application_get_ui_style(application) == PW3270_UI_STYLE_CLASSICAL)  
268 - gtk_application_set_menubar(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "menubar"))); 267 + gtk_application_set_menubar(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "menubar")));
269 268
270 pw3270_load_placeholders(builder); 269 pw3270_load_placeholders(builder);
271 270
ui/application.xml
@@ -28,419 +28,424 @@ @@ -28,419 +28,424 @@
28 28
29 --> 29 -->
30 <interface> 30 <interface>
31 - <requires lib="gtk+" version="3.0"/>  
32 - <menu id="app-menu">  
33 -  
34 - <item>  
35 - <attribute name="label" translatable="yes">About PW3270</attribute>  
36 - <attribute name="action">app.about</attribute>  
37 - </item> 31 + <requires lib="gtk+" version="3.0"/>
  32 + <menu id="app-menu">
38 33
39 - <item>  
40 - <attribute name="label" translatable="yes">New Window</attribute>  
41 - <attribute name="action">app.new.window</attribute>  
42 - </item> 34 + <item>
  35 + <attribute name="label" translatable="yes">About PW3270</attribute>
  36 + <attribute name="action">app.about</attribute>
  37 + </item>
43 38
44 - <submenu> 39 + <item>
  40 + <attribute name="label" translatable="yes">New Window</attribute>
  41 + <attribute name="action">app.new.window</attribute>
  42 + </item>
45 43
46 - <attribute name='label' translatable='yes'>_View</attribute> 44 + <submenu>
47 45
48 - <item>  
49 - <attribute name="label" translatable="yes">Trace</attribute>  
50 - <attribute name="action">win.trace</attribute>  
51 - </item> 46 + <attribute name='label' translatable='yes'>Options</attribute>
52 47
53 - <item>  
54 - <attribute name="label" translatable="yes">Toolbar</attribute>  
55 - <attribute name="action">win.toolbar</attribute>  
56 - </item> 48 + <item>
  49 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  50 + <attribute name="action">win.toolbar</attribute>
  51 + </item>
57 52
58 - <item>  
59 - <attribute name="label" translatable="yes">Menu</attribute>  
60 - <attribute name="action">win.menubar</attribute>  
61 - </item> 53 + <item>
  54 + <attribute name="label" translatable="yes">Show menu</attribute>
  55 + <attribute name="action">win.menubar</attribute>
  56 + </item>
62 57
63 - </submenu> 58 + <item>
  59 + <attribute name="label" translatable="yes">Show trace</attribute>
  60 + <attribute name="action">win.trace</attribute>
  61 + </item>
64 62
65 - <item>  
66 - <attribute name="label" translatable="yes">Quit</attribute>  
67 - <attribute name="action">app.quit</attribute>  
68 - </item>  
69 -  
70 - </menu> 63 + </submenu>
71 64
72 - <menu id='menubar'> 65 + <item>
  66 + <attribute name="label" translatable="yes">Preferences</attribute>
  67 + <attribute name="action">win.preferences</attribute>
  68 + </item>
73 69
74 - <submenu> 70 + <item>
  71 + <attribute name="label" translatable="yes">Quit</attribute>
  72 + <attribute name="action">app.quit</attribute>
  73 + </item>
75 74
76 - <attribute name='label' translatable='yes'>_File</attribute> 75 + </menu>
77 76
78 - <section> 77 + <menu id='menubar'>
79 78
80 - <item>  
81 - <attribute name="label" translatable="yes">Save screen</attribute>  
82 - <attribute name="action">win.save_screen</attribute>  
83 - </item> 79 + <submenu>
84 80
85 - <item>  
86 - <attribute name="label" translatable="yes">Save selected</attribute>  
87 - <attribute name="action">win.save_selected</attribute>  
88 - </item> 81 + <attribute name='label' translatable='yes'>_File</attribute>
89 82
90 - <item>  
91 - <attribute name="label" translatable="yes">Save copy</attribute>  
92 - <attribute name="action">win.save_copy</attribute>  
93 - </item> 83 + <section>
94 84
95 - </section> 85 + <item>
  86 + <attribute name="label" translatable="yes">Save screen</attribute>
  87 + <attribute name="action">win.save_screen</attribute>
  88 + </item>
96 89
97 - <section> 90 + <item>
  91 + <attribute name="label" translatable="yes">Save selected</attribute>
  92 + <attribute name="action">win.save_selected</attribute>
  93 + </item>
98 94
99 - <item>  
100 - <attribute name="label" translatable="yes">Print</attribute>  
101 - <attribute name="action">win.print</attribute>  
102 - </item> 95 + <item>
  96 + <attribute name="label" translatable="yes">Save copy</attribute>
  97 + <attribute name="action">win.save_copy</attribute>
  98 + </item>
103 99
104 - <item>  
105 - <attribute name="label" translatable="yes">Print selected</attribute>  
106 - <attribute name="action">win.print_selected</attribute>  
107 - </item> 100 + </section>
  101 +
  102 + <section>
  103 +
  104 + <item>
  105 + <attribute name="label" translatable="yes">Print</attribute>
  106 + <attribute name="action">win.print</attribute>
  107 + </item>
  108 +
  109 + <item>
  110 + <attribute name="label" translatable="yes">Print selected</attribute>
  111 + <attribute name="action">win.print_selected</attribute>
  112 + </item>
  113 +
  114 + <item>
  115 + <attribute name="label" translatable="yes">Print copy</attribute>
  116 + <attribute name="action">win.print_copy</attribute>
  117 + </item>
  118 +
  119 + </section>
  120 +
  121 + <section>
  122 +
  123 + <item>
  124 + <attribute name="label" translatable="yes">Send/Receive files</attribute>
  125 + <attribute name="action">win.file.transfer</attribute>
  126 + </item>
108 127
109 - <item>  
110 - <attribute name="label" translatable="yes">Print copy</attribute>  
111 - <attribute name="action">win.print_copy</attribute>  
112 - </item> 128 + <item>
  129 + <attribute name="label" translatable="yes">Quit application</attribute>
  130 + <attribute name="action">app.quit</attribute>
  131 + </item>
113 132
114 </section> 133 </section>
115 134
116 - <section> 135 + </submenu>
  136 +
  137 + <submenu>
  138 +
  139 + <attribute name='label' translatable='yes'>_Edit</attribute>
  140 +
  141 + <section>
  142 +
  143 + <item>
  144 + <attribute name="label" translatable="yes">Copy</attribute>
  145 + <attribute name="action">win.copy</attribute>
  146 + <attribute name="target">auto</attribute>
  147 + </item>
  148 +
  149 + <item>
  150 + <attribute name="label" translatable="yes">Copy as text</attribute>
  151 + <attribute name="action">win.copy</attribute>
  152 + <attribute name="target">text</attribute>
  153 + </item>
  154 +
  155 + <item>
  156 + <attribute name="label" translatable="yes">Copy as table</attribute>
  157 + <attribute name="action">win.copy</attribute>
  158 + <attribute name="target">table</attribute>
  159 + </item>
  160 +
  161 + <item>
  162 + <attribute name="label" translatable="yes">Append to copy</attribute>
  163 + <attribute name="action">win.copy</attribute>
  164 + <attribute name="target">append</attribute>
  165 + </item>
  166 +
  167 + <item>
  168 + <attribute name="label" translatable="yes">Cut</attribute>
  169 + <attribute name="action">win.cut</attribute>
  170 + <attribute name="target">auto</attribute>
  171 + </item>
  172 +
  173 + <item>
  174 + <attribute name="label" translatable="yes">Paste from clipboard</attribute>
  175 + <attribute name="action">win.paste</attribute>
  176 + <attribute name="target">clipboard://</attribute>
  177 + </item>
  178 +
  179 + <item>
  180 + <attribute name="label" translatable="yes">Paste next</attribute>
  181 + <attribute name="action">win.paste</attribute>
  182 + <attribute name="target">next://</attribute>
  183 + </item>
  184 +
  185 + <item>
  186 + <attribute name="label" translatable="yes">Paste from text file</attribute>
  187 + <attribute name="action">win.paste</attribute>
  188 + <attribute name="target">file://</attribute>
  189 + </item>
117 190
118 - <item>  
119 - <attribute name="label" translatable="yes">Send/Receive files</attribute>  
120 - <attribute name="action">win.file.transfer</attribute>  
121 - </item>  
122 -  
123 - <item>  
124 - <attribute name="label" translatable="yes">Quit application</attribute>  
125 - <attribute name="action">app.quit</attribute>  
126 - </item>  
127 -  
128 - </section> 191 + </section>
  192 +
  193 + <section>
  194 +
  195 + <item>
  196 + <attribute name="label" translatable="yes">Select all</attribute>
  197 + <attribute name="action">win.select-all</attribute>
  198 + </item>
129 199
130 - </submenu>  
131 -  
132 - <submenu> 200 + <item>
  201 + <attribute name="label" translatable="yes">Select Field</attribute>
  202 + <attribute name="action">win.select-field</attribute>
  203 + </item>
133 204
134 - <attribute name='label' translatable='yes'>_Edit</attribute>  
135 -  
136 - <section>  
137 -  
138 - <item>  
139 - <attribute name="label" translatable="yes">Copy</attribute>  
140 - <attribute name="action">win.copy</attribute>  
141 - <attribute name="target">auto</attribute>  
142 - </item> 205 + <item>
  206 + <attribute name="label" translatable="yes">Unselect</attribute>
  207 + <attribute name="action">win.unselect</attribute>
  208 + </item>
143 209
144 - <item>  
145 - <attribute name="label" translatable="yes">Copy as text</attribute>  
146 - <attribute name="action">win.copy</attribute>  
147 - <attribute name="target">text</attribute>  
148 - </item> 210 + <item>
  211 + <attribute name="label" translatable="yes">Reselect</attribute>
  212 + <attribute name="action">win.reselect</attribute>
  213 + </item>
  214 +
  215 + </section>
149 216
150 - <item>  
151 - <attribute name="label" translatable="yes">Copy as table</attribute>  
152 - <attribute name="action">win.copy</attribute>  
153 - <attribute name="target">table</attribute>  
154 - </item> 217 + <section>
155 218
156 - <item>  
157 - <attribute name="label" translatable="yes">Append to copy</attribute>  
158 - <attribute name="action">win.copy</attribute>  
159 - <attribute name="target">append</attribute>  
160 - </item> 219 + <item>
  220 + <attribute name="label" translatable="yes">Clear</attribute>
  221 + <attribute name="action">win.clear</attribute>
  222 + </item>
161 223
162 - <item>  
163 - <attribute name="label" translatable="yes">Cut</attribute>  
164 - <attribute name="action">win.cut</attribute>  
165 - <attribute name="target">auto</attribute>  
166 - </item> 224 + <item>
  225 + <attribute name="label" translatable="yes">Erase input</attribute>
  226 + <attribute name="action">win.erase_input</attribute>
  227 + </item>
167 228
168 - <item>  
169 - <attribute name="label" translatable="yes">Paste from clipboard</attribute>  
170 - <attribute name="action">win.paste</attribute>  
171 - <attribute name="target">clipboard://</attribute>  
172 - </item> 229 + <item>
  230 + <attribute name="label" translatable="yes">Delete Field</attribute>
  231 + <attribute name="action">win.delete_field</attribute>
  232 + </item>
  233 +
  234 + <item>
  235 + <attribute name="label" translatable="yes">Erase to end of field</attribute>
  236 + <attribute name="action">win.erase_eof</attribute>
  237 + </item>
  238 +
  239 + <item>
  240 + <attribute name="label" translatable="yes">Erase to end of line</attribute>
  241 + <attribute name="action">win.erase_eol</attribute>
  242 + </item>
  243 +
  244 + </section>
173 245
174 - <item>  
175 - <attribute name="label" translatable="yes">Paste next</attribute>  
176 - <attribute name="action">win.paste</attribute>  
177 - <attribute name="target">next://</attribute>  
178 - </item> 246 + </submenu>
179 247
180 - <item>  
181 - <attribute name="label" translatable="yes">Paste from text file</attribute>  
182 - <attribute name="action">win.paste</attribute>  
183 - <attribute name="target">file://</attribute>  
184 - </item> 248 + <submenu id="view-menu-placeholder">
185 249
186 - </section> 250 + <attribute name='label' translatable='yes'>_View</attribute>
187 251
188 - <section> 252 + <item>
  253 + <attribute name="label" translatable="yes">Trace</attribute>
  254 + <attribute name="action">win.trace</attribute>
  255 + </item>
189 256
190 - <item>  
191 - <attribute name="label" translatable="yes">Select all</attribute>  
192 - <attribute name="action">win.select-all</attribute>  
193 - </item> 257 + <item>
  258 + <attribute name="label" translatable="yes">Toolbar</attribute>
  259 + <attribute name="action">win.toolbar</attribute>
  260 + </item>
194 261
195 - <item>  
196 - <attribute name="label" translatable="yes">Select Field</attribute>  
197 - <attribute name="action">win.select-field</attribute>  
198 - </item> 262 + <item>
  263 + <attribute name="label" translatable="yes">Menu</attribute>
  264 + <attribute name="action">win.menubar</attribute>
  265 + </item>
199 266
200 - <item>  
201 - <attribute name="label" translatable="yes">Unselect</attribute>  
202 - <attribute name="action">win.unselect</attribute>  
203 - </item> 267 + <item>
  268 + <attribute name="label" translatable="yes">Field attributes</attribute>
  269 + <attribute name="action">win.fieldattr</attribute>
  270 + </item>
204 271
205 - <item>  
206 - <attribute name="label" translatable="yes">Reselect</attribute>  
207 - <attribute name="action">win.reselect</attribute>  
208 - </item> 272 + </submenu>
209 273
210 - </section> 274 + <submenu>
211 275
212 - <section> 276 + <attribute name='label' translatable='yes'>_Network</attribute>
  277 +
  278 + <item>
  279 + <attribute name="label" translatable="yes">Host properties</attribute>
  280 + <attribute name="action">win.set.host</attribute>
  281 + </item>
  282 +
  283 + <item>
  284 + <attribute name="label" translatable="yes">_Connect</attribute>
  285 + <attribute name="action">win.connect</attribute>
  286 + </item>
  287 +
  288 + <item>
  289 + <attribute name="label" translatable="yes">_Disconnect</attribute>
  290 + <attribute name="action">win.disconnect</attribute>
  291 + </item>
  292 +
  293 + </submenu>
  294 +
  295 + <submenu>
  296 +
  297 + <attribute name='label' translatable='yes'>Settings</attribute>
  298 +
  299 + <item>
  300 + <attribute name="label" translatable="yes">Colors</attribute>
  301 + <attribute name="action">win.set.colors</attribute>
  302 + </item>
  303 +
  304 + <submenu>
  305 +
  306 + <attribute name="label" translatable="yes">Screen size</attribute>
  307 +
  308 + <item>
  309 + <attribute name="label" translatable="yes">Model 2 - 80x24</attribute>
  310 + <attribute name="action">win.model-number</attribute>
  311 + <attribute name="target">2</attribute>
  312 + </item>
  313 + <item>
  314 + <attribute name="label" translatable="yes">Model 3 - 80x32</attribute>
  315 + <attribute name="action">win.model-number</attribute>
  316 + <attribute name="target">3</attribute>
  317 + </item>
  318 + <item>
  319 + <attribute name="label" translatable="yes">Model 4 - 80x43</attribute>
  320 + <attribute name="action">win.model-number</attribute>
  321 + <attribute name="target">4</attribute>
  322 + </item>
  323 + <item>
  324 + <attribute name="label" translatable="yes">Model 5 - 132x27</attribute>
  325 + <attribute name="action">win.model-number</attribute>
  326 + <attribute name="target">5</attribute>
  327 + </item>
  328 +
  329 + </submenu>
  330 +
  331 + <submenu id='font-select-placeholder'>
  332 + <attribute name="label" translatable="yes">Terminal font</attribute>
  333 + </submenu>
  334 +
  335 + <submenu>
  336 +
  337 + <attribute name='label' translatable='yes'>Options</attribute>
  338 +
  339 + <item>
  340 + <attribute name="label" translatable="yes">Connect on startup</attribute>
  341 + <attribute name="action">win.autoconnect</attribute>
  342 + </item>
  343 +
  344 + <item>
  345 + <attribute name="label" translatable="yes">Blinking Cursor</attribute>
  346 + <attribute name="action">win.cursorblink</attribute>
  347 + </item>
  348 +
  349 + <item>
  350 + <attribute name="label" translatable="yes">Monocase</attribute>
  351 + <attribute name="action">win.monocase</attribute>
  352 + </item>
  353 +
  354 + <item>
  355 + <attribute name="label" translatable="yes">Track Cursor</attribute>
  356 + <attribute name="action">win.cursorpos</attribute>
  357 + </item>
  358 +
  359 + <item>
  360 + <attribute name="label" translatable="yes">Full Screen</attribute>
  361 + <attribute name="action">win.fullscreen</attribute>
  362 + </item>
  363 +
  364 + <item>
  365 + <attribute name="label" translatable="yes">Resize on alternate screen</attribute>
  366 + <attribute name="action">win.altscreen</attribute>
  367 + </item>
  368 +
  369 + <item>
  370 + <attribute name="label" translatable="yes">Paste with left margin</attribute>
  371 + <attribute name="action">win.marginedpaste</attribute>
  372 + </item>
  373 +
  374 + <item>
  375 + <attribute name="label" translatable="yes">Cross hair cursor</attribute>
  376 + <attribute name="action">win.crosshair</attribute>
  377 + </item>
  378 +
  379 + <item>
  380 + <attribute name="label" translatable="yes">Blank Fill</attribute>
  381 + <attribute name="action">win.blankfill</attribute>
  382 + </item>
  383 +
  384 + <item>
  385 + <attribute name="label" translatable="yes">Select by rectangles</attribute>
  386 + <attribute name="action">win.rectselect</attribute>
  387 + </item>
  388 +
  389 + <item>
  390 + <attribute name="label" translatable="yes">Auto-Reconnect</attribute>
  391 + <attribute name="action">win.autoreconnect</attribute>
  392 + </item>
  393 +
  394 + <item>
  395 + <attribute name="label" translatable="yes">Bold</attribute>
  396 + <attribute name="action">win.bold</attribute>
  397 + </item>
  398 +
  399 + <item>
  400 + <attribute name="label" translatable="yes">Show Underline</attribute>
  401 + <attribute name="action">win.underline</attribute>
  402 + </item>
  403 +
  404 + <item>
  405 + <attribute name="label" translatable="yes">Keep selected</attribute>
  406 + <attribute name="action">win.keepselected</attribute>
  407 + </item>
  408 +
  409 + <item>
  410 + <attribute name="label" translatable="yes">Smart paste</attribute>
  411 + <attribute name="action">win.smartpaste</attribute>
  412 + </item>
  413 +
  414 + <item>
  415 + <attribute name="label" translatable="yes">Alert sound</attribute>
  416 + <attribute name="action">win.beep</attribute>
  417 + </item>
  418 +
  419 + <item>
  420 + <attribute name="label" translatable="yes">Use +/- for field navigation</attribute>
  421 + <attribute name="action">win.kpalternative</attribute>
  422 + </item>
  423 +
  424 + <item>
  425 + <attribute name="label" translatable="yes">Network keep alive</attribute>
  426 + <attribute name="action">win.keepalive</attribute>
  427 + </item>
213 428
214 - <item>  
215 - <attribute name="label" translatable="yes">Clear</attribute>  
216 - <attribute name="action">win.clear</attribute>  
217 - </item>  
218 -  
219 - <item>  
220 - <attribute name="label" translatable="yes">Erase input</attribute>  
221 - <attribute name="action">win.erase_input</attribute>  
222 - </item>  
223 -  
224 - <item>  
225 - <attribute name="label" translatable="yes">Delete Field</attribute>  
226 - <attribute name="action">win.delete_field</attribute>  
227 - </item>  
228 -  
229 - <item>  
230 - <attribute name="label" translatable="yes">Erase to end of field</attribute>  
231 - <attribute name="action">win.erase_eof</attribute>  
232 - </item>  
233 -  
234 - <item>  
235 - <attribute name="label" translatable="yes">Erase to end of line</attribute>  
236 - <attribute name="action">win.erase_eol</attribute>  
237 - </item>  
238 -  
239 - </section>  
240 -  
241 - </submenu>  
242 -  
243 - <submenu id="view-menu-placeholder">  
244 -  
245 - <attribute name='label' translatable='yes'>_View</attribute>  
246 -  
247 - <item>  
248 - <attribute name="label" translatable="yes">Trace</attribute>  
249 - <attribute name="action">win.trace</attribute>  
250 - </item>  
251 -  
252 - <item>  
253 - <attribute name="label" translatable="yes">Toolbar</attribute>  
254 - <attribute name="action">win.toolbar</attribute>  
255 - </item>  
256 -  
257 - <item>  
258 - <attribute name="label" translatable="yes">Menu</attribute>  
259 - <attribute name="action">win.menubar</attribute>  
260 - </item>  
261 -  
262 - <item>  
263 - <attribute name="label" translatable="yes">Field attributes</attribute>  
264 - <attribute name="action">win.fieldattr</attribute>  
265 - </item>  
266 -  
267 - </submenu>  
268 -  
269 - <submenu>  
270 -  
271 - <attribute name='label' translatable='yes'>_Network</attribute>  
272 -  
273 - <item>  
274 - <attribute name="label" translatable="yes">Configure host</attribute>  
275 - <attribute name="action">win.set.host</attribute>  
276 - </item>  
277 -  
278 - <item>  
279 - <attribute name="label" translatable="yes">_Connect</attribute>  
280 - <attribute name="action">win.connect</attribute>  
281 - </item>  
282 -  
283 - <item>  
284 - <attribute name="label" translatable="yes">_Disconnect</attribute>  
285 - <attribute name="action">win.disconnect</attribute>  
286 - </item>  
287 -  
288 - </submenu>  
289 -  
290 - <submenu>  
291 -  
292 - <attribute name='label' translatable='yes'>Settings</attribute>  
293 -  
294 - <item>  
295 - <attribute name="label" translatable="yes">Colors</attribute>  
296 - <attribute name="action">win.set.colors</attribute>  
297 - </item>  
298 -  
299 - <submenu>  
300 -  
301 - <attribute name="label" translatable="yes">Screen size</attribute>  
302 -  
303 - <item>  
304 - <attribute name="label" translatable="yes">Model 2 - 80x24</attribute>  
305 - <attribute name="action">win.model-number</attribute>  
306 - <attribute name="target">2</attribute>  
307 - </item>  
308 - <item>  
309 - <attribute name="label" translatable="yes">Model 3 - 80x32</attribute>  
310 - <attribute name="action">win.model-number</attribute>  
311 - <attribute name="target">3</attribute>  
312 - </item>  
313 - <item>  
314 - <attribute name="label" translatable="yes">Model 4 - 80x43</attribute>  
315 - <attribute name="action">win.model-number</attribute>  
316 - <attribute name="target">4</attribute>  
317 - </item>  
318 - <item>  
319 - <attribute name="label" translatable="yes">Model 5 - 132x27</attribute>  
320 - <attribute name="action">win.model-number</attribute>  
321 - <attribute name="target">5</attribute>  
322 - </item>  
323 -  
324 - </submenu>  
325 -  
326 - <submenu id='font-select-placeholder'>  
327 - <attribute name="label" translatable="yes">Terminal font</attribute>  
328 - </submenu>  
329 -  
330 - <submenu>  
331 -  
332 - <attribute name='label' translatable='yes'>Options</attribute>  
333 -  
334 - <item>  
335 - <attribute name="label" translatable="yes">Connect on startup</attribute>  
336 - <attribute name="action">win.autoconnect</attribute>  
337 - </item>  
338 -  
339 - <item>  
340 - <attribute name="label" translatable="yes">Blinking Cursor</attribute>  
341 - <attribute name="action">win.cursorblink</attribute>  
342 - </item>  
343 -  
344 - <item>  
345 - <attribute name="label" translatable="yes">Monocase</attribute>  
346 - <attribute name="action">win.monocase</attribute>  
347 - </item>  
348 -  
349 - <item>  
350 - <attribute name="label" translatable="yes">Track Cursor</attribute>  
351 - <attribute name="action">win.cursorpos</attribute>  
352 - </item>  
353 -  
354 - <item>  
355 - <attribute name="label" translatable="yes">Full Screen</attribute>  
356 - <attribute name="action">win.fullscreen</attribute>  
357 - </item>  
358 -  
359 - <item>  
360 - <attribute name="label" translatable="yes">Resize on alternate screen</attribute>  
361 - <attribute name="action">win.altscreen</attribute>  
362 - </item>  
363 -  
364 - <item>  
365 - <attribute name="label" translatable="yes">Paste with left margin</attribute>  
366 - <attribute name="action">win.marginedpaste</attribute>  
367 - </item>  
368 -  
369 - <item>  
370 - <attribute name="label" translatable="yes">Cross hair cursor</attribute>  
371 - <attribute name="action">win.crosshair</attribute>  
372 - </item>  
373 -  
374 - <item>  
375 - <attribute name="label" translatable="yes">Blank Fill</attribute>  
376 - <attribute name="action">win.blankfill</attribute>  
377 - </item>  
378 -  
379 - <item>  
380 - <attribute name="label" translatable="yes">Select by rectangles</attribute>  
381 - <attribute name="action">win.rectselect</attribute>  
382 - </item>  
383 -  
384 - <item>  
385 - <attribute name="label" translatable="yes">Auto-Reconnect</attribute>  
386 - <attribute name="action">win.autoreconnect</attribute>  
387 - </item>  
388 -  
389 - <item>  
390 - <attribute name="label" translatable="yes">Bold</attribute>  
391 - <attribute name="action">win.bold</attribute>  
392 - </item>  
393 -  
394 - <item>  
395 - <attribute name="label" translatable="yes">Show Underline</attribute>  
396 - <attribute name="action">win.underline</attribute>  
397 - </item>  
398 -  
399 - <item>  
400 - <attribute name="label" translatable="yes">Keep selected</attribute>  
401 - <attribute name="action">win.keepselected</attribute>  
402 - </item>  
403 -  
404 - <item>  
405 - <attribute name="label" translatable="yes">Smart paste</attribute>  
406 - <attribute name="action">win.smartpaste</attribute>  
407 - </item>  
408 -  
409 - <item>  
410 - <attribute name="label" translatable="yes">Alert sound</attribute>  
411 - <attribute name="action">win.beep</attribute>  
412 - </item>  
413 -  
414 - <item>  
415 - <attribute name="label" translatable="yes">Use +/- for field navigation</attribute>  
416 - <attribute name="action">win.kpalternative</attribute>  
417 - </item>  
418 -  
419 - <item>  
420 - <attribute name="label" translatable="yes">Network keep alive</attribute>  
421 - <attribute name="action">win.keepalive</attribute>  
422 - </item> 429 + <item>
  430 + <attribute name="label" translatable="yes">Dynamic font spacing</attribute>
  431 + <attribute name="action">win.dynamic-font-spacing</attribute>
  432 + </item>
423 433
424 - <item>  
425 - <attribute name="label" translatable="yes">Dynamic font spacing</attribute>  
426 - <attribute name="action">win.dynamic-font-spacing</attribute>  
427 - </item> 434 + </submenu>
  435 +
  436 + </submenu>
  437 +
  438 + <submenu>
  439 +
  440 + <attribute name='label' translatable='yes'>Help</attribute>
  441 +
  442 + <item>
  443 + <attribute name="label" translatable="yes">About PW3270</attribute>
  444 + <attribute name="action">app.about</attribute>
  445 + </item>
  446 +
  447 + </submenu>
428 448
429 - </submenu>  
430 -  
431 - </submenu>  
432 -  
433 - <submenu>  
434 -  
435 - <attribute name='label' translatable='yes'>Help</attribute>  
436 -  
437 - <item>  
438 - <attribute name="label" translatable="yes">About PW3270</attribute>  
439 - <attribute name="action">app.about</attribute>  
440 - </item>  
441 -  
442 - </submenu> 449 + </menu>
443 450
444 -  
445 - </menu>  
446 </interface> 451 </interface>
@@ -28,324 +28,304 @@ @@ -28,324 +28,304 @@
28 28
29 --> 29 -->
30 <interface> 30 <interface>
31 - <requires lib="gtk+" version="3.0"/>  
32 - <menu id="gear-menu">  
33 - <section>  
34 -  
35 - <submenu>  
36 - <attribute name="label" translatable="yes">New</attribute>  
37 - <item>  
38 - <attribute name="label" translatable="yes">Tab</attribute>  
39 - <attribute name="action">app.new.tab</attribute>  
40 - </item>  
41 - <item>  
42 - <attribute name="label" translatable="yes">Application Window</attribute>  
43 - <attribute name="action">app.new.window</attribute>  
44 - </item>  
45 - </submenu>  
46 -  
47 - <submenu>  
48 - <attribute name="label" translatable="yes">Open</attribute>  
49 - <item>  
50 - <attribute name="label" translatable="yes">File</attribute>  
51 - <attribute name="action">app.open</attribute>  
52 - </item>  
53 - <item>  
54 - <attribute name="label" translatable="yes">New tab</attribute>  
55 - <attribute name="action">app.new.tab</attribute>  
56 - </item>  
57 - <item>  
58 - <attribute name="label" translatable="yes">New window</attribute>  
59 - <attribute name="action">app.new.window</attribute>  
60 - </item>  
61 - </submenu>  
62 -  
63 - </section>  
64 -  
65 - <section>  
66 - <item>  
67 - <attribute name="label" translatable="yes">Preferences</attribute>  
68 - <attribute name="action">win.preferences</attribute>  
69 - </item>  
70 - </section>  
71 - </menu>  
72 -  
73 - <menu id="popup-over-selected-area">  
74 -  
75 - <submenu>  
76 -  
77 - <attribute name='label' translatable='yes'>_Edit</attribute>  
78 -  
79 - <section>  
80 -  
81 - <item>  
82 - <attribute name="label" translatable="yes">Copy</attribute>  
83 - <attribute name="action">win.copy</attribute>  
84 - <attribute name="target">auto</attribute>  
85 - </item>  
86 -  
87 - <item>  
88 - <attribute name="label" translatable="yes">Copy as text</attribute>  
89 - <attribute name="action">win.copy</attribute>  
90 - <attribute name="target">text</attribute>  
91 - </item>  
92 -  
93 - <item>  
94 - <attribute name="label" translatable="yes">Copy as table</attribute>  
95 - <attribute name="action">win.copy</attribute>  
96 - <attribute name="target">table</attribute>  
97 - </item>  
98 -  
99 - <item>  
100 - <attribute name="label" translatable="yes">Append to copy</attribute>  
101 - <attribute name="action">win.copy</attribute>  
102 - <attribute name="target">append</attribute>  
103 - </item>  
104 -  
105 - <item>  
106 - <attribute name="label" translatable="yes">Cut</attribute>  
107 - <attribute name="action">win.cut</attribute>  
108 - <attribute name="target">auto</attribute>  
109 - </item>  
110 -  
111 - </section>  
112 - <section>  
113 -  
114 - <item>  
115 - <attribute name="label" translatable="yes">Save selected</attribute>  
116 - <attribute name="action">win.save_selected</attribute>  
117 - </item>  
118 -  
119 - <item>  
120 - <attribute name="label" translatable="yes">Print selected</attribute>  
121 - <attribute name="action">win.print_selected</attribute>  
122 - </item>  
123 -  
124 - <item>  
125 - <attribute name="label" translatable="yes">Unselect</attribute>  
126 - <attribute name="action">win.unselect</attribute>  
127 - </item>  
128 -  
129 - </section>  
130 -  
131 - <section>  
132 -  
133 - <item>  
134 - <attribute name="label" translatable="yes">Clear</attribute>  
135 - <attribute name="action">win.clear</attribute>  
136 - </item>  
137 -  
138 - <item>  
139 - <attribute name="label" translatable="yes">Erase input</attribute>  
140 - <attribute name="action">win.erase_input</attribute>  
141 - </item>  
142 -  
143 - <item>  
144 - <attribute name="label" translatable="yes">Delete Field</attribute>  
145 - <attribute name="action">win.delete_field</attribute>  
146 - </item>  
147 -  
148 - <item>  
149 - <attribute name="label" translatable="yes">Erase to end of field</attribute>  
150 - <attribute name="action">win.erase_eof</attribute>  
151 - </item>  
152 -  
153 - <item>  
154 - <attribute name="label" translatable="yes">Erase to end of line</attribute>  
155 - <attribute name="action">win.erase_eol</attribute>  
156 - </item>  
157 31
158 - </section> 32 + <requires lib="gtk+" version="3.0"/>
  33 + <menu id="gear-menu">
  34 + <section>
  35 +
  36 + <item>
  37 + <attribute name="label" translatable="yes">New tab</attribute>
  38 + <attribute name="action">app.new.tab</attribute>
  39 + </item>
  40 + <item>
  41 + <attribute name="label" translatable="yes">New Window</attribute>
  42 + <attribute name="action">app.new.window</attribute>
  43 + </item>
  44 + </section>
159 45
160 - </submenu> 46 + <item>
  47 + <attribute name="label" translatable="yes">Preferences</attribute>
  48 + <attribute name="action">win.preferences</attribute>
  49 + </item>
161 50
162 - <submenu> 51 + </menu>
163 52
164 - <attribute name='label' translatable='yes'>Options</attribute> 53 + <menu id="popup-over-selected-area">
  54 +
  55 + <submenu>
  56 + <attribute name='label' translatable='yes'>_Edit</attribute>
165 57
166 - <item>  
167 - <attribute name="label" translatable="yes">Show toolbar</attribute>  
168 - <attribute name="action">win.toolbar</attribute>  
169 - </item> 58 + <section>
  59 +
  60 + <item>
  61 + <attribute name="label" translatable="yes">Copy</attribute>
  62 + <attribute name="action">win.copy</attribute>
  63 + <attribute name="target">auto</attribute>
  64 + </item>
170 65
171 - <item>  
172 - <attribute name="label" translatable="yes">Show menu</attribute>  
173 - <attribute name="action">win.menubar</attribute>  
174 - </item> 66 + <item>
  67 + <attribute name="label" translatable="yes">Copy as text</attribute>
  68 + <attribute name="action">win.copy</attribute>
  69 + <attribute name="target">text</attribute>
  70 + </item>
  71 +
  72 + <item>
  73 + <attribute name="label" translatable="yes">Copy as table</attribute>
  74 + <attribute name="action">win.copy</attribute>
  75 + <attribute name="target">table</attribute>
  76 + </item>
175 77
176 - <item>  
177 - <attribute name="label" translatable="yes">Full screen</attribute>  
178 - <attribute name="action">win.fullscreen</attribute>  
179 - </item> 78 + <item>
  79 + <attribute name="label" translatable="yes">Append to copy</attribute>
  80 + <attribute name="action">win.copy</attribute>
  81 + <attribute name="target">append</attribute>
  82 + </item>
180 83
181 - </submenu> 84 + <item>
  85 + <attribute name="label" translatable="yes">Cut</attribute>
  86 + <attribute name="action">win.cut</attribute>
  87 + <attribute name="target">auto</attribute>
  88 + </item>
182 89
183 - <item>  
184 - <attribute name="label" translatable="yes">Disconnect</attribute>  
185 - <attribute name="action">win.disconnect</attribute>  
186 - </item> 90 + </section>
187 91
188 - <item>  
189 - <attribute name="label" translatable="yes">Close window</attribute>  
190 - <attribute name="action">win.close</attribute>  
191 - </item> 92 + <section>
192 93
193 - </menu> 94 + <item>
  95 + <attribute name="label" translatable="yes">Save selected</attribute>
  96 + <attribute name="action">win.save_selected</attribute>
  97 + </item>
194 98
195 - <menu id="popup-over-unselected-area"> 99 + <item>
  100 + <attribute name="label" translatable="yes">Print selected</attribute>
  101 + <attribute name="action">win.print_selected</attribute>
  102 + </item>
196 103
197 - <submenu> 104 + <item>
  105 + <attribute name="label" translatable="yes">Unselect</attribute>
  106 + <attribute name="action">win.unselect</attribute>
  107 + </item>
198 108
199 - <attribute name='label' translatable='yes'>_Edit</attribute> 109 + </section>
200 110
201 - <section> 111 + <section>
202 112
203 - <item>  
204 - <attribute name="label" translatable="yes">Paste from clipboard</attribute>  
205 - <attribute name="action">win.paste</attribute>  
206 - <attribute name="target">clipboard://</attribute>  
207 - </item> 113 + <item>
  114 + <attribute name="label" translatable="yes">Clear</attribute>
  115 + <attribute name="action">win.clear</attribute>
  116 + </item>
208 117
209 - <item>  
210 - <attribute name="label" translatable="yes">Paste next</attribute>  
211 - <attribute name="action">win.paste</attribute>  
212 - <attribute name="target">next://</attribute>  
213 - </item> 118 + <item>
  119 + <attribute name="label" translatable="yes">Erase input</attribute>
  120 + <attribute name="action">win.erase_input</attribute>
  121 + </item>
214 122
215 - <item>  
216 - <attribute name="label" translatable="yes">Paste from text file</attribute>  
217 - <attribute name="action">win.paste</attribute>  
218 - <attribute name="target">file://</attribute>  
219 - </item> 123 + <item>
  124 + <attribute name="label" translatable="yes">Delete Field</attribute>
  125 + <attribute name="action">win.delete_field</attribute>
  126 + </item>
220 127
221 - </section> 128 + <item>
  129 + <attribute name="label" translatable="yes">Erase to end of field</attribute>
  130 + <attribute name="action">win.erase_eof</attribute>
  131 + </item>
222 132
223 - <section> 133 + <item>
  134 + <attribute name="label" translatable="yes">Erase to end of line</attribute>
  135 + <attribute name="action">win.erase_eol</attribute>
  136 + </item>
224 137
225 - <item>  
226 - <attribute name="label" translatable="yes">Select all</attribute>  
227 - <attribute name="action">win.select-all</attribute>  
228 - </item> 138 + </section>
229 139
230 - <item>  
231 - <attribute name="label" translatable="yes">Select Field</attribute>  
232 - <attribute name="action">win.select-field</attribute>  
233 - </item> 140 + </submenu>
234 141
235 - <item>  
236 - <attribute name="label" translatable="yes">Reselect</attribute>  
237 - <attribute name="action">win.reselect</attribute>  
238 - </item> 142 + <submenu>
239 143
240 - </section> 144 + <attribute name='label' translatable='yes'>Options</attribute>
241 145
242 - <section> 146 + <item>
  147 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  148 + <attribute name="action">win.toolbar</attribute>
  149 + </item>
243 150
244 - <item>  
245 - <attribute name="label" translatable="yes">Clear</attribute>  
246 - <attribute name="action">win.clear</attribute>  
247 - </item> 151 + <item>
  152 + <attribute name="label" translatable="yes">Show menu</attribute>
  153 + <attribute name="action">win.menubar</attribute>
  154 + </item>
248 155
249 - <item>  
250 - <attribute name="label" translatable="yes">Erase input</attribute>  
251 - <attribute name="action">win.erase_input</attribute>  
252 - </item> 156 + <item>
  157 + <attribute name="label" translatable="yes">Full screen</attribute>
  158 + <attribute name="action">win.fullscreen</attribute>
  159 + </item>
253 160
254 - <item>  
255 - <attribute name="label" translatable="yes">Delete Field</attribute>  
256 - <attribute name="action">win.delete_field</attribute>  
257 - </item> 161 + </submenu>
258 162
259 - <item>  
260 - <attribute name="label" translatable="yes">Erase to end of field</attribute>  
261 - <attribute name="action">win.erase_eof</attribute>  
262 - </item> 163 + <item>
  164 + <attribute name="label" translatable="yes">Disconnect</attribute>
  165 + <attribute name="action">win.disconnect</attribute>
  166 + </item>
263 167
264 - <item>  
265 - <attribute name="label" translatable="yes">Erase to end of line</attribute>  
266 - <attribute name="action">win.erase_eol</attribute>  
267 - </item> 168 + <item>
  169 + <attribute name="label" translatable="yes">Close window</attribute>
  170 + <attribute name="action">win.close</attribute>
  171 + </item>
268 172
269 - </section> 173 + </menu>
270 174
271 - </submenu> 175 + <menu id="popup-over-unselected-area">
272 176
273 - <item>  
274 - <attribute name="label" translatable="yes">Send/Receive files</attribute>  
275 - <attribute name="action">win.file.transfer</attribute>  
276 - </item> 177 + <submenu>
277 178
278 - <submenu> 179 + <attribute name='label' translatable='yes'>_Edit</attribute>
279 180
280 - <attribute name='label' translatable='yes'>Options</attribute> 181 + <section>
281 182
282 - <item>  
283 - <attribute name="label" translatable="yes">Show toolbar</attribute>  
284 - <attribute name="action">win.toolbar</attribute>  
285 - </item> 183 + <item>
  184 + <attribute name="label" translatable="yes">Paste from clipboard</attribute>
  185 + <attribute name="action">win.paste</attribute>
  186 + <attribute name="target">clipboard://</attribute>
  187 + </item>
286 188
287 - <item>  
288 - <attribute name="label" translatable="yes">Show menu</attribute>  
289 - <attribute name="action">win.menubar</attribute>  
290 - </item> 189 + <item>
  190 + <attribute name="label" translatable="yes">Paste next</attribute>
  191 + <attribute name="action">win.paste</attribute>
  192 + <attribute name="target">next://</attribute>
  193 + </item>
291 194
292 - <item>  
293 - <attribute name="label" translatable="yes">Full screen</attribute>  
294 - <attribute name="action">win.fullscreen</attribute>  
295 - </item> 195 + <item>
  196 + <attribute name="label" translatable="yes">Paste from text file</attribute>
  197 + <attribute name="action">win.paste</attribute>
  198 + <attribute name="target">file://</attribute>
  199 + </item>
296 200
297 - </submenu> 201 + </section>
298 202
299 - <item>  
300 - <attribute name="label" translatable="yes">Disconnect</attribute>  
301 - <attribute name="action">win.disconnect</attribute>  
302 - </item> 203 + <section>
303 204
304 - <item>  
305 - <attribute name="label" translatable="yes">Close window</attribute>  
306 - <attribute name="action">win.close</attribute>  
307 - </item> 205 + <item>
  206 + <attribute name="label" translatable="yes">Select all</attribute>
  207 + <attribute name="action">win.select-all</attribute>
  208 + </item>
308 209
309 - </menu> 210 + <item>
  211 + <attribute name="label" translatable="yes">Select Field</attribute>
  212 + <attribute name="action">win.select-field</attribute>
  213 + </item>
310 214
311 - <menu id="popup-when-offline"> 215 + <item>
  216 + <attribute name="label" translatable="yes">Reselect</attribute>
  217 + <attribute name="action">win.reselect</attribute>
  218 + </item>
312 219
313 - <item>  
314 - <attribute name="label" translatable="yes">_Connect</attribute>  
315 - <attribute name="action">win.connect</attribute>  
316 - </item> 220 + </section>
317 221
318 - <item>  
319 - <attribute name="label" translatable="yes">Configure host</attribute>  
320 - <attribute name="action">win.set.host</attribute>  
321 - </item> 222 + <section>
322 223
323 - <submenu> 224 + <item>
  225 + <attribute name="label" translatable="yes">Clear</attribute>
  226 + <attribute name="action">win.clear</attribute>
  227 + </item>
324 228
325 - <attribute name='label' translatable='yes'>Options</attribute> 229 + <item>
  230 + <attribute name="label" translatable="yes">Erase input</attribute>
  231 + <attribute name="action">win.erase_input</attribute>
  232 + </item>
326 233
327 - <item>  
328 - <attribute name="label" translatable="yes">Show toolbar</attribute>  
329 - <attribute name="action">win.toolbar</attribute>  
330 - </item> 234 + <item>
  235 + <attribute name="label" translatable="yes">Delete Field</attribute>
  236 + <attribute name="action">win.delete_field</attribute>
  237 + </item>
331 238
332 - <item>  
333 - <attribute name="label" translatable="yes">Show menu</attribute>  
334 - <attribute name="action">win.menubar</attribute>  
335 - </item> 239 + <item>
  240 + <attribute name="label" translatable="yes">Erase to end of field</attribute>
  241 + <attribute name="action">win.erase_eof</attribute>
  242 + </item>
336 243
337 - <item>  
338 - <attribute name="label" translatable="yes">Full screen</attribute>  
339 - <attribute name="action">win.fullscreen</attribute>  
340 - </item> 244 + <item>
  245 + <attribute name="label" translatable="yes">Erase to end of line</attribute>
  246 + <attribute name="action">win.erase_eol</attribute>
  247 + </item>
341 248
342 - </submenu> 249 + </section>
343 250
344 - <item>  
345 - <attribute name="label" translatable="yes">Close window</attribute>  
346 - <attribute name="action">win.close</attribute>  
347 - </item> 251 + </submenu>
348 252
349 - </menu> 253 + <item>
  254 + <attribute name="label" translatable="yes">Send/Receive files</attribute>
  255 + <attribute name="action">win.file.transfer</attribute>
  256 + </item>
  257 +
  258 + <submenu>
  259 +
  260 + <attribute name='label' translatable='yes'>Options</attribute>
  261 +
  262 + <item>
  263 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  264 + <attribute name="action">win.toolbar</attribute>
  265 + </item>
  266 +
  267 + <item>
  268 + <attribute name="label" translatable="yes">Show menu</attribute>
  269 + <attribute name="action">win.menubar</attribute>
  270 + </item>
  271 +
  272 + <item>
  273 + <attribute name="label" translatable="yes">Full screen</attribute>
  274 + <attribute name="action">win.fullscreen</attribute>
  275 + </item>
  276 +
  277 + </submenu>
  278 +
  279 + <item>
  280 + <attribute name="label" translatable="yes">Disconnect</attribute>
  281 + <attribute name="action">win.disconnect</attribute>
  282 + </item>
  283 +
  284 + <item>
  285 + <attribute name="label" translatable="yes">Close window</attribute>
  286 + <attribute name="action">win.close</attribute>
  287 + </item>
  288 +
  289 + </menu>
  290 +
  291 + <menu id="popup-when-offline">
  292 +
  293 + <item>
  294 + <attribute name="label" translatable="yes">_Connect</attribute>
  295 + <attribute name="action">win.connect</attribute>
  296 + </item>
  297 +
  298 + <item>
  299 + <attribute name="label" translatable="yes">Host properties</attribute>
  300 + <attribute name="action">win.set.host</attribute>
  301 + </item>
  302 +
  303 + <submenu>
  304 +
  305 + <attribute name='label' translatable='yes'>Options</attribute>
  306 +
  307 + <item>
  308 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  309 + <attribute name="action">win.toolbar</attribute>
  310 + </item>
  311 +
  312 + <item>
  313 + <attribute name="label" translatable="yes">Show menu</attribute>
  314 + <attribute name="action">win.menubar</attribute>
  315 + </item>
  316 +
  317 + <item>
  318 + <attribute name="label" translatable="yes">Full screen</attribute>
  319 + <attribute name="action">win.fullscreen</attribute>
  320 + </item>
  321 +
  322 + </submenu>
  323 +
  324 + <item>
  325 + <attribute name="label" translatable="yes">Close window</attribute>
  326 + <attribute name="action">win.close</attribute>
  327 + </item>
  328 +
  329 + </menu>
350 330
351 </interface> 331 </interface>