From: Le P. - P. <lep...@us...> - 2005-12-31 15:13:47
|
Update of /cvsroot/amsn/amsn-extras/plugins/chameleon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27669 Modified Files: button.tcl checkbutton.tcl common.tcl frame.tcl label.tcl labelframe.tcl radiobutton.tcl Log Message: Styles now work with me... even Smiley selector and color chooser... Index: label.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/label.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** label.tcl 31 Dec 2005 11:05:58 -0000 1.2 --- label.tcl 31 Dec 2005 15:13:38 -0000 1.3 *************** *** 42,51 **** array set label_widgetOptions { ! -activebackground -styleOption ! -activeforeground -styleOption -anchor -anchor ! -background -styleOption -bd -styleOption ! -bg -styleOption -bitmap -ignore -border -styleOption --- 42,51 ---- array set label_widgetOptions { ! -activebackground -ignore ! -activeforeground -ignore -anchor -anchor ! -background -background -bd -styleOption ! -bg -background -bitmap -ignore -border -styleOption *************** *** 54,70 **** -compound -compound -cursor -cursor ! -disabledforeground -styleOption ! -fg -styleOption ! -font -styleOption ! -foreground -styleOption -height -ignore ! -highlightbackground -styleOption ! -highlightcolor -styleOption ! -highlightthickness -styleOption -image -image -justify -justify -padx -toImplement -pady -toImplement ! -relief -styleOption -state -state -takefocus -takefocus --- 54,70 ---- -compound -compound -cursor -cursor ! -disabledforeground -ignore ! -fg -foreground ! -font -font ! -foreground -foreground -height -ignore ! -highlightbackground -ignore ! -highlightcolor -ignore ! -highlightthickness -ignore -image -image -justify -justify -padx -toImplement -pady -toImplement ! -relief -relief -state -state -takefocus -takefocus Index: labelframe.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/labelframe.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** labelframe.tcl 31 Dec 2005 11:05:58 -0000 1.2 --- labelframe.tcl 31 Dec 2005 15:13:38 -0000 1.3 *************** *** 62,68 **** -foreground -styleOption -height -toImplement ! -highlightbackground -styleOption ! -highlightcolor -styleOption ! -highlightthickness -styleOption -labelanchor -labelanchor -labelwidget -labelwidget --- 62,68 ---- -foreground -styleOption -height -toImplement ! -highlightbackground -ignore ! -highlightcolor -ignore ! -highlightthickness -ignore -labelanchor -labelanchor -labelwidget -labelwidget Index: button.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/button.tcl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** button.tcl 31 Dec 2005 11:05:58 -0000 1.3 --- button.tcl 31 Dec 2005 15:13:38 -0000 1.4 *************** *** 52,56 **** -activebackground -ignore -activeforeground -ignore ! -anchor -ignore -background -styleOption -bg -styleOption --- 52,56 ---- -activebackground -ignore -activeforeground -ignore ! -anchor -styleOption -background -styleOption -bg -styleOption *************** *** 62,68 **** -cursor -cursor -disabledforeground -ignore ! -font -ignore ! -foreground -ignore ! -fg -ignore -highlightbackground -ignore -image -image --- 62,68 ---- -cursor -cursor -disabledforeground -ignore ! -font -styleOption ! -foreground -styleOption ! -fg -styleOption -highlightbackground -ignore -image -image Index: radiobutton.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/radiobutton.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiobutton.tcl 31 Dec 2005 11:05:58 -0000 1.2 --- radiobutton.tcl 31 Dec 2005 15:13:38 -0000 1.3 *************** *** 78,84 **** -wraplength -ignore -command -command ! -height -toImplement -indicatoron -ignore ! -selectcolor -ignore -offrelief -styleOption -overrelief -styleOption --- 78,84 ---- -wraplength -ignore -command -command ! -height -ignore -indicatoron -ignore ! -selectcolor -styleOption -offrelief -styleOption -overrelief -styleOption Index: common.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/common.tcl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** common.tcl 31 Dec 2005 11:05:58 -0000 1.5 --- common.tcl 31 Dec 2005 15:13:38 -0000 1.6 *************** *** 112,117 **** } ! if { [set ${widget_type}_widgetOptions($name)] == "-styleOption" && $value != ""} { ! if { [info exists ${widget_type}_styleOptions($name)]} { set options([set ${widget_type}_styleOptions($name)]) $value } else { --- 112,118 ---- } ! # && $value != "" ! if { [set ${widget_type}_widgetOptions($name)] == "-styleOption" } { ! if { [info exists ${widget_type}_styleOptions($name)] } { set options([set ${widget_type}_styleOptions($name)]) $value } else { *************** *** 153,158 **** array set ${widget_type}_styleOptions { - -background -background -bg -background -bd -borderwidth -borderwidth -borderwidth --- 154,159 ---- array set ${widget_type}_styleOptions { -bg -background + -fg -foreground -bd -borderwidth -borderwidth -borderwidth *************** *** 160,164 **** -highlightcolor -focuscolor -highlightthickness -focusthickness - -relief -relief } --- 161,164 ---- Index: frame.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/frame.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** frame.tcl 31 Dec 2005 11:05:58 -0000 1.2 --- frame.tcl 31 Dec 2005 15:13:38 -0000 1.3 *************** *** 50,55 **** array set frame_widgetOptions { -bd -borderwidth ! -borderwidth -styleOption ! -border -styleOption -class -class -relief -styleOption --- 50,55 ---- array set frame_widgetOptions { -bd -borderwidth ! -borderwidth -borderwidth ! -border -borderwidth -class -class -relief -styleOption *************** *** 60,66 **** -cursor -cursor -height -toImplement ! -highlightbackground -styleOption ! -highlightcolor -styleOption ! -highlightthickness -styleOption -padx -toImplement -pady -toImplement --- 60,66 ---- -cursor -cursor -height -toImplement ! -highlightbackground -styleOption ! -highlightcolor -styleOption ! -highlightthickness -styleOption -padx -toImplement -pady -toImplement Index: checkbutton.tcl =================================================================== RCS file: /cvsroot/amsn/amsn-extras/plugins/chameleon/checkbutton.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** checkbutton.tcl 31 Dec 2005 11:05:58 -0000 1.2 --- checkbutton.tcl 31 Dec 2005 15:13:38 -0000 1.3 *************** *** 66,70 **** -highlightthickness -styleOption -image -image ! -justify -ignore -padx -toImplement -pady -toImplement --- 66,70 ---- -highlightthickness -styleOption -image -image ! -justify -styleOption -padx -toImplement -pady -toImplement *************** *** 76,80 **** -textvariable -textvariable -underline -underline ! -wraplength -ignore -command -command -height -ignore --- 76,80 ---- -textvariable -textvariable -underline -underline ! -wraplength -styleOption -command -command -height -ignore |