The Fl_File_Chooser window now properly resizes its controls (STR

#766)

The Fl_Help_Dialog window now properly resizes its controls (STR
#768)

The Fl_File_Chooser favorites window is now resizable (STR #770)

Added more documentation on the file chooser filter pattern format
(in both functions.html and Fl_File_Chooser.html)

Added Fl_File_Chooser::save_label (for favorites dialog) and
Fl_File_Chooser::ok_label() to change the default "OK" button
label to something more appropriate according to the HIG.



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

10 files changed, 442 insertions, 157 deletions

diff --git a/CHANGES b/CHANGES
index e60a793d1..ddf5a2a4a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,12 @@ CHANGES IN FLTK 1.1.7
 
 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745)
+	- The Fl_File_Chooser window now properly resizes its
+	  controls (STR #766)
+	- The Fl_Help_Dialog window now properly resizes its
+	  controls (STR #768)
+	- The Fl_File_Chooser favorites window is now resizable
+	  (STR #770)
 	- Now provide FL_PLASTIC_ROUND_UP/DOWN_BOX box types
 	  which are used by the plastic scheme.
 	- FLUID windows that are resized through the widget panel
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index 047ec3170..bc55fb561 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #ifndef Fl_File_Chooser_H
@@ -74,8 +101,9 @@ private:
   Fl_Return_Button *okButton;
   inline void cb_okButton_i(Fl_Return_Button*, void*);
   static void cb_okButton(Fl_Return_Button*, void*);
-  inline void cb_Cancel_i(Fl_Button*, void*);
-  static void cb_Cancel(Fl_Button*, void*);
+  Fl_Button *cancelButton;
+  inline void cb_cancelButton_i(Fl_Button*, void*);
+  static void cb_cancelButton(Fl_Button*, void*);
   Fl_Double_Window *favWindow;
   Fl_File_Browser *favList;
   inline void cb_favList_i(Fl_File_Browser*, void*);
@@ -112,6 +140,8 @@ public:
   uchar iconsize();
   void label(const char *l);
   const char * label();
+  void ok_label(const char *l);
+  const char * ok_label();
   void preview(int e);
   int preview() const { return previewButton->value(); };
   void rescan();
@@ -139,6 +169,7 @@ public:
   static const char *new_directory_label;
   static const char *new_directory_tooltip;
   static const char *preview_label;
+  static const char *save_label;
   static const char *show_label;
   static Fl_File_Sort_F *sort;
 };
@@ -146,3 +177,7 @@ FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relativ
 FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0);
 FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));
 #endif
+
+//
+// End of "$Id$".
+//
diff --git a/FL/Fl_Help_Dialog.H b/FL/Fl_Help_Dialog.H
index f5f9e6a37..23f6e6c75 100644
--- a/FL/Fl_Help_Dialog.H
+++ b/FL/Fl_Help_Dialog.H
@@ -1,12 +1,39 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0105
+//
+// "$Id$"
+//
+// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #ifndef Fl_Help_Dialog_H
 #define Fl_Help_Dialog_H
 #include <FL/Fl.H>
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Help_View.H>
-#include <FL/Fl_Button.H>
 #include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
 #include <FL/Fl_Input.H>
 
 class FL_EXPORT Fl_Help_Dialog {
@@ -58,3 +85,7 @@ public:
   int y();
 };
 #endif
+
+//
+// End of "$Id$".
+//
diff --git a/documentation/Fl_File_Chooser.html b/documentation/Fl_File_Chooser.html
index e1a6b964e..3627845f7 100644
--- a/documentation/Fl_File_Chooser.html
+++ b/documentation/Fl_File_Chooser.html
@@ -82,6 +82,10 @@ dialogs:
 	<TD>"Preview"</TD>
 </TR>
 <TR>
+	<TD><TT>save_label</TT></TD>
+	<TD>"Save"</TD>
+</TR>
+<TR>
 	<TD><TT>show_label</TT></TD>
 	<TD>"Show:"</TD>
 </TR>
@@ -117,6 +121,7 @@ code and changing it accordingly.
 	<LI><A HREF="#Fl_File_Chooser.hide">hide</A>
 	<LI><A HREF="#Fl_File_Chooser.iconsize">iconsize</A>
 	<LI><A HREF="#Fl_File_Chooser.label">label</A>
+	<LI><A HREF="#Fl_File_Chooser.ok_label">ok_label</A>
 	<LI><A HREF="#Fl_File_Chooser.preview">preview</A>
 	<LI><A HREF="#Fl_File_Chooser.rescan">rescan</A>
 	<LI><A HREF="#Fl_File_Chooser.show">show</A>
@@ -193,7 +198,14 @@ const char *directory()</A></H4>
 <H4><A NAME="Fl_File_Chooser.filter">void filter(const char *pattern)<BR>
 const char *filter()</A></H4>
 
-<P>Sets or gets the current filename filter pattern.
+<P>Sets or gets the current filename filter patterns. The filter
+patterns use <A
+href="#fl_filename_match"><tt>fl_filename_match()</tt></A>.
+Multiple patterns can be used by separating them with tabs, like
+"*.jpg\t*.png\t*.gif\t*". In addition, you can provide
+human-readable labels with the patterns inside parenthesis, like
+"JPEG&nbsp;Files&nbsp;(*.jpg)\tPNG&nbsp;Files&nbsp;(*.png)\tGIF&nbsp;Files&nbsp;(*.gif)\tAll&nbsp;Files&nbsp;(*)".
+Use <tt>filter(NULL)</tt> to show all files.</p>
 
 <H4><A NAME="Fl_File_Chooser.filter_value">void filter_value(int f)<BR>
 int filter_value()</A></H4>
@@ -215,6 +227,12 @@ const char *label()</A></H4>
 
 <P>Sets or gets the title bar text for the <CODE>Fl_File_Chooser</CODE>.
 
+<H4><A NAME="Fl_File_Chooser.label">void ok_label(const char *l)<BR>
+const char *ok_label()</A></H4>
+
+<P>Sets or gets the label for the "ok" button in the
+<CODE>Fl_File_Chooser</CODE>.
+
 <H4><A NAME="Fl_File_Chooser.preview">void preview(int e)<BR>
 int preview()</A></H4>
 
diff --git a/documentation/functions.html b/documentation/functions.html
index 19af7989a..74d1e2409 100644
--- a/documentation/functions.html
+++ b/documentation/functions.html
@@ -492,10 +492,13 @@ pointer to that filename or <tt>NULL</tt> if Cancel is chosen.
 <P><tt>message</tt> is a string used to title the window.
 
 <P><tt>pattern</tt> is used to limit the files listed in a
-directory to those matching the pattern. This matching is done
-by <A
-href="#fl_filename_match"><tt>fl_filename_match()</tt></A>. Use
-<tt>NULL</tt> to show all files.
+directory to those matching the pattern. This matching is done by
+<A href="#fl_filename_match"><tt>fl_filename_match()</tt></A>.
+Multiple patterns can be used by separating them with tabs, like
+"*.jpg\t*.png\t*.gif\t*". In addition, you can provide
+human-readable labels with the patterns inside parenthesis, like
+"JPEG&nbsp;Files&nbsp;(*.jpg)\tPNG&nbsp;Files&nbsp;(*.png)\tGIF&nbsp;Files&nbsp;(*.gif)\tAll&nbsp;Files&nbsp;(*)".
+Pass <tt>NULL</tt> to show all files.</p>
 
 <P><tt>fname</tt> is a default filename to fill in the chooser
 with. If this is <tt>NULL</tt> then the last filename that was
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 4901f2ac8..085029031 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
 // generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #include "../FL/Fl_File_Chooser.H"
@@ -78,14 +105,14 @@ void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
   ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_okButton_i(o,v);
 }
 
