From 5475f2dddd7a76e1ee939b99d1ab6f816f4a3271 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 2 Jul 2025 12:45:00 +0200 Subject: FLUID: Multiple fixes - fixes new naming of i18n class - fixes use of deprecated setonly() - fixes false assumption that all children of a Window are Widgets --- fluid/panels/settings_panel.fl | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'fluid/panels/settings_panel.fl') diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl index 59c1a476d..efa015065 100644 --- a/fluid/panels/settings_panel.fl +++ b/fluid/panels/settings_panel.fl @@ -198,8 +198,8 @@ Function {make_settings_window()} {open xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 resizable } { Fl_Group w_settings_general_tab { - label General open selected - scale_image {36 24} image {../icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 resizable + label General open + scale_image {36 24} image {../icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide resizable } { Fl_Group {} { callback {propagate_load(o, v);} open @@ -502,7 +502,7 @@ Fluid.layout_list.update_dialogs();} for (int i=1; i<4; i++) w_layout_menu_storage[i]->activate(); w_layout_menu_delete->activate(); } - w_layout_menu_storage[static_cast(suite.storage_)]->setonly(); + w_layout_menu_storage[static_cast(suite.storage_)]->setonly(menu_w_layout_menu); }} open xywh {296 78 24 24} } { @@ -1524,7 +1524,7 @@ if (v == LOAD) { Fl_Group w_settings_i18n_tab { label Locale callback {propagate_load(o, v);} open - scale_image {36 24} image {../icons/language_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide + scale_image {36 24} image {../icons/language_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 } { Fl_Group {} { callback propagate_load open @@ -1559,10 +1559,10 @@ if (v == LOAD) { Fl_Input i18n_gnu_include_input { label {\#include:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_gnu_include.c_str()); + o->value(Fluid.proj.i18n.gnu_include.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_gnu_include = o->value(); + Fluid.proj.i18n.gnu_include = o->value(); Fluid.proj.set_modflag(1); }} tooltip {The include file for internationalization.} xywh {100 103 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1570,10 +1570,10 @@ if (v == LOAD) { Fl_Input i18n_gnu_conditional_input { label {Conditional:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_gnu_conditional.c_str()); + o->value(Fluid.proj.i18n.gnu_conditional.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_gnu_conditional = o->value(); + Fluid.proj.i18n.gnu_conditional = o->value(); Fluid.proj.set_modflag(1); }} tooltip {only include the header file if this preprocessor macro is defined, for example FLTK_GETTEXT_FOUND} xywh {100 128 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1581,21 +1581,21 @@ if (v == LOAD) { Fl_Input i18n_gnu_function_input { label {Function:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_gnu_function.c_str()); + o->value(Fluid.proj.i18n.gnu_function.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_gnu_function = o->value(); + Fluid.proj.i18n.gnu_function = o->value(); Fluid.proj.set_modflag(1); -}} +}} selected tooltip {The function to call to translate labels and tooltips, usually "gettext" or "_"} xywh {100 153 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 } Fl_Input i18n_gnu_static_function_input { label {Static Function:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_gnu_static_function.c_str()); + o->value(Fluid.proj.i18n.gnu_static_function.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_gnu_static_function = o->value(); + Fluid.proj.i18n.gnu_static_function = o->value(); Fluid.proj.set_modflag(1); }} tooltip {function to call to translate static text, The function to call to internationalize labels and tooltips, usually "gettext_noop" or "N_"} xywh {100 178 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1608,10 +1608,10 @@ if (v == LOAD) { Fl_Input i18n_pos_include_input { label {\#include:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_pos_include.c_str()); + o->value(Fluid.proj.i18n.posix_include.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_pos_include = o->value(); + Fluid.proj.i18n.posix_include = o->value(); Fluid.proj.set_modflag(1); }} tooltip {The include file for internationalization.} xywh {100 103 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1619,10 +1619,10 @@ if (v == LOAD) { Fl_Input i18n_pos_conditional_input { label {Conditional:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_pos_conditional.c_str()); + o->value(Fluid.proj.i18n.posix_conditional.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_pos_conditional = o->value(); + Fluid.proj.i18n.posix_conditional = o->value(); Fluid.proj.set_modflag(1); }} tooltip {only include the header file if this preprocessor macro is defined, for example FLTK_GETTEXT_FOUND} xywh {100 128 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1630,10 +1630,10 @@ if (v == LOAD) { Fl_Input i18n_pos_file_input { label {Catalog:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_pos_file.c_str()); + o->value(Fluid.proj.i18n.posix_file.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_pos_file = o->value(); + Fluid.proj.i18n.posix_file = o->value(); Fluid.proj.set_modflag(1); }} tooltip {The name of the message catalog.} xywh {100 153 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 @@ -1645,10 +1645,10 @@ if (v == LOAD) { Fl_Input i18n_pos_set_input { label {Set:} callback {if (v == LOAD) { - o->value(Fluid.proj.i18n.i18n_pos_set.c_str()); + o->value(Fluid.proj.i18n.posix_set.c_str()); } else { Fluid.proj.undo.checkpoint(); - Fluid.proj.i18n.i18n_pos_set = o->value(); + Fluid.proj.i18n.posix_set = o->value(); Fluid.proj.set_modflag(1); }} tooltip {The message set number.} xywh {100 178 80 20} type Int box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11 -- cgit v1.2.3