Fluid: added keyboard shortcuts documentation.

4 files changed, 65 insertions, 7 deletions

diff --git a/documentation/src/fluid.dox b/documentation/src/fluid.dox
index bad962d70..fd4cf4a38 100644
--- a/documentation/src/fluid.dox
+++ b/documentation/src/fluid.dox
@@ -19,6 +19,7 @@ Subchapters:
 \li \ref fluid_templates
 \li \ref fluid_i18n
 \li \ref fluid_limitations
+\li \ref fluid_hotkeys
 
 \section fluid_what_is_fluid What is FLUID?
 
@@ -1585,6 +1586,64 @@ blocks of code. However, static code and data generated by this
 segment (menu items, images, include statements, etc.) will still
 be generated and likely cause compile-time warnings.
 
+\section fluid_hotkeys Keyboard Shortcuts
+
+On Apple computers, use the Apple Command key instead of Ctrl.
+
+<table>
+<tr><th>Key Combo</th><th>Function</th></tr>
+<tr><td> `F1` </td><td> widget properties dialog </td></tr>
+<tr><td> `F2` </td><td> move widget earlier in tree </td></tr>
+<tr><td> `F3` </td><td> move widget later in tree </td></tr>
+<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> `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>
+<tr><td> `Alt-4` </td><td> label text medium </td></tr>
+<tr><td> `Alt-5` </td><td> label text large </td></tr>
+<tr><td> `Alt-6` </td><td> label text huge </td></tr>
+<tr><td> `Ctrl-A` </td><td> select all </td></tr>
+<tr><td> `Shift-Ctrl-A` </td><td> select none </td></tr>
+<tr><td> `Alt-B` </td><td>  </td> widget bin </tr>
+<tr><td> `Ctrl-C` </td><td> copy widgets </td></tr>
+<tr><td> `Shift-Ctrl-C` </td><td> generate C code </td></tr>
+<tr><td> `Ctrl-G` </td><td> grid setting dialog </td></tr>
+<tr><td> `Alt-G` </td><td> execute again </td></tr>
+<tr><td> `Shift-Alt-G` </td><td> FLTK settings dialog </td></tr>
+<tr><td> `Ctrl-I` </td><td> insert design into project </td></tr>
+<tr><td> `Ctrl-N` </td><td> new design </td></tr>
+<tr><td> `Shift-Ctrl-N` </td><td> new design from template </td></tr>
+<tr><td> `Ctrl-O` </td><td> open design file </td></tr>
+<tr><td> `Shift-Ctrl-O` </td><td> toggle overlays </td></tr>
+<tr><td> `Ctrl-P` </td><td> print all windows </td></tr>
+<tr><td> `Alt-P` </td><td> project settings </td></tr>
+<tr><td> `Shift-Alt-P` </td><td> Fluid settings dialog </td></tr>
+<tr><td> `Ctrl-Q` </td><td> quit Fluid </td></tr>
+<tr><td> `Ctrl-S` </td><td> save design </td></tr>
+<tr><td> `Shift-Ctrl-S` </td><td> save design with new name </td></tr>
+<tr><td> `Shift-Alt-S` </td><td> source view window </td></tr>
+<tr><td> `Ctrl-U` </td><td> duplicate widgets </td></tr>
+<tr><td> `Ctrl-V` </td><td> paste widgets </td></tr>
+<tr><td> `Shift-Ctrl-W` </td><td> write text strings </td></tr>
+<tr><td> `Ctrl-X` </td><td> cut selected Widgets </td></tr>
+<tr><td> `Alt-X` </td><td> show 'execute command' dialog </td></tr>
+<tr><td> `Ctrl-Z` </td><td> undo </td></tr>
+<tr><td> `Shift-Ctrl-Z` </td><td> redo </td></tr>
+<tr><th>Key Combo</th><th>Function in interactive Window</th></tr>
+<tr><td> `LMB` </td><td> select one widget </td></tr>
+<tr><td> `Shift-LMB` </td><td> extend widget selection </td></tr>
+<tr><td> `Shift-LMB-Drag` </td><td> window only: resize proportional </td></tr>
+<tr><td> `Tab` </td><td> select next </td></tr>
+<tr><td> `Shift-Tab` </td><td> select previous </td></tr>
+<tr><td> `Arrow` </td><td> move by one unit </td></tr>
+<tr><td> `Shift-Arrow` </td><td> resize by one unit </td></tr>
+<tr><td> `Ctrl-Arrow` </td><td> move by grid units </td></tr>
+<tr><td> `Shift-Ctrl-Arrow` </td><td> resize by grid units </td></tr>
+</table>
+
 
 \htmlonly
 <hr>
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index ea2e4da54..e910b7153 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -1322,9 +1322,8 @@ int Fl_Window_Type::handle(int event) {
     case FL_Up:    dx = 0; dy = -1; goto ARROW;
     case FL_Down:  dx = 0; dy = +1; goto ARROW;
     ARROW:
-      // for some reason BOTTOM/TOP are swapped... should be fixed...
-      drag = (Fl::event_state(FL_SHIFT)) ? (RIGHT|TOP) : DRAG;
-      if (Fl::event_state(FL_CTRL)) {dx *= gridx; dy *= gridy;}
+      drag = (Fl::event_state(FL_SHIFT)) ? (RIGHT|BOTTOM) : DRAG;
+      if (Fl::event_state(FL_COMMAND)) {dx *= gridx; dy *= gridy;}
       moveallchildren();
       drag = 0;
       return 1;
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index f1f1e5394..7760654d9 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -107,7 +107,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);
@@ -514,6 +513,7 @@ ive to the origin at construction time");
         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 Font:");
           o->labelfont(1);
           o->labelsize(11);
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 482e229ea..f4f3bd3a2 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -40,7 +40,7 @@ Function {make_widget_panel()} {
       Fl_Group {} {
         label GUI
         callback propagate_load
-        xywh {10 30 400 330} labelsize 11 when 0 hide resizable
+        xywh {10 30 400 330} labelsize 11 when 0 resizable
       } {
         Fl_Group {} {
           label {Label:}
@@ -436,8 +436,8 @@ Use Ctrl-J for newlines.} xywh {95 285 310 20} labelfont 1 labelsize 11 textsize
       }
       Fl_Group {} {
         label Style
-        callback propagate_load selected
-        xywh {10 30 400 330} labelsize 11 when 0
+        callback propagate_load
+        xywh {10 30 400 330} labelsize 11 when 0 hide
       } {
         Fl_Group {} {
           label {Label Font:}