Fix new GUI panels to conform to HIG.

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

4 files changed, 47 insertions, 45 deletions

diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index c44e6c213..b0e089276 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -396,7 +396,7 @@ Fl_Round_Button *def_widget_size[6]={(Fl_Round_Button *)0};
 
 Fl_Double_Window* make_layout_window() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(275, 240, "Layout Settings");
+  { Fl_Double_Window* o = grid_window = new Fl_Double_Window(285, 245, "Layout Settings");
     w = o;
     { Fl_Input* o = horizontal_input = new Fl_Input(106, 10, 50, 25, "x");
       o->tooltip("Horizontal grid spacing.");
@@ -427,7 +427,7 @@ Fl_Double_Window* make_layout_window() {
       o->down_box(FL_DOWN_BOX);
       o->callback((Fl_Callback*)guides_cb, (void*)(4));
     }
-    { Fl_Button* o = new Fl_Button(205, 205, 60, 25, "Close");
+    { Fl_Button* o = new Fl_Button(215, 210, 60, 25, "Close");
       o->tooltip("Close this dialog.");
       o->callback((Fl_Callback*)cb_Close2);
     }
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 1bfa207c2..dc7ad3ee1 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -158,15 +158,15 @@ Function {make_settings_window()} {open
     } {
       MenuItem {} {
         label Default
-        xywh {0 0 35 25} labelsize 14
+        xywh {0 0 35 25}
       }
       MenuItem {} {
         label None
-        xywh {0 0 35 25} labelsize 14
+        xywh {0 0 35 25}
       }
       MenuItem {} {
         label Plastic
-        xywh {0 0 35 25} labelsize 14
+        xywh {0 0 35 25}
       }
     }
     Fl_Group {} {
@@ -300,8 +300,8 @@ Function {make_shell_window()} {open
 Function {make_layout_window()} {open
 } {
   Fl_Window grid_window {
-    label {Layout Settings}
-    xywh {676 337 275 240} type Double non_modal visible
+    label {Layout Settings} selected
+    xywh {676 337 285 245} type Double non_modal visible
   } {
     Fl_Input horizontal_input {
       label x
@@ -333,7 +333,7 @@ Function {make_layout_window()} {open
     Fl_Button {} {
       label Close
       callback {grid_window->hide();}
-      tooltip {Close this dialog.} xywh {205 205 60 25}
+      tooltip {Close this dialog.} xywh {215 210 60 25}
     }
     Fl_Box {} {
       label {Grid:}
@@ -348,7 +348,7 @@ Function {make_layout_window()} {open
     } {
       Fl_Round_Button {def_widget_size[0]} {
         user_data 8 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {105 115 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
@@ -357,7 +357,7 @@ Function {make_layout_window()} {open
       }
       Fl_Round_Button {def_widget_size[1]} {
         user_data 11 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {180 115 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
@@ -366,7 +366,7 @@ Function {make_layout_window()} {open
       }
       Fl_Round_Button {def_widget_size[2]} {
         user_data 14 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {105 140 70 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
@@ -375,7 +375,7 @@ Function {make_layout_window()} {open
       }
       Fl_Round_Button {def_widget_size[3]} {
         user_data 18 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {180 140 90 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
@@ -384,7 +384,7 @@ Function {make_layout_window()} {open
       }
       Fl_Round_Button {def_widget_size[4]} {
         user_data 24 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {105 165 75 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
@@ -393,7 +393,7 @@ Function {make_layout_window()} {open
       }
       Fl_Round_Button {def_widget_size[5]} {
         user_data 32 user_data_type long
-        callback default_widget_size_cb selected
+        callback default_widget_size_cb
         xywh {180 165 95 25} type Radio down_box ROUND_DOWN_BOX
       }
       Fl_Box {} {
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index 2cc95cad1..43c6ccf88 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -853,14 +853,17 @@ Fl_Light_Button *sv_autoposition=(Fl_Light_Button *)0;
 
 Fl_Double_Window* make_sourceview() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = sourceview_panel = new Fl_Double_Window(544, 500, "Code View");
+  { Fl_Double_Window* o = sourceview_panel = new Fl_Double_Window(520, 490, "Code View");
     w = o;
     o->callback((Fl_Callback*)toggle_sourceview_cb);
-    { Fl_Tabs* o = sv_tab = new Fl_Tabs(20, 10, 500, 440);
+    { Fl_Tabs* o = sv_tab = new Fl_Tabs(10, 10, 500, 440);
+      o->selection_color((Fl_Color)4);
+      o->labelcolor(FL_BACKGROUND2_COLOR);
       o->callback((Fl_Callback*)update_sourceview_position_cb);
-      { Fl_Group* o = new Fl_Group(20, 35, 500, 415, "Source");
+      { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Source");
         o->labelsize(13);
-        { CodeEditor* o = sv_source = new CodeEditor(25, 40, 490, 405);
+        o->hide();
+        { CodeEditor* o = sv_source = new CodeEditor(20, 50, 480, 390);
           o->box(FL_DOWN_FRAME);
           o->color(FL_BACKGROUND2_COLOR);
           o->selection_color(FL_SELECTION_COLOR);
@@ -877,10 +880,9 @@ Fl_Double_Window* make_sourceview() {
         o->end();
         Fl_Group::current()->resizable(o);
       }
-      { Fl_Group* o = new Fl_Group(20, 35, 500, 415, "Header");
+      { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header");
         o->labelsize(13);
-        o->hide();
-        { CodeEditor* o = sv_header = new CodeEditor(25, 40, 490, 405);
+        { CodeEditor* o = sv_header = new CodeEditor(20, 50, 480, 390);
           o->box(FL_DOWN_FRAME);
           o->color(FL_BACKGROUND2_COLOR);
           o->selection_color(FL_SELECTION_COLOR);
@@ -899,23 +901,23 @@ Fl_Double_Window* make_sourceview() {
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Group* o = new Fl_Group(20, 460, 500, 25);
-      { Fl_Button* o = new Fl_Button(20, 460, 80, 25, "refresh");
+    { Fl_Group* o = new Fl_Group(10, 460, 500, 20);
+      { Fl_Button* o = new Fl_Button(10, 460, 61, 20, "Refresh");
         o->labelsize(11);
         o->callback((Fl_Callback*)update_sourceview_cb);
       }
-      { Fl_Light_Button* o = sv_autorefresh = new Fl_Light_Button(105, 460, 80, 25, "autorefresh");
+      { Fl_Light_Button* o = sv_autorefresh = new Fl_Light_Button(76, 460, 91, 20, "Auto-Refresh");
         o->labelsize(11);
         o->callback((Fl_Callback*)update_sourceview_cb);
       }
-      { Fl_Light_Button* o = sv_autoposition = new Fl_Light_Button(190, 460, 80, 25, "autoposition");
+      { Fl_Light_Button* o = sv_autoposition = new Fl_Light_Button(172, 460, 89, 20, "Auto-Position");
         o->labelsize(11);
       }
-      { Fl_Button* o = new Fl_Button(440, 460, 80, 25, "close");
+      { Fl_Button* o = new Fl_Button(460, 460, 50, 20, "Close");
         o->labelsize(11);
         o->callback((Fl_Callback*)toggle_sourceview_b_cb);
       }
-      { Fl_Box* o = new Fl_Box(275, 460, 160, 25);
+      { Fl_Box* o = new Fl_Box(265, 460, 190, 20);
         Fl_Group::current()->resizable(o);
       }
       o->end();
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index 032a75f0e..655ead0ce 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -689,57 +689,57 @@ Function {make_sourceview()} {open
   Fl_Window sourceview_panel {
     label {Code View}
     callback toggle_sourceview_cb open
-    xywh {388 212 544 500} type Double resizable size_range {384 120 0 0} visible
+    xywh {533 374 520 490} type Double resizable size_range {384 120 0 0} visible
   } {
     Fl_Tabs sv_tab {
       callback update_sourceview_position_cb open
-      xywh {20 10 500 440} resizable
+      xywh {10 10 500 440} selection_color 4 labelcolor 7 resizable
     } {
       Fl_Group {} {
         label Source open
-        xywh {20 35 500 415} labelsize 13 resizable
+        xywh {10 35 500 415} labelsize 13 hide resizable
       } {
         Fl_Text_Editor sv_source {
-          xywh {25 40 490 405} textfont 4 textsize 11 resizable
+          xywh {20 50 480 390} textfont 4 textsize 11 resizable
           code0 {\#include "CodeEditor.h"}
           class CodeEditor
         }
       }
       Fl_Group {} {
         label Header open
-        xywh {20 35 500 415} labelsize 13 hide
+        xywh {10 35 500 415} labelsize 13
       } {
-        Fl_Text_Editor sv_header {
-          xywh {25 40 490 405} textfont 4 textsize 11 resizable
+        Fl_Text_Editor sv_header {selected
+          xywh {20 50 480 390} textfont 4 textsize 11 resizable
           code0 {\#include "CodeEditor.h"}
           class CodeEditor
         }
       }
     }
     Fl_Group {} {open
-      xywh {20 460 500 25}
+      xywh {10 460 500 20}
     } {
       Fl_Button {} {
-        label refresh
+        label Refresh
         callback update_sourceview_cb
-        xywh {20 460 80 25} labelsize 11
+        xywh {10 460 61 20} labelsize 11
       }
       Fl_Light_Button sv_autorefresh {
-        label autorefresh
-        xywh {105 460 80 25} labelsize 11
+        label {Auto-Refresh}
+        xywh {76 460 91 20} labelsize 11
         code0 {o->callback((Fl_Callback*)update_sourceview_cb);}
       }
       Fl_Light_Button sv_autoposition {
-        label autoposition
-        xywh {190 460 80 25} labelsize 11
+        label {Auto-Position}
+        xywh {172 460 89 20} labelsize 11
       }
       Fl_Button {} {
-        label close
-        callback toggle_sourceview_b_cb selected
-        xywh {440 460 80 25} labelsize 11
+        label Close
+        callback toggle_sourceview_b_cb
+        xywh {460 460 50 20} labelsize 11
       }
       Fl_Box {} {
-        xywh {275 460 160 25} resizable
+        xywh {265 460 190 20} resizable
       }
     }
   }