1 files changed, 67 insertions, 43 deletions
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 9d0ed50a3..3e6728487 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -2,6 +2,8 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
+mac_shell_cmd {echo "I love Fluid"}
+mac_shell_flags 3
 comment {//
 // Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
 //
@@ -26,6 +28,9 @@ decl {\#include "fluid.h"} {public global
 decl {\#include "widget_browser.h"} {public global
 }
 
+decl {\#include "shell_command.h"} {public global
+}
+
 decl {\#include <FL/Fl_Text_Buffer.H>} {public local
 }
 
@@ -281,53 +286,72 @@ Examples:
   }
 }
 
-Function {make_shell_window()} {open selected
+Function {make_shell_window()} {open
 } {
   Fl_Window shell_window {
-    label {Shell Command}
-    xywh {873 248 365 125} type Double visible
+    label {Shell Command} open
+    xywh {469 233 365 200} type Double modal size_range {365 200 365 200} visible
   } {
-    Fl_Input shell_command_input {
-      label {Command:}
-      callback {fluid_prefs.set("shell_command", shell_command_input->value());}
-      xywh {10 27 347 25} labelfont 1 align 5
-      code0 {char buf[1024];}
-      code1 {fluid_prefs.get("shell_command", buf, "", sizeof(buf));}
-      code2 {shell_command_input->value(buf);}
-    }
-    Fl_Check_Button shell_writecode_button {
-      label {Write Code}
-      callback {fluid_prefs.set("shell_writecode", shell_writecode_button->value());}
-      xywh {128 61 93 19} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("shell_writecode", b, 1);}
-      code2 {shell_writecode_button->value(b);}
-    }
-    Fl_Check_Button shell_writemsgs_button {
-      label {Write Messages}
-      callback {fluid_prefs.set("shell_writemsgs", shell_writemsgs_button->value());}
-      xywh {231 61 126 19} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("shell_writemsgs", b, 0);}
-      code2 {shell_writemsgs_button->value(b);}
-    }
-    Fl_Check_Button shell_savefl_button {
-      label {Save .FL File}
-      callback {fluid_prefs.set("shell_savefl", shell_savefl_button->value());}
-      xywh {10 62 108 19} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("shell_savefl", b, 1);}
-      code2 {shell_savefl_button->value(b);}
-    }
-    Fl_Return_Button {} {
-      label {Run Command}
-      callback do_shell_command
-      xywh {132 90 143 25}
+    Fl_Group {} {open
+      xywh {0 0 365 165}
+    } {
+      Fl_Input shell_command_input {
+        label {Command:}
+        tooltip {external shell command} xywh {82 14 277 20} labelfont 1 labelsize 12 textfont 4 textsize 12 resizable
+      }
+      Fl_Check_Button shell_savefl_button {
+        label {save .fl design file}
+        tooltip {save the design to the .fl file before running the command} xywh {82 39 136 19} down_box DOWN_BOX labelsize 12
+      }
+      Fl_Check_Button shell_writecode_button {
+        label {save source code}
+        tooltip {generate the source code and header file before running the command} xywh {82 59 120 19} down_box DOWN_BOX labelsize 12
+      }
+      Fl_Check_Button shell_writemsgs_button {
+        label {save i18n strings}
+        tooltip {save the internationalisation string before running the command} xywh {82 79 126 19} down_box DOWN_BOX labelsize 12
+      }
+      Fl_Check_Button shell_use_fl_button {
+        label {use settings in .fl design files}
+        callback {g_shell_use_fl_settings = shell_use_fl_button->value();
+fluid_prefs.set("shell_use_fl", g_shell_use_fl_settings);}
+        tooltip {check to read and write shell command from and to .fl files} xywh {82 110 180 19} down_box DOWN_BOX labelsize 12
+      }
+      Fl_Box {} {
+        xywh {82 103 275 1} box BORDER_FRAME color 0
+      }
+      Fl_Group {} {open
+        xywh {82 134 273 20}
+      } {
+        Fl_Button {} {
+          label {save as default}
+          callback {apply_shell_window();
+shell_prefs_set();} selected
+          tooltip {update the Fluid app settings for external shell commands to the current settings} xywh {82 134 104 20} labelsize 12
+        }
+        Fl_Box {} {
+          xywh {186 136 169 15} resizable
+        }
+      }
     }
-    Fl_Button {} {
-      label Cancel
-      callback {shell_window->hide();}
-      xywh {285 90 72 25}
+    Fl_Group {} {open
+      xywh {0 160 365 40}
+    } {
+      Fl_Box {} {
+        xywh {10 167 135 25} resizable
+      }
+      Fl_Return_Button {} {
+        label Run
+        callback {apply_shell_window();
+do_shell_command(NULL, NULL);}
+        tooltip {save selected files and run the command} xywh {145 167 100 25} labelsize 12
+      }
+      Fl_Button {} {
+        label Cancel
+        callback {shell_command_input->value(g_shell_command);
+shell_window->hide();}
+        xywh {255 167 100 25} labelsize 12
+      }
     }
   }
   Fl_Window shell_run_window {