Download as
Browse Code »

Commit 8890365fbdc1197ae29514a62490e827388da4cc

Authored by Perry Werneck
1 parent 522153e1
Exists in master and in 3 other branches develop, macos, network_module

Some actions requires more than one accelerator.

Showing 2 changed files with 45 additions and 45 deletions   Show diff stats
src/core/actions/table.c
  Diff comments   View file @8890365
... ... @@ -80,7 +80,7 @@
80 80 .name = "reconnect",
81 81 .type = LIB3270_ACTION_TYPE_NETWORK,
82 82  
83   - .key = NULL,
  83 + .keys = NULL,
84 84 .icon = "gtk-connect",
85 85 .label = N_( "_Connect" ) ,
86 86 .summary = N_( "Connect to host." ),
... ... @@ -94,7 +94,7 @@
94 94 .name = "disconnect",
95 95 .type = LIB3270_ACTION_TYPE_NETWORK,
96 96  
97   - .key = NULL,
  97 + .keys = NULL,
98 98 .icon = "gtk-disconnect",
99 99 .label = N_( "_Disconnect" ),
100 100 .summary = N_( "Disconnect from host." ),
... ... @@ -111,7 +111,7 @@
111 111 .name = "up",
112 112 .type = LIB3270_ACTION_TYPE_NAVIGATION,
113 113  
114   - .key = "Up",
  114 + .keys = "Up,KP_Up",
115 115 .icon = NULL,
116 116 .label = NULL,
117 117 .summary = N_( "Cursor up 1 position." ),
... ... @@ -125,7 +125,7 @@
125 125 .name = "down",
126 126 .type = LIB3270_ACTION_TYPE_NAVIGATION,
127 127  
128   - .key = "Down",
  128 + .keys = "Down,KP_Down",
129 129 .icon = NULL,
130 130 .label = NULL,
131 131 .summary = N_( "Cursor down 1 position." ),
... ... @@ -139,7 +139,7 @@
139 139 .name = "left",
140 140 .type = LIB3270_ACTION_TYPE_NAVIGATION,
141 141  
142   - .key = "Left",
  142 + .keys = "Left,KP_Left",
143 143 .icon = NULL,
144 144 .label = NULL,
145 145 .summary = N_( "Cursor left 1 position." ),
... ... @@ -153,7 +153,7 @@
153 153 .name = "right",
154 154 .type = LIB3270_ACTION_TYPE_NAVIGATION,
155 155  
156   - .key = "Right",
  156 + .keys = "Right,KP_Right",
157 157 .icon = NULL,
158 158 .label = NULL,
159 159 .summary = N_( "Cursor right 1 position." ),
... ... @@ -167,7 +167,7 @@
167 167 .name = "newline",
168 168 .type = LIB3270_ACTION_TYPE_NAVIGATION,
169 169  
170   - .key = "Control_R",
  170 + .keys = "Control_R",
171 171 .icon = NULL,
172 172 .label = NULL,
173 173 .summary = N_( "Cursor to first field on next line or any lines after that." ),
... ... @@ -181,7 +181,7 @@
181 181 .name = "previous-word",
182 182 .type = LIB3270_ACTION_TYPE_NAVIGATION,
183 183  
184   - .key = NULL,
  184 + .keys = NULL,
185 185 .icon = NULL,
186 186 .label = NULL,
187 187 .summary = N_( "Cursor to previous word." ),
... ... @@ -195,7 +195,7 @@
195 195 .name = "next-word",
196 196 .type = LIB3270_ACTION_TYPE_NAVIGATION,
197 197  
198   - .key = NULL,
  198 + .keys = NULL,
199 199 .icon = NULL,
200 200 .label = NULL,
201 201 .summary = N_( "Cursor to next unprotected word." ),
... ... @@ -212,7 +212,7 @@
212 212 .name = "save-all",
213 213 .type = LIB3270_ACTION_TYPE_FILE,
214 214  
215   - .key = NULL,
  215 + .keys = NULL,
216 216 .icon = "document-save",
217 217 .label = NULL,
218 218 .summary = N_( "Save screen." ),
... ... @@ -226,7 +226,7 @@
226 226 .name = "save-selected",
227 227 .type = LIB3270_ACTION_TYPE_FILE,
228 228  
229   - .key = NULL,
  229 + .keys = NULL,
