Hide/Show Widget Bin and Overlays, instead of checks.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4139 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 59 insertions, 28 deletions

diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index 1c5179b28..7a8e63f84 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -654,6 +654,30 @@ void select_all_cb(Fl_Widget *,void *) {
   selection_changed(p);
 }
 
+void select_none_cb(Fl_Widget *,void *) {
+  Fl_Type *p = Fl_Type::current ? Fl_Type::current->parent : 0;
+  if (in_this_only) {
+    Fl_Type *t = p;
+    for (; t && t != in_this_only; t = t->parent);
+    if (t != in_this_only) p = in_this_only;
+  }
+  for (;;) {
+    if (p) {
+      int foundany = 0;
+      for (Fl_Type *t = p->next; t && t->level>p->level; t = t->next) {
+	if (t->new_selected) {widget_browser->select(t,0,0); foundany = 1;}
+      }
+      if (foundany) break;
+      p = p->parent;
+    } else {
+      for (Fl_Type *t = Fl_Type::first; t; t = t->next)
+	widget_browser->select(t,0,0);
+      break;
+    }
+  }
+  selection_changed(p);
+}
+
 static void delete_children(Fl_Type *p) {
   Fl_Type *f;
   for (f = p; f && f->next && f->next->level > p->level; f = f->next);
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 36e101717..4b211c4b2 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1301,7 +1301,7 @@ void cancel_cb(Fl_Button* o, void* v) {
   the_panel->hide();
 }
 
-void toggle_overlays(Fl_Widget *,void *); // in Fl_Window_Type.C
+void toggle_overlays(Fl_Widget *,void *); // in Fl_Window_Type.cxx
 void overlay_cb(Fl_Button*o,void *v) {
   toggle_overlays(o,v);
 }
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index e5a038657..d348ee158 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -922,12 +922,11 @@ void Fl_Window_Type::draw_overlay() {
   fl_rectf(mybx,mybt-5,5,5);
 }
 
-extern Fl_Menu_Bar *main_menubar;
+extern Fl_Menu_Item Main_Menu[];
 
 // Calculate new bounding box of selected widgets:
 void Fl_Window_Type::fix_overlay() {
-  Fl_Menu_Item *item = (Fl_Menu_Item *)main_menubar->find_item("&Edit/O&verlays");
-  if (item) item->set();
+  Main_Menu[36].label("Hide O&verlays");
   overlays_invisible = 0;
   recalc = 1;
   ((Overlay_Window *)(this->o))->redraw_overlay();
@@ -941,6 +940,10 @@ void redraw_overlays() {
 
 void toggle_overlays(Fl_Widget *,void *) {
   overlays_invisible = !overlays_invisible;
+
+  if (overlays_invisible) Main_Menu[36].label("Show O&verlays");
+  else Main_Menu[36].label("Hide O&verlays");
+
   for (Fl_Type *o=Fl_Type::first; o; o=o->next)
     if (o->is_window()) {
       Fl_Widget_Type* w = (Fl_Widget_Type*)o;
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index cb814b321..4b030c728 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -415,6 +415,7 @@ void openwidget_cb(Fl_Widget *, void *) {
 void toggle_overlays(Fl_Widget *,void *);
 
 void select_all_cb(Fl_Widget *,void *);
+void select_none_cb(Fl_Widget *,void *);
 
 void group_cb(Fl_Widget *, void *);
 
@@ -559,28 +560,12 @@ void manual_cb(Fl_Widget *, void *) {
   show_help("index.html");
 }
 
-void toggle_widgetbin_cb(Fl_Widget *, void *) {
-  Fl_Menu_Item *item = (Fl_Menu_Item *)main_menubar->find_item("&Edit/Widget &Bin");
-
-  if ( !widgetbin_panel ) {
-    make_widgetbin();
-    widgetbin_panel->callback(toggle_widgetbin_cb);
-    if (!position_window(widgetbin_panel,"widgetbin_pos", 1, 320, 30)) return;
-
-  }
-  if ( widgetbin_panel->visible() ) {
-    widgetbin_panel->hide();
-    if (item) item->clear();
-  } else {
-    widgetbin_panel->show();
-    if (item) item->set();
-  }
-}
-
 ////////////////////////////////////////////////////////////////
 
 extern Fl_Menu_Item New_Menu[];
 
+void toggle_widgetbin_cb(Fl_Widget *, void *);
+
 Fl_Menu_Item Main_Menu[] = {
 {"&File",0,0,0,FL_SUBMENU},
   {"&New", FL_CTRL+'n', new_cb, 0},
@@ -609,8 +594,9 @@ Fl_Menu_Item Main_Menu[] = {
   {"C&ut", FL_CTRL+'x', cut_cb},
   {"&Copy", FL_CTRL+'c', copy_cb},
   {"&Duplicate", FL_CTRL+'d', duplicate_cb},
-  {"&Paste", FL_CTRL+'v', paste_cb},
-  {"Select &All", FL_CTRL+'a', select_all_cb, 0, FL_MENU_DIVIDER},
+  {"&Paste", FL_CTRL+'v', paste_cb, 0, FL_MENU_DIVIDER},
+  {"Select &All", FL_CTRL+'a', select_all_cb},
+  {"Select &None", FL_CTRL+FL_SHIFT+'a', select_none_cb, 0, FL_MENU_DIVIDER},
   {"&Open...", FL_F+1, openwidget_cb},
   {"&Sort",0,sort_cb},
   {"&Earlier", FL_F+2, earlier_cb},
@@ -618,11 +604,11 @@ Fl_Menu_Item Main_Menu[] = {
 //{"Show", FL_F+5, show_cb},
 //{"Hide", FL_F+6, hide_cb},
   {"&Group", FL_F+7, group_cb},
-  {"U&ngroup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER},
+  {"Ung&roup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER},
 //{"Deactivate", 0, nyi},
 //{"Activate", 0, nyi, 0, FL_MENU_DIVIDER},
-  {"O&verlays",FL_CTRL+FL_SHIFT+'o',toggle_overlays, 0, FL_MENU_TOGGLE | FL_MENU_VALUE},
-  {"Widget &Bin",FL_ALT+'b',toggle_widgetbin_cb, 0, FL_MENU_TOGGLE | FL_MENU_DIVIDER},
+  {"Hide O&verlays",FL_CTRL+FL_SHIFT+'o',toggle_overlays},
+  {"Show Widget &Bin",FL_ALT+'b',toggle_widgetbin_cb, 0, FL_MENU_DIVIDER},
   {"Pro&ject Settings...",FL_CTRL+'p',show_project_cb},
   {"&GUI Settings...",FL_CTRL+FL_SHIFT+'p',show_settings_cb},
   {0},
@@ -675,8 +661,23 @@ Fl_Menu_Item Main_Menu[] = {
 
 extern void fill_in_New_Menu();
 
-void make_main_window() {
+void toggle_widgetbin_cb(Fl_Widget *, void *) {
+  if (!widgetbin_panel) {
+    make_widgetbin();
+    widgetbin_panel->callback(toggle_widgetbin_cb);
+    if (!position_window(widgetbin_panel,"widgetbin_pos", 1, 320, 30)) return;
+  }
+
+  if (widgetbin_panel->visible()) {
+    widgetbin_panel->hide();
+    Main_Menu[37].label("Show Widget &Bin");
+  } else {
+    widgetbin_panel->show();
+    Main_Menu[37].label("Hide Widget &Bin");
+  }
+}
 
+void make_main_window() {
   fluid_prefs.get("snap", snap, 1);
   fluid_prefs.get("gridx", gridx, 5);
   fluid_prefs.get("gridy", gridy, 5);
@@ -920,6 +921,9 @@ void set_modflag(int mf) {
       main_window->label(title);
     } else main_window->label(basename);
   }
+
+  if (modflag) Main_Menu[16].activate();
+  else Main_Menu[16].deactivate();
 }
 
 ////////////////////////////////////////////////////////////////