Download as
Browse Code »

Commit 60154693de00cfcb38b07ce215a857330abd1312

Authored by Perry Werneck
1 parent 906fa5e2
Exists in master and in 1 other branch develop

Updating action summary.

Showing 2 changed files with 18 additions and 3 deletions   Show diff stats
src/terminal/actions/table.c
  Diff comments   View file @6015469
... ... @@ -63,6 +63,7 @@
63 63 {
64 64 .flags = 0,
65 65 .name = "copy",
  66 + .summary = N_( "Copy" ),
66 67 .key = 'c',
67 68 .mods = GDK_CONTROL_MASK,
68 69 .activate = fire_copy_accelerator
... ... @@ -71,6 +72,7 @@
71 72 {
72 73 .flags = V3270_COPY_APPEND,
73 74 .name = "copy-append",
  75 + .summary = N_( "Add to copy" ),
74 76 .key = 'c',
75 77 .mods = GDK_ALT_MASK,
76 78 .activate = fire_copy_accelerator
... ... @@ -79,6 +81,7 @@
79 81 {
80 82 .flags = V3270_COPY_TEXT,
81 83 .name = "copy-text",
  84 + .summary = N_( "Copy as plain text" ),
82 85 .key = 'c',
83 86 .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK,
84 87 .activate = fire_copy_accelerator
... ... @@ -87,6 +90,7 @@
87 90 {
88 91 .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_DEFAULT,
89 92 .name = "cut",
  93 + .summary = N_( "Cut" ),
90 94 .key = 'x',
91 95 .mods = GDK_CONTROL_MASK,
92 96 .activate = fire_copy_accelerator
... ... @@ -95,6 +99,7 @@
95 99 {
96 100 .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_APPEND,
97 101 .name = "cut-append",
  102 + .summary = N_( "Cut and append to copy" ),
98 103 .key = 'x',
99 104 .mods = GDK_ALT_MASK,
100 105 .activate = fire_copy_accelerator
... ... @@ -103,6 +108,7 @@
103 108 {
104 109 .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_TEXT,
105 110 .name = "cut-text",
  111 + .summary = N_( "Cut as plain text" ),
106 112 .key = 'x',
107 113 .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK,
108 114 .activate = fire_copy_accelerator
... ... @@ -111,6 +117,7 @@
111 117 {
112 118 .flags = 0,
113 119 .name = "paste",
  120 + .summary = N_("Paste"),
114 121 .key = 'v',
115 122 .mods = GDK_CONTROL_MASK,
116 123 .activate = fire_paste_accelerator
... ... @@ -119,6 +126,7 @@
119 126 {
120 127 .flags = 1,
121 128 .name = "paste-text",
  129 + .summary = N_("Paste as plain text"),
122 130 .key = 'v',
123 131 .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK,
124 132 .activate = fire_paste_accelerator
... ... @@ -127,6 +135,7 @@
127 135 {
128 136 .flags = 2,
129 137 .name = "paste-file",
  138 + .summary = N_("Paste from text file"),
130 139 .key = 'v',
131 140 .mods = GDK_ALT_MASK,
132 141 .activate = fire_paste_accelerator
... ... @@ -135,6 +144,7 @@
135 144 {
136 145 .flags = 0,
137 146 .name = "zoom-in",
  147 + .summary = N_("Zoom in"),
138 148 .key = GDK_KP_Add,
139 149 .mods = GDK_CONTROL_MASK,
140 150 .activate = fire_zoom_action
... ... @@ -143,6 +153,7 @@
143 153 {
144 154 .flags = 1,
145 155 .name = "zoom-out",
  156 + .summary = N_("Zoom out"),
146 157 .key = GDK_KP_Subtract,
147 158 .mods = GDK_CONTROL_MASK,
148 159 .activate = fire_zoom_action
... ... @@ -151,6 +162,7 @@
151 162 {
152 163 .flags = 2,
153 164 .name = "zoom-fit-best",
  165 + .summary = N_("Zoom to best size"),
154 166 .key = '0',
155 167 .mods = GDK_CONTROL_MASK,
156 168 .activate = fire_zoom_action
... ...
src/terminal/keyboard/accelerator.c
  Diff comments   View file @6015469
... ... @@ -159,17 +159,20 @@
159 159  
160 160 case V3270_ACCELERATOR_TYPE_INTERNAL:
161 161 if( ((V3270_ACTION *) accel->arg)->summary )
162   - return ((V3270_ACTION *) accel->arg)->summary;
  162 + return gettext(((V3270_ACTION *) accel->arg)->summary);
  163 +
  164 + if( ((V3270_ACTION *) accel->arg)->description )
  165 + return gettext(((V3270_ACTION *) accel->arg)->description);
163 166  
164 167 break;
165 168  
166 169 case V3270_ACCELERATOR_TYPE_LIB3270_TOGGLE:
167 170  
168 171 if(((LIB3270_TOGGLE *) accel->arg)->summary)
169   - return ((LIB3270_TOGGLE *) accel->arg)->summary;
  172 + return gettext(((LIB3270_TOGGLE *) accel->arg)->summary);
170 173  
171 174 if(((LIB3270_TOGGLE *) accel->arg)->description)
172   - return ((LIB3270_TOGGLE *) accel->arg)->description;
  175 + return gettext(((LIB3270_TOGGLE *) accel->arg)->description);
173 176  
174 177 break;
175 178  
... ...