Download as
Browse Code »

Commit 7193969918af0e98dfc5ace1c3147f96280d4eb0

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

Removing unused D-Bus references. 

Updating keytable.
Showing 3 changed files with 36 additions and 45 deletions   Show diff stats
configure.ac
  Diff comments   View file @7193969
... ... @@ -569,14 +569,6 @@ AC_SUBST(LIBSSL_LIBS)
569 569 AC_SUBST(LIBSSL_CFLAGS)
570 570  
571 571 dnl ---------------------------------------------------------------------------
572   -dnl Check for D-Bus
573   -dnl ---------------------------------------------------------------------------
574   -
575   -PKG_CHECK_MODULES( [DBUS], [dbus-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([ No DBUS support.]) )
576   -AC_SUBST(DBUS_LIBS)
577   -AC_SUBST(DBUS_CFLAGS)
578   -
579   -dnl ---------------------------------------------------------------------------
580 572 dnl Check for LDAP
581 573 dnl ---------------------------------------------------------------------------
582 574  
... ...
src/core/actions/table.c
  Diff comments   View file @7193969
... ... @@ -237,7 +237,7 @@
237 237 .name = "next-word",
238 238 .type = LIB3270_ACTION_TYPE_NAVIGATION,
239 239  
240   - .keys = NULL,
  240 + .keys = "<Primary>Right",
241 241 .icon = NULL,
242 242 .label = N_("Next word"),
243 243 .summary = N_( "Cursor to next unprotected word" ),
... ... @@ -271,7 +271,7 @@
271 271 .keys = "<Primary>a",
272 272 .icon = "edit-select-all",
273 273 .label = N_( "Select all" ),
274   - .summary = NULL,
  274 + .summary = N_( "Select all" ),
275 275 .activate = lib3270_select_all,
276 276  
277 277 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -282,7 +282,7 @@
282 282 .name = "unselect",
283 283 .type = LIB3270_ACTION_TYPE_SELECTION,
284 284  
285   - .keys = NULL,
  285 + .keys = "<Primary>u",
286 286 .icon = NULL,
287 287 .label = N_( "Remove selection" ),
288 288 .summary = N_( "Remove selection" ),
... ... @@ -326,8 +326,8 @@
326 326  
327 327 .keys = "<Shift>Up",
328 328 .icon = NULL,
329   - .label = N_( "Move cursor up and select" ),
330   - .summary = NULL,
  329 + .label = N_( "Select UP" ),
  330 + .summary = N_( "Move cursor up and select" ),
331 331 .activate = select_up,
332 332  
333 333 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -340,8 +340,8 @@
340 340  
341 341 .keys = "<Shift>Down",
342 342 .icon = NULL,
343   - .label = N_( "Move cursor down and select" ),
344   - .summary = NULL,
  343 + .label = N_( "Select Down" ),
  344 + .summary = N_( "Move cursor down and select" ),
345 345 .activate = select_down,
346 346  
347 347 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -354,8 +354,8 @@
354 354  
355 355 .keys = "<Shift>Left",
356 356 .icon = NULL,
357   - .label = N_( "Move cursor left and select" ),
358   - .summary = NULL,
  357 + .label = N_( "Select Left" ),
  358 + .summary = N_( "Move cursor left and select" ),
359 359 .activate = select_left,
360 360  
361 361 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -368,8 +368,8 @@
368 368  
369 369 .keys = "<Shift>Right",
370 370 .icon = NULL,
371   - .label = N_( "Move cursor rigth and select" ),
372   - .summary = NULL,
  371 + .label = N_( "Select right" ),
  372 + .summary = N_( "Move cursor rigth and select" ),
373 373 .activate = select_right,
374 374  
375 375 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -382,8 +382,8 @@
382 382  
383 383 .keys = "<Alt>Up",
384 384 .icon = NULL,
385   - .label = N_( "Move selection up" ),
386   - .summary = NULL,
  385 + .label = N_( "Selection up" ),
  386 + .summary = N_( "Move selection up" ),
387 387 .activate = selection_up,
388 388  
389 389 .group = LIB3270_ACTION_GROUP_SELECTION,
... ... @@ -396,8 +396,8 @@
396 396  
397 397 .keys = "<Alt>Down",
398 398 .icon = NULL,
399   - .label = N_( "Move selection down" ),
400   - .summary = NULL,
  399 + .label = N_( "Selection down" ),
  400 + .summary = N_( "Move selection down" ),
401 401 .activate = selection_down,
402 402  
403 403 .group = LIB3270_ACTION_GROUP_SELECTION,
... ... @@ -410,8 +410,8 @@
410 410  
411 411 .keys = "<Alt>Left",
412 412 .icon = NULL,
413   - .label = N_( "Move selection left" ),
414   - .summary = NULL,
  413 + .label = N_( "Selection left" ),
  414 + .summary = N_( "Move selection left" ),
415 415 .activate = selection_left,
416 416  
417 417 .group = LIB3270_ACTION_GROUP_SELECTION,
... ... @@ -424,8 +424,8 @@
424 424  
425 425 .keys = "<Alt>Right",
426 426 .icon = NULL,
427   - .label = N_( "Move selection right" ),
428   - .summary = NULL,
  427 + .label = N_( "Selection right" ),
  428 + .summary = N_( "Move selection right" ),
429 429 .activate = selection_right,
430 430 .activatable = lib3270_get_has_selection
431 431  
... ... @@ -456,7 +456,7 @@
456 456 .keys = NULL,
457 457 .icon = NULL,
458 458 .label = N_("Field end"),
459   - .summary = N_( "Move the cursor to the first blank after the last nonblank in the field" ),
  459 + .summary = N_( "Move the cursor to the first blank after the last non blank in the field" ),
460 460 .activate = lib3270_fieldend,
461 461  
462 462 .group = LIB3270_ACTION_GROUP_FORMATTED,
... ... @@ -484,7 +484,7 @@
484 484 .keys = "Tab",
485 485 .icon = "go-next",
486 486 .label = N_("Next field"),
487   - .summary = N_( "Tab forward to next field" ),
  487 + .summary = N_( "Move to the next unprotected field on screen" ),
488 488 .activate = lib3270_nextfield,
489 489  
490 490 .group = LIB3270_ACTION_GROUP_FORMATTED,
... ... @@ -498,7 +498,7 @@
498 498 .keys = "<Shift>ISO_Left_Tab",
499 499 .icon = "go-previous",
500 500 .label = N_("Previous field"),
501   - .summary = N_( "Tab backward to previous field" ),
  501 + .summary = N_( "Move to the previous unprotected field on screen" ),
502 502 .activate = lib3270_previousfield,
503 503  
504 504 .group = LIB3270_ACTION_GROUP_FORMATTED,
... ... @@ -527,7 +527,7 @@
527 527 .name = "delete-field",
528 528 .type = LIB3270_ACTION_TYPE_NAVIGATION,
529 529  
530   - .keys = "<Primary>u",
  530 + .keys = NULL,
531 531 .icon = NULL,
532 532 .label = N_( "Delete field" ),
533 533 .summary = N_( "Delete field" ),
... ... @@ -545,10 +545,10 @@
545 545 .keys = NULL,
546 546 .icon = "edit-clear",
547 547 .label = N_("Erase input"),
548   - .summary = N_("Clear"),
  548 + .summary = N_("Erase all unprotected fields"),
549 549 .activate = lib3270_eraseinput,
550 550  
551   - .group = LIB3270_ACTION_GROUP_ONLINE,
  551 + .group = LIB3270_ACTION_GROUP_FORMATTED,
552 552 .activatable = lib3270_is_connected
553 553 },
554 554  
... ... @@ -587,7 +587,7 @@
587 587 .keys = "BackSpace",
588 588 .icon = NULL,
589 589 .label = N_("Erase"),
590   - .summary = NULL,
  590 + .summary = N_("Erase"),
