Update some FLUID documentation, no snapshots though.

Tiny bug in fluid.cxx that would still show the wrong
message if it was unable to load a file from the history.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2172 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

documentation/fluid.html

@@ -541,6 +541,14 @@ without changing the name, as FLUID will write over the
 <tt>.fd</tt> file with its own format, which fdesign cannot
 read! </P>
 
+<H4>File/Insert... (Ctrl+i)</H4>
+
+<P>Inserts the contents of another <TT>.fl</TT> file, without
+changing the name of the current <TT>.fl</TT> file.  All the
+functions (even if they have the same names as the current ones)
+are added, and you will have to use cut/paste to put the widgets
+where you want.
+
 <H4>File/Save (Ctrl+s)</H4>
 
 <P>Writes the current data to the <TT>.fl</TT> file.  If the
@@ -550,14 +558,6 @@ file is unnamed then FLUID will ask for a filename.
 
 <P>Asks for a new filename and saves the file.
 
-<H4>File/Merge... (Ctrl+i)</H4>
-
-<P>Inserts the contents of another <TT>.fl</TT> file, without
-changing the name of the current <TT>.fl</TT> file.  All the
-functions (even if they have the same names as the current ones)
-are added, and you will have to use cut/paste to put the widgets
-where you want.
-
 <H4>File/Write Code (Ctrl+Shift+C)</H4>
 
 <P>&quot;Compiles&quot; the data into a <TT>.cxx</TT> and <TT>.h</TT>
@@ -568,7 +568,7 @@ FLUID with the <tt>-c</tt> switch.
 the leading  directory and trailing &quot;.fl&quot; stripped, and
 &quot;.h&quot; or &quot;.cxx&quot; appended.</P>
 
-<H4>File/Write Messages (Ctrl+Shift+W)</H4>
+<H4>File/Write Strings (Ctrl+Shift+W)</H4>
 
 <P>Writes a message file for all of the text labels defined in
 the current file.
@@ -586,7 +586,7 @@ changed the current file.
 
 <H4>Edit/Undo (Ctrl+z)</H4>
 
-<P>This isn't implemented yet.  You should do save  often so you can
+<P>This isn't implemented yet.  You should do save often so you can
 recover from any mistakes you make.
 
 <H4>Edit/Cut (Ctrl+x)</H4>
@@ -672,17 +672,10 @@ 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.
 
-<H4>Edit/Preferences (Ctrl+p)</H4>
+<H4>Edit/Project Settings... (Ctrl+p)</H4>
 
-<P>Displays the preferences panel.  The alignment preferences
+<P>Displays the project settings panel.
-control the grid that all widgets snap to when you move and
+The output filenames control the extensions or names of the
-resize them, and for the "snap" which is how far a widget has to
-be dragged from its original position to actually change.
-
-<P ALIGN="CENTER"><IMG SRC="fluid_prefs.gif" ALT="FLUID Preferences Window."><BR>
-<I>Figure 9-7: FLUID Preferences Window.</I></P>
-
-<P>The output filenames control the extensions or names of the
 files the are generated by FLUID.  If you check the "Include .h
 from .cxx" button the code file will include the header file
 automatically.
@@ -690,6 +683,14 @@ automatically.
 <P>The internationalization options are described <A
 HREF="#I18N">later in this chapter</A>.
 
+<P ALIGN="CENTER"><IMG SRC="fluid_prefs.gif" ALT="FLUID Preferences Window."><BR>
+<I>Figure 9-7: FLUID Preferences Window.</I></P>
+
+<H4>Edit/GUI Settings... (Shift+Ctrl+p)</H4>
+
+<P>Displays the GUI settings panel. This panel is used
+to control the user interface settings.
+
 <H4>New/Code/Function</H4>
 
 <P>Creates a new C function.  You will be asked for a name for
@@ -737,6 +738,42 @@ widget, if possible.
 <P>When you create the widget you will get the widget's control
 panel, which is described later in this chapter.</P>
 
+
+<H4>Layout/Align/... </H4>
+
+<P>Align all selected widgets to the first widget in the selection.
+
+<H4>Layout/Space Evenly/... </H4>
+
+<P>Space all selected widgets evenly inside the selected space.
+Widgets will be sorted from first to last.
+
+<H4>Layout/Make Same Size/... </H4>
+
+<P>Make all slected widgets the same size as the first selected widget.
+
+<H4>Layout/Center in Group/... </H4>
+
+<P>Center all selected widgets relative to their parent widget
+
+<H4>Layout/Grid... (Ctrl+g)</H4>
+
+<P>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.
+
+
+<H4>Shell/Execute Command... (Alt+x)</H4>
+
+<P>Displays the shell command panel. The shell command
+is commonly used to run a 'make' script to compile the FLTK output.
+
+<H4>Shell/Execute Again (Alt+g)</H4>
+
+<P>Run the shell command again.
+
 <H4>Help/About FLUID</H4>
 
 <P>Pops up a panel showing the version of FLUID.

fluid/fluid.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.23 2002/05/01 23:08:35 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.24 2002/05/02 04:23:33 matthiaswm Exp $"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -165,7 +165,7 @@ void open_history_cb(Fl_Widget *, void *v) {
   char *localcopy = strdup( (char*)v );
   set_filename(localcopy);
   if (!read_file(localcopy, 0)) {
-    fl_message("Can't read %s: %s", v, strerror(errno));
+    fl_message("Can't read %s: %s", localcopy, strerror(errno));
     free(localcopy);
     return;
   }
@@ -780,5 +780,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.23 2002/05/01 23:08:35 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.24 2002/05/02 04:23:33 matthiaswm Exp $".
 //