[Ede-cvs] ede101/eiconsconf eiconsconf.cpp,1.2,1.3 eiconsconf.fld,1.1.1.1,1.2 eiconsconf.h,1.1.1.1,1.2

[Vedran L. <vlj...@us...>]

Update of /cvsroot/ede/ede101/eiconsconf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21243

Modified Files:
	eiconsconf.cpp eiconsconf.fld eiconsconf.h 
Log Message:
Use classic checkboxes instead of rounded ones


Index: eiconsconf.cpp
===================================================================
RCS file: /cvsroot/ede/ede101/eiconsconf/eiconsconf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eiconsconf.cpp	25 Jan 2005 15:33:16 -0000	1.2
--- eiconsconf.cpp	13 Feb 2005 13:50:42 -0000	1.3
***************
*** 1,3 ****
! // generated by Fast Light User Interface Designer (fluid) version 2,0003
  
  #include "eiconsconf.h"
--- 1,3 ----
! // generated by Extended Fast Light User Interface Designer (eFluid) version 2,0003
  
  #include "eiconsconf.h"
***************
*** 6,12 ****
  #include <efltk/Fl_Locale.h>
  #include <edeconf.h>
- 
  #include "eicon.h"
- 
  Fl_Window* iconsConfWindow;
  
--- 6,10 ----
***************
*** 25,29 ****
    sendUpdateInfo();
  }
- 
  Fl_Button* colorButton;
  
--- 23,26 ----
***************
*** 32,36 ****
    label_background = (int) colorButton->color();
  }
- 
  Fl_Button* colorButton1;
  
--- 29,32 ----
***************
*** 39,43 ****
    label_foreground = (int) colorButton1->color();
  }
- 
  Fl_Value_Slider* maxWidthSlider;
  
--- 35,38 ----
***************
*** 45,49 ****
    label_maxwidth = (int) maxWidthSlider->value();
  }
- 
  Fl_Value_Slider* fontsizeSlider;
  
--- 40,43 ----
***************
*** 51,55 ****
    label_fontsize = (int)  fontsizeSlider->value();
  }
- 
  Fl_Value_Slider* gridspaceSlider;
  
--- 45,48 ----
***************
*** 57,61 ****
    label_gridspacing = (int) gridspaceSlider->value();
  }
- 
  Fl_Check_Button* autoArrButton;
  
--- 50,53 ----
***************
*** 63,67 ****
    auto_arr = (o->value()>0);
  }
- 
  Fl_Check_Button* engageButton;
  
--- 55,58 ----
***************
*** 69,73 ****
    label_engage_1click = (int) engageButton->value();
  }
- 
  Fl_Check_Button* bg_color_check;
  
--- 60,63 ----
***************
*** 85,88 ****
--- 75,79 ----
     {Fl_Window* o = iconsConfWindow = new Fl_Window(265, 314, _("Icons settings"));
      w = o;
+     o->shortcut(0xff1b);
       {Fl_Button* o = new Fl_Button(25, 280, 75, 25, _("&OK"));
        o->callback((Fl_Callback*)cb_OK);
***************
*** 95,104 ****
      }
       {Fl_Tabs* o = new Fl_Tabs(3, 5, 257, 265);
!        {Fl_Group* o = new Fl_Group(0, 20, 257, 245, _("Look&&feel"));
!         o->align(FL_ALIGN_TOP | FL_ALIGN_LEFT);
           {Fl_Button* o = colorButton = new Fl_Button(165, 17, 60, 18, _("Background color: "));
            o->box(FL_DOWN_BOX);
            o->callback((Fl_Callback*)cb_colorButton);
!           o->align(132);
            o->color((Fl_Color) label_background);
            if(label_trans) o->deactivate();
--- 86,96 ----
      }
       {Fl_Tabs* o = new Fl_Tabs(3, 5, 257, 265);
!       o->color((Fl_Color)0xfffffffe);
!        {Fl_Group* o = new Fl_Group(1, 23, 255, 241, _("Look&&feel"));
!         o->align(FL_ALIGN_TOP|FL_ALIGN_LEFT);
           {Fl_Button* o = colorButton = new Fl_Button(165, 17, 60, 18, _("Background color: "));
            o->box(FL_DOWN_BOX);
            o->callback((Fl_Callback*)cb_colorButton);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_WRAP);
            o->color((Fl_Color) label_background);
            if(label_trans) o->deactivate();
***************
*** 107,111 ****
            o->box(FL_DOWN_BOX);
            o->callback((Fl_Callback*)cb_colorButton1);
!           o->align(132);
            o->color((Fl_Color) label_foreground);
          }
--- 99,103 ----
            o->box(FL_DOWN_BOX);
            o->callback((Fl_Callback*)cb_colorButton1);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_WRAP);
            o->color((Fl_Color) label_foreground);
          }
***************
*** 118,122 ****
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_maxWidthSlider);
!           o->align(132);
            o->value(label_maxwidth);
          }