230 230 .icon = NULL,
231 231 .label = NULL,
232 232 .summary = N_( "Save selected area." ),
... ... @@ -240,7 +240,7 @@
240 240 .name = "save-copy",
241 241 .type = LIB3270_ACTION_TYPE_FILE,
242 242  
243   - .key = NULL,
  243 + .keys = NULL,
244 244 .icon = NULL,
245 245 .label = NULL,
246 246 .summary = NULL,
... ... @@ -254,7 +254,7 @@
254 254 .name = "paste-from-file",
255 255 .type = LIB3270_ACTION_TYPE_FILE,
256 256  
257   - .key = NULL,
  257 + .keys = NULL,
258 258 .icon = "document-load",
259 259 .label = NULL,
260 260 .summary = N_( "Paste file." ),
... ... @@ -271,7 +271,7 @@
271 271 .name = "select-all",
272 272 .type = LIB3270_ACTION_TYPE_SELECTION,
273 273  
274   - .key = "<ctrl>a",
  274 + .keys = "<ctrl>a",
275 275 .icon = "edit-select-all",
276 276 .label = N_( "Select all" ),
277 277 .summary = NULL,
... ... @@ -285,7 +285,7 @@
285 285 .name = "unselect",
286 286 .type = LIB3270_ACTION_TYPE_SELECTION,
287 287  
288   - .key = NULL,
  288 + .keys = NULL,
289 289 .icon = NULL,
290 290 .label = N_( "Remove selection" ),
291 291 .summary = N_( "Remove selection" ),
... ... @@ -299,7 +299,7 @@
299 299 .name = "reselect",
300 300 .type = LIB3270_ACTION_TYPE_SELECTION,
301 301  
302   - .key = "<Ctrl>r",
  302 + .keys = "<Ctrl>r",
303 303 .icon = NULL,
304 304 .label = N_( "Reselect" ),
305 305 .summary = N_( "Reselect"),
... ... @@ -316,7 +316,7 @@
316 316 .name = "select-field",
317 317 .type = LIB3270_ACTION_TYPE_SELECTION,
318 318  
319   - .key = "<Ctrl>f",
  319 + .keys = "<Ctrl>f",
320 320 .icon = NULL,
321 321 .label = N_( "Select field" ),
322 322 .summary = N_( "Select Field" ),
... ... @@ -331,7 +331,7 @@
331 331 .name = "field-end",
332 332 .type = LIB3270_ACTION_TYPE_NAVIGATION,
333 333  
334   - .key = NULL,
  334 + .keys = NULL,
335 335 .icon = NULL,
336 336 .label = NULL,
337 337 .summary = N_( "Move the cursor to the first blank after the last nonblank in the field." ),
... ... @@ -345,7 +345,7 @@
345 345 .name = "first-field",
346 346 .type = LIB3270_ACTION_TYPE_NAVIGATION,
347 347  
348   - .key = "Home",
  348 + .keys = "Home",
349 349 .icon = "go-first",
350 350 .label = NULL,
351 351 .summary = N_( "Move to first unprotected field on screen." ),
... ... @@ -359,7 +359,7 @@
359 359 .name = "next-field",
360 360 .type = LIB3270_ACTION_TYPE_NAVIGATION,
361 361  
362   - .key = "Tab",
  362 + .keys = "Tab",
363 363 .icon = "go-next",
364 364 .label = NULL,
365 365 .summary = N_( "Tab forward to next field." ),
... ... @@ -373,7 +373,7 @@
373 373 .name = "previous-field",
374 374 .type = LIB3270_ACTION_TYPE_NAVIGATION,
375 375  
376   - .key = "ISO_Left_Tab",
  376 + .keys = "ISO_Left_Tab",
377 377 .icon = "go-previous",
378 378 .label = NULL,
379 379 .summary = N_( "Tab backward to previous field." ),
... ... @@ -391,7 +391,7 @@
391 391 .name = "delete-word",
392 392 .type = LIB3270_ACTION_TYPE_NAVIGATION,
393 393  
394   - .key = "<Ctrl>w",
  394 + .keys = "<Ctrl>w",
