wip

1 files changed, 37 insertions, 37 deletions

diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index 66df11816..1494bd357 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -544,7 +544,7 @@ Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0;
 
 static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
   if (v == LOAD) {
-    fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+    Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
     int i;
     if (suite.storage_ == FLD_TOOL_STORE_INTERNAL) {
       w_layout_menu_rename->deactivate();
@@ -572,25 +572,25 @@ static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
 }
 
 static void cb_w_layout_menu_storage(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_INTERNAL);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage1(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_USER);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage2(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_PROJECT);
   Fluid.layout_list->update_dialogs();
 }
 
 static void cb_w_layout_menu_storage3(Fl_Menu_*, void*) {
-  fld::app::Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
+  Layout_Suite &suite = (*Fluid.layout_list)[Fluid.layout_list->current_suite()];
   suite.storage(FLD_TOOL_STORE_FILE);
   Fluid.layout_list->update_dialogs();
 }
@@ -1122,7 +1122,7 @@ static void cb_Store(Fl_Choice* o, void* v) {
   int selected = w_settings_shell_list_selected;
   if (v == LOAD) {
     if (selected) {
-      fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
+      Tool_Store ts = g_shell_config->list[selected-1]->storage;
       o->value(o->find_item_with_argument((long)ts));
     } else {
       o->value(o->find_item_with_argument((long)FLD_TOOL_STORE_USER));
@@ -1130,7 +1130,7 @@ static void cb_Store(Fl_Choice* o, void* v) {
   } else {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
-      fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
+      Tool_Store ts = (Tool_Store)(o->mvalue()->argument());
       if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
       cmd->storage = ts;
       //w_settings_shell_list->text(selected, cmd->name);
@@ -2447,18 +2447,18 @@ Fl_Choice *w_settings_user_commenttext=(Fl_Choice *)0;
 
 static void cb_Reset(Fl_Button* o, void* v) {
   if (v == LOAD) return;
-  fld::widget::Node_Browser::label_color = 72;
-  fld::widget::Node_Browser::label_font = FL_HELVETICA;
-  fld::widget::Node_Browser::class_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::class_font = FL_HELVETICA_BOLD;
-  fld::widget::Node_Browser::func_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::func_font = FL_HELVETICA;
-  fld::widget::Node_Browser::name_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::name_font = FL_HELVETICA;
-  fld::widget::Node_Browser::code_color = FL_FOREGROUND_COLOR;
-  fld::widget::Node_Browser::code_font = FL_HELVETICA;
-  fld::widget::Node_Browser::comment_color = FL_DARK_GREEN;
-  fld::widget::Node_Browser::comment_font = FL_DARK_GREEN;
+  Node_Browser::label_color = 72;
+  Node_Browser::label_font = FL_HELVETICA;
+  Node_Browser::class_color = FL_FOREGROUND_COLOR;
+  Node_Browser::class_font = FL_HELVETICA_BOLD;
+  Node_Browser::func_color = FL_FOREGROUND_COLOR;
+  Node_Browser::func_font = FL_HELVETICA;
+  Node_Browser::name_color = FL_FOREGROUND_COLOR;
+  Node_Browser::name_font = FL_HELVETICA;
+  Node_Browser::code_color = FL_FOREGROUND_COLOR;
+  Node_Browser::code_font = FL_HELVETICA;
+  Node_Browser::comment_color = FL_DARK_GREEN;
+  Node_Browser::comment_font = FL_DARK_GREEN;
   o->parent()->do_callback(o->parent(), LOAD);
   widget_browser->redraw();
   widget_browser->save_prefs();
@@ -3423,17 +3423,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::label_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::label_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 112, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::label_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::label_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 112, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::label_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::label_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3449,17 +3449,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::class_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::class_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 137, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::class_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::class_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 137, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::class_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::class_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3475,17 +3475,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::func_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::func_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 162, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::func_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::func_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 162, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::func_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::func_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3501,17 +3501,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::name_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::name_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 187, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::name_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::name_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 187, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::name_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::name_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3527,17 +3527,17 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(12);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::code_font));
+            o->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::code_font));
             Fl_Group::current()->resizable(o);
             o->menu(fontmenu);
           } // Fl_Choice* o
           { Fl_Button* o = new Fl_Button(271, 212, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::code_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::code_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 212, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::code_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::code_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3553,17 +3553,17 @@ Fl_Double_Window* make_settings_window() {
             w_settings_user_commenttext->labelfont(1);
             w_settings_user_commenttext->labelsize(12);
             w_settings_user_commenttext->textsize(11);
-            w_settings_user_commenttext->callback((Fl_Callback*)cb_Comments, (void*)(&fld::widget::Node_Browser::comment_font));
+            w_settings_user_commenttext->callback((Fl_Callback*)cb_Comments, (void*)(&Node_Browser::comment_font));
             Fl_Group::current()->resizable(w_settings_user_commenttext);
             o->menu(fontmenu);
           } // Fl_Choice* w_settings_user_commenttext
           { Fl_Button* o = new Fl_Button(271, 237, 51, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&fld::widget::Node_Browser::comment_color));
+            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Node_Browser::comment_color));
           } // Fl_Button* o
           { Fl_Menu_Button* o = new Fl_Menu_Button(322, 237, 18, 20);
             o->labelsize(12);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&fld::widget::Node_Browser::comment_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::comment_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();