summaryrefslogtreecommitdiff
path: root/fluid/panels
diff options
context:
space:
mode:
Diffstat (limited to 'fluid/panels')
-rw-r--r--fluid/panels/settings_panel.cxx38
-rw-r--r--fluid/panels/settings_panel.fl32
2 files changed, 32 insertions, 38 deletions
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index 3b32fc665..04aa8e900 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -611,20 +611,14 @@ static void cb_w_layout_menu_load(Fl_Menu_*, void*) {
static void cb_w_layout_menu_save(Fl_Menu_*, void*) {
// Give the user a file chooser with a suggested name
- char path[FL_PATH_MAX];
Fl_Native_File_Chooser fnfc;
fnfc.title("Save Layout Settings:");
fnfc.type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE);
fnfc.options(Fl_Native_File_Chooser::SAVEAS_CONFIRM | Fl_Native_File_Chooser::USE_FILTER_EXT);
fnfc.filter("FLUID Layouts\t*.fll\n");
- const char *filename = Fluid.layout_list->filename_.c_str();
- fl_filename_path(path, FL_PATH_MAX, filename);
- fnfc.directory(path);
- fnfc.preset_file(fl_filename_name(filename));
if (fnfc.show() != 0) return;
const char *new_filename = fnfc.filename();
if (!new_filename) return;
- Fluid.layout_list->filename_ = new_filename;
Fluid.layout_list->save(new_filename);
}
@@ -2153,10 +2147,10 @@ Fl_Input *i18n_gnu_include_input=(Fl_Input *)0;
static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_include.c_str());
+ o->value(Fluid.proj.i18n.gnu_include);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_include = o->value();
+ Fluid.proj.i18n.set_gnu_include(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2165,10 +2159,10 @@ Fl_Input *i18n_gnu_conditional_input=(Fl_Input *)0;
static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_conditional.c_str());
+ o->value(Fluid.proj.i18n.gnu_conditional);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_conditional = o->value();
+ Fluid.proj.i18n.set_gnu_conditional(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2177,10 +2171,10 @@ Fl_Input *i18n_gnu_function_input=(Fl_Input *)0;
static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_function.c_str());
+ o->value(Fluid.proj.i18n.gnu_function);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_function = o->value();
+ Fluid.proj.i18n.set_gnu_function(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2189,10 +2183,10 @@ Fl_Input *i18n_gnu_static_function_input=(Fl_Input *)0;
static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_static_function.c_str());
+ o->value(Fluid.proj.i18n.gnu_static_function);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_static_function = o->value();
+ Fluid.proj.i18n.set_gnu_static_function(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2207,10 +2201,10 @@ Fl_Input *i18n_pos_include_input=(Fl_Input *)0;
static void cb_i18n_pos_include_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_include.c_str());
+ o->value(Fluid.proj.i18n.posix_include);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_include = o->value();
+ Fluid.proj.i18n.set_posix_include(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2219,10 +2213,10 @@ Fl_Input *i18n_pos_conditional_input=(Fl_Input *)0;
static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_conditional.c_str());
+ o->value(Fluid.proj.i18n.posix_conditional);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_conditional = o->value();
+ Fluid.proj.i18n.set_posix_conditional(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2231,10 +2225,10 @@ Fl_Input *i18n_pos_file_input=(Fl_Input *)0;
static void cb_i18n_pos_file_input(Fl_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_file.c_str());
+ o->value(Fluid.proj.i18n.posix_file);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_file = o->value();
+ Fluid.proj.i18n.set_posix_file(o->value());
Fluid.proj.set_modflag(1);
}
}
@@ -2247,10 +2241,10 @@ Fl_Int_Input *i18n_pos_set_input=(Fl_Int_Input *)0;
static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) {
if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_set.c_str());
+ o->value(Fluid.proj.i18n.posix_set);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_set = o->value();
+ Fluid.proj.i18n.set_posix_set(o->value());
Fluid.proj.set_modflag(1);
}
}
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index abc0ade2f..86513bafd 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -1586,10 +1586,10 @@ if (v == LOAD) {
Fl_Input i18n_gnu_include_input {
label {\#include:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_include.c_str());
+ o->value(Fluid.proj.i18n.gnu_include);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_include = o->value();
+ Fluid.proj.i18n.set_gnu_include(o->value());
Fluid.proj.set_modflag(1);
}}
tooltip {The include file for internationalization.} xywh {110 103 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1597,10 +1597,10 @@ if (v == LOAD) {
Fl_Input i18n_gnu_conditional_input {
label {Conditional:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_conditional.c_str());
+ o->value(Fluid.proj.i18n.gnu_conditional);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_conditional = o->value();
+ Fluid.proj.i18n.set_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 {110 128 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1608,10 +1608,10 @@ if (v == LOAD) {
Fl_Input i18n_gnu_function_input {
label {Function:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_function.c_str());
+ o->value(Fluid.proj.i18n.gnu_function);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_function = o->value();
+ Fluid.proj.i18n.set_gnu_function(o->value());
Fluid.proj.set_modflag(1);
}}
tooltip {The function to call to translate labels and tooltips, usually "gettext" or "_"} xywh {110 153 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1619,10 +1619,10 @@ if (v == LOAD) {
Fl_Input i18n_gnu_static_function_input {
label {Static Function:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.gnu_static_function.c_str());
+ o->value(Fluid.proj.i18n.gnu_static_function);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.gnu_static_function = o->value();
+ Fluid.proj.i18n.set_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 {110 178 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1635,10 +1635,10 @@ if (v == LOAD) {
Fl_Input i18n_pos_include_input {
label {\#include:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_include.c_str());
+ o->value(Fluid.proj.i18n.posix_include);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_include = o->value();
+ Fluid.proj.i18n.set_posix_include(o->value());
Fluid.proj.set_modflag(1);
}}
tooltip {The include file for internationalization.} xywh {110 103 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1646,10 +1646,10 @@ if (v == LOAD) {
Fl_Input i18n_pos_conditional_input {
label {Conditional:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_conditional.c_str());
+ o->value(Fluid.proj.i18n.posix_conditional);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_conditional = o->value();
+ Fluid.proj.i18n.set_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 {110 128 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1657,10 +1657,10 @@ if (v == LOAD) {
Fl_Input i18n_pos_file_input {
label {Catalog:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_file.c_str());
+ o->value(Fluid.proj.i18n.posix_file);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_file = o->value();
+ Fluid.proj.i18n.set_posix_file(o->value());
Fluid.proj.set_modflag(1);
}}
tooltip {The name of the message catalog.} xywh {110 153 230 20} box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
@@ -1672,10 +1672,10 @@ if (v == LOAD) {
Fl_Input i18n_pos_set_input {
label {Set:}
callback {if (v == LOAD) {
- o->value(Fluid.proj.i18n.posix_set.c_str());
+ o->value(Fluid.proj.i18n.posix_set);
} else {
Fluid.proj.undo.checkpoint();
- Fluid.proj.i18n.posix_set = o->value();
+ Fluid.proj.i18n.set_posix_set(o->value());
Fluid.proj.set_modflag(1);
}}
tooltip {The message set number.} xywh {110 178 80 20} type Int box THIN_DOWN_BOX labelsize 12 textfont 4 textsize 12
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 09:15:40 +0000