Commit d1648baf1c8d9347438c2ba032a6a4cc32a4be97
1 parent
51d81f75
Exists in
master
and in
1 other branch
Working on accelerators dialog.
Showing
2 changed files
with
17 additions
and
16 deletions
Show diff stats
src/dialogs/settings/accelerator.c
@@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
112 | 112 | ||
113 | static void V3270AcceleratorSettings_init(V3270AcceleratorSettings *widget) | 113 | static void V3270AcceleratorSettings_init(V3270AcceleratorSettings *widget) |
114 | { | 114 | { |
115 | - size_t ix; | 115 | + //size_t ix; |
116 | 116 | ||
117 | // Create description list | 117 | // Create description list |
118 | GtkCellRenderer * text_renderer = gtk_cell_renderer_text_new(); | 118 | GtkCellRenderer * text_renderer = gtk_cell_renderer_text_new(); |
@@ -144,7 +144,6 @@ | @@ -144,7 +144,6 @@ | ||
144 | gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view),TRUE); | 144 | gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view),TRUE); |
145 | gtk_tree_view_set_search_column(GTK_TREE_VIEW(view),1); | 145 | gtk_tree_view_set_search_column(GTK_TREE_VIEW(view),1); |
146 | 146 | ||
147 | - | ||
148 | g_signal_connect(G_OBJECT(widget),"realize",G_CALLBACK(realize),view); | 147 | g_signal_connect(G_OBJECT(widget),"realize",G_CALLBACK(realize),view); |
149 | 148 | ||
150 | gtk_widget_set_tooltip_markup(view,_("Keyboard accelerators")); | 149 | gtk_widget_set_tooltip_markup(view,_("Keyboard accelerators")); |
@@ -180,7 +179,7 @@ | @@ -180,7 +179,7 @@ | ||
180 | NULL | 179 | NULL |
181 | ); | 180 | ); |
182 | 181 | ||
183 | - gtk_tree_view_column_set_min_width(column, 500); | 182 | + gtk_tree_view_column_set_min_width(column, 100); |
184 | gtk_tree_view_column_set_resizable(column, TRUE); | 183 | gtk_tree_view_column_set_resizable(column, TRUE); |
185 | 184 | ||
186 | gtk_tree_view_insert_column( | 185 | gtk_tree_view_insert_column( |
@@ -210,12 +209,13 @@ | @@ -210,12 +209,13 @@ | ||
210 | NULL | 209 | NULL |
211 | ); | 210 | ); |
212 | 211 | ||
212 | + /* | ||
213 | for(ix = 1; ix < 3; ix++) | 213 | for(ix = 1; ix < 3; ix++) |
214 | { | 214 | { |
215 | column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), ix); | 215 | column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), ix); |
216 | - gtk_tree_view_column_set_min_width(column, 200); | ||
217 | gtk_tree_view_column_set_resizable(column, TRUE); | 216 | gtk_tree_view_column_set_resizable(column, TRUE); |
218 | } | 217 | } |
218 | + */ | ||
219 | 219 | ||
220 | // Create scroller view | 220 | // Create scroller view |
221 | { | 221 | { |
@@ -223,14 +223,13 @@ | @@ -223,14 +223,13 @@ | ||
223 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); | 223 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); |
224 | gtk_container_add(GTK_CONTAINER(box),view); | 224 | gtk_container_add(GTK_CONTAINER(box),view); |
225 | 225 | ||
226 | - /* | ||
227 | - gtk_widget_set_vexpand(view,TRUE); | ||
228 | - gtk_widget_set_hexpand(view,TRUE); | ||
229 | - */ | ||
230 | - | 226 | + gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(box),TRUE); |
227 | + //gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(box),TRUE); | ||
231 | gtk_widget_set_vexpand(box,TRUE); | 228 | gtk_widget_set_vexpand(box,TRUE); |
232 | gtk_widget_set_hexpand(box,TRUE); | 229 | gtk_widget_set_hexpand(box,TRUE); |
233 | 230 | ||
231 | + gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(box),800); | ||
232 | + //gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(box),600); | ||
234 | gtk_grid_attach(GTK_GRID(widget),box,0,0,10,10); | 233 | gtk_grid_attach(GTK_GRID(widget),box,0,0,10,10); |
235 | } | 234 | } |
236 | 235 |
src/terminal/actions/table.c
@@ -318,17 +318,17 @@ | @@ -318,17 +318,17 @@ | ||
318 | { | 318 | { |
319 | .group = LIB3270_ACTION_GROUP_NONE, | 319 | .group = LIB3270_ACTION_GROUP_NONE, |
320 | .name = "dialog-keyboard", | 320 | .name = "dialog-keyboard", |
321 | - .label = N_("Change keyboard accelerators"), | 321 | + .label = N_("Keyboard accelerators"), |
322 | + .summary = N_("Edit keyboard accelerators"), | ||
322 | .activate = fire_accelerators_dialog | 323 | .activate = fire_accelerators_dialog |
323 | - | ||
324 | }, | 324 | }, |
325 | 325 | ||
326 | { | 326 | { |
327 | .group = LIB3270_ACTION_GROUP_OFFLINE, | 327 | .group = LIB3270_ACTION_GROUP_OFFLINE, |
328 | .name = "dialog-host", | 328 | .name = "dialog-host", |
329 | - .label = N_("Change host settings"), | 329 | + .label = N_("Host settings"), |
330 | + .summary = N_("Edit host settings"), | ||
330 | .activate = fire_host_dialog | 331 | .activate = fire_host_dialog |
331 | - | ||
332 | }, | 332 | }, |
333 | 333 | ||
334 | // | 334 | // |
@@ -355,13 +355,15 @@ | @@ -355,13 +355,15 @@ | ||
355 | 355 | ||
356 | static int fire_accelerators_dialog(GtkWidget *widget, const struct _v3270_action * action) { | 356 | static int fire_accelerators_dialog(GtkWidget *widget, const struct _v3270_action * action) { |
357 | 357 | ||
358 | - gtk_widget_show_all( | 358 | + GtkWidget * dialog = |
359 | v3270_settings_popup_dialog( | 359 | v3270_settings_popup_dialog( |
360 | v3270_accelerator_settings_new(), | 360 | v3270_accelerator_settings_new(), |
361 | widget, | 361 | widget, |
362 | TRUE | 362 | TRUE |
363 | - ) | ||
364 | - ); | 363 | + ); |
364 | + | ||
365 | + gtk_window_set_default_size(GTK_WINDOW(dialog),950,400); | ||
366 | + gtk_widget_show_all(dialog); | ||
365 | 367 | ||
366 | return 0; | 368 | return 0; |
367 | } | 369 | } |