Bug fixes and UI tweaking...

src/Fl_Menu_.cxx:
    - Fl_Menu_::find_item(): wasn't checking for a non-NULL label()...

fluid/alignment_panel.*:
fluid/widget_panel.*:
    - Use small controls, normalize layout.
    - Add FLTK header/footer comments.

fluid/Fluid_Image.cxx:
    - Use relative paths for images.


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

1 files changed, 121 insertions, 43 deletions

diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index fdca44967..deb481c51 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1,3 +1,30 @@
+//
+// "$Id$"
+//
+// Setting and shell dialogs 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 "alignment_panel.h"
@@ -33,40 +60,43 @@ Fl_Input *i18n_function_input=(Fl_Input *)0;
 
 Fl_Double_Window* make_project_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = project_window = new Fl_Double_Window(365, 210, "Project Settings");
+  { Fl_Double_Window* o = project_window = new Fl_Double_Window(345, 185, "Project Settings");
     w = o;
-    { Fl_Button* o = new Fl_Button(295, 175, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(293, 156, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close);
     }
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 345, 154);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 325, 138);
+      o->selection_color(FL_INACTIVE_COLOR);
       o->labelsize(11);
-      { Fl_Group* o = new Fl_Group(10, 30, 345, 134, "Output");
+      { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Output");
         o->labelsize(11);
-        o->hide();
-        { Fl_Box* o = new Fl_Box(23, 40, 319, 15, "Use \"name.ext\" to set name or just \".ext\" to set only extension.");
+        { Fl_Box* o = new Fl_Box(20, 40, 304, 15, "Use \"name.ext\" to set name or just \".ext\" to set extension.");
           o->labelsize(11);
           o->align(132|FL_ALIGN_INSIDE);
         }
-        { Fl_Input* o = header_file_input = new Fl_Input(97, 60, 245, 20, "Header File:");
+        { Fl_Input* o = header_file_input = new Fl_Input(96, 60, 228, 20, "Header File:");
           o->tooltip("The name of the generated header file.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)header_input_cb, (void*)(1));
           o->when(FL_WHEN_CHANGED);
         }
-        { Fl_Input* o = code_file_input = new Fl_Input(98, 85, 244, 20, "Code File:");
+        { Fl_Input* o = code_file_input = new Fl_Input(97, 85, 227, 20, "Code File:");
           o->tooltip("The name of the generated code file.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)code_input_cb, (void*)(1));
           o->when(FL_WHEN_CHANGED);
         }
-        { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(177, 110, 165, 20, "Include Header from Code");
+        { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(166, 110, 158, 20, "Include Header from Code");
           o->tooltip("Include the header file from the code file.");
           o->value(1);
           o->labelsize(11);
@@ -74,45 +104,51 @@ Fl_Double_Window* make_project_window() {
         }
         o->end();
       }
-      { Fl_Group* o = new Fl_Group(10, 30, 345, 134, "Internationalization");
+      { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Internationalization");
         o->labelsize(11);
-        { Fl_Choice* o = i18n_type_chooser = new Fl_Choice(100, 42, 100, 20, "Use:");
+        o->hide();
+        { Fl_Choice* o = i18n_type_chooser = new Fl_Choice(80, 42, 100, 20, "Use:");
           o->tooltip("Type of internationalization to use.");
           o->box(FL_THIN_UP_BOX);
           o->down_box(FL_BORDER_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_type_cb);
           o->menu(menu_i18n_type_chooser);
         }
-        { Fl_Input* o = i18n_include_input = new Fl_Input(100, 67, 245, 20, "#include:");
+        { Fl_Input* o = i18n_include_input = new Fl_Input(80, 67, 245, 20, "#include:");
           o->tooltip("The include file for internationalization.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_file_input = new Fl_Input(100, 92, 245, 20, "File:");
+        { Fl_Input* o = i18n_file_input = new Fl_Input(80, 92, 245, 20, "File:");
           o->tooltip("The name of the message catalog.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_set_input = new Fl_Input(100, 117, 245, 20, "Set:");
+        { Fl_Input* o = i18n_set_input = new Fl_Input(80, 117, 245, 20, "Set:");
           o->tooltip("The message set number.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)i18n_text_cb);
         }
-        { Fl_Input* o = i18n_function_input = new Fl_Input(100, 92, 245, 20, "Function:");
+        { Fl_Input* o = i18n_function_input = new Fl_Input(80, 92, 245, 20, "Function:");
           o->tooltip("The function to call to internationalize the labels and tooltips.");
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
           o->labelsize(11);
           o->textfont(4);
           o->textsize(11);
@@ -162,39 +198,48 @@ static void cb_prevpos_button(Fl_Check_Button*, void*) {
 
 Fl_Double_Window* make_settings_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = settings_window = new Fl_Double_Window(255, 210, "GUI Settings");
+  { Fl_Double_Window* o = settings_window = new Fl_Double_Window(215, 185, "GUI Settings");
     w = o;
-    { Fl_Button* o = new Fl_Button(185, 179, 60, 25, "Close");
+    o->labelsize(11);
+    { Fl_Button* o = new Fl_Button(163, 155, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close1);
     }
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 235, 158);
-      { Fl_Group* o = new Fl_Group(10, 35, 235, 133, "GUI:");
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 195, 135);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
+      { Fl_Group* o = new Fl_Group(10, 30, 195, 115, "GUI:");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Check_Button* o = tooltips_button = new Fl_Check_Button(20, 45, 215, 20, "Show Tooltips");
+        { Fl_Check_Button* o = tooltips_button = new Fl_Check_Button(20, 40, 97, 20, "Show Tooltips");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_tooltips_button);
           int b;
           fluid_prefs.get("show_tooltips", b, 1);
           tooltips_button->value(b);
           Fl_Tooltip::enable(b);
         }
-        { Fl_Check_Button* o = completion_button = new Fl_Check_Button(20, 75, 215, 20, "Show Completion Dialogs");
+        { Fl_Check_Button* o = completion_button = new Fl_Check_Button(20, 65, 152, 20, "Show Completion Dialogs");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_completion_button);
           int b;
           fluid_prefs.get("show_completion_dialogs", b, 1);
           completion_button->value(b);
         }
-        { Fl_Check_Button* o = openlast_button = new Fl_Check_Button(20, 105, 215, 20, "Open Previous File on Startup");
+        { Fl_Check_Button* o = openlast_button = new Fl_Check_Button(20, 90, 175, 20, "Open Previous File on Startup");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_openlast_button);
           int b;
           fluid_prefs.get("open_previous_file", b, 0);
           openlast_button->value(b);
         }
-        { Fl_Check_Button* o = prevpos_button = new Fl_Check_Button(20, 135, 215, 20, "Remember Window Positions");
+        { Fl_Check_Button* o = prevpos_button = new Fl_Check_Button(20, 115, 175, 20, "Remember Window Positions");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_prevpos_button);
           int b;
           fluid_prefs.get("prev_window_pos", b, 1);
@@ -251,33 +296,42 @@ Fl_Text_Display *shell_run_display=(Fl_Text_Display *)0;
 
 Fl_Double_Window* make_shell_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = shell_window = new Fl_Double_Window(450, 145, "Shell Command");
+  { Fl_Double_Window* o = shell_window = new Fl_Double_Window(335, 135, "Shell Command");
     w = o;
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 430, 90);
-      { Fl_Group* o = new Fl_Group(10, 30, 430, 70, "Shell Command");
+    o->labelsize(11);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 314, 85);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
+      { Fl_Group* o = new Fl_Group(10, 30, 314, 65, "Shell Command");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Input* o = shell_command_input = new Fl_Input(20, 40, 410, 20);
+        { Fl_Input* o = shell_command_input = new Fl_Input(20, 40, 294, 21);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)cb_shell_command_input);
           char buf[1024];
           fluid_prefs.get("shell_command", buf, "", sizeof(buf));
           shell_command_input->value(buf);
         }
-        { Fl_Check_Button* o = shell_savefl_button = new Fl_Check_Button(20, 65, 110, 20, "Save .FL File");
+        { Fl_Check_Button* o = shell_savefl_button = new Fl_Check_Button(20, 66, 93, 19, "Save .FL File");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_savefl_button);
           int b;
           fluid_prefs.get("shell_savefl", b, 1);
           shell_savefl_button->value(b);
         }
-        { Fl_Check_Button* o = shell_writecode_button = new Fl_Check_Button(140, 65, 95, 20, "Write Code");
+        { Fl_Check_Button* o = shell_writecode_button = new Fl_Check_Button(118, 66, 83, 19, "Write Code");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_writecode_button);
           int b;
           fluid_prefs.get("shell_writecode", b, 1);
           shell_writecode_button->value(b);
         }
-        { Fl_Check_Button* o = shell_writemsgs_button = new Fl_Check_Button(245, 65, 130, 20, "Write Messages");
+        { Fl_Check_Button* o = shell_writemsgs_button = new Fl_Check_Button(206, 66, 108, 19, "Write Messages");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)cb_shell_writemsgs_button);
           int b;
           fluid_prefs.get("shell_writemsgs", b, 0);
@@ -287,22 +341,27 @@ Fl_Double_Window* make_shell_window() {
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(375, 110, 65, 25, "Cancel");
+    { Fl_Button* o = new Fl_Button(276, 105, 48, 20, "Cancel");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Cancel);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(225, 110, 140, 25, "Run Command");
+    { Fl_Return_Button* o = new Fl_Return_Button(162, 105, 109, 20, "Run Command");
+      o->labelsize(11);
       o->callback((Fl_Callback*)do_shell_command);
     }
     o->end();
   }
-  { Fl_Double_Window* o = shell_run_window = new Fl_Double_Window(555, 435, "Shell Command Output");
+  { Fl_Double_Window* o = shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output");
     w = o;
-    { Fl_Return_Button* o = shell_run_button = new Fl_Return_Button(465, 400, 80, 25, "Close");
+    o->labelsize(11);
+    { Fl_Return_Button* o = shell_run_button = new Fl_Return_Button(486, 400, 59, 20, "Close");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_shell_run_button);
     }
     { Fl_Text_Display* o = shell_run_display = new Fl_Text_Display(10, 10, 530, 380);
+      o->labelsize(11);
       o->textfont(4);
-      o->textsize(12);
+      o->textsize(11);
       Fl_Group::current()->resizable(o);
       shell_run_buffer = new Fl_Text_Buffer();
       shell_run_display->buffer(shell_run_buffer);
@@ -328,47 +387,66 @@ static void cb_Close2(Fl_Button*, void*) {
 
 Fl_Double_Window* make_grid_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(155, 205, "Grid");
+  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(145, 180, "Grid");
     w = o;
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 135, 150);
+    o->labelsize(11);
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 124, 131);
+      o->selection_color(FL_INACTIVE_COLOR);
+      o->labelsize(11);
       o->align(FL_ALIGN_TOP_LEFT);
-      { Fl_Group* o = new Fl_Group(10, 30, 135, 130, "Grid");
+      { Fl_Group* o = new Fl_Group(10, 30, 124, 111, "Grid");
+        o->labelsize(11);
         o->align(FL_ALIGN_TOP_LEFT);
-        { Fl_Input* o = horizontal_input = new Fl_Input(95, 40, 40, 20, "Horizontal:");
+        { Fl_Input* o = horizontal_input = new Fl_Input(84, 40, 40, 20, "Horizontal:");
           o->tooltip("Horizontal grid spacing.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(1));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Input* o = vertical_input = new Fl_Input(95, 70, 40, 20, "Vertical:");
+        { Fl_Input* o = vertical_input = new Fl_Input(84, 65, 40, 20, "Vertical:");
           o->tooltip("Vertical grid spacing.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(2));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Input* o = snap_input = new Fl_Input(95, 100, 40, 20, "Snap:");
+        { Fl_Input* o = snap_input = new Fl_Input(84, 90, 40, 20, "Snap:");
           o->tooltip("Snap to grid within this many pixels.");
           o->type(2);
           o->box(FL_THIN_DOWN_BOX);
+          o->labelfont(1);
+          o->labelsize(11);
+          o->textsize(11);
           o->callback((Fl_Callback*)grid_cb, (void*)(3));
           o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
         }
-        { Fl_Check_Button* o = guides_toggle = new Fl_Check_Button(30, 125, 105, 25, "Show Guides");
+        { Fl_Check_Button* o = guides_toggle = new Fl_Check_Button(30, 115, 94, 16, "Show Guides");
           o->tooltip("Show distance and alignment guides in overlay");
           o->down_box(FL_DOWN_BOX);
+          o->labelsize(11);
           o->callback((Fl_Callback*)guides_cb, (void*)(4));
         }
         o->end();
       }
       o->end();
     }
-    { Fl_Button* o = new Fl_Button(85, 170, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(92, 151, 42, 20, "Close");
       o->tooltip("Close this dialog.");
+      o->labelsize(11);
       o->callback((Fl_Callback*)cb_Close2);
     }
     o->end();
   }
   return w;
 }
+
+//
+// End of "$Id$".
+//