Commit f7fd1b35edd5e8958247fb1c3d2b797ef4c0d311
1 parent
e0247aab
Exists in
master
and in
1 other branch
Fixing clipboard settings dialog.
Showing
2 changed files
with
6 additions
and
4 deletions
Show diff stats
src/dialogs/settings/clipboard.c
| @@ -285,11 +285,11 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | @@ -285,11 +285,11 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | ||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | v3270_settings_create_toggle_buttons(toggles, G_N_ELEMENTS(toggles), grids, widget->input.toggles); | 287 | v3270_settings_create_toggle_buttons(toggles, G_N_ELEMENTS(toggles), grids, widget->input.toggles); |
| 288 | - g_signal_connect(G_OBJECT(widget->input.toggles[1]),"toggled",G_CALLBACK(keep_selected_toggled),widget); | ||
| 289 | - | ||
| 290 | v3270_settings_create_combos(combos, G_N_ELEMENTS(combos), grids, widget->input.combos); | 288 | v3270_settings_create_combos(combos, G_N_ELEMENTS(combos), grids, widget->input.combos); |
| 291 | v3270_settings_create_checkboxes(checkboxes, G_N_ELEMENTS(checkboxes), grids, widget->input.checkboxes); | 289 | v3270_settings_create_checkboxes(checkboxes, G_N_ELEMENTS(checkboxes), grids, widget->input.checkboxes); |
| 292 | 290 | ||
| 291 | + g_signal_connect(G_OBJECT(widget->input.toggles[1]),"toggled",G_CALLBACK(keep_selected_toggled),widget); | ||
| 292 | + | ||
| 293 | // Setup combos | 293 | // Setup combos |
| 294 | { | 294 | { |
| 295 | GtkCellRenderer * text_renderer = gtk_cell_renderer_text_new(); | 295 | GtkCellRenderer * text_renderer = gtk_cell_renderer_text_new(); |
| @@ -512,6 +512,8 @@ static void load(GtkWidget *w, GtkWidget *t) { | @@ -512,6 +512,8 @@ static void load(GtkWidget *w, GtkWidget *t) { | ||
| 512 | 512 | ||
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | + keep_selected_toggled(widget->input.toggles[1],widget); | ||
| 516 | + | ||
| 515 | } | 517 | } |
| 516 | 518 | ||
| 517 | static gchar get_active_id(V3270ClipboardSettings *widget, size_t combo) { | 519 | static gchar get_active_id(V3270ClipboardSettings *widget, size_t combo) { |
src/dialogs/settings/tools.c
| @@ -137,10 +137,10 @@ | @@ -137,10 +137,10 @@ | ||
| 137 | 137 | ||
| 138 | for(checkbox = 0; checkbox < length; checkbox++) { | 138 | for(checkbox = 0; checkbox < length; checkbox++) { |
| 139 | 139 | ||
| 140 | - buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(definitions[checkbox].label)); | 140 | + buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(PACKAGE_NAME,definitions[checkbox].label))); |
| 141 | 141 | ||
| 142 | if(definitions[checkbox].tooltip) | 142 | if(definitions[checkbox].tooltip) |
| 143 | - gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),definitions[checkbox].tooltip); | 143 | + gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(PACKAGE_NAME,definitions[checkbox].tooltip)); |
| 144 | 144 | ||
| 145 | gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START); | 145 | gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START); |
| 146 | gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1); | 146 | gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1); |