395 395 .icon = NULL,
396 396 .label = NULL,
397 397 .summary = N_( "Backspaces the cursor until it hits the front of a word." ),
... ... @@ -405,7 +405,7 @@
405 405 .name = "delete-field",
406 406 .type = LIB3270_ACTION_TYPE_NAVIGATION,
407 407  
408   - .key = "<Ctrl>u",
  408 + .keys = "<Ctrl>u",
409 409 .icon = NULL,
410 410 .label = NULL,
411 411 .summary = N_( "Delete field" ),
... ... @@ -420,7 +420,7 @@
420 420 .name = "erase-input",
421 421 .type = LIB3270_ACTION_TYPE_GENERIC,
422 422  
423   - .key = NULL,
  423 + .keys = NULL,
424 424 .icon = "edit-clear",
425 425 .label = N_("Erase input"),
426 426 .summary = NULL,
... ... @@ -434,7 +434,7 @@
434 434 .name = "erase-eof",
435 435 .type = LIB3270_ACTION_TYPE_GENERIC,
436 436  
437   - .key = "End",
  437 + .keys = "End",
438 438 .icon = NULL,
439 439 .label = NULL,
440 440 .summary = N_( "Erase End Of Field Key." ),
... ... @@ -448,7 +448,7 @@
448 448 .name = "erase-eol",
449 449 .type = LIB3270_ACTION_TYPE_GENERIC,
450 450  
451   - .key = NULL,
  451 + .keys = NULL,
452 452 .icon = NULL,
453 453 .label = NULL,
454 454 .summary = N_( "Erase End Of Line Key." ),
... ... @@ -462,7 +462,7 @@
462 462 .name = "erase",
463 463 .type = LIB3270_ACTION_TYPE_GENERIC,
464 464  
465   - .key = "BackSpace",
  465 + .keys = "BackSpace",
466 466 .icon = NULL,
467 467 .label = NULL,
468 468 .summary = NULL,
... ... @@ -479,7 +479,7 @@
479 479 .name = "enter",
480 480 .type = LIB3270_ACTION_TYPE_GENERIC,
481 481  
482   - .key = NULL,
  482 + .keys = NULL,
483 483 .icon = NULL,
484 484 .label = NULL,
485 485 .summary = N_( "Send an \"Enter\" action." ),
... ... @@ -494,7 +494,7 @@
494 494 .name = "kybdreset",
495 495 .type = LIB3270_ACTION_TYPE_GENERIC,
496 496  
497   - .key = "Escape",
  497 + .keys = "Escape",
498 498 .icon = NULL,
499 499 .label = NULL,
500 500 .summary = NULL,
... ... @@ -508,7 +508,7 @@
508 508 .name = "clear",
509 509 .type = LIB3270_ACTION_TYPE_GENERIC,
510 510  
511   - .key = NULL,
  511 + .keys = NULL,
512 512 .icon = NULL,
513 513 .label = N_("Clear"),
514 514 .summary = N_( "Clear AID key" ),
... ... @@ -523,7 +523,7 @@
523 523 .name = "delete",
524 524 .type = LIB3270_ACTION_TYPE_GENERIC,
525 525  
526   - .key = "Delete",
  526 + .keys = "Delete",
527 527 .icon = NULL,
528 528 .label = NULL,
529 529 .summary = NULL,
... ... @@ -537,7 +537,7 @@
537 537 .name = "dup",
538 538 .type = LIB3270_ACTION_TYPE_GENERIC,
539 539  
540   - .key = "<Shift>KP_Multiply",
  540 + .keys = "<Shift>KP_Multiply",
541 541 .icon = NULL,
542 542 .label = NULL,
543 543 .summary = N_( "DUP key" ),
... ... @@ -551,7 +551,7 @@
551 551 .name = "fieldmark",
552 552 .type = LIB3270_ACTION_TYPE_GENERIC,
553 553  
554   - .key = NULL,
  554 + .keys = NULL,
555 555 .icon = NULL,
556 556 .label = NULL,
557 557 .summary = N_( "FM key" ),
... ... @@ -565,7 +565,7 @@
565 565 .name = "backspace",
566 566 .type = LIB3270_ACTION_TYPE_NAVIGATION,
567 567  
568   - .key = NULL,
  568 + .keys = NULL,
