Bringing over fix [r11833] from 1.3 current to the porting branch.

Added updated settings dialog screenshots to the fluid docs.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11834 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 39 insertions, 15 deletions

diff --git a/documentation/src/fluid-edit-global-fltk-settings.png b/documentation/src/fluid-edit-global-fltk-settings.png
new file mode 100644
index 000000000..482c9eee5
--- /dev/null
+++ b/documentation/src/fluid-edit-global-fltk-settings.png
diff --git a/documentation/src/fluid-edit-gui-settings.png b/documentation/src/fluid-edit-gui-settings.png
new file mode 100644
index 000000000..732ae3ed0
--- /dev/null
+++ b/documentation/src/fluid-edit-gui-settings.png
diff --git a/documentation/src/fluid-edit-proj-settings.png b/documentation/src/fluid-edit-proj-settings.png
new file mode 100644
index 000000000..a499f627d
--- /dev/null
+++ b/documentation/src/fluid-edit-proj-settings.png
diff --git a/documentation/src/fluid-layout-grid-and-size-settings.png b/documentation/src/fluid-layout-grid-and-size-settings.png
new file mode 100644
index 000000000..e10e0bc17
--- /dev/null
+++ b/documentation/src/fluid-layout-grid-and-size-settings.png
diff --git a/documentation/src/fluid.dox b/documentation/src/fluid.dox
index c357189b9..cc24a5d17 100644
--- a/documentation/src/fluid.dox
+++ b/documentation/src/fluid.dox
@@ -753,26 +753,46 @@ the selection.  This makes it easier to see box borders and how
 the layout looks.  The overlays will be forced back on if you
 change the selection.
 
-\par Edit/Project Settings... (Ctrl+p)
+\par Edit/Project Settings... (Alt+p)
 
 \par
 Displays the project settings panel.
-The output filenames control the extensions or names of the files that
-are generated by FLUID. If you check the "Include Header from Code"
+
+\par
+Under the "Output" tab you control the extensions or names of the files
+that are generated by FLUID. If you check the "Include Header from Code"
 button the code file will include the header file automatically.
 
 \par
-The \ref fluid_i18n "internationalization" options are described
-later in this chapter.
+Under the "Internationalization" tab are the \ref fluid_i18n "internationalization"
+options, described later in this chapter.
+
+\image html fluid-edit-proj-settings.png "Figure 9-7: FLUID Project Settings Window"
+\image latex fluid-edit-proj-settings.png "FLUID Project Settings Window" width=10cm
+
+\par Edit/GUI Settings... (Shift+Alt+p)
+
+\par
+Displays the GUI Settings panel, used to control the user interface settings.
+
+\image html fluid-edit-gui-settings.png "Figure 9-7a: FLUID GUI Settings Window"
+\image latex fluid-edit-gui-settings.png "FLUID GUI Settings Window" width=10cm
 
-\image html fluid_prefs.png "Figure 9-7: FLUID Preferences Window"
-\image latex fluid_prefs.png "FLUID Preferences Window" width=10cm
+\par Edit/Global FLTK Settings... (Shift+Alt+g)
 
-\par Edit/Project Settings... (Shift+Ctrl+p)
+\par
+Displays the FLTK Global Settings ("Preferences") panel, used to control fluid's
+user specific and/or system wide settings.
+
+\par
+Tooltips provide descriptions of each option.
 
 \par
-Displays the project settings ("Preferences") panel. This panel is used
-to control the user interface settings.
+At the lower-right, "User Settings" causes changes to only affect the current user,
+"System Settings" causes changes to be applied to all users on the current machine.
+
+\image html fluid-edit-global-fltk-settings.png "Figure 9-7b: FLUID Global Settings Window"
+\image latex fluid-edit-global-fltk-settings.png "FLUID Global Settings Window" width=10cm
 
 \par New/Code/Function
 
@@ -850,14 +870,18 @@ Make all selected widgets the same size as the first selected widget.
 \par
 Center all selected widgets relative to their parent widget
 
-\par Layout/Grid... (Ctrl+g)
+\par Layout/Grid and Size Settings... (Ctrl+g)
 
 \par
 Displays the grid settings panel. 
-This panel
-controls the grid that all widgets snap to when you move and
-resize them, and for the "snap" which is how far a widget has to
-be dragged from its original position to actually change.
+
+\par
+This panel controls the grid that all widgets snap to when you move
+and resize them, and for the "snap" which is how far a widget has to be
+dragged from its original position to actually change.
+
+\image html fluid-layout-grid-and-size-settings.png "Figure 9-7c: FLUID Layout/Grid Settings Window"
+\image latex fluid-layout-grid-and-size-settings.png "FLUID Layout/Grid Settings Window" width=10cm
 
 \par Shell/Execute Command... (Alt+x)
 
diff --git a/documentation/src/fluid_prefs.png b/documentation/src/fluid_prefs.png
deleted file mode 100644
index 7d7048061..000000000
--- a/documentation/src/fluid_prefs.png
+++ /dev/null