Commit 1e3a0d8a0d937256c2555f52c0df7b47217457fb
1 parent
1c36a04e
Exists in
master
and in
2 other branches
Adding nick for toggles, removing 'gtk-' from icons.
Showing
3 changed files
with
9 additions
and
3 deletions
Show diff stats
src/core/actions/table.c
... | ... | @@ -108,7 +108,7 @@ const LIB3270_ACTION * lib3270_get_actions() { |
108 | 108 | .type = LIB3270_ACTION_TYPE_NETWORK, |
109 | 109 | |
110 | 110 | .keys = NULL, |
111 | - .icon = "gtk-connect", | |
111 | + .icon = "connect", | |
112 | 112 | .label = N_( "_Reconnect" ), |
113 | 113 | .summary = N_( "Reconnect to the same host" ), |
114 | 114 | .activate = connect_host, |
... | ... | @@ -122,7 +122,7 @@ const LIB3270_ACTION * lib3270_get_actions() { |
122 | 122 | .type = LIB3270_ACTION_TYPE_NETWORK, |
123 | 123 | |
124 | 124 | .keys = NULL, |
125 | - .icon = "gtk-disconnect", | |
125 | + .icon = "disconnect", | |
126 | 126 | .label = N_( "_Disconnect" ), |
127 | 127 | .summary = N_( "Disconnect from host" ), |
128 | 128 | .activate = lib3270_disconnect, |
... | ... | @@ -601,7 +601,7 @@ const LIB3270_ACTION * lib3270_get_actions() { |
601 | 601 | .type = LIB3270_ACTION_TYPE_GENERIC, |
602 | 602 | |
603 | 603 | .keys = NULL, |
604 | - .icon = "gtk-ok", | |
604 | + .icon = "ok", | |
605 | 605 | .label = N_("Enter"), |
606 | 606 | .summary = N_( "Send an \"Enter\" action" ), |
607 | 607 | .activate = lib3270_enter, | ... | ... |
src/core/toggles/table.c
... | ... | @@ -86,6 +86,7 @@ const LIB3270_TOGGLE toggle_descriptor[LIB3270_TOGGLE_COUNT+1] = { |
86 | 86 | { |
87 | 87 | .id = LIB3270_TOGGLE_DS_TRACE, |
88 | 88 | .name = "dstrace", |
89 | + .nick = "ds", | |
89 | 90 | .def = False, |
90 | 91 | .key = NULL, // Default keycode |
91 | 92 | .icon = NULL, // Icon name |
... | ... | @@ -116,6 +117,7 @@ const LIB3270_TOGGLE toggle_descriptor[LIB3270_TOGGLE_COUNT+1] = { |
116 | 117 | { |
117 | 118 | .id = LIB3270_TOGGLE_SCREEN_TRACE, |
118 | 119 | .name = "screentrace", |
120 | + .nick = "sc", | |
119 | 121 | .def = False, |
120 | 122 | .key = NULL, // Default keycode |
121 | 123 | .icon = NULL, // Icon name |
... | ... | @@ -126,6 +128,7 @@ const LIB3270_TOGGLE toggle_descriptor[LIB3270_TOGGLE_COUNT+1] = { |
126 | 128 | { |
127 | 129 | .id = LIB3270_TOGGLE_EVENT_TRACE, |
128 | 130 | .name = "eventtrace", |
131 | + .nick = "ev", | |
129 | 132 | .def = False, |
130 | 133 | .key = NULL, // Default keycode |
131 | 134 | .icon = NULL, // Icon name |
... | ... | @@ -286,6 +289,7 @@ const LIB3270_TOGGLE toggle_descriptor[LIB3270_TOGGLE_COUNT+1] = { |
286 | 289 | { |
287 | 290 | .id = LIB3270_TOGGLE_NETWORK_TRACE, |
288 | 291 | .name = "nettrace", |
292 | + .nick = "net", | |
289 | 293 | .def = False, |
290 | 294 | .key = NULL, // Default keycode |
291 | 295 | .icon = NULL, // Icon name |
... | ... | @@ -296,6 +300,7 @@ const LIB3270_TOGGLE toggle_descriptor[LIB3270_TOGGLE_COUNT+1] = { |
296 | 300 | { |
297 | 301 | .id = LIB3270_TOGGLE_SSL_TRACE, |
298 | 302 | .name = "ssltrace", |
303 | + .nick = "ssl", | |
299 | 304 | .def = False, |
300 | 305 | .key = NULL, // Default keycode |
301 | 306 | .icon = NULL, // Icon name | ... | ... |
src/include/lib3270/toggle.h
... | ... | @@ -98,6 +98,7 @@ typedef struct _lib3270_toggle { |
98 | 98 | LIB3270_TOGGLE_ID id; ///< @brief Toggle ID. |
99 | 99 | const char def; ///< @brief Default value. |
100 | 100 | const char * key; ///< @brief Default key (or NULL if no default). |
101 | + const char * nick; ///< @brief Toggle nick. | |
101 | 102 | |
102 | 103 | } LIB3270_TOGGLE; |
103 | 104 | ... | ... |