591 591 .activate = lib3270_erase,
592 592  
593 593 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -633,7 +633,7 @@
633 633 .keys = "Escape",
634 634 .icon = NULL,
635 635 .label = N_("Reset"),
636   - .summary = N_("Reset"),
  636 + .summary = N_("Reset keyboard lock"),
637 637 .activate = lib3270_kybdreset,
638 638  
639 639 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -648,7 +648,7 @@
648 648 .keys = "Delete",
649 649 .icon = NULL,
650 650 .label = N_("Delete"),
651   - .summary = NULL,
  651 + .summary = N_("Delete"),
652 652 .activate = lib3270_delete,
653 653  
654 654 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -673,10 +673,10 @@
673 673 .name = "fieldmark",
674 674 .type = LIB3270_ACTION_TYPE_GENERIC,
675 675  
676   - .keys = NULL,
  676 + .keys = "<Shift>Home",
677 677 .icon = NULL,
678 678 .label = N_("FM key"),
679   - .summary = N_( "FM key" ),
  679 + .summary = N_( "Field Mark" ),
680 680 .activate = lib3270_fieldmark,
681 681  
682 682 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -704,7 +704,7 @@
704 704 .keys = "<shift>Escape",
705 705 .icon = NULL,
706 706 .label = N_("Attn"),
707   - .summary = N_( "ATTN key, per RFC 2355. Sends IP, regardless" ),
  707 + .summary = N_( "ATTN key, per RFC 2355. Sends IP, regardless" ),
