Download as
Browse Code »

Commit 3881b3c964733c3c7235695e75ae5985ff184fc0

Authored by Perry Werneck
1 parent cb68047c
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Working on classic UI.

Showing 5 changed files with 100 additions and 44 deletions   Show diff stats
src/objects/actions/print.c
  Diff comments   View file @3881b3c
... ... @@ -81,7 +81,7 @@
81 81 action->parent.activate = activate_print_screen;
82 82  
83 83 action->group.id = LIB3270_ACTION_GROUP_ONLINE;
84   - action->parent.name = "print_screen";
  84 + action->parent.name = "print.screen";
85 85 action->label = N_( "Print screen" );
86 86  
87 87 return G_ACTION(action);
... ... @@ -95,7 +95,7 @@
95 95 action->parent.activate = activate_print_selected;
96 96  
97 97 action->group.id = LIB3270_ACTION_GROUP_SELECTION;
98   - action->parent.name = "print_selected";
  98 + action->parent.name = "print.selected";
99 99 action->label = N_( "Print selected" );
100 100  
101 101 return G_ACTION(action);
... ...
src/objects/actions/save.c
  Diff comments   View file @3881b3c
... ... @@ -80,7 +80,7 @@
80 80 action->parent.activate = activate_save_screen;
81 81  
82 82 action->group.id = LIB3270_ACTION_GROUP_ONLINE;
83   - action->parent.name = "save_screen";
  83 + action->parent.name = "save.screen";
84 84 action->label = N_( "Save screen" );
85 85  
86 86 return G_ACTION(action);
... ... @@ -94,7 +94,7 @@
94 94 action->parent.activate = activate_save_selected;
95 95  
96 96 action->group.id = LIB3270_ACTION_GROUP_SELECTION;
97   - action->parent.name = "save_selected";
  97 + action->parent.name = "save.selected";
98 98 action->label = N_( "Save selected" );
99 99  
100 100 return G_ACTION(action);
... ...
src/objects/application/application.c
  Diff comments   View file @3881b3c