-inline void Fl_File_Chooser::cb_Cancel_i(Fl_Button*, void*) {
+inline void Fl_File_Chooser::cb_cancelButton_i(Fl_Button*, void*) {
   fileName->value("");
 fileList->deselect();
 Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
 window->hide();
 }
-void Fl_File_Chooser::cb_Cancel(Fl_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_Cancel_i(o,v);
+void Fl_File_Chooser::cb_cancelButton(Fl_Button* o, void* v) {
+  ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_cancelButton_i(o,v);
 }
 
 inline void Fl_File_Chooser::cb_favList_i(Fl_File_Browser*, void*) {
@@ -99,35 +126,35 @@ inline void Fl_File_Chooser::cb_favUpButton_i(Fl_Button*, void*) {
   favoritesCB(favUpButton);
 }
 void Fl_File_Chooser::cb_favUpButton(Fl_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favUpButton_i(o,v);
+  ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favUpButton_i(o,v);
 }
 
 inline void Fl_File_Chooser::cb_favDeleteButton_i(Fl_Button*, void*) {
   favoritesCB(favDeleteButton);
 }
 void Fl_File_Chooser::cb_favDeleteButton(Fl_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favDeleteButton_i(o,v);
+  ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDeleteButton_i(o,v);
 }
 
 inline void Fl_File_Chooser::cb_favDownButton_i(Fl_Button*, void*) {
   favoritesCB(favDownButton);
 }
 void Fl_File_Chooser::cb_favDownButton(Fl_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favDownButton_i(o,v);
+  ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDownButton_i(o,v);
 }
 
 inline void Fl_File_Chooser::cb_favCancelButton_i(Fl_Button*, void*) {
   favWindow->hide();
 }
 void Fl_File_Chooser::cb_favCancelButton(Fl_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favCancelButton_i(o,v);
+  ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favCancelButton_i(o,v);
 }
 
 inline void Fl_File_Chooser::cb_favOkButton_i(Fl_Return_Button*, void*) {
   favoritesCB(favOkButton);
 }
 void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) {
-  ((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favOkButton_i(o,v);
+  ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favOkButton_i(o,v);
 }
 
 Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) {
@@ -135,9 +162,10 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
   { Fl_Double_Window* o = window = new Fl_Double_Window(490, 380, "Choose File");
     w = o;
     o->callback((Fl_Callback*)cb_window, (void*)(this));
-    { Fl_Group* o = new Fl_Group(65, 10, 415, 25);
+    { Fl_Group* o = new Fl_Group(10, 10, 470, 25);
       { Fl_Choice* o = showChoice = new Fl_Choice(65, 10, 215, 25, "Show:");
         o->down_box(FL_BORDER_BOX);
+        o->labelfont(1);
         o->callback((Fl_Callback*)cb_showChoice);
         Fl_Group::current()->resizable(o);
         showChoice->label(show_label);
@@ -186,25 +214,27 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
         o->end();
       }
       { Fl_File_Input* o = fileName = new Fl_File_Input(115, 300, 365, 35);
+        o->labelfont(1);
         o->callback((Fl_Callback*)cb_fileName);
         o->when(FL_WHEN_ENTER_KEY);
         Fl_Group::current()->resizable(o);
         fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);
       }
       { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:");
+        o->labelfont(1);
         o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
         o->label(filename_label);
       }
       { Fl_Group* o = new Fl_Group(10, 345, 470, 25);
-        { Fl_Return_Button* o = okButton = new Fl_Return_Button(300, 345, 85, 25, "OK");
+        { Fl_Return_Button* o = okButton = new Fl_Return_Button(313, 345, 85, 25, "OK");
           o->callback((Fl_Callback*)cb_okButton);
           okButton->label(fl_ok);
         }
-        { Fl_Button* o = new Fl_Button(395, 345, 85, 25, "Cancel");
-          o->callback((Fl_Callback*)cb_Cancel);
+        { Fl_Button* o = cancelButton = new Fl_Button(408, 345, 72, 25, "Cancel");
+          o->callback((Fl_Callback*)cb_cancelButton);
           o->label(fl_cancel);
         }
-        { Fl_Box* o = new Fl_Box(10, 345, 300, 25);
+        { Fl_Box* o = new Fl_Box(10, 345, 30, 25);
           Fl_Group::current()->resizable(o);
         }
         o->end();
@@ -221,24 +251,35 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
     { Fl_File_Browser* o = favList = new Fl_File_Browser(10, 10, 300, 95);
       o->type(2);
       o->callback((Fl_Callback*)cb_favList);
+      Fl_Group::current()->resizable(o);
     }
-    { Fl_Button* o = favUpButton = new Fl_Button(320, 10, 25, 25, "@8>");
-      o->callback((Fl_Callback*)cb_favUpButton);
-    }
-    { Fl_Button* o = favDeleteButton = new Fl_Button(320, 45, 25, 25, "X");
-      o->labelfont(1);
-      o->callback((Fl_Callback*)cb_favDeleteButton);
-    }
-    { Fl_Button* o = favDownButton = new Fl_Button(320, 80, 25, 25, "@2>");
-      o->callback((Fl_Callback*)cb_favDownButton);
-    }
-    { Fl_Button* o = favCancelButton = new Fl_Button(270, 115, 75, 25, "Cancel");
-      o->callback((Fl_Callback*)cb_favCancelButton);
-      favCancelButton->label(fl_cancel);
+    { Fl_Group* o = new Fl_Group(320, 10, 25, 95);
+      { Fl_Button* o = favUpButton = new Fl_Button(320, 10, 25, 25, "@8>");
+        o->callback((Fl_Callback*)cb_favUpButton);
+      }
+      { Fl_Button* o = favDeleteButton = new Fl_Button(320, 45, 25, 25, "X");
+        o->labelfont(1);
+        o->callback((Fl_Callback*)cb_favDeleteButton);
+        Fl_Group::current()->resizable(o);
+      }
+      { Fl_Button* o = favDownButton = new Fl_Button(320, 80, 25, 25, "@2>");
+        o->callback((Fl_Callback*)cb_favDownButton);
+      }
+      o->end();
     }
-    { Fl_Return_Button* o = favOkButton = new Fl_Return_Button(185, 115, 75, 25, "OK");
-      o->callback((Fl_Callback*)cb_favOkButton);
-      favOkButton->label(fl_ok);
+    { Fl_Group* o = new Fl_Group(10, 113, 335, 29);
+      { Fl_Button* o = favCancelButton = new Fl_Button(273, 115, 72, 25, "Cancel");
+        o->callback((Fl_Callback*)cb_favCancelButton);
+        favCancelButton->label(fl_cancel);
+      }
+      { Fl_Return_Button* o = favOkButton = new Fl_Return_Button(181, 115, 79, 25, "Save");
+        o->callback((Fl_Callback*)cb_favOkButton);
+        favOkButton->label(save_label);
+      }
+      { Fl_Box* o = new Fl_Box(10, 115, 161, 25);
+        Fl_Group::current()->resizable(o);
+      }
+      o->end();
     }
     favWindow->label(manage_favorites_label);
     o->set_modal();
@@ -314,6 +355,18 @@ const char * Fl_File_Chooser::label() {
   return (window->label());
 }
 
+void Fl_File_Chooser::ok_label(const char *l) {
+  okButton->label(l);
+int w, h;
+okButton->measure_label(w, h);
+okButton->resize(cancelButton->x() - 50 - w, cancelButton->y(),
+                 w + 40, 25);
+}
+
+const char * Fl_File_Chooser::ok_label() {
+  return (okButton->label());
+}
+
 void Fl_File_Chooser::show() {
   window->hotspot(fileList);
 window->show();
@@ -372,3 +425,7 @@ int Fl_File_Chooser::type() {
 int Fl_File_Chooser::visible() {
   return window->visible();
 }
+
+//
+// End of "$Id$".
+//
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index fed85b594..656b5e987 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -2,6 +2,35 @@
 version 1.0107 
 header_name {../FL/Fl_File_Chooser.H} 
 code_name {.cxx}
+comment {//
+// "$Id$"
+//
+// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+} {in_source in_header
+} 
+
 class FL_EXPORT Fl_File_Chooser {open
 } {
   decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public
@@ -37,12 +66,12 @@ window->hide();} open
       code3 {\#include <string.h>} modal visible
     } {
       Fl_Group {} {
-        private xywh {65 10 415 25}
+        private xywh {10 10 470 25}
       } {
         Fl_Choice showChoice {
           label {Show:}
           callback {showChoiceCB();} open
-          private xywh {65 10 215 25} down_box BORDER_BOX resizable
+          private xywh {65 10 215 25} down_box BORDER_BOX labelfont 1 resizable
           code0 {showChoice->label(show_label);}
         } {}
         Fl_Menu_Button favoritesButton {
@@ -90,12 +119,12 @@ window->hide();} open
         }
         Fl_File_Input fileName {
           callback {fileNameCB();}
-          private xywh {115 300 365 35} when 8 resizable
+          private xywh {115 300 365 35} labelfont 1 when 8 resizable
           code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);}
         }
         Fl_Box {} {
           label {Filename:}
-          private xywh {10 310 105 25} align 24
+          private xywh {10 310 105 25} labelfont 1 align 24
           code0 {o->label(filename_label);}
         }
         Fl_Group {} {open
@@ -108,61 +137,72 @@ if (callback_)
   (*callback_)(this, data_);
 
 window->hide();}
-            private xywh {300 345 85 25}
+            private xywh {313 345 85 25}
             code0 {\#include <FL/fl_ask.H>}
             code1 {okButton->label(fl_ok);}
           }
-          Fl_Button {} {
+          Fl_Button cancelButton {
             label Cancel
             callback {fileName->value("");
 fileList->deselect();
 Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
 window->hide();}
-            private xywh {395 345 85 25}
+            private xywh {408 345 72 25}
             code0 {o->label(fl_cancel);}
           }
-          Fl_Box {} {
-            private xywh {10 345 300 25} resizable
+          Fl_Box {} {selected
+            private xywh {10 345 30 25} resizable
           }
         }
       }
     }
     Fl_Window favWindow {
       label {Manage Favorites}
-      private xywh {580 44 355 150} type Double hide
-      code0 {favWindow->label(manage_favorites_label);} modal
+      private xywh {580 44 355 150} type Double resizable
+      code0 {favWindow->label(manage_favorites_label);} modal visible
     } {
       Fl_File_Browser favList {
         callback {favoritesCB(favList);}
-        private xywh {10 10 300 95} type Hold
-      }
-      Fl_Button favUpButton {
-        label {@8>}
-        callback {favoritesCB(favUpButton);}
-        private xywh {320 10 25 25}
+        private xywh {10 10 300 95} type Hold resizable
       }
-      Fl_Button favDeleteButton {
-        label X
-        callback {favoritesCB(favDeleteButton);}
-        private xywh {320 45 25 25} labelfont 1
-      }
-      Fl_Button favDownButton {
-        label {@2>}
-        callback {favoritesCB(favDownButton);}
-        private xywh {320 80 25 25}
-      }
-      Fl_Button favCancelButton {
-        label Cancel
-        callback {favWindow->hide();}
-        private xywh {270 115 75 25}
-        code0 {favCancelButton->label(fl_cancel);}
+      Fl_Group {} {open
+        xywh {320 10 25 95}
+      } {
+        Fl_Button favUpButton {
+          label {@8>}
+          callback {favoritesCB(favUpButton);}
+          private xywh {320 10 25 25}
+        }
+        Fl_Button favDeleteButton {
+          label X
+          callback {favoritesCB(favDeleteButton);}
+          private xywh {320 45 25 25} labelfont 1 resizable
+        }
+        Fl_Button favDownButton {
+          label {@2>}
+          callback {favoritesCB(favDownButton);}
+          private xywh {320 80 25 25}
+        }
       }
-      Fl_Return_Button favOkButton {
-        label OK
-        callback {favoritesCB(favOkButton);}
-        private xywh {185 115 75 25}
-        code0 {\#include <FL/fl_ask.H>}
-        code1 {favOkButton->label(fl_ok);}
+      Fl_Group {} {open
+        xywh {10 113 335 29}
+      } {
+        Fl_Button favCancelButton {
+          label Cancel
+          callback {favWindow->hide();}
+          private xywh {273 115 72 25}
+          code0 {favCancelButton->label(fl_cancel);}
+        }
+        Fl_Return_Button favOkButton {
+          label Save
+          callback {favoritesCB(favOkButton);}
+          private xywh {181 115 79 25}
+          code0 {\#include <FL/fl_ask.H>}
+          code1 {favOkButton->label(save_label);}
+        }
+        Fl_Box {} {
+          xywh {10 115 161 25} resizable
+        }
       }
     }
     code {callback_ = 0;
@@ -239,6 +279,18 @@ showChoiceCB();} {}
   } {
     code {return (window->label());} {}
   }
+  Function {ok_label(const char *l)} {open return_type void
+  } {
+    code {okButton->label(l);
+int w, h;
+okButton->measure_label(w, h);
+okButton->resize(cancelButton->x() - 50 - w, cancelButton->y(),
+                 w + 40, 25);} {}
+  }
+  Function {ok_label()} {return_type {const char *}
+  } {
+    code {return (okButton->label());} {}
+  }
   decl {void preview(int e);} {public
   }
   decl {int preview() const { return previewButton->value(); }} {public
@@ -250,8 +302,7 @@ showChoiceCB();} {}
     code {window->hotspot(fileList);
 window->show();
 rescan();
-fileName->take_focus();} {selected
-    }
+fileName->take_focus();} {}
   }
   Function {shown()} {return_type int
   } {
@@ -331,6 +382,8 @@ else
   }
   decl {static const char *preview_label;} {public
   }
+  decl {static const char *save_label;} {public
+  }
   decl {static const char *show_label;} {public
   }
   decl {static Fl_File_Sort_F *sort;} {public
@@ -345,3 +398,9 @@ decl {FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const
 
 decl {FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));} {public
 } 
+
+comment {
+//
+// End of "$Id$".
+//} {in_source in_header
+} 
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index 710be10cf..196d0eee3 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -91,6 +91,7 @@ const char	*Fl_File_Chooser::manage_favorites_label = "Manage Favorites";
 const char	*Fl_File_Chooser::new_directory_label = "New Directory?";
 const char	*Fl_File_Chooser::new_directory_tooltip = "Create a new directory.";
 const char	*Fl_File_Chooser::preview_label = "Preview";
+const char	*Fl_File_Chooser::save_label = "Save";
 const char	*Fl_File_Chooser::show_label = "Show:";
 Fl_File_Sort_F	*Fl_File_Chooser::sort = fl_numericsort;
 
diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index 5d03cc7fc..4b4e7eb1b 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -1,4 +1,31 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0105
+//
+// "$Id$"
+//
+// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #include "../FL/Fl_Help_Dialog.H"
 #include "flstring.h"
@@ -43,7 +70,7 @@ inline void Fl_Help_Dialog::cb_Close_i(Fl_Button*, void*) {
   window_->hide();
 }
 void Fl_Help_Dialog::cb_Close(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_Close_i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_Close_i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
@@ -63,7 +90,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
 view_->topline(l);
 }
 void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_back__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_back__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
@@ -83,7 +110,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
 view_->topline(l);
 }
 void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_forward__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_forward__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
@@ -95,7 +122,7 @@ if (view_->textsize() <= 8)
 larger_->activate();
 }
 void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_smaller__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_smaller__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
@@ -107,14 +134,14 @@ if (view_->textsize() >= 18)
 smaller_->activate();
 }
 void Fl_Help_Dialog::cb_larger_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_larger__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_larger__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
   find_pos_ = view_->find(find_->value(), find_pos_);
 }
 void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_find__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->parent()->user_data()))->cb_find__i(o,v);
 }
 
 Fl_Help_Dialog::Fl_Help_Dialog() {
@@ -136,43 +163,48 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Button* o = new Fl_Button(425, 350, 95, 25, "Close");
-      o->callback((Fl_Callback*)cb_Close);
-      o->label(fl_close);
-    }
-    { Fl_Button* o = back_ = new Fl_Button(355, 350, 25, 25, "@<-");
-      o->tooltip("Show the previous help page.");
-      o->shortcut(0xff51);
-      o->labelcolor((Fl_Color)2);
-      o->callback((Fl_Callback*)cb_back_);
-    }
-    { Fl_Button* o = forward_ = new Fl_Button(390, 350, 25, 25, "@->");
-      o->tooltip("Show the next help page.");
-      o->shortcut(0xff53);
-      o->labelcolor((Fl_Color)2);
-      o->callback((Fl_Callback*)cb_forward_);
-    }
-    { Fl_Button* o = smaller_ = new Fl_Button(285, 350, 25, 25, "F");
-      o->tooltip("Make the help text smaller.");
-      o->labelfont(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)cb_smaller_);
-    }
-    { Fl_Button* o = larger_ = new Fl_Button(320, 350, 25, 25, "F");
-      o->tooltip("Make the help text larger.");
-      o->labelfont(1);
-      o->labelsize(16);
-      o->callback((Fl_Callback*)cb_larger_);
-    }
-    { Fl_Group* o = new Fl_Group(10, 350, 265, 25);
-      o->box(FL_DOWN_BOX);
-      o->color(FL_BACKGROUND2_COLOR);
-      { Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, "@search");
-        o->tooltip("find text in document");
-        o->box(FL_FLAT_BOX);
-        o->labelsize(13);
-        o->callback((Fl_Callback*)cb_find_);
-        o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+    { Fl_Group* o = new Fl_Group(10, 348, 510, 27);
+      { Fl_Button* o = new Fl_Button(456, 350, 64, 25, "Close");
+        o->callback((Fl_Callback*)cb_Close);
+        o->label(fl_close);
+      }
+      { Fl_Button* o = back_ = new Fl_Button(386, 350, 25, 25, "@<-");
+        o->tooltip("Show the previous help page.");
+        o->shortcut(0xff51);
+        o->labelcolor((Fl_Color)2);
+        o->callback((Fl_Callback*)cb_back_);
+      }
+      { Fl_Button* o = forward_ = new Fl_Button(421, 350, 25, 25, "@->");
+        o->tooltip("Show the next help page.");
+        o->shortcut(0xff53);
+        o->labelcolor((Fl_Color)2);
+        o->callback((Fl_Callback*)cb_forward_);
+      }
+      { Fl_Button* o = smaller_ = new Fl_Button(316, 350, 25, 25, "F");
+        o->tooltip("Make the help text smaller.");
+        o->labelfont(1);
+        o->labelsize(10);
+        o->callback((Fl_Callback*)cb_smaller_);
+      }
+      { Fl_Button* o = larger_ = new Fl_Button(351, 350, 25, 25, "F");
+        o->tooltip("Make the help text larger.");
+        o->labelfont(1);
+        o->labelsize(16);
+        o->callback((Fl_Callback*)cb_larger_);
+      }
+      { Fl_Group* o = new Fl_Group(10, 350, 296, 25);
+        o->box(FL_DOWN_BOX);
+        o->color(FL_BACKGROUND2_COLOR);
+        { Fl_Input* o = find_ = new Fl_Input(35, 352, 268, 21, "@search");
+          o->tooltip("find text in document");
+          o->box(FL_FLAT_BOX);
+          o->labelsize(13);
+          o->callback((Fl_Callback*)cb_find_);
+          o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+          Fl_Group::current()->resizable(o);
+        }
+        o->end();
+        Fl_Group::current()->resizable(o);
       }
       o->end();
     }
@@ -263,3 +295,7 @@ int Fl_Help_Dialog::x() {
 int Fl_Help_Dialog::y() {
   return (window_->y());
 }
+
+//
+// End of "$Id$".
+//
diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl
index 4524cbda3..ba291593c 100644
--- a/src/Fl_Help_Dialog.fl
+++ b/src/Fl_Help_Dialog.fl
@@ -1,7 +1,36 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0105 
+version 1.0107 
 header_name {../FL/Fl_Help_Dialog.H} 
 code_name {.cxx}
+comment {//
+// "$Id$"
+//
+// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+} {in_source in_header
+} 
+
 decl {\#include "flstring.h"} {} 
 
 decl {\#include <FL/fl_ask.H>} {} 
@@ -48,20 +77,23 @@ else if (view_->filename())
 {
   strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
   line_[index_] = view_->topline();
-}} open
+}} open selected
         private xywh {10 10 510 330} box DOWN_BOX selection_color 15 resizable
         code0 {\#include <FL/Fl_Help_View.H>}
         class Fl_Help_View
       } {}
-      Fl_Button {} {
-        label Close
-        callback {window_->hide();}
-        private xywh {425 350 95 25}
-        code0 {o->label(fl_close);}
-      }
-      Fl_Button back_ {
-        label {@<-}
-        callback {if (index_ > 0)
+      Fl_Group {} {open
+        xywh {10 348 510 27}
+      } {
+        Fl_Button {} {
+          label Close
+          callback {window_->hide();}
+          private xywh {456 350 64 25}
+          code0 {o->label(fl_close);}
+        }
+        Fl_Button back_ {
+          label {@<-}
+          callback {if (index_ > 0)
   index_ --;
 
 if (index_ == 0)
@@ -75,11 +107,11 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
 view_->topline(l);}
-        private tooltip {Show the previous help page.} xywh {355 350 25 25} shortcut 0xff51 labelcolor 2
-      }
-      Fl_Button forward_ {
-        label {@->}
-        callback {if (index_ < max_)
+          private tooltip {Show the previous help page.} xywh {386 350 25 25} shortcut 0xff51 labelcolor 2
+        }
+        Fl_Button forward_ {
+          label {@->}
+          callback {if (index_ < max_)
   index_ ++;
 
 if (index_ >= max_)
@@ -93,35 +125,36 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
 view_->topline(l);}
-        private tooltip {Show the next help page.} xywh {390 350 25 25} shortcut 0xff53 labelcolor 2
-      }
-      Fl_Button smaller_ {
-        label F
-        callback {if (view_->textsize() > 8)
+          private tooltip {Show the next help page.} xywh {421 350 25 25} shortcut 0xff53 labelcolor 2
+        }
+        Fl_Button smaller_ {
+          label F
+          callback {if (view_->textsize() > 8)
   view_->textsize(view_->textsize() - 2);
 
 if (view_->textsize() <= 8)
   smaller_->deactivate();
 larger_->activate();}
-        private tooltip {Make the help text smaller.} xywh {285 350 25 25} labelfont 1 labelsize 10
-      }
-      Fl_Button larger_ {
-        label F
-        callback {if (view_->textsize() < 18)
+          private tooltip {Make the help text smaller.} xywh {316 350 25 25} labelfont 1 labelsize 10
+        }
+        Fl_Button larger_ {
+          label F
+          callback {if (view_->textsize() < 18)
   view_->textsize(view_->textsize() + 2);
 
 if (view_->textsize() >= 18)
   larger_->deactivate();
 smaller_->activate();}
-        private tooltip {Make the help text larger.} xywh {320 350 25 25} labelfont 1 labelsize 16
-      }
-      Fl_Group {} {open
-        xywh {10 350 265 25} box DOWN_BOX color 7
-      } {
-        Fl_Input find_ {
-          label {@search}
-          callback {find_pos_ = view_->find(find_->value(), find_pos_);} selected
-          private tooltip {find text in document} xywh {35 352 238 21} box FLAT_BOX labelsize 13 when 10
+          private tooltip {Make the help text larger.} xywh {351 350 25 25} labelfont 1 labelsize 16
+        }
+        Fl_Group {} {open
+          xywh {10 350 296 25} box DOWN_BOX color 7 resizable
+        } {
+          Fl_Input find_ {
+            label {@search}
+            callback {find_pos_ = view_->find(find_->value(), find_pos_);}
+            private tooltip {find text in document} xywh {35 352 268 21} box NO_BOX labelsize 13 when 10 resizable
+          }
         }
       }
     }
@@ -210,3 +243,9 @@ else
     code {return (window_->y());} {}
   }
 } 
+
+comment {
+//
+// End of "$Id$".
+//} {in_source in_header
+}