708 708 .activate = lib3270_attn,
709 709  
710 710 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -718,7 +718,7 @@
718 718 .keys = NULL,
719 719 .icon = NULL,
720 720 .label = N_("Break"),
721   - .summary = NULL,
  721 + .summary = N_("Break"),
722 722 .activate = lib3270_break,
723 723  
724 724 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -732,7 +732,7 @@
732 732 .keys = "<shift><alt>v",
733 733 .icon = "edit-paste",
734 734 .label = N_("Paste next"),
735   - .summary = NULL,
  735 + .summary = N_("Paste next"),
736 736 .activate = lib3270_paste_next,
737 737  
738 738 .group = LIB3270_ACTION_GROUP_LOCK_STATE,
... ... @@ -746,7 +746,7 @@
746 746 .keys = "<shift>Print",
747 747 .icon = NULL,
748 748 .label = N_("Sys Req"),
749   - .summary = NULL,
  749 + .summary = N_("Sys Request"),
750 750 .activate = lib3270_sysreq,
751 751  
752 752 .group = LIB3270_ACTION_GROUP_ONLINE,
... ... @@ -764,7 +764,7 @@
764 764 .keys = NULL,
765 765 .icon = NULL,
766 766 .label = N_("Test pattern"),
767   - .summary = NULL,
  767 + .summary = N_("Show test pattern"),
768 768 .activate = lib3270_testpattern,
769 769  
770 770 .group = LIB3270_ACTION_GROUP_OFFLINE,
... ... @@ -778,7 +778,7 @@
778 778 .keys = NULL,
779 779 .icon = NULL,
780 780 .label = N_("Charset table"),
781   - .summary = NULL,
  781 + .summary = N_("Show charset table"),
782 782 .activate = lib3270_charsettable,
783 783  
784 784 .group = LIB3270_ACTION_GROUP_OFFLINE,
... ...
src/include/config.h.in
  Diff comments   View file @7193969
... ... @@ -61,7 +61,6 @@
61 61 #undef HAVE_GETADDRINFO
62 62 #undef HAVE_VASPRINTF
63 63 #undef HAVE_INET_NTOP
64   - #undef HAVE_DBUS
65 64 #undef HAVE_LIBCURL
66 65 #undef HAVE_SYSLOG
67 66  
... ...