Add "scheme" chooser in GUI settings dialog.

Set window image to scheme_bg image when the window is shown.


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

1 files changed, 75 insertions, 40 deletions

diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index bb0db6430..775850dad 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -40,7 +40,7 @@ decl {\#include <FL/Fl_Text_Display.H>} {public
 Function {make_project_window()} {open
 } {
   Fl_Window project_window {
-    label {Project Settings} open
+    label {Project Settings}
     xywh {312 395 345 185} type Double hide
     code0 {\#include <FL/Fl_Preferences.H>}
     code1 {\#include <FL/Fl_Tooltip.H>} modal
@@ -88,15 +88,15 @@ Function {make_project_window()} {open
           callback i18n_type_cb open
           tooltip {Type of internationalization to use.} xywh {80 42 100 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
         } {
-          Menu_Item {} {
+          MenuItem {} {
             label None
             xywh {0 0 100 20} labelsize 11
           }
-          Menu_Item {} {
+          MenuItem {} {
             label {GNU gettext}
             xywh {0 0 100 20} labelsize 11
           }
-          Menu_Item {} {
+          MenuItem {} {
             label {POSIX catgets}
             xywh {0 0 100 20} labelsize 11
           }
@@ -135,50 +135,85 @@ decl {extern Fl_Preferences fluid_prefs;} {public
 decl {Fl_Text_Buffer *shell_run_buffer;} {public
 } 
 
+decl {void scheme_cb(Fl_Choice *, void *);} {selected public
+} 
+
 Function {make_settings_window()} {open
 } {
   Fl_Window settings_window {
-    label {GUI Settings}
-    xywh {321 150 235 185} type Double hide
+    label {GUI Settings} open
+    xywh {326 155 300 190} type Double visible
   } {
-    Fl_Check_Button tooltips_button {
-      label {Show Tooltips}
-      callback {Fl_Tooltip::enable(tooltips_button->value());
-fluid_prefs.set("show_tooltips", tooltips_button->value());} selected
-      xywh {10 10 113 25} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("show_tooltips", b, 1);}
-      code2 {tooltips_button->value(b);}
-      code3 {Fl_Tooltip::enable(b);}
-    }
-    Fl_Check_Button completion_button {
-      label {Show Completion Dialogs}
-      callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());} selected
-      xywh {10 45 186 25} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
-      code2 {completion_button->value(b);}
-    }
-    Fl_Check_Button openlast_button {
-      label {Open Previous File on Startup}
-      callback {fluid_prefs.set("open_previous_file", openlast_button->value());} selected
-      xywh {10 80 215 25} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("open_previous_file", b, 0);}
-      code2 {openlast_button->value(b);}
+    Fl_Choice scheme_choice {
+      label {Scheme:}
+      callback scheme_cb
+      xywh {75 10 115 25} down_box BORDER_BOX labelfont 1
+      code0 {int s;}
+      code1 {fluid_prefs.get("scheme", s, 0);}
+      code2 {scheme_choice->value(s);}
+      code3 {scheme_cb(0, 0);}
+    } {
+      MenuItem {} {
+        label Default
+        xywh {0 0 35 25}
+      }
+      MenuItem {} {
+        label None
+        xywh {0 0 35 25}
+      }
+      MenuItem {} {
+        label Plastic
+        xywh {0 0 35 25}
+      }
     }
-    Fl_Check_Button prevpos_button {
-      label {Remember Window Positions}
-      callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());} selected
-      xywh {10 115 210 25} down_box DOWN_BOX
-      code0 {int b;}
-      code1 {fluid_prefs.get("prev_window_pos", b, 1);}
-      code2 {prevpos_button->value(b);}
+    Fl_Group {} {
+      label {Options:
+
+
+
+
+}
+      xywh {75 45 215 100} labelfont 1 align 4
+    } {
+      Fl_Check_Button tooltips_button {
+        label {Show Tooltips}
+        callback {Fl_Tooltip::enable(tooltips_button->value());
+fluid_prefs.set("show_tooltips", tooltips_button->value());}
+        xywh {75 45 113 25} down_box DOWN_BOX
+        code0 {int b;}
+        code1 {fluid_prefs.get("show_tooltips", b, 1);}
+        code2 {tooltips_button->value(b);}
+        code3 {Fl_Tooltip::enable(b);}
+      }
+      Fl_Check_Button completion_button {
+        label {Show Completion Dialogs}
+        callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());}
+        xywh {75 70 186 25} down_box DOWN_BOX
+        code0 {int b;}
+        code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
+        code2 {completion_button->value(b);}
+      }
+      Fl_Check_Button openlast_button {
+        label {Open Previous File on Startup}
+        callback {fluid_prefs.set("open_previous_file", openlast_button->value());}
+        xywh {75 95 215 25} down_box DOWN_BOX
+        code0 {int b;}
+        code1 {fluid_prefs.get("open_previous_file", b, 0);}
+        code2 {openlast_button->value(b);}
+      }
+      Fl_Check_Button prevpos_button {
+        label {Remember Window Positions}
+        callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
+        xywh {75 120 210 25} down_box DOWN_BOX
+        code0 {int b;}
+        code1 {fluid_prefs.get("prev_window_pos", b, 1);}
+        code2 {prevpos_button->value(b);}
+      }
     }
     Fl_Button {} {
       label Close
-      callback {settings_window->hide();} selected
-      tooltip {Close this dialog.} xywh {161 150 64 25}
+      callback {settings_window->hide();}
+      tooltip {Close this dialog.} xywh {226 155 64 25}
     }
   }
 }