569 569 .icon = NULL,
570 570 .label = NULL,
571 571 .summary = N_( "3270-style backspace." ),
... ... @@ -579,7 +579,7 @@
579 579 .name = "attn",
580 580 .type = LIB3270_ACTION_TYPE_GENERIC,
581 581  
582   - .key = "<shift>Escape",
  582 + .keys = "<shift>Escape",
583 583 .icon = NULL,
584 584 .label = NULL,
585 585 .summary = N_( "ATTN key, per RFC 2355. Sends IP, regardless." ),
... ... @@ -593,7 +593,7 @@
593 593 .name = "break",
594 594 .type = LIB3270_ACTION_TYPE_GENERIC,
595 595  
596   - .key = NULL,
  596 + .keys = NULL,
597 597 .icon = NULL,
598 598 .label = NULL,
599 599 .summary = NULL,
... ... @@ -607,7 +607,7 @@
607 607 .name = "paste-next",
608 608 .type = LIB3270_ACTION_TYPE_SELECTION,
609 609  
610   - .key = "<shift><ctrl>v",
  610 + .keys = "<shift><ctrl>v",
611 611 .icon = NULL,
612 612 .label = NULL,
613 613 .summary = NULL,
... ... @@ -621,7 +621,7 @@
621 621 .name = "sysreq",
622 622 .type = LIB3270_ACTION_TYPE_GENERIC,
623 623  
624   - .key = "<shift>Print",
  624 + .keys = "<shift>Print",
625 625 .icon = NULL,
626 626 .label = NULL,
627 627 .summary = NULL,
... ... @@ -638,7 +638,7 @@
638 638 .name = "print",
639 639 .type = LIB3270_ACTION_TYPE_PRINTER,
640 640  
641   - .key = "Print",
  641 + .keys = "Print",
642 642 .icon = "document-print",
643 643 .label = N_("Print"),
644 644 .summary = N_("Send to print"),
... ... @@ -653,7 +653,7 @@
653 653 .name = "print-all",
654 654 .type = LIB3270_ACTION_TYPE_PRINTER,
655 655  
656   - .key = NULL,
  656 + .keys = NULL,
657 657 .icon = NULL,
658 658 .label = NULL,
659 659 .summary = N_("Print screen contents"),
... ... @@ -667,7 +667,7 @@
667 667 .name = "print-selected",
668 668 .type = LIB3270_ACTION_TYPE_PRINTER,
669 669  
670   - .key = NULL,
  670 + .keys = NULL,
671 671 .icon = NULL,
672 672 .label = NULL,
673 673 .summary = N_( "Print selected area." ),
... ... @@ -681,7 +681,7 @@
681 681 .name = "print-copy",
682 682 .type = LIB3270_ACTION_TYPE_PRINTER,
683 683  
684   - .key = NULL,
  684 + .keys = NULL,
685 685 .icon = NULL,
686 686 .label = NULL,
687 687 .summary = N_("Print copy (if available)"),
... ... @@ -699,7 +699,7 @@
699 699 .name = "testpattern",
700 700 .type = LIB3270_ACTION_TYPE_GENERIC,
701 701  
702   - .key = NULL,
  702 + .keys = NULL,
703 703 .icon = NULL,
704 704 .label = NULL,
705 705 .summary = NULL,
... ... @@ -713,7 +713,7 @@
713 713 .name = "charsettable",
714 714 .type = LIB3270_ACTION_TYPE_GENERIC,
715 715  
716   - .key = NULL,
  716 + .keys = NULL,
717 717 .icon = NULL,
718 718 .label = NULL,
719 719 .summary = NULL,
... ...
src/include/lib3270/actions.h
  Diff comments   View file @8890365
... ... @@ -54,7 +54,7 @@
54 54 int (*activate)(H3270 *hSession); ///< @brief lib3270 associated method.
55 55 int (*activatable)(const H3270 *hSession); ///< @brief Is the action activatable?
56 56  
57   - const char *key; ///< @brief Default key (or NULL if no default).
  57 + const char *keys; ///< @brief Default accelerators (or NULL if no default).
58 58  
59 59 } LIB3270_ACTION;
60 60  
... ...