FLUID: Move i18n settings into its own class

4 files changed, 34 insertions, 34 deletions

diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx
index 3cf191618..3c46715bd 100644
--- a/fluid/panels/codeview_panel.cxx
+++ b/fluid/panels/codeview_panel.cxx
@@ -180,7 +180,7 @@ void update_codeview_cb(class Fl_Button*, void*) {
       char fn[FL_PATH_MAX+1];
       fl_strlcpy(fn, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
       fl_strlcat(fn, "strings", FL_PATH_MAX);
-      fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n_type)]);
+      fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n.type)]);
       fld::io::write_strings(Fluid.proj, fn);
       int top = cv_strings->top_line();
       cv_strings->buffer()->loadfile(fn);
diff --git a/fluid/panels/codeview_panel.fl b/fluid/panels/codeview_panel.fl
index 3af688e16..612639c0d 100644
--- a/fluid/panels/codeview_panel.fl
+++ b/fluid/panels/codeview_panel.fl
@@ -209,7 +209,7 @@ and load those into the Code Viewer widgets.} open return_type void
     char fn[FL_PATH_MAX+1];
     fl_strlcpy(fn, Fluid.get_tmpdir().c_str(), FL_PATH_MAX);
     fl_strlcat(fn, "strings", FL_PATH_MAX);
-    fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n_type)]);
+    fl_filename_setext(fn, FL_PATH_MAX, exts[static_cast<int>(Fluid.proj.i18n.i18n_type)]);
     fld::io::write_strings(Fluid.proj, fn);
     int top = cv_strings->top_line();
     cv_strings->buffer()->loadfile(fn);
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index a57c797c2..d695c535c 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -2137,10 +2137,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.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_gnu_include = o->value();
+    Fluid.proj.i18n.gnu_include = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2149,10 +2149,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.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_gnu_conditional = o->value();
+    Fluid.proj.i18n.gnu_conditional = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2161,10 +2161,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.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_gnu_function = o->value();
+    Fluid.proj.i18n.gnu_function = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2173,10 +2173,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.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_gnu_static_function = o->value();
+    Fluid.proj.i18n.gnu_static_function = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2191,10 +2191,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_pos_include.c_str());
+    o->value(Fluid.proj.i18n.posix_include.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_pos_include = o->value();
+    Fluid.proj.i18n.posix_include = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2203,10 +2203,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_pos_conditional.c_str());
+    o->value(Fluid.proj.i18n.posix_conditional.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_pos_conditional = o->value();
+    Fluid.proj.i18n.posix_conditional = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2215,10 +2215,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_pos_file.c_str());
+    o->value(Fluid.proj.i18n.posix_file.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_pos_file = o->value();
+    Fluid.proj.i18n.posix_file = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
@@ -2231,10 +2231,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_pos_set.c_str());
+    o->value(Fluid.proj.i18n.posix_set.c_str());
   } else {
     Fluid.proj.undo.checkpoint();
-    Fluid.proj.i18n_pos_set = o->value();
+    Fluid.proj.i18n.posix_set = o->value();
     Fluid.proj.set_modflag(1);
   }
 }
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index dd1f61107..59c1a476d 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -1559,10 +1559,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.i18n_gnu_include.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_gnu_include = o->value();
+  Fluid.proj.i18n.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_gnu_conditional.c_str());
+  o->value(Fluid.proj.i18n.i18n_gnu_conditional.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_gnu_conditional = o->value();
+  Fluid.proj.i18n.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,10 +1581,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.i18n_gnu_function.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_gnu_function = o->value();
+  Fluid.proj.i18n.i18n_gnu_function = o->value();
   Fluid.proj.set_modflag(1);
 }}
             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
@@ -1592,10 +1592,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.i18n_gnu_static_function.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_gnu_static_function = o->value();
+  Fluid.proj.i18n.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_pos_include.c_str());
+  o->value(Fluid.proj.i18n.i18n_pos_include.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_pos_include = o->value();
+  Fluid.proj.i18n.i18n_pos_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_pos_conditional.c_str());
+  o->value(Fluid.proj.i18n.i18n_pos_conditional.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_pos_conditional = o->value();
+  Fluid.proj.i18n.i18n_pos_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_pos_file.c_str());
+  o->value(Fluid.proj.i18n.i18n_pos_file.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_pos_file = o->value();
+  Fluid.proj.i18n.i18n_pos_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_pos_set.c_str());
+  o->value(Fluid.proj.i18n.i18n_pos_set.c_str());
 } else {
   Fluid.proj.undo.checkpoint();
-  Fluid.proj.i18n_pos_set = o->value();
+  Fluid.proj.i18n.i18n_pos_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