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

Modified Files:
        tuxpaint-config2.cxx tuxpaint-config2.fl tuxpaint-config2.h 
        tuxpaint-config2.txt 
Log Message:
Fluid overhaul!!!  Goals added to TODO.txt.


Index: tuxpaint-config2.h
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tuxpaint-config2.h  24 Mar 2004 14:14:55 -0000      1.2
--- tuxpaint-config2.h  2 Apr 2004 06:20:00 -0000       1.3
***************
*** 1,3 ****
! // generated by Fast Light User Interface Designer (fluid) version 1.0200
  
  #ifndef tuxpaint_config2_h
--- 1,3 ----
! // generated by Fast Light User Interface Designer (fluid) version 1.0104
  
  #ifndef tuxpaint_config2_h
***************
*** 8,19 ****
  #include <FL/Fl_Tabs.H>
  #include <FL/Fl_Group.H>
  #include <FL/Fl_Check_Button.H>
  #include <FL/Fl_Round_Button.H>
  #include <FL/Fl_Choice.H>
  #include <FL/Fl_Value_Input.H>
- #include <FL/Fl_Input.H>
- #include <FL/Fl_Menu_Bar.H>
  #include <FL/Fl_Button.H>
  Fl_Double_Window* Show_TPC_Window();
- extern Fl_Menu_Item menu_[];
  #endif
--- 8,19 ----
  #include <FL/Fl_Tabs.H>
  #include <FL/Fl_Group.H>
+ #include <FL/Fl_Text_Display.H>
  #include <FL/Fl_Check_Button.H>
  #include <FL/Fl_Round_Button.H>
  #include <FL/Fl_Choice.H>
  #include <FL/Fl_Value_Input.H>
  #include <FL/Fl_Button.H>
+ #include <FL/Fl_Input.H>
+ #include <FL/Fl_File_Input.H>
  Fl_Double_Window* Show_TPC_Window();
  #endif

Index: tuxpaint-config2.txt
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tuxpaint-config2.txt        24 Mar 2004 14:14:55 -0000      1.2
--- tuxpaint-config2.txt        2 Apr 2004 06:20:00 -0000       1.3
***************
*** 1,3 ****
! # generated by Fast Light User Interface Designer (fluid) version 1.0200
  TuxPaint Config v0.0.1 by Synthetic Software Products
  Video & Sound
--- 1,3 ----
! # generated by Fast Light User Interface Designer (fluid) version 1.0104
  TuxPaint Config v0.0.1 by Synthetic Software Products
  Video & Sound

Index: tuxpaint-config2.fl
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.fl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tuxpaint-config2.fl 24 Mar 2004 15:20:42 -0000      1.5
--- tuxpaint-config2.fl 2 Apr 2004 06:20:00 -0000       1.6
***************
*** 1,4 ****
  # data file for the Fltk User Interface Designer (fluid)
! version 1.0200 
  header_name {.h} 
  code_name {.cxx}
--- 1,7 ----
  # data file for the Fltk User Interface Designer (fluid)
! version 1.0104 
! i18n_type 1 
! i18n_include <libintl.h> 
! i18n_function gettext 
  header_name {.h} 
  code_name {.cxx}
