Cleaning up widget browser, renamed to Node_Browser.

5 files changed, 45 insertions, 41 deletions

diff --git a/fluid/panels/function_panel.cxx b/fluid/panels/function_panel.cxx
index 34f67b881..4ef8fac64 100644
--- a/fluid/panels/function_panel.cxx
+++ b/fluid/panels/function_panel.cxx
@@ -23,7 +23,7 @@
 #include "nodes/factory.h"
 #include "rsrcs/pixmaps.h"
 #include "widgets/Bin_Button.h"
-#include "widgets/widget_browser.h"
+#include "widgets/Node_Browser.h"
 
 /**
  Allow widget navigation on text fields with Tab.
diff --git a/fluid/panels/function_panel.fl b/fluid/panels/function_panel.fl
index b63b4bf50..7adb2ecea 100644
--- a/fluid/panels/function_panel.fl
+++ b/fluid/panels/function_panel.fl
@@ -43,7 +43,7 @@ decl {\#include "rsrcs/pixmaps.h"} {private local
 decl {\#include "widgets/Bin_Button.h"} {private global
 }
 
-decl {\#include "widgets/widget_browser.h"} {private local
+decl {\#include "widgets/Node_Browser.h"} {private local
 }
 
 Function {use_tab_navigation(int, Fl_Text_Editor*)} {
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index a0e2092a8..fd67676c6 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -23,6 +23,7 @@
 #include <FL/fl_ask.H>
 #include "../src/flstring.h"
 #include <string.h>
+using namespace fld::widget;
 void scheme_cb(Fl_Scheme_Choice *, void *);
 int w_settings_shell_list_selected;
 
@@ -3355,16 +3356,16 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(11);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 112, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 112, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::label_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::label_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3377,16 +3378,16 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(11);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 137, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 137, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::class_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::class_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3399,16 +3400,16 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(11);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 162, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 162, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::func_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::func_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3421,16 +3422,16 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(11);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 187, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 187, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::name_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::name_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3443,16 +3444,16 @@ Fl_Double_Window* make_settings_window() {
             o->labelfont(1);
             o->labelsize(11);
             o->textsize(11);
-            o->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 212, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 212, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::code_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::code_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
@@ -3465,16 +3466,16 @@ Fl_Double_Window* make_settings_window() {
             w_settings_user_commenttext->labelfont(1);
             w_settings_user_commenttext->labelsize(11);
             w_settings_user_commenttext->textsize(11);
-            w_settings_user_commenttext->callback((Fl_Callback*)cb_Comments, (void*)(&Widget_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(251, 237, 51, 20);
             o->labelsize(11);
-            o->callback((Fl_Callback*)cb_Color_Chip, (void*)(&Widget_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(302, 237, 18, 20);
-            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Widget_Browser::comment_color));
+            o->callback((Fl_Callback*)cb_Color_Choice, (void*)(&Node_Browser::comment_color));
             o->menu(colormenu);
           } // Fl_Menu_Button* o
           o->end();
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index a53e96b4b..fad6580af 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -64,7 +64,7 @@ decl {\#include "app/shell_command.h"} {public global
 decl {\#include "tools/fluid_filename.h"} {public local
 }
 
-decl {\#include "widgets/widget_browser.h"} {public global
+decl {\#include "widgets/Node_Browser.h"} {public global
 }
 
 decl {\#include <FL/Fl_Text_Buffer.H>} {public local
@@ -88,12 +88,15 @@ decl {\#include <FL/Fl_Tooltip.H>} {private global
 decl {\#include <FL/fl_ask.H>} {private global
 }
 
-decl {\#include "../src/flstring.h"} {selected private global
+decl {\#include "../src/flstring.h"} {private global
 }
 
 decl {\#include <string.h>} {private global
 }
 
+decl {using namespace fld::widget;} {selected private global
+}
+
 decl {void init_scheme(void);} {
   comment {// initialize the scheme from preferences} public global
 }
@@ -1677,19 +1680,19 @@ if (v == LOAD) {
         } {
           Fl_Choice {} {
             label {Label:}
-            user_data {&Widget_Browser::label_font}
+            user_data {&Node_Browser::label_font}
             callback cb_Comments open
             xywh {100 112 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::label_color}
+            user_data {&Node_Browser::label_color}
             callback cb_Color_Chip
             xywh {251 112 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::label_color}
+            user_data {&Node_Browser::label_color}
             callback cb_Color_Choice open
             xywh {302 112 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
@@ -1702,19 +1705,19 @@ if (v == LOAD) {
         } {
           Fl_Choice {} {
             label {Class:}
-            user_data {&Widget_Browser::class_font}
+            user_data {&Node_Browser::class_font}
             callback cb_Comments open
             xywh {100 137 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::class_color}
+            user_data {&Node_Browser::class_color}
             callback cb_Color_Chip
             xywh {251 137 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::class_color}
+            user_data {&Node_Browser::class_color}
             callback cb_Color_Choice open
             xywh {302 137 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
@@ -1727,19 +1730,19 @@ if (v == LOAD) {
         } {
           Fl_Choice {} {
             label {Function:}
-            user_data {&Widget_Browser::func_font}
+            user_data {&Node_Browser::func_font}
             callback cb_Comments open
             xywh {100 162 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::func_color}
+            user_data {&Node_Browser::func_color}
             callback cb_Color_Chip
             xywh {251 162 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::func_color}
+            user_data {&Node_Browser::func_color}
             callback cb_Color_Choice open
             xywh {302 162 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
@@ -1752,19 +1755,19 @@ if (v == LOAD) {
         } {
           Fl_Choice {} {
             label {Name:}
-            user_data {&Widget_Browser::name_font}
+            user_data {&Node_Browser::name_font}
             callback cb_Comments open
             xywh {100 187 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::name_color}
+            user_data {&Node_Browser::name_color}
             callback cb_Color_Chip
             xywh {251 187 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::name_color}
+            user_data {&Node_Browser::name_color}
             callback cb_Color_Choice open
             xywh {302 187 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
@@ -1777,19 +1780,19 @@ if (v == LOAD) {
         } {
           Fl_Choice {} {
             label {Code:}
-            user_data {&Widget_Browser::code_font}
+            user_data {&Node_Browser::code_font}
             callback cb_Comments open
             xywh {100 212 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::code_color}
+            user_data {&Node_Browser::code_color}
             callback cb_Color_Chip
             xywh {251 212 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::code_color}
+            user_data {&Node_Browser::code_color}
             callback cb_Color_Choice open
             xywh {302 212 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
@@ -1802,19 +1805,19 @@ if (v == LOAD) {
         } {
           Fl_Choice w_settings_user_commenttext {
             label {Comments:}
-            user_data {&Widget_Browser::comment_font}
+            user_data {&Node_Browser::comment_font}
             callback cb_Comments open
             xywh {100 237 151 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
             code0 {extern Fl_Menu_Item fontmenu[];}
             code1 {o->menu(fontmenu);}
           } {}
           Fl_Button {} {
-            user_data {&Widget_Browser::comment_color}
+            user_data {&Node_Browser::comment_color}
             callback cb_Color_Chip
             xywh {251 237 51 20} labelsize 11
           }
           Fl_Menu_Button {} {
-            user_data {&Widget_Browser::comment_color}
+            user_data {&Node_Browser::comment_color}
             callback cb_Color_Choice open
             xywh {302 237 18 20}
             code0 {extern Fl_Menu_Item colormenu[];}
diff --git a/fluid/panels/settings_panel.h b/fluid/panels/settings_panel.h
index 918e69c8a..c26b165c5 100644
--- a/fluid/panels/settings_panel.h
+++ b/fluid/panels/settings_panel.h
@@ -23,7 +23,7 @@
 #include "app/Fd_Snap_Action.h"
 #include "app/shell_command.h"
 #include "tools/fluid_filename.h"
-#include "widgets/widget_browser.h"
+#include "widgets/Node_Browser.h"
 #include <FL/Fl_Text_Buffer.H>
 #include <FL/Fl_Text_Display.H>
 #include <FL/fl_string_functions.h>