8 files changed, 90 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index a1fd32e94..dbe31e6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,7 +99,7 @@ etc/FLTKConfig.cmake
 /fluid/TAGS
 /fluid/fluid.app
 /fluid/pixmaps/*.bck
-/fluid/html/
+/fluid/documentation/html/
 
 # /lib/
 /lib/lib*
diff --git a/fluid/Doxyfile b/fluid/Doxyfile
index 8fb98f75f..3aed35683 100644
--- a/fluid/Doxyfile
+++ b/fluid/Doxyfile
@@ -1180,7 +1180,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = documentation/html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -1545,7 +1545,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
 # FULL_SIDEBAR option determines if the side bar is limited to only the treeview
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 2fb6dafa3..ac275f462 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -337,6 +337,12 @@ Fl_Check_Button *shell_use_fl_button=(Fl_Check_Button *)0;
 static void cb_shell_use_fl_button(Fl_Check_Button*, void*) {
   g_shell_use_fl_settings = shell_use_fl_button->value();
 fluid_prefs.set("shell_use_fl", g_shell_use_fl_settings);
+if (g_shell_use_fl_settings) {
+  shell_settings_read();
+} else {
+  shell_prefs_get();
+}
+update_shell_window();
 }
 
 static void cb_save(Fl_Button*, void*) {
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 3e6728487..08faa20b0 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -290,7 +290,7 @@ Function {make_shell_window()} {open
 } {
   Fl_Window shell_window {
     label {Shell Command} open
-    xywh {469 233 365 200} type Double modal size_range {365 200 365 200} visible
+    xywh {468 233 365 200} type Double modal size_range {365 200 365 200} visible
   } {
     Fl_Group {} {open
       xywh {0 0 365 165}
@@ -314,7 +314,13 @@ Function {make_shell_window()} {open
       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);}
+fluid_prefs.set("shell_use_fl", g_shell_use_fl_settings);
+if (g_shell_use_fl_settings) {
+  shell_settings_read();
+} else {
+  shell_prefs_get();
+}
+update_shell_window();} selected
         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 {} {
@@ -326,7 +332,7 @@ fluid_prefs.set("shell_use_fl", g_shell_use_fl_settings);}
         Fl_Button {} {
           label {save as default}
           callback {apply_shell_window();
-shell_prefs_set();} selected
+shell_prefs_set();}
           tooltip {update the Fluid app settings for external shell commands to the current settings} xywh {82 134 104 20} labelsize 12
         }
         Fl_Box {} {
diff --git a/fluid/documentation/src/code.dox b/fluid/documentation/src/code.dox
new file mode 100644
index 000000000..58b041d11
--- /dev/null
+++ b/fluid/documentation/src/code.dox
@@ -0,0 +1,36 @@
+
+
+/**
+
+ \page code Code Nodes
+
+ Overview of code nodes.
+
+ \section function Functions and Methods
+
+ Creating functions and methods.
+
+ \code
+ #include "test.fl"
+ \endcode
+
+ \section code Code
+
+ \section codeblock Code Block
+
+ \section declaration Declaration
+
+ \section declarationblock Declaration Block
+
+ \section class Classes
+
+ Fluid can create a new C++ class.
+
+ \section widgetclass Widget Class
+
+ \section comment Comments
+
+ \section inlineddata Inlined Data
+
+ */
+
diff --git a/fluid/documentation/src/index.dox b/fluid/documentation/src/index.dox
new file mode 100644
index 000000000..95cc95158
--- /dev/null
+++ b/fluid/documentation/src/index.dox
@@ -0,0 +1,26 @@
+
+
+/**
+
+ \mainpage Fluid User Manual and Developer Overview
+
+ \subpage function
+
+ \subpage code
+
+ \subpage codeblock
+
+ \subpage declaration
+
+ \subpage declarationblock
+
+ \subpage class
+
+ \subpage widgetclass
+
+ \subpage comment
+
+ \subpage inlineddata
+
+ */
+
diff --git a/fluid/shell_command.cxx b/fluid/shell_command.cxx
index af7e0ef64..14e46ab05 100644
--- a/fluid/shell_command.cxx
+++ b/fluid/shell_command.cxx
@@ -342,13 +342,20 @@ void do_shell_command(Fl_Return_Button*, void*) {
  Fluid app settings are saved per user and per machine.
  */
 void show_shell_window() {
+  update_shell_window();
+  shell_window->hotspot(shell_command_input);
+  shell_window->show();
+}
+
+/**
+ Update the shell properties dialog box.
+ */
+void update_shell_window() {
   shell_command_input->value(g_shell_command);
   shell_savefl_button->value(g_shell_save_fl);
   shell_writecode_button->value(g_shell_save_code);
   shell_writemsgs_button->value(g_shell_save_strings);
   shell_use_fl_button->value(g_shell_use_fl_settings);
-  shell_window->hotspot(shell_command_input);
-  shell_window->show();
 }
 
 /**
diff --git a/fluid/shell_command.h b/fluid/shell_command.h
index 765806786..8a1f4e2a2 100644
--- a/fluid/shell_command.h
+++ b/fluid/shell_command.h
@@ -32,6 +32,7 @@
 #endif
 
 void show_shell_window();
+void update_shell_window();
 void apply_shell_window();
 void do_shell_command(class Fl_Return_Button*, void*);