Update of /cvsroot/tuxpaint/tuxpaint-config/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv691

Modified Files:
        tuxpaint-config2.cxx tuxpaint-config2.fl tuxpaint-config2.h 
Added Files:
        defaults.cxx 
Log Message:
Added Defaults.cxx

Index: tuxpaint-config2.h
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tuxpaint-config2.h  7 Apr 2004 17:46:08 -0000       1.7
+++ tuxpaint-config2.h  10 Apr 2004 12:56:32 -0000      1.8
@@ -18,15 +18,26 @@
 extern Fl_Check_Button *CHECKBUTTON_fullscreen;
 extern Fl_Group *GROUP_resolution;
 #include <FL/Fl_Round_Button.H>
+extern Fl_Round_Button *ROUNDBUTTON_640x480;
+extern Fl_Round_Button *ROUNDBUTTON_800x600;
 extern Fl_Group *GROUP_sound;
 extern Fl_Check_Button *CHECKBUTTON_soundeffects;
 extern Fl_Group *TABE_mouseandkeyboard;
 extern Fl_Group *GROUP_mouse;
+extern Fl_Check_Button *CHECKBUTTON_fancycursorshapes;
+extern Fl_Check_Button *CHECKBUTTON_grabmousepointer;
+extern Fl_Check_Button *CHECKBUTTON_mousewheelsupport;
 extern Fl_Group *GROUP_keyboard;
 extern Fl_Check_Button *CHECKBUTTON_enablekbd;
 extern Fl_Group *TABE_simplification;
 extern Fl_Group *GROUP_interfacesimpl;
+extern Fl_Check_Button *CHECKBUTTON_disableshaperotation;
+extern Fl_Check_Button *CHECKBUTTON_simpleshapeoutlines;
+extern Fl_Check_Button *CHECKBUTTON_showuppercasetextonly;
 extern Fl_Group *GROUP_controlsimpl;
+extern Fl_Check_Button *CHECKBUTTON_disablequitbutton;
+extern Fl_Check_Button *CHECKBUTTON_disablestampstool;
+extern Fl_Check_Button *CHECKBUTTON_disablestampcontrols;
 extern Fl_Group *TABE_locale;
 extern Fl_Group *GROUP_locale;
 #include <FL/Fl_Choice.H>

--- NEW FILE: defaults.cxx ---
#include "defaults.h"


void DEF_videoandsound
{
    // Video Defaults
        
    CHECKBUTTON_fullscreen                  -> value (0);
    ROUNDBUTTON_640x480                     -> value (1);
    ROUNDBUTTON_800x600                     -> value (0);

    // Sound Defaults
    
    CHECKBUTTON_soundeffects                -> value (1);
}

void DEF_mouseandkeyboard
{
    // Mouse Defaults
    
    CHECKBUTTON_fancycursorshapes           -> value (1);
    CHECKBUTTON_grabmousepointer            -> value (0);
    CHECKBUTTON_mousewheelsupport           -> value (1);
        
    // Keyboard Defaults
    
    CHECKBUTTON_enablekbd                   -> value (1);
}

void DEF_simplification
{
    // Interface Simplification Defaults

    CHECKBUTTON_disableshaperotation        -> value (0);
    CHECKBUTTON_simpleshapeoutlines         -> value (0);
    CHECKBUTTON_showuppercasetextonly       -> value (0);

    // Control Simplification Defaults
    
    CHECKBUTTON_disablequitbutton           -> value (0);
    CHECKBUTTON_disablestampstool           -> value (0);
    CHECKBUTTON_disablestampcontrol         -> value (0);
}

void DEF_locale
{
    // Locale Defaults
        
    CHECKBUTTON_mirrorstamps                -> value (0);
}

void DEF_printing
{
    // Printing Perm. Defaults

    CHECKBUTTON_allowprinting               -> value (1);
    VALUEINPUT_printdelay                   -> value (0);

    // Print Cmd. Defaults

    CHECKBUTTON_usealtprintcmd              -> value (0);
}