... ... @@ -308,13 +308,13 @@
308 308 } conditional_actions[] = {
309 309 {
310 310 .label = N_("Save copy"),
311   - .action_name = "save_copy",
  311 + .action_name = "save.copy",
312 312 .property_name = "has_copy",
313 313 .activate = pw3270_application_save_copy_activated
314 314 },
315 315 {
316 316 .label = N_("Print copy"),
317   - .action_name = "print_copy",
  317 + .action_name = "print.copy",
318 318 .property_name = "has_copy",
319 319 .activate = pw3270_application_print_copy_activated
320 320 }
... ...
ui/application.xml
  Diff comments   View file @3881b3c
... ... @@ -84,17 +84,17 @@
84 84  
85 85 <item>
86 86 <attribute name="label" translatable="yes">Save screen</attribute>
87   - <attribute name="action">win.save_screen</attribute>
  87 + <attribute name="action">win.save.screen</attribute>
88 88 </item>
89 89  
90 90 <item>
91 91 <attribute name="label" translatable="yes">Save selected</attribute>
92   - <attribute name="action">win.save_selected</attribute>
  92 + <attribute name="action">win.save.selected</attribute>
93 93 </item>
94 94  
95 95 <item>
96 96 <attribute name="label" translatable="yes">Save copy</attribute>
97   - <attribute name="action">win.save_copy</attribute>
  97 + <attribute name="action">win.save.copy</attribute>
98 98 </item>
99 99  
100 100 </section>
... ... @@ -102,18 +102,18 @@
102 102 <section>
103 103  
104 104 <item>
105   - <attribute name="label" translatable="yes">Print</attribute>
106   - <attribute name="action">win.print</attribute>
  105 + <attribute name="label" translatable="yes">Print Screen</attribute>
  106 + <attribute name="action">win.print.screen</attribute>
107 107 </item>
108 108  
109 109 <item>
110 110 <attribute name="label" translatable="yes">Print selected</attribute>
111   - <attribute name="action">win.print_selected</attribute>
  111 + <attribute name="action">win.print.selected</attribute>
112 112 </item>
113 113  
114 114 <item>
115 115 <attribute name="label" translatable="yes">Print copy</attribute>
116   - <attribute name="action">win.print_copy</attribute>
  116 + <attribute name="action">win.print.copy</attribute>
117 117 </item>
118 118  
119 119 </section>
... ... @@ -362,6 +362,11 @@
362 362 </item>
363 363  
364 364 <item>
  365 + <attribute name="label" translatable="yes">Cross hair cursor</attribute>
  366 + <attribute name="action">win.crosshair</attribute>
  367 + </item>
  368 +
  369 + <item>
365 370 <attribute name="label" translatable="yes">Resize on alternate screen</attribute>
366 371 <attribute name="action">win.altscreen</attribute>
367 372 </item>
... ... @@ -372,11 +377,6 @@
372 377 </item>
373 378  
374 379 <item>
375   - <attribute name="label" translatable="yes">Cross hair cursor</attribute>
376   - <attribute name="action">win.crosshair</attribute>
377   - </item>
378   -
379   - <item>
380 380 <attribute name="label" translatable="yes">Blank Fill</attribute>
381 381 <attribute name="action">win.blankfill</attribute>
382 382 </item>
... ...
ui/window.xml
  Diff comments   View file @3881b3c
... ... @@ -98,12 +98,12 @@
98 98  
99 99 <item>
100 100 <attribute name="label" translatable="yes">Save selected</attribute>
101   - <attribute name="action">win.save_selected</attribute>
  101 + <attribute name="action">win.save.selected</attribute>
102 102 </item>
103 103  
104 104 <item>
105 105 <attribute name="label" translatable="yes">Print selected</attribute>
106   - <attribute name="action">win.print_selected</attribute>
  106 + <attribute name="action">win.print.selected</attribute>
107 107 </item>
108 108  
109 109 <item>
... ... @@ -148,20 +148,43 @@
148 148  
149 149 <attribute name='label' translatable='yes'>Options</attribute>
150 150  
151   - <item>
152   - <attribute name="label" translatable="yes">Show toolbar</attribute>
153   - <attribute name="action">win.toolbar</attribute>
154   - </item>
  151 + <section>
155 152  
156   - <item>
157   - <attribute name="label" translatable="yes">Show menu</attribute>
158   - <attribute name="action">win.menubar</attribute>
159   - </item>
  153 + <item>
  154 + <attribute name="label" translatable="yes">Select by rectangles</attribute>
  155 + <attribute name="action">win.rectselect</attribute>
  156 + </item>
160 157  
161   - <item>
162   - <attribute name="label" translatable="yes">Full screen</attribute>
163   - <attribute name="action">win.fullscreen</attribute>
164   - </item>
  158 + <item>
  159 + <attribute name="label" translatable="yes">Paste with left margin</attribute>
  160 + <attribute name="action">win.marginedpaste</attribute>
  161 + </item>
  162 +
  163 + <item>
  164 + <attribute name="label" translatable="yes">Blank Fill</attribute>
  165 + <attribute name="action">win.blankfill</attribute>
  166 + </item>
  167 +
  168 + </section>
  169 +
  170 + <section>
  171 +
  172 + <item>
  173 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  174 + <attribute name="action">win.toolbar</attribute>
  175 + </item>
  176 +
  177 + <item>
  178 + <attribute name="label" translatable="yes">Show menu</attribute>
  179 + <attribute name="action">win.menubar</attribute>
  180 + </item>
  181 +
  182 + <item>
  183 + <attribute name="label" translatable="yes">Full screen</attribute>
  184 + <attribute name="action">win.fullscreen</attribute>
  185 + </item>
  186 +
  187 + </section>
165 188  
166 189 </submenu>
167 190  
... ... @@ -256,6 +279,16 @@
256 279 </submenu>
257 280  
258 281 <item>
  282 + <attribute name="label" translatable="yes">Save screen</attribute>
  283 + <attribute name="action">win.save.screen</attribute>
  284 + </item>
  285 +
  286 + <item>
  287 + <attribute name="label" translatable="yes">Print screen</attribute>
  288 + <attribute name="action">win.print.screen</attribute>
  289 + </item>
  290 +
  291 + <item>
259 292 <attribute name="label" translatable="yes">Send/Receive files</attribute>
260 293 <attribute name="action">win.file.transfer</attribute>
261 294 </item>
... ... @@ -264,20 +297,43 @@
264 297  
265 298 <attribute name='label' translatable='yes'>Options</attribute>
266 299  
267   - <item>
268   - <attribute name="label" translatable="yes">Show toolbar</attribute>
269   - <attribute name="action">win.toolbar</attribute>
270   - </item>
  300 + <section>
271 301  
272   - <item>
273   - <attribute name="label" translatable="yes">Show menu</attribute>
274   - <attribute name="action">win.menubar</attribute>
275   - </item>
  302 + <item>
  303 + <attribute name="label" translatable="yes">Select by rectangles</attribute>
  304 + <attribute name="action">win.rectselect</attribute>
  305 + </item>
276 306  
277   - <item>
278   - <attribute name="label" translatable="yes">Full screen</attribute>
279   - <attribute name="action">win.fullscreen</attribute>
280   - </item>
  307 + <item>
  308 + <attribute name="label" translatable="yes">Paste with left margin</attribute>
  309 + <attribute name="action">win.marginedpaste</attribute>
  310 + </item>
  311 +
  312 + <item>
  313 + <attribute name="label" translatable="yes">Blank Fill</attribute>
  314 + <attribute name="action">win.blankfill</attribute>
  315 + </item>
  316 +
  317 + </section>
  318 +
  319 + <section>
  320 +
  321 + <item>
  322 + <attribute name="label" translatable="yes">Show toolbar</attribute>
  323 + <attribute name="action">win.toolbar</attribute>
  324 + </item>
  325 +
  326 + <item>
  327 + <attribute name="label" translatable="yes">Show menu</attribute>
  328 + <attribute name="action">win.menubar</attribute>
  329 + </item>
  330 +
  331 + <item>
  332 + <attribute name="label" translatable="yes">Full screen</attribute>
  333 + <attribute name="action">win.fullscreen</attribute>
  334 + </item>
  335 +
  336 + </section>
281 337  
282 338 </submenu>
283 339  
... ...