***************
*** 6,38 ****
  } {
    Fl_Window WINDOW_tpc {
!     label {TuxPaint Config v0.0.1 by Synthetic Software Products} open
!     xywh {321 263 604 436} type Double visible
    } {
      Fl_Tabs {} {open
!       xywh {4 32 596 340} box PLASTIC_UP_BOX
      } {
        Fl_Group {} {
!         label {Video & Sound} open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 1 selection_color 1 align 37 
hide
        } {
          Fl_Group {} {
            label {Video :}
!           xywh {12 72 288 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label Fullscreen
!             xywh {24 100 96 32} down_box DOWN_BOX
            }
            Fl_Group {} {
!             label {Resolution :}
!             xywh {24 140 124 88} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
            } {
              Fl_Round_Button {} {
!               label {640 x 480}
!               xywh {48 168 100 28} type Radio down_box ROUND_DOWN_BOX value 1
              }
              Fl_Round_Button {} {
!               label {800 x 600}
!               xywh {48 196 100 32} type Radio down_box ROUND_DOWN_BOX
              }
            }
--- 9,54 ----
  } {
    Fl_Window WINDOW_tpc {
!     label {Tux Paint Config v0.0.1} open
!     xywh {405 213 675 425} type Double visible
    } {
      Fl_Tabs {} {open
!       xywh {5 30 665 340} box PLASTIC_UP_BOX
      } {
        Fl_Group {} {
!         label About open selected
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 132 selection_color 92 align 37
!       } {
!         Fl_Group {} {
!           label {About Tux Paint Config.} open
!           xywh {12 72 653 288} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
!         } {
!           Fl_Text_Display {} {
!             xywh {35 95 610 245}
!           }
!         }
!       }
!       Fl_Group {} {
!         label {Video & Sound}
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 1 selection_color 1 align 37 
hide
        } {
          Fl_Group {} {
            label {Video :}
!           xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label {&Fullscreen}
!             tooltip {Display Tux Paint in full-screen mode} xywh {24 100 106 32} 
down_box DOWN_BOX shortcut 0x80066
            }
            Fl_Group {} {
!             label {Resolution / Window Size :}
!             xywh {24 197 303 153} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 
21
            } {
              Fl_Round_Button {} {
!               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 {} {
!               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
              }
            }
***************
*** 40,154 ****
          Fl_Group {} {
            label {Sound :}
!           xywh {308 72 284 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label Sound
!             xywh {320 100 72 32} down_box DOWN_BOX value 1
            }
          }
        }
        Fl_Group {} {
!         label {Mouse & Keyboard} open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 2 selection_color 2 align 37 
hide
        } {
          Fl_Group {} {
            label {Mouse :}
!           xywh {12 72 288 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label {Fancy Cursors}
!             xywh {24 100 120 32} down_box DOWN_BOX value 1
            }
            Fl_Check_Button {} {
!             label Grab
!             xywh {24 132 120 32} down_box DOWN_BOX
            }
            Fl_Check_Button {} {
!             label Wheelmouse
!             xywh {24 164 120 32} down_box DOWN_BOX value 1
            }
          }
          Fl_Group {} {
            label {Keyboard :}
!           xywh {308 72 284 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label Shortcuts
!             xywh {320 100 88 32} down_box DOWN_BOX value 1
            }
          }
        }
        Fl_Group {} {
!         label Complexity open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 3 selection_color 3 align 37 
hide
        } {
          Fl_Group {} {
!           label {Complexity :}
!           xywh {12 72 580 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
!           Fl_Group {} {
!             label {Shapes :}
!             xywh {24 108 124 88} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
!           } {
!             Fl_Round_Button {} {
!               label Simple
!               xywh {48 136 100 28} type Radio down_box ROUND_DOWN_BOX
!             }
!             Fl_Round_Button {} {
!               label Complex
!               xywh {48 164 100 32} type Radio down_box ROUND_DOWN_BOX value 1
!             }
            }
            Fl_Check_Button {} {
!             label Quit
!             xywh {24 204 124 32} down_box DOWN_BOX value 1
            }
            Fl_Check_Button {} {
!             label Outlines
!             xywh {24 236 124 32} down_box DOWN_BOX
            }
            Fl_Check_Button {} {
!             label {Stamp Controls}
!             xywh {24 268 124 32} down_box DOWN_BOX value 1
            }
          }
        }
        Fl_Group {} {
!         label Locale open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 4 selection_color 4 align 37 
hide
        } {
          Fl_Group {} {
            label {Locale :}
!           xywh {12 72 580 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Choice {} {
              label {Language : } open
!             xywh {108 108 220 32} down_box BORDER_BOX
            } {}
            Fl_Check_Button {} {
!             label {Mirror Stamps}
!             xywh {24 148 220 32} down_box DOWN_BOX
            }
          }
        }
        Fl_Group {} {
!         label Printer open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 5 selection_color 5 align 37 
hide
        } {
          Fl_Group {} {
!           label {Printer :}
!           xywh {12 72 580 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label Print
!             xywh {24 100 356 32} down_box DOWN_BOX value 1
            }
            Fl_Value_Input {} {
!             label {Print Delay :        }
!             xywh {136 140 244 32}
            }
            Fl_Input {} {
!             label {Print Command : }
!             xywh {136 180 244 32}
            }
          }
--- 56,187 ----
          Fl_Group {} {
            label {Sound :}
!           xywh {340 70 324 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label {Enable &Sound Effects}
!             tooltip {Play sound effects} xywh {360 100 180 32} down_box DOWN_BOX 
shortcut 0x80073 value 1
            }
          }
        }
        Fl_Group {} {
!         label {Mouse & Keyboard}
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 2 selection_color 2 align 37 
hide
        } {
          Fl_Group {} {
            label {Mouse :}
!           xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             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 {} {
!             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 {} {
!             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
            }
          }
          Fl_Group {} {
            label {Keyboard :}
!           xywh {340 70 324 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label {Enable &Keyboard Shortcuts}
!             tooltip {Allow keyboard shortcuts (e.g., Ctrl-S for Save)} xywh {360 100 
225 32} down_box DOWN_BOX shortcut 0x8006b value 1
            }
          }
        }
        Fl_Group {} {
!         label Simplification open
!         xywh {5 65 665 305} box PLASTIC_UP_BOX color 3 selection_color 3 align 37 
hide
        } {
          Fl_Group {} {
!           label {Interface Simplification :} open
!           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 {} {
!             label {Disable Shape &Rotation}
!             xywh {25 100 200 30} down_box DOWN_BOX shortcut 0x80072
            }
            Fl_Check_Button {} {
!             label {Show &Uppercase Text Only}
!             xywh {25 225 195 30} down_box DOWN_BOX shortcut 0x80075
            }
+         }
+         Fl_Group {} {
+           label {Control Simplification :} open
+           xywh {340 70 323 285} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
+         } {
            Fl_Check_Button {} {
!             label {Disable '&Quit' Button}
!             xywh {355 100 195 30} down_box DOWN_BOX shortcut 0x80071
!           }
!           Fl_Check_Button {} {
!             label {Disable '&Stamps' Tool}
!             xywh {355 165 200 25} down_box DOWN_BOX shortcut 0x80073
!           }
!           Fl_Check_Button {} {
!             label {Disable Stamp &Controls}
!             xywh {355 225 200 25} down_box DOWN_BOX shortcut 0x80063
            }
          }
        }
        Fl_Group {} {
!         label Locale
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 4 selection_color 4 align 37 
hide
        } {
          Fl_Group {} {
            label {Locale :}
!           xywh {12 72 653 288} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Choice {} {
              label {Language : } open
!             tooltip {Run Tux Paint in another language} xywh {20 118 220 32} 
down_box BORDER_BOX align 5
            } {}
            Fl_Check_Button {} {
!             label {&Mirror Stamps}
!             tooltip {Mirror-image stamps by default} xywh {20 218 220 32} down_box 
DOWN_BOX shortcut 0x8006d
            }
          }
        }
        Fl_Group {} {
!         label Printing open
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 5 selection_color 5 align 37 
hide
        } {
          Fl_Group {} {
!           label {Print Permissions :} open
!           xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
            Fl_Check_Button {} {
!             label {Allow &Printing}
!             tooltip {Allow Tux Paint to print} xywh {24 100 141 32} down_box 
DOWN_BOX shortcut 0x80070 value 1
            }
            Fl_Value_Input {} {
!             label {Print Delay : }
!             tooltip {Only print once every N seconds (0 to disable)} xywh {25 195 50 
25} align 5 maximum 3600 step 1
            }
+           Fl_Button {} {
+             label seconds
+             xywh {80 195 80 25} box FLAT_BOX
+           }
+         }
+         Fl_Group {} {
+           label {Print Command :} open
+           xywh {340 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
+         } {
            Fl_Input {} {
!             label {Alternative Print Command : }
!             tooltip {Use this command to print} xywh {350 140 305 30} align 5
!           }
!           Fl_Check_Button {} {
!             label {Use &Alternative Print Command}
!             xywh {350 100 255 25} down_box DOWN_BOX shortcut 0x80061
            }
          }
***************
*** 156,241 ****
        Fl_Group {} {
          label Saving open
!         xywh {4 64 596 308} box PLASTIC_UP_BOX color 6 selection_color 6 align 37 
hide
        } {
          Fl_Group {} {
!           label {Saving :}
!           xywh {12 72 580 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
!           Fl_Group {} {
!             label {Save Over :} open
!             xywh {24 108 128 112} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 
21
!           } {
!             Fl_Round_Button {} {
!               label Ask
!               xywh {48 136 104 28} type Radio down_box ROUND_DOWN_BOX value 1
!             }
!             Fl_Round_Button {} {
!               label New
!               xywh {48 164 104 28} type Radio down_box ROUND_DOWN_BOX
!             }
!             Fl_Round_Button {} {
!               label Neither
!               xywh {48 192 104 28} type Radio down_box ROUND_DOWN_BOX
!             }
            }
-           Fl_Choice {} {
-             label {Save Directory : } open
-             xywh {136 228 220 32} down_box BORDER_BOX
-           } {}
          }
-       }
-       Fl_Group {} {
-         label Configuration open
-         xywh {4 64 596 308} box PLASTIC_UP_BOX color 8 selection_color 8 align 37
-       } {
          Fl_Group {} {
!           label {Configuration :}
!           xywh {12 72 580 292} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
!           Fl_Check_Button {} {
!             label Stamps
!             xywh {24 100 120 32} down_box DOWN_BOX value 1
            }
            Fl_Check_Button {} {
!             label {System Config} selected
!             xywh {24 132 120 32} down_box DOWN_BOX value 1
            }
-         }
-       }
-     }
-     Fl_Menu_Bar {} {open
-       xywh {0 0 604 28} box PLASTIC_UP_BOX
-     } {
-       submenu {} {
-         label Config open
-         xywh {0 0 100 20}
-       } {}
-       submenu {} {
-         label {                                                                      
                      } open
-         xywh {0 0 100 20} deactivate
-       } {}
-       submenu {} {
-         label Help open
-         xywh {4 4 100 20}
-       } {
-         menuitem {} {
-           label {About Tuxpaint-Config}
-           xywh {0 0 100 20} divider
-         }
-         menuitem {} {
-           label {About Tuxpaint}
-           xywh {12 12 100 20}
-         }
-         menuitem {} {
-           label {About Tux4Kids}
-           xywh {20 20 100 20} divider
-         }
-         menuitem {} {
-           label {About NBS}
-           xywh {32 32 100 20}
-         }
-         menuitem {} {
-           label {About SSP}
-           xywh {44 44 100 20}
          }
        }
--- 189,227 ----
        Fl_Group {} {
          label Saving open
!         xywh {5 64 665 306} box PLASTIC_UP_BOX color 6 selection_color 6 align 37 
hide
        } {
          Fl_Group {} {
!           label {Save Over Earlier Work :}
!           xywh {12 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
!           Fl_Round_Button {} {
!             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 {} {
!             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 {} {
!             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 {} {
!           label {Save Directory :}
!           xywh {340 70 323 290} box PLASTIC_UP_BOX labeltype EMBOSSED_LABEL align 21
          } {
!           Fl_File_Input {} {
!             label {Alternative Save Directory :}
!             tooltip {Pick an alternative directory to save images into} xywh {350 
145 220 35} align 5
            }
            Fl_Check_Button {} {
!             label {Use &Alternative Save Directory}
!             xywh {350 100 265 25} down_box DOWN_BOX shortcut 0x80061
!           }
!           Fl_Button {} {
!             label {Browse...}
!             xywh {575 155 80 25} shortcut 0x80062
            }
          }
        }
***************
*** 243,251 ****
      Fl_Button {} {
        label Apply
!       xywh {320 388 96 32} box PLASTIC_UP_BOX down_box PLASTIC_DOWN_BOX labelfont 1 
align 64
      }
      Fl_Button {} {
        label Reset
!       xywh {480 388 96 32} box PLASTIC_UP_BOX down_box PLASTIC_DOWN_BOX labelfont 1 
align 64
      }
    }
--- 229,241 ----
      Fl_Button {} {
        label Apply
!       xywh {455 388 96 32} box PLASTIC_UP_BOX down_box PLASTIC_DOWN_BOX labelfont 1 
align 64
      }
      Fl_Button {} {
        label Reset
!       xywh {560 388 96 32} box PLASTIC_UP_BOX down_box PLASTIC_DOWN_BOX labelfont 1 
align 64
!     }
!     Fl_Button {} {
!       label Defaults
!       xywh {15 388 96 32} box PLASTIC_UP_BOX down_box PLASTIC_DOWN_BOX labelfont 1 
align 64
      }
    }

Index: tuxpaint-config2.cxx
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint-config/src/tuxpaint-config2.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tuxpaint-config2.cxx        24 Mar 2004 15:20:42 -0000      1.5
--- tuxpaint-config2.cxx        2 Apr 2004 06:20:00 -0000       1.6
***************
*** 1,31 ****
! // generated by Fast Light User Interface Designer (fluid) version 1.0200
  
  #include "tuxpaint-config2.h"
  
  Fl_Double_Window *WINDOW_tpc=(Fl_Double_Window *)0;
  
- Fl_Menu_Item menu_[] = {
-  {"Config", 0,  0, 0, 64, 0, 0, 14, 56},
-  {0},
-  {"                                                                             \
-                ", 0,  0, 0, 65, 0, 0, 14, 56},
-  {0},
-  {"Help", 0,  0, 0, 64, 0, 0, 14, 56},
-  {"About Tuxpaint-Config", 0,  0, 0, 128, 0, 0, 14, 56},
-  {"About Tuxpaint", 0,  0, 0, 0, 0, 0, 14, 56},
-  {"About Tux4Kids", 0,  0, 0, 128, 0, 0, 14, 56},
-  {"About NBS", 0,  0, 0, 0, 0, 0, 14, 56},
-  {"About SSP", 0,  0, 0, 0, 0, 0, 14, 56},
-  {0},
-  {0}
- };
- 
  Fl_Double_Window* Show_TPC_Window() {
    Fl_Double_Window* w;
!   { Fl_Double_Window* o = WINDOW_tpc = new Fl_Double_Window(604, 436, "TuxPaint 
Config v0.0.1 by Synthetic Software Products");
      w = o;
!     { Fl_Tabs* o = new Fl_Tabs(4, 32, 596, 340);
        o->box(FL_PLASTIC_UP_BOX);
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Video & Sound");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)1);
--- 1,30 ----
! // generated by Fast Light User Interface Designer (fluid) version 1.0104
  
+ #include <libintl.h>
  #include "tuxpaint-config2.h"
  
  Fl_Double_Window *WINDOW_tpc=(Fl_Double_Window *)0;
  
  Fl_Double_Window* Show_TPC_Window() {
    Fl_Double_Window* w;
!   { Fl_Double_Window* o = WINDOW_tpc = new Fl_Double_Window(675, 425, gettext("Tux 
Paint Config v0.0.1"));
      w = o;
!     { Fl_Tabs* o = new Fl_Tabs(5, 30, 665, 340);
        o->box(FL_PLASTIC_UP_BOX);
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("About"));
!         o->box(FL_PLASTIC_UP_BOX);
!         o->color((Fl_Color)132);
!         o->selection_color((Fl_Color)92);
!         o->align(37);
!         { Fl_Group* o = new Fl_Group(12, 72, 653, 288, gettext("About Tux Paint 
Config."));
!           o->box(FL_PLASTIC_UP_BOX);
!           o->labeltype(FL_EMBOSSED_LABEL);
!           o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
!           new Fl_Text_Display(35, 95, 610, 245);
!           o->end();
!         }
!         o->end();
!       }
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("Video & Sound"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)1);
***************
*** 33,55 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 288, 292, "Video :");
            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, 96, 32, "Fullscreen");
              o->down_box(FL_DOWN_BOX);
            }
!           { Fl_Group* o = new Fl_Group(24, 140, 124, 88, "Resolution :");
              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(48, 168, 100, 28, "640 x 
480");
                o->type(102);
                o->down_box(FL_ROUND_DOWN_BOX);
                o->value(1);
              }
!             { Fl_Round_Button* o = new Fl_Round_Button(48, 196, 100, 32, "800 x 
600");
                o->type(102);
                o->down_box(FL_ROUND_DOWN_BOX);
              }
              o->end();
--- 32,60 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 70, 323, 290, gettext("Video :"));
            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, 106, 32, 
gettext("&Fullscreen"));
!             o->tooltip(gettext("Display Tux Paint in full-screen mode"));
              o->down_box(FL_DOWN_BOX);
+             o->shortcut(0x80066);
            }
!           { Fl_Group* o = new Fl_Group(24, 197, 303, 153, gettext("Resolution / 
Window Size :"));
              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"));
!               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"));
!               o->tooltip(gettext("Run Tux Paint in an 800x600 window or display"));
                o->type(102);
                o->down_box(FL_ROUND_DOWN_BOX);
+               o->shortcut(0x80038);
              }
              o->end();
***************
*** 57,67 ****
            o->end();
          }
!         { Fl_Group* o = new Fl_Group(308, 72, 284, 292, "Sound :");
            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(320, 100, 72, 32, "Sound");
              o->down_box(FL_DOWN_BOX);
              o->value(1);
            }
            o->end();
--- 62,74 ----
            o->end();
          }
!         { Fl_Group* o = new Fl_Group(340, 70, 324, 290, gettext("Sound :"));
            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(360, 100, 180, 32, 
gettext("Enable &Sound Effects"));
!             o->tooltip(gettext("Play sound effects"));
              o->down_box(FL_DOWN_BOX);
              o->value(1);
+             o->shortcut(0x80073);
            }
            o->end();
***************
*** 69,73 ****
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Mouse & Keyboard");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)2);
--- 76,80 ----
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("Mouse & Keyboard"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)2);
***************
*** 75,102 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 288, 292, "Mouse :");
            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, 120, 32, "Fancy 
Cursors");
              o->down_box(FL_DOWN_BOX);
              o->value(1);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 132, 120, 32, "Grab");
              o->down_box(FL_DOWN_BOX);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 164, 120, 32, "Wheelmouse");
              o->down_box(FL_DOWN_BOX);
              o->value(1);
            }
            o->end();
          }
!         { Fl_Group* o = new Fl_Group(308, 72, 284, 292, "Keyboard :");
            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(320, 100, 88, 32, "Shortcuts");
              o->down_box(FL_DOWN_BOX);
              o->value(1);
            }
            o->end();
--- 82,117 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 70, 323, 290, gettext("Mouse :"));
            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"));
!             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"));
!             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"));
!             o->tooltip(gettext("Allow mouse wheel to be used for selection 
scrolling"));
              o->down_box(FL_DOWN_BOX);
              o->value(1);
+             o->shortcut(0x80077);
            }
            o->end();
          }
!         { Fl_Group* o = new Fl_Group(340, 70, 324, 290, gettext("Keyboard :"));
            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(360, 100, 225, 32, 
gettext("Enable &Keyboard Shortcuts"));
!             o->tooltip(gettext("Allow keyboard shortcuts (e.g., Ctrl-S for Save)"));
              o->down_box(FL_DOWN_BOX);
              o->value(1);
+             o->shortcut(0x8006b);
            }
            o->end();
***************
*** 104,108 ****
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Complexity");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)3);
--- 119,123 ----
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(5, 65, 665, 305, gettext("Simplification"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)3);
***************
*** 110,142 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 580, 292, "Complexity :");
            o->box(FL_PLASTIC_UP_BOX);
            o->labeltype(FL_EMBOSSED_LABEL);
            o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
!           { Fl_Group* o = new Fl_Group(24, 108, 124, 88, "Shapes :");
!             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(48, 136, 100, 28, "Simple");
!               o->type(102);
!               o->down_box(FL_ROUND_DOWN_BOX);
!             }
!             { Fl_Round_Button* o = new Fl_Round_Button(48, 164, 100, 32, "Complex");
!               o->type(102);
!               o->down_box(FL_ROUND_DOWN_BOX);
!               o->value(1);
!             }
!             o->end();
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 204, 124, 32, "Quit");
              o->down_box(FL_DOWN_BOX);
!             o->value(1);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 236, 124, 32, "Outlines");
              o->down_box(FL_DOWN_BOX);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 268, 124, 32, "Stamp 
Controls");
              o->down_box(FL_DOWN_BOX);
!             o->value(1);
            }
            o->end();
--- 125,161 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(10, 70, 325, 285, gettext("Interface 
Simplification :"));
            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"));
!             o->down_box(FL_DOWN_BOX);
!             o->shortcut(0x8006f);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(25, 100, 200, 30, 
gettext("Disable Shape &Rotation"));
              o->down_box(FL_DOWN_BOX);
!             o->shortcut(0x80072);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(25, 225, 195, 30, gettext("Show 
&Uppercase Text Only"));
              o->down_box(FL_DOWN_BOX);
+             o->shortcut(0x80075);
            }
!           o->end();
!         }
!         { Fl_Group* o = new Fl_Group(340, 70, 323, 285, gettext("Control 
Simplification :"));
!           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"));
              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"));
!             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"));
!             o->down_box(FL_DOWN_BOX);
!             o->shortcut(0x80063);
            }
            o->end();
***************
*** 144,148 ****
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Locale");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)4);
--- 163,167 ----
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("Locale"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)4);
***************
*** 150,162 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 580, 292, "Locale :");
            o->box(FL_PLASTIC_UP_BOX);
            o->labeltype(FL_EMBOSSED_LABEL);
            o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
!           { Fl_Choice* o = new Fl_Choice(108, 108, 220, 32, "Language : ");
              o->down_box(FL_BORDER_BOX);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 148, 220, 32, "Mirror 
Stamps");
              o->down_box(FL_DOWN_BOX);
            }
            o->end();
--- 169,185 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 653, 288, gettext("Locale :"));
            o->box(FL_PLASTIC_UP_BOX);
            o->labeltype(FL_EMBOSSED_LABEL);
            o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
!           { Fl_Choice* o = new Fl_Choice(20, 118, 220, 32, gettext("Language : "));
!             o->tooltip(gettext("Run Tux Paint in another language"));
              o->down_box(FL_BORDER_BOX);
+             o->align(FL_ALIGN_TOP_LEFT);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(20, 218, 220, 32, 
gettext("&Mirror Stamps"));
!             o->tooltip(gettext("Mirror-image stamps by default"));
              o->down_box(FL_DOWN_BOX);
+             o->shortcut(0x8006d);
            }
            o->end();
***************
*** 164,168 ****
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Printer");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)5);
--- 187,191 ----
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("Printing"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)5);
***************
*** 170,188 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 580, 292, "Printer :");
            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, 356, 32, "Print");
              o->down_box(FL_DOWN_BOX);
              o->value(1);
            }
-           new Fl_Value_Input(136, 140, 244, 32, "Print Delay :        ");
-           new Fl_Input(136, 180, 244, 32, "Print Command : ");
            o->end();
          }
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Saving");
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)6);
--- 193,234 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 70, 323, 290, gettext("Print Permissions 
:"));
            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, 141, 32, 
gettext("Allow &Printing"));
!             o->tooltip(gettext("Allow Tux Paint to print"));
              o->down_box(FL_DOWN_BOX);
              o->value(1);
+             o->shortcut(0x80070);
+           }
+           { Fl_Value_Input* o = new Fl_Value_Input(25, 195, 50, 25, gettext("Print 
Delay : "));
+             o->tooltip(gettext("Only print once every N seconds (0 to disable)"));
+             o->maximum(3600);
+             o->step(1);
+             o->align(FL_ALIGN_TOP_LEFT);
+           }
+           { Fl_Button* o = new Fl_Button(80, 195, 80, 25, gettext("seconds"));
+             o->box(FL_FLAT_BOX);
+           }
+           o->end();
+         }
+         { Fl_Group* o = new Fl_Group(340, 70, 323, 290, gettext("Print Command :"));
+           o->box(FL_PLASTIC_UP_BOX);
+           o->labeltype(FL_EMBOSSED_LABEL);
+           o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
+           { Fl_Input* o = 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);
+           }
+           { Fl_Check_Button* o = new Fl_Check_Button(350, 100, 255, 25, gettext("Use 
&Alternative Print Command"));
+             o->down_box(FL_DOWN_BOX);
+             o->shortcut(0x80061);
            }
            o->end();
          }
          o->end();
        }
!       { Fl_Group* o = new Fl_Group(5, 64, 665, 306, gettext("Saving"));
          o->box(FL_PLASTIC_UP_BOX);
          o->color((Fl_Color)6);
***************
*** 190,239 ****
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 72, 580, 292, "Saving :");
            o->box(FL_PLASTIC_UP_BOX);
            o->labeltype(FL_EMBOSSED_LABEL);
            o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
!           { Fl_Group* o = new Fl_Group(24, 108, 128, 112, "Save Over :");
!             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(48, 136, 104, 28, "Ask");
!               o->type(102);
!               o->down_box(FL_ROUND_DOWN_BOX);
!               o->value(1);
!             }
!             { Fl_Round_Button* o = new Fl_Round_Button(48, 164, 104, 28, "New");
!               o->type(102);
!               o->down_box(FL_ROUND_DOWN_BOX);
!             }
!             { Fl_Round_Button* o = new Fl_Round_Button(48, 192, 104, 28, "Neither");
!               o->type(102);
!               o->down_box(FL_ROUND_DOWN_BOX);
!             }
!             o->end();
            }
!           { Fl_Choice* o = new Fl_Choice(136, 228, 220, 32, "Save Directory : ");
!             o->down_box(FL_BORDER_BOX);
            }
            o->end();
          }
!         o->end();
!       }
!       { Fl_Group* o = new Fl_Group(4, 64, 596, 308, "Configuration");
!         o->box(FL_PLASTIC_UP_BOX);
!         o->color(FL_INACTIVE_COLOR);
!         o->selection_color(FL_INACTIVE_COLOR);
!         o->align(37);
!         { Fl_Group* o = new Fl_Group(12, 72, 580, 292, "Configuration :");
            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, 120, 32, "Stamps");
!             o->down_box(FL_DOWN_BOX);
!             o->value(1);
            }
!           { Fl_Check_Button* o = new Fl_Check_Button(24, 132, 120, 32, "System 
Config");
              o->down_box(FL_DOWN_BOX);
!             o->value(1);
            }
            o->end();
--- 236,278 ----
          o->align(37);
          o->hide();
!         { Fl_Group* o = new Fl_Group(12, 70, 323, 290, gettext("Save Over Earlier 
Work :"));
            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"));
!             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"));
!             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"));
!             o->tooltip(gettext("When re-saving a picture, always make a new file"));
!             o->type(102);
!             o->down_box(FL_ROUND_DOWN_BOX);
!             o->shortcut(0x8006e);
            }
            o->end();
          }
!         { Fl_Group* o = new Fl_Group(340, 70, 323, 290, gettext("Save Directory :"));
            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 :"));
!             o->tooltip(gettext("Pick an alternative directory to save images into"));
!             o->align(FL_ALIGN_TOP_LEFT);
            }
!           { Fl_Check_Button* o = 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..."));
!             o->shortcut(0x80062);
            }
            o->end();
***************
*** 243,251 ****
        o->end();
      }
!     { Fl_Menu_Bar* o = new Fl_Menu_Bar(0, 0, 604, 28);
        o->box(FL_PLASTIC_UP_BOX);
!       o->menu(menu_);
      }
!     { Fl_Button* o = new Fl_Button(320, 388, 96, 32, "Apply");
        o->box(FL_PLASTIC_UP_BOX);
        o->down_box(FL_PLASTIC_DOWN_BOX);
--- 282,292 ----
        o->end();
      }
!     { Fl_Button* o = new Fl_Button(455, 388, 96, 32, gettext("Apply"));
        o->box(FL_PLASTIC_UP_BOX);
!       o->down_box(FL_PLASTIC_DOWN_BOX);
!       o->labelfont(1);
!       o->align(FL_ALIGN_CLIP);
      }
!     { Fl_Button* o = new Fl_Button(560, 388, 96, 32, gettext("Reset"));
        o->box(FL_PLASTIC_UP_BOX);
        o->down_box(FL_PLASTIC_DOWN_BOX);
***************
*** 253,257 ****
        o->align(FL_ALIGN_CLIP);
      }
!     { Fl_Button* o = new Fl_Button(480, 388, 96, 32, "Reset");
        o->box(FL_PLASTIC_UP_BOX);
        o->down_box(FL_PLASTIC_DOWN_BOX);
--- 294,298 ----
        o->align(FL_ALIGN_CLIP);
      }
!     { Fl_Button* o = new Fl_Button(15, 388, 96, 32, gettext("Defaults"));
        o->box(FL_PLASTIC_UP_BOX);
        o->down_box(FL_PLASTIC_DOWN_BOX);

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

Reply via email to