--- 110,114 ----
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_maxWidthSlider);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_WRAP);
            o->value(label_maxwidth);
          }
***************
*** 129,133 ****
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_fontsizeSlider);
!           o->align(132);
            o->value(label_fontsize);
          }
--- 121,125 ----
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_fontsizeSlider);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_WRAP);
            o->value(label_fontsize);
          }
***************
*** 140,156 ****
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_gridspaceSlider);
!           o->align(132);
            o->value(label_gridspacing);
          }
           {Fl_Check_Button* o = autoArrButton = new Fl_Check_Button(25, 215, 222, 20, _("Auto arrange icons"));
-           o->button_box(FL_ROUND_DOWN_BOX);
            o->callback((Fl_Callback*)cb_autoArrButton);
!           o->align(68|FL_ALIGN_INSIDE);
            o->value(auto_arr);
          }
           {Fl_Check_Button* o = engageButton = new Fl_Check_Button(25, 190, 222, 20, _("Engage with just one click"));
-           o->button_box(FL_ROUND_DOWN_BOX);
            o->callback((Fl_Callback*)cb_engageButton);
!           o->align(68|FL_ALIGN_INSIDE);
            o->value(label_engage_1click);
          }
--- 132,146 ----
            o->slider_size(10);
            o->callback((Fl_Callback*)cb_gridspaceSlider);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_WRAP);
            o->value(label_gridspacing);
          }
           {Fl_Check_Button* o = autoArrButton = new Fl_Check_Button(25, 215, 222, 20, _("Auto arrange icons"));
            o->callback((Fl_Callback*)cb_autoArrButton);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
            o->value(auto_arr);
          }
           {Fl_Check_Button* o = engageButton = new Fl_Check_Button(25, 190, 222, 20, _("Engage with just one click"));
            o->callback((Fl_Callback*)cb_engageButton);
!           o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
            o->value(label_engage_1click);
          }
***************
*** 165,168 ****
--- 155,159 ----
      }
      o->end();
+     o->resizable(o);
    }
    w->show(argc, argv);

Index: eiconsconf.h
===================================================================
RCS file: /cvsroot/ede/ede101/eiconsconf/eiconsconf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** eiconsconf.h	20 Jan 2004 17:11:23 -0000	1.1.1.1
--- eiconsconf.h	13 Feb 2005 13:50:42 -0000	1.2
***************
*** 1,23 ****
! // generated by Fast Light User Interface Designer (fluid) version 2,0003
  
- #ifndef eiconsconf_h
- #define eiconsconf_h
  #include <efltk/Fl.h>
  #include <efltk/Fl_Locale.h>
  #include <efltk/Fl_Window.h>
- extern Fl_Window* iconsConfWindow;
  #include <efltk/Fl_Button.h>
  #include <efltk/Fl_Tabs.h>
  #include <efltk/Fl_Group.h>
  extern Fl_Button* colorButton;
  extern Fl_Button* colorButton1;
- #include <efltk/Fl_Value_Slider.h>
  extern Fl_Value_Slider* maxWidthSlider;
  extern Fl_Value_Slider* fontsizeSlider;
  extern Fl_Value_Slider* gridspaceSlider;
- #include <efltk/Fl_Check_Button.h>
  extern Fl_Check_Button* autoArrButton;
  extern Fl_Check_Button* engageButton;
  extern Fl_Check_Button* bg_color_check;
  void changeBoxColor(Fl_Button *box);
  #endif
--- 1,27 ----
! // generated by Extended Fast Light User Interface Designer (eFluid) version 2,0003
! 
! #ifndef _EICONSCONF_H_
! #define _EICONSCONF_H_
  
  #include <efltk/Fl.h>
  #include <efltk/Fl_Locale.h>
  #include <efltk/Fl_Window.h>
  #include <efltk/Fl_Button.h>
  #include <efltk/Fl_Tabs.h>
  #include <efltk/Fl_Group.h>
+ #include <efltk/Fl_Value_Slider.h>
+ #include <efltk/Fl_Check_Button.h>
+ 
+ extern Fl_Window* iconsConfWindow;
  extern Fl_Button* colorButton;
  extern Fl_Button* colorButton1;
  extern Fl_Value_Slider* maxWidthSlider;
  extern Fl_Value_Slider* fontsizeSlider;
  extern Fl_Value_Slider* gridspaceSlider;
  extern Fl_Check_Button* autoArrButton;
  extern Fl_Check_Button* engageButton;
  extern Fl_Check_Button* bg_color_check;
+ 
  void changeBoxColor(Fl_Button *box);
+ 
  #endif

Index: eiconsconf.fld
===================================================================
RCS file: /cvsroot/ede/ede101/eiconsconf/eiconsconf.fld,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** eiconsconf.fld	20 Jan 2004 17:11:23 -0000	1.1.1.1
--- eiconsconf.fld	13 Feb 2005 13:50:42 -0000	1.2
***************
*** 1,3 ****
! # data file for the FLTK User Interface Designer (FLUID)
  version 2,0003 
  images_dir ./icons 
--- 1,3 ----
! # data file for the eFLTK User Interface Designer (eFLUID)
  version 2,0003 
  images_dir ./icons 
***************
*** 14,25 ****
  decl {\#include <efltk/Fl_Locale.h>} {} 
  
  decl {\#include "eicon.h"} {} 
  
! Function {} {} {
    code {fl_init_locale_support("eiconsconf", PREFIX"/share/locale");
  readIconsConfiguration();} {}
    Fl_Window iconsConfWindow {
      label {Icons settings} open
!     xywh {54 60 265 314} hide
    } {
      Fl_Button {} {
--- 14,29 ----
  decl {\#include <efltk/Fl_Locale.h>} {} 
  
+ decl {\#include <edeconf.h>} {selected
+ } 
+ 
  decl {\#include "eicon.h"} {} 
  
! Function {} {open
! } {
    code {fl_init_locale_support("eiconsconf", PREFIX"/share/locale");
  readIconsConfiguration();} {}
    Fl_Window iconsConfWindow {
      label {Icons settings} open
!     xywh {54 60 265 314} resizable visible
    } {
      Fl_Button {} {
***************
*** 42,50 ****
      }
      Fl_Tabs {} {open
!       xywh {3 5 257 265}
      } {
        Fl_Group {} {
          label {Look&&feel} open
!         xywh {0 20 257 245} align 5
        } {
          Fl_Button colorButton {
--- 46,54 ----
      }
      Fl_Tabs {} {open
!       xywh {3 5 257 265} color 0xfffffffe
      } {
        Fl_Group {} {
          label {Look&&feel} open
!         xywh {1 23 255 241} align FL_ALIGN_TOP|FL_ALIGN_LEFT
        } {
          Fl_Button colorButton {
***************
*** 52,56 ****
            callback {changeBoxColor(colorButton);
  label_background = (int) colorButton->color();}
!           xywh {165 17 60 18} align 132 box DOWN_BOX
            extra_code {o->color((Fl_Color) label_background);
  if(label_trans) o->deactivate();}
--- 56,60 ----
            callback {changeBoxColor(colorButton);
  label_background = (int) colorButton->color();}
!           xywh {165 17 60 18} align FL_ALIGN_LEFT|FL_ALIGN_WRAP box DOWN_BOX
            extra_code {o->color((Fl_Color) label_background);
  if(label_trans) o->deactivate();}
***************
*** 60,64 ****
            callback {changeBoxColor(colorButton1);
  label_foreground = (int) colorButton1->color();}
!           xywh {165 47 60 18} align 132 box DOWN_BOX
            extra_code {o->color((Fl_Color) label_foreground);}
          }
--- 64,68 ----
            callback {changeBoxColor(colorButton1);
  label_foreground = (int) colorButton1->color();}
!           xywh {165 47 60 18} align FL_ALIGN_LEFT|FL_ALIGN_WRAP box DOWN_BOX
            extra_code {o->color((Fl_Color) label_foreground);}
          }
***************
*** 66,70 ****
            label {Maximum width: }
            callback {label_maxwidth = (int) maxWidthSlider->value();}
!           xywh {115 95 125 20} type HORIZONTAL align 132 minimum 48 maximum 200 step 1 value 50 slider_size 10
            extra_code {o->value(label_maxwidth);}
          }
--- 70,74 ----
            label {Maximum width: }
            callback {label_maxwidth = (int) maxWidthSlider->value();}
!           xywh {115 95 125 20} type HORIZONTAL align FL_ALIGN_LEFT|FL_ALIGN_WRAP minimum 48 maximum 200 step 1 value 50 slider_size 10
            extra_code {o->value(label_maxwidth);}
          }
***************
*** 72,76 ****
            label {Font height: }
            callback {label_fontsize = (int)  fontsizeSlider->value();}
!           xywh {115 125 125 20} type {HORIZONTAL|Fl_Slider::TICK_ABOVE} align 132 minimum 8 maximum 48 step 1 value 10 slider_size 10
            extra_code {o->value(label_fontsize);}
          }
--- 76,80 ----
            label {Font height: }
            callback {label_fontsize = (int)  fontsizeSlider->value();}
!           xywh {115 125 125 20} type {HORIZONTAL|Fl_Slider::TICK_ABOVE} align FL_ALIGN_LEFT|FL_ALIGN_WRAP minimum 8 maximum 48 step 1 value 10 slider_size 10
            extra_code {o->value(label_fontsize);}
          }
***************
*** 78,82 ****
            label {Grid spacing: }
            callback {label_gridspacing = (int) gridspaceSlider->value();}
!           xywh {115 155 125 20} type {HORIZONTAL|Fl_Slider::TICK_ABOVE} align 132 minimum 1 maximum 50 step 1 value 10 slider_size 10
            extra_code {o->value(label_gridspacing);}
          }
--- 82,86 ----
            label {Grid spacing: }
            callback {label_gridspacing = (int) gridspaceSlider->value();}
!           xywh {115 155 125 20} type {HORIZONTAL|Fl_Slider::TICK_ABOVE} align FL_ALIGN_LEFT|FL_ALIGN_WRAP minimum 1 maximum 50 step 1 value 10 slider_size 10
            extra_code {o->value(label_gridspacing);}
          }
***************
*** 84,88 ****
            label {Auto arrange icons}
            callback {auto_arr = (o->value()>0);}
!           xywh {25 215 222 20} align 84 button_box ROUND_DOWN_BOX
            extra_code {o->value(auto_arr);}
          }
--- 88,92 ----
            label {Auto arrange icons}
            callback {auto_arr = (o->value()>0);}
!           xywh {25 215 222 20} align FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP
            extra_code {o->value(auto_arr);}
          }
***************
*** 90,94 ****
            label {Engage with just one click}
            callback {label_engage_1click = (int) engageButton->value();}
!           xywh {25 190 222 20} align 84 button_box ROUND_DOWN_BOX
            extra_code {o->value(label_engage_1click);}
          }
--- 94,98 ----
            label {Engage with just one click}
            callback {label_engage_1click = (int) engageButton->value();}
!           xywh {25 190 222 20} align FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP
            extra_code {o->value(label_engage_1click);}
          }
***************
*** 106,110 ****
  } 
  
! Function {changeBoxColor(Fl_Button *box)} {selected return_type void
  } {
    code {Fl_Button *colorBox = box;
--- 110,114 ----
  } 
  
! Function {changeBoxColor(Fl_Button *box)} {return_type void
  } {
    code {Fl_Button *colorBox = box;