Update of /cvsroot/tuxpaint/tuxpaint-config/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32679
Modified Files:
tuxpaint-config2.cxx tuxpaint-config2.fl tuxpaint-config2.h
Log Message:
All Buttons, Inputs aso. should now have names, Removed Buttons used for Labels with
Boxes
Index: tuxpaint-config2.h
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tuxpaint-config2.h 7 Apr 2004 16:02:20 -0000 1.5
+++ tuxpaint-config2.h 7 Apr 2004 16:13:59 -0000 1.6
@@ -45,9 +45,15 @@
extern Fl_Check_Button *CHECKBUTTON_usealtprintcmd;
extern Fl_Group *TABE_saving;
extern Fl_Group *GROUP_saveover;
+extern Fl_Round_Button *ROUNBUTTON_askbeforeoverwrite;
+extern Fl_Round_Button *ROUNDBUTTON_alwaysoverwriteolderversions;
+extern Fl_Round_Button *ROUNBUTTON_alwayssavenewpicture;
extern Fl_Group *GROUP_savedir;
#include <FL/Fl_File_Input.H>
+extern Fl_File_Input *FILEINPUT_alternatesavedir;
+extern Fl_Check_Button *CHECKBUTTON_usealternatesavedir;
#include <FL/Fl_Button.H>
+extern Fl_Button *BUTTON_browsesavedir;
extern Fl_Button *BUTTON_apply;
extern Fl_Button *BUTTON_reset;
extern Fl_Button *BUTTON_defaults;
Index: tuxpaint-config2.fl
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.fl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tuxpaint-config2.fl 7 Apr 2004 16:02:20 -0000 1.8
+++ tuxpaint-config2.fl 7 Apr 2004 16:13:59 -0000 1.9
@@ -152,7 +152,7 @@
}
}
Fl_Group TABE_printing {
- label Printing open
+ label Printing
xywh {5 64 665 306} box PLASTIC_UP_BOX color 5 selection_color 5 align 37 hide
} {
Fl_Group GROUP_printperms {
@@ -173,12 +173,12 @@
}
}
Fl_Group GROUP_printcmd {
- label {Print Command :} open
+ label {Print Command :}
xywh {340 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
} {
Fl_Input TEXTINPUT_printcmd {
label {Alternative Print Command : }
- tooltip {Use this command to print} xywh {350 140 305 30} align 5
+ tooltip {Use this command to print} xywh {350 140 305 30} align 5
deactivate
}
Fl_Check_Button CHECKBUTTON_usealtprintcmd {
label {Use &Alternative Print Command}
@@ -187,41 +187,41 @@
}
}
Fl_Group TABE_saving {
- label Saving open
+ label Saving
xywh {5 64 665 306} box PLASTIC_UP_BOX color 6 selection_color 6 align 37 hide
} {
Fl_Group GROUP_saveover {
label {Save Over Earlier Work :}
xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
} {
- Fl_Round_Button {} {
+ Fl_Round_Button ROUNBUTTON_askbeforeoverwrite {
label {&Ask Before Overwriting}
tooltip {When re-saving a picture, ask whether to save over the old
version} xywh {30 97 200 28} type Radio down_box ROUND_DOWN_BOX shortcut 0x80061 value
1
}
- Fl_Round_Button {} {
+ Fl_Round_Button ROUNDBUTTON_alwaysoverwriteolderversions {
label {Always &Overwrite Older Version}
tooltip {When re-saving a picture, always overwrite the old version} xywh
{30 167 265 28} type Radio down_box ROUND_DOWN_BOX shortcut 0x8006f
}
- Fl_Round_Button {} {
+ Fl_Round_Button ROUNBUTTON_alwayssavenewpicture {
label {Always Save &New Picture}
tooltip {When re-saving a picture, always make a new file} xywh {30 235
210 20} type Radio down_box ROUND_DOWN_BOX shortcut 0x8006e
}
}
Fl_Group GROUP_savedir {
- label {Save Directory :}
+ label {Save Directory :} open
xywh {340 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
} {
- Fl_File_Input {} {
+ Fl_File_Input FILEINPUT_alternatesavedir {
label {Alternative Save Directory :}
- tooltip {Pick an alternative directory to save images into} xywh {350 145
220 35} align 5
+ tooltip {Pick an alternative directory to save images into} xywh {350 145
220 35} align 69 deactivate
}
- Fl_Check_Button {} {
+ Fl_Check_Button CHECKBUTTON_usealternatesavedir {
label {Use &Alternative Save Directory}
xywh {350 100 265 25} down_box DOWN_BOX shortcut 0x80061
}
- Fl_Button {} {
+ Fl_Button BUTTON_browsesavedir {
label {Browse...}
- xywh {575 155 80 25} shortcut 0x80062
+ xywh {575 155 80 25} shortcut 0x80062 deactivate
}
}
}
Index: tuxpaint-config2.cxx
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tuxpaint-config2.cxx 7 Apr 2004 16:02:20 -0000 1.8
+++ tuxpaint-config2.cxx 7 Apr 2004 16:13:58 -0000 1.9
@@ -67,8 +67,20 @@
Fl_Group *GROUP_saveover=(Fl_Group *)0;
+Fl_Round_Button *ROUNBUTTON_askbeforeoverwrite=(Fl_Round_Button *)0;
+
+Fl_Round_Button *ROUNDBUTTON_alwaysoverwriteolderversions=(Fl_Round_Button *)0;
+
+Fl_Round_Button *ROUNBUTTON_alwayssavenewpicture=(Fl_Round_Button *)0;
+
Fl_Group *GROUP_savedir=(Fl_Group *)0;
+Fl_File_Input *FILEINPUT_alternatesavedir=(Fl_File_Input *)0;
+
+Fl_Check_Button *CHECKBUTTON_usealternatesavedir=(Fl_Check_Button *)0;
+
+Fl_Button *BUTTON_browsesavedir=(Fl_Button *)0;
+
Fl_Button *BUTTON_apply=(Fl_Button *)0;
Fl_Button *BUTTON_reset=(Fl_Button *)0;
@@ -290,6 +302,7 @@
{ Fl_Input* o = TEXTINPUT_printcmd = new Fl_Input(350, 140, 305, 30,
gettext("Alternative Print Command : "));
o->tooltip(gettext("Use this command to print"));
o->align(FL_ALIGN_TOP_LEFT);
+ o->deactivate();
}
{ Fl_Check_Button* o = CHECKBUTTON_usealtprintcmd = new
Fl_Check_Button(350, 100, 255, 25, gettext("Use &Alternative Print Command"));
o->down_box(FL_DOWN_BOX);
@@ -309,20 +322,20 @@
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(30, 97, 200, 28, gettext("&Ask
Before Overwriting"));
+ { Fl_Round_Button* o = ROUNBUTTON_askbeforeoverwrite = new
Fl_Round_Button(30, 97, 200, 28, gettext("&Ask Before Overwriting"));
o->tooltip(gettext("When re-saving a picture, ask whether to save over
the old version"));
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
o->value(1);
o->shortcut(0x80061);
}
- { Fl_Round_Button* o = new Fl_Round_Button(30, 167, 265, 28,
gettext("Always &Overwrite Older Version"));
+ { Fl_Round_Button* o = ROUNDBUTTON_alwaysoverwriteolderversions = new
Fl_Round_Button(30, 167, 265, 28, gettext("Always &Overwrite Older Version"));
o->tooltip(gettext("When re-saving a picture, always overwrite the old
version"));
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
o->shortcut(0x8006f);
}
- { Fl_Round_Button* o = new Fl_Round_Button(30, 235, 210, 20,
gettext("Always Save &New Picture"));
+ { Fl_Round_Button* o = ROUNBUTTON_alwayssavenewpicture = new
Fl_Round_Button(30, 235, 210, 20, gettext("Always Save &New Picture"));
o->tooltip(gettext("When re-saving a picture, always make a new file"));
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
@@ -334,16 +347,18 @@
o->box(FL_PLASTIC_UP_BOX);
o->labeltype(FL_EMBOSSED_LABEL);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
- { Fl_File_Input* o = new Fl_File_Input(350, 145, 220, 35,
gettext("Alternative Save Directory :"));
+ { Fl_File_Input* o = FILEINPUT_alternatesavedir = new Fl_File_Input(350,
145, 220, 35, gettext("Alternative Save Directory :"));
o->tooltip(gettext("Pick an alternative directory to save images into"));
- o->align(FL_ALIGN_TOP_LEFT);
+ o->align(69);
+ o->deactivate();
}
- { Fl_Check_Button* o = new Fl_Check_Button(350, 100, 265, 25, gettext("Use
&Alternative Save Directory"));
+ { Fl_Check_Button* o = CHECKBUTTON_usealternatesavedir = new
Fl_Check_Button(350, 100, 265, 25, gettext("Use &Alternative Save Directory"));
o->down_box(FL_DOWN_BOX);
o->shortcut(0x80061);
}
- { Fl_Button* o = new Fl_Button(575, 155, 80, 25, gettext("Browse..."));
+ { Fl_Button* o = BUTTON_browsesavedir = new Fl_Button(575, 155, 80, 25,
gettext("Browse..."));
o->shortcut(0x80062);
+ o->deactivate();
}
o->end();
}
_______________________________________________
Tuxpaint-commits mailing list
[EMAIL PROTECTED]
http://tux4kids.net/mailman/listinfo/tuxpaint-commits