void DEF_saving
{
    // Saving Over Defaults

    ROUNDBUTTON_askbeforeoverwriting        -> value (1);
    ROUNDBUTTON_alwaysoverwriteolderversion -> value (0);
    ROUNDBUTTON_alwayssavenewpicture        -> value (0);

    // Save Directory Defaults

    CHECKBUTTON_usealternatesavedir         -> value (0);
}


Index: tuxpaint-config2.fl
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.fl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tuxpaint-config2.fl 7 Apr 2004 17:46:08 -0000       1.10
+++ tuxpaint-config2.fl 10 Apr 2004 12:56:32 -0000      1.11
@@ -43,11 +43,11 @@
             label {Resolution / Window Size :}
             xywh {24 197 303 153} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
           } {
-            Fl_Round_Button {} {
+            Fl_Round_Button ROUNDBUTTON_640x480 {
               label {&640 x 480}
               tooltip {Run Tux Paint in a 640x480 window or display} xywh {40 217 277 
28} type Radio down_box ROUND_DOWN_BOX shortcut 0x80036 value 1
             }
-            Fl_Round_Button {} {
+            Fl_Round_Button ROUNDBUTTON_800x600 {
               label {&800 x 600}
               tooltip {Run Tux Paint in an 800x600 window or display} xywh {40 240 
277 35} type Radio down_box ROUND_DOWN_BOX shortcut 0x80038
             }
@@ -71,15 +71,15 @@
           label {Mouse :}
           xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
         } {
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_fancycursorshapes {
             label {&Fancy Cursor Shapes}
             tooltip {Use context-sensitive mouse pointer shapes} xywh {24 100 181 32} 
down_box DOWN_BOX shortcut 0x80066 value 1
           }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_grabmousepointer {
             label {&Grab Mouse Pointer}
             tooltip {Keep the mouse within the Tux Paint window} xywh {24 166 171 32} 
down_box DOWN_BOX shortcut 0x80067
           }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_mousewheelsupport {
             label {Mouse &Wheel Support}
             tooltip {Allow mouse wheel to be used for selection scrolling} xywh {24 
233 176 32} down_box DOWN_BOX shortcut 0x80077 value 1
           }
@@ -102,15 +102,15 @@
           label {Interface Simplification :}
           xywh {10 70 325 285} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
         } {
-          Fl_Check_Button {} {
-            label {Simple Shape &Outlines}
-            xywh {25 165 195 30} down_box DOWN_BOX shortcut 0x8006f
-          }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_disableshaperotation {
             label {Disable Shape &Rotation}
             xywh {25 100 200 30} down_box DOWN_BOX shortcut 0x80072
           }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_simpleshapeoutlines {
+            label {Simple Shape &Outlines}
+            xywh {25 165 195 30} down_box DOWN_BOX shortcut 0x8006f
+          }
+          Fl_Check_Button CHECKBUTTON_showuppercasetextonly {
             label {Show &Uppercase Text Only}
             xywh {25 225 195 30} down_box DOWN_BOX shortcut 0x80075
           }
@@ -119,15 +119,15 @@
           label {Control Simplification :}
           xywh {340 70 323 285} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
         } {
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_disablequitbutton {
             label {Disable '&Quit' Button}
             xywh {355 100 195 30} down_box DOWN_BOX shortcut 0x80071
           }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_disablestampstool {
             label {Disable '&Stamps' Tool}
             xywh {355 165 200 25} down_box DOWN_BOX shortcut 0x80073
           }
-          Fl_Check_Button {} {
+          Fl_Check_Button CHECKBUTTON_disablestampcontrols {
             label {Disable Stamp &Controls}
             xywh {355 225 200 25} down_box DOWN_BOX shortcut 0x80063
           }
@@ -216,7 +216,7 @@
           }
         }
         Fl_Group GROUP_savedir {
-          label {Save Directory :} open
+          label {Save Directory :}
           xywh {340 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
         } {
           Fl_File_Input FILEINPUT_alternatesavedir {

Index: tuxpaint-config2.cxx
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tuxpaint-config2.cxx        7 Apr 2004 17:45:57 -0000       1.10
+++ tuxpaint-config2.cxx        10 Apr 2004 12:56:32 -0000      1.11
@@ -21,6 +21,10 @@
 
 Fl_Group *GROUP_resolution=(Fl_Group *)0;
 
+Fl_Round_Button *ROUNDBUTTON_640x480=(Fl_Round_Button *)0;
+
+Fl_Round_Button *ROUNDBUTTON_800x600=(Fl_Round_Button *)0;
+
 Fl_Group *GROUP_sound=(Fl_Group *)0;
 
 Fl_Check_Button *CHECKBUTTON_soundeffects=(Fl_Check_Button *)0;
@@ -29,6 +33,12 @@
 
 Fl_Group *GROUP_mouse=(Fl_Group *)0;
 
+Fl_Check_Button *CHECKBUTTON_fancycursorshapes=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_grabmousepointer=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_mousewheelsupport=(Fl_Check_Button *)0;
+
 Fl_Group *GROUP_keyboard=(Fl_Group *)0;
 
 Fl_Check_Button *CHECKBUTTON_enablekbd=(Fl_Check_Button *)0;
@@ -37,8 +47,20 @@
 
 Fl_Group *GROUP_interfacesimpl=(Fl_Group *)0;
 
+Fl_Check_Button *CHECKBUTTON_disableshaperotation=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_simpleshapeoutlines=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_showuppercasetextonly=(Fl_Check_Button *)0;
+
 Fl_Group *GROUP_controlsimpl=(Fl_Group *)0;
 
+Fl_Check_Button *CHECKBUTTON_disablequitbutton=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_disablestampstool=(Fl_Check_Button *)0;
+
+Fl_Check_Button *CHECKBUTTON_disablestampcontrols=(Fl_Check_Button *)0;
+
 Fl_Group *TABE_locale=(Fl_Group *)0;
 
 Fl_Group *GROUP_locale=(Fl_Group *)0;
@@ -150,14 +172,14 @@
             o->box(FL_PLASTIC_UP_BOX);
             o->labeltype(FL_EMBOSSED_LABEL);
             o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
-            { Fl_Round_Button* o = new Fl_Round_Button(40, 217, 277, 28, 
gettext("&640 x 480"));
+            { Fl_Round_Button* o = ROUNDBUTTON_640x480 = new Fl_Round_Button(40, 217, 
277, 28, gettext("&640 x 480"));
               o->tooltip(gettext("Run Tux Paint in a 640x480 window or display"));
               o->type(102);
               o->down_box(FL_ROUND_DOWN_BOX);
               o->value(1);
               o->shortcut(0x80036);
             }
-            { Fl_Round_Button* o = new Fl_Round_Button(40, 240, 277, 35, 
gettext("&800 x 600"));
+            { Fl_Round_Button* o = ROUNDBUTTON_800x600 = new Fl_Round_Button(40, 240, 
277, 35, gettext("&800 x 600"));
               o->tooltip(gettext("Run Tux Paint in an 800x600 window or display"));
               o->type(102);
               o->down_box(FL_ROUND_DOWN_BOX);
@@ -191,18 +213,18 @@
           o->box(FL_PLASTIC_UP_BOX);
           o->labeltype(FL_EMBOSSED_LABEL);
           o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
-          { Fl_Check_Button* o = new Fl_Check_Button(24, 100, 181, 32, 
gettext("&Fancy Cursor Shapes"));
+          { Fl_Check_Button* o = CHECKBUTTON_fancycursorshapes = new 
Fl_Check_Button(24, 100, 181, 32, gettext("&Fancy Cursor Shapes"));
             o->tooltip(gettext("Use context-sensitive mouse pointer shapes"));
             o->down_box(FL_DOWN_BOX);
             o->value(1);
             o->shortcut(0x80066);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(24, 166, 171, 32, gettext("&Grab 
Mouse Pointer"));
+          { Fl_Check_Button* o = CHECKBUTTON_grabmousepointer = new 
Fl_Check_Button(24, 166, 171, 32, gettext("&Grab Mouse Pointer"));
             o->tooltip(gettext("Keep the mouse within the Tux Paint window"));
             o->down_box(FL_DOWN_BOX);
             o->shortcut(0x80067);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(24, 233, 176, 32, gettext("Mouse 
&Wheel Support"));
+          { Fl_Check_Button* o = CHECKBUTTON_mousewheelsupport = new 
Fl_Check_Button(24, 233, 176, 32, gettext("Mouse &Wheel Support"));
             o->tooltip(gettext("Allow mouse wheel to be used for selection 
scrolling"));
             o->down_box(FL_DOWN_BOX);
             o->value(1);
@@ -234,15 +256,15 @@
           o->box(FL_PLASTIC_UP_BOX);
           o->labeltype(FL_EMBOSSED_LABEL);
           o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
-          { Fl_Check_Button* o = new Fl_Check_Button(25, 165, 195, 30, 
gettext("Simple Shape &Outlines"));
+          { Fl_Check_Button* o = CHECKBUTTON_disableshaperotation = new 
Fl_Check_Button(25, 100, 200, 30, gettext("Disable Shape &Rotation"));
             o->down_box(FL_DOWN_BOX);
-            o->shortcut(0x8006f);
+            o->shortcut(0x80072);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(25, 100, 200, 30, 
gettext("Disable Shape &Rotation"));
+          { Fl_Check_Button* o = CHECKBUTTON_simpleshapeoutlines = new 
Fl_Check_Button(25, 165, 195, 30, gettext("Simple Shape &Outlines"));
             o->down_box(FL_DOWN_BOX);
-            o->shortcut(0x80072);
+            o->shortcut(0x8006f);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(25, 225, 195, 30, gettext("Show 
&Uppercase Text Only"));
+          { Fl_Check_Button* o = CHECKBUTTON_showuppercasetextonly = new 
Fl_Check_Button(25, 225, 195, 30, gettext("Show &Uppercase Text Only"));
             o->down_box(FL_DOWN_BOX);
             o->shortcut(0x80075);
           }
@@ -252,15 +274,15 @@
           o->box(FL_PLASTIC_UP_BOX);
           o->labeltype(FL_EMBOSSED_LABEL);
           o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
-          { Fl_Check_Button* o = new Fl_Check_Button(355, 100, 195, 30, 
gettext("Disable \'&Quit\' Button"));
+          { Fl_Check_Button* o = CHECKBUTTON_disablequitbutton = new 
Fl_Check_Button(355, 100, 195, 30, gettext("Disable \'&Quit\' Button"));
             o->down_box(FL_DOWN_BOX);
             o->shortcut(0x80071);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(355, 165, 200, 25, 
gettext("Disable \'&Stamps\' Tool"));
+          { Fl_Check_Button* o = CHECKBUTTON_disablestampstool = new 
Fl_Check_Button(355, 165, 200, 25, gettext("Disable \'&Stamps\' Tool"));
             o->down_box(FL_DOWN_BOX);
             o->shortcut(0x80073);
           }
-          { Fl_Check_Button* o = new Fl_Check_Button(355, 225, 200, 25, 
gettext("Disable Stamp &Controls"));
+          { Fl_Check_Button* o = CHECKBUTTON_disablestampcontrols = new 
Fl_Check_Button(355, 225, 200, 25, gettext("Disable Stamp &Controls"));
             o->down_box(FL_DOWN_BOX);
             o->shortcut(0x80063);
           }

_______________________________________________
Tuxpaint-commits mailing list
[EMAIL PROTECTED]
http://tux4kids.net/mailman/listinfo/tuxpaint-commits

Reply via email to