FLUID: Stops overriding Ctrl-0 shortcut. #802

Ctrl-0 is used by FLTK globally to zoom all windows back to 100%,
so FLUID should not override that. Loading the previous file is now
Ctrl-1 instead of Ctrl-0.

4 files changed, 16 insertions, 16 deletions

diff --git a/documentation/src/fluid.dox b/documentation/src/fluid.dox
index fb558a472..ebfdaaafe 100644
--- a/documentation/src/fluid.dox
+++ b/documentation/src/fluid.dox
@@ -1681,7 +1681,7 @@ On Apple computers, use the Apple Command key instead of Ctrl.
 <tr><td> `F7` </td><td> group widgets </td></tr>
 <tr><td> `F8` </td><td> ungroup widgets </td></tr>
 <tr><td> `Delete` </td><td> delete selected widgets </td></tr>
-<tr><td> `Ctrl-0..9` </td><td> load design from history </td></tr>
+<tr><td> `Ctrl-1..9` </td><td> load project from history </td></tr>
 <tr><td> `Alt-1` </td><td> label text tiny </td></tr>
 <tr><td> `Alt-2` </td><td> lLabel text small </td></tr>
 <tr><td> `Alt-3` </td><td> label text normal </td></tr>
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index f9c99dc43..90be6a00e 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1619,16 +1619,16 @@ Fl_Menu_Item Main_Menu[] = {
   {"&Print...", FL_COMMAND+'p', print_menu_cb},
   {"Write &Code...", FL_COMMAND+FL_SHIFT+'c', write_cb, 0},
   {"&Write Strings...", FL_COMMAND+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER},
-  {relative_history[0], FL_COMMAND+'0', menu_file_open_history_cb, absolute_history[0]},
-  {relative_history[1], FL_COMMAND+'1', menu_file_open_history_cb, absolute_history[1]},
-  {relative_history[2], FL_COMMAND+'2', menu_file_open_history_cb, absolute_history[2]},
-  {relative_history[3], FL_COMMAND+'3', menu_file_open_history_cb, absolute_history[3]},
-  {relative_history[4], FL_COMMAND+'4', menu_file_open_history_cb, absolute_history[4]},
-  {relative_history[5], FL_COMMAND+'5', menu_file_open_history_cb, absolute_history[5]},
-  {relative_history[6], FL_COMMAND+'6', menu_file_open_history_cb, absolute_history[6]},
-  {relative_history[7], FL_COMMAND+'7', menu_file_open_history_cb, absolute_history[7]},
-  {relative_history[8], FL_COMMAND+'8', menu_file_open_history_cb, absolute_history[8]},
-  {relative_history[9], FL_COMMAND+'9', menu_file_open_history_cb, absolute_history[9], FL_MENU_DIVIDER},
+  {relative_history[0], FL_COMMAND+'1', menu_file_open_history_cb, absolute_history[0]},
+  {relative_history[1], FL_COMMAND+'2', menu_file_open_history_cb, absolute_history[1]},
+  {relative_history[2], FL_COMMAND+'3', menu_file_open_history_cb, absolute_history[2]},
+  {relative_history[3], FL_COMMAND+'4', menu_file_open_history_cb, absolute_history[3]},
+  {relative_history[4], FL_COMMAND+'5', menu_file_open_history_cb, absolute_history[4]},
+  {relative_history[5], FL_COMMAND+'6', menu_file_open_history_cb, absolute_history[5]},
+  {relative_history[6], FL_COMMAND+'7', menu_file_open_history_cb, absolute_history[6]},
+  {relative_history[7], FL_COMMAND+'8', menu_file_open_history_cb, absolute_history[7]},
+  {relative_history[8], FL_COMMAND+'9', menu_file_open_history_cb, absolute_history[8]},
+  {relative_history[9], 0, menu_file_open_history_cb, absolute_history[9], FL_MENU_DIVIDER},
   {"&Quit", FL_COMMAND+'q', exit_cb},
   {0},
 {"&Edit",0,0,0,FL_SUBMENU},
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 4f18c961a..295f629f6 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -564,7 +564,6 @@ Fl_Double_Window* make_widget_panel() {
         o->labelsize(11);
         o->callback((Fl_Callback*)propagate_load);
         o->when(FL_WHEN_NEVER);
-        o->hide();
         { Fl_Group* o = new Fl_Group(95, 40, 309, 20, "Label:");
           o->labelfont(1);
           o->labelsize(11);
@@ -1438,6 +1437,7 @@ access the Widget pointer and \'v\' to access the user value.");
       { widget_tab_grid_child = new Fl_Group(10, 30, 400, 330, "Grid Child");
         widget_tab_grid_child->labelsize(11);
         widget_tab_grid_child->callback((Fl_Callback*)propagate_load);
+        widget_tab_grid_child->hide();
         { Fl_Group* o = new Fl_Group(95, 60, 315, 20, "Location:");
           o->labelfont(1);
           o->labelsize(11);
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 3434a1889..648a8a1b8 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -57,7 +57,7 @@ Function {make_window()} {open
       colgaps { 1 3 -1 }
     } {
       Fl_Button {} {
-        label Button selected
+        label Button
         xywh {85 75 139 59} labelsize 11
         parent_properties {
           location {1 1}
@@ -82,8 +82,8 @@ Function {make_widget_panel()} {
     } {
       Fl_Group {} {
         label GUI
-        callback propagate_load
-        xywh {10 30 400 330} labelsize 11 when 0 hide resizable
+        callback propagate_load selected
+        xywh {10 30 400 330} labelsize 11 when 0 resizable
       } {
         Fl_Group {} {
           label {Label:}
@@ -859,7 +859,7 @@ wCallback->do_callback(wCallback, v);} open
       Fl_Group widget_tab_grid_child {
         label {Grid Child}
         callback propagate_load open
-        xywh {10 30 400 330} labelsize 11
+        xywh {10 30 400 330} labelsize 11 hide
       } {
         Fl_Group {} {
           label {Location:}