Cleaning up widget browser, renamed to Node_Browser.

1 files changed, 23 insertions, 20 deletions

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[];}