[PD-cvs] pd/src desire.tk,1.1.2.276,1.1.2.277
Mathieu Bouchard
matju at users.sourceforge.net
Mon Jul 3 21:53:22 CEST 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10771
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
removing "global look" lines
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.276
retrieving revision 1.1.2.277
diff -C2 -d -r1.1.2.276 -r1.1.2.277
*** desire.tk 3 Jul 2006 19:46:23 -0000 1.1.2.276
--- desire.tk 3 Jul 2006 19:53:18 -0000 1.1.2.277
***************
*** 1089,1093 ****
#sets the edit_toggle so the edit mode checkbox will follow if key binding is used
catch {.$self.bbar.edit configure -image icon_mode_$mode}
! .$self.c configure -background [if $@editmode {list [look canvasbgedit]} {list [look canvasbgrun]}]
}
--- 1089,1093 ----
#sets the edit_toggle so the edit mode checkbox will follow if key binding is used
catch {.$self.bbar.edit configure -image icon_mode_$mode}
! $self draw
}
***************
*** 1340,1349 ****
def* Canvas draw {} {
! global look
! if {$@editmode} {
! .$self.c configure -background [look canvasbgedit]} else {
! .$self.c configure -background [look canvasbgrun]
! }
!
$self adjust_scrollbars
}
--- 1340,1345 ----
def* Canvas draw {} {
! if {$@editmode} {set bg [look canvasbgedit]} else {set bg [look canvasbgrun]}
! .$self.c configure -background $bg
$self adjust_scrollbars
}
***************
*** 1356,1360 ****
def io draw/2 {which n y} {
- global look
set nplus [expr $n==1 ? 1 : $n-1]
mset {x1 y1 x2 y2} [$self bbox]
--- 1352,1355 ----
***************
*** 1376,1380 ****
def io draw {} {
- global look
set fy [look iopos]
mset {x1 y1 x2 y2} [$self bbox]
--- 1371,1374 ----
***************
*** 1392,1396 ****
# text = the input text field
# confusing?;)
! global font look
super
mset {x1 y1} [$self xy]
--- 1386,1390 ----
# text = the input text field
# confusing?;)
! global font
super
mset {x1 y1} [$self xy]
***************
*** 1411,1415 ****
def* TextBox edit {} {
! global look font
if {$@edit} {return}
set t .$@canvas.c.${self}text
--- 1405,1409 ----
def* TextBox edit {} {
! global font
if {$@edit} {return}
set t .$@canvas.c.${self}text
***************
*** 1428,1439 ****
#--------------------------------------- label completion
#text $propose -height 1 -width [expr [string length $@text]+1] -relief flat \
! # -bg ${look(objectbg)} -borderwidth 0 -highlightthickness 0\
# -font $font(str) -fg red
#---------------------------------------
bind Text <Tab> "$self tab; continue"
text $t -height 1 -width [expr [string length $@text]+1] -relief flat \
! -bg ${look(objectbg)} -borderwidth 0 -highlightthickness 0\
-font $font(str) -fg [look objectfg]
- #${look(objectbg)}
bind $t <Key> "$self key %W %x %y %K %A 0"
bind $t <Control-Return> "$self key %W %x %y 10 %A 0"
--- 1422,1432 ----
#--------------------------------------- label completion
#text $propose -height 1 -width [expr [string length $@text]+1] -relief flat \
! # -bg $look(objectbg) -borderwidth 0 -highlightthickness 0\
# -font $font(str) -fg red
#---------------------------------------
bind Text <Tab> "$self tab; continue"
text $t -height 1 -width [expr [string length $@text]+1] -relief flat \
! -bg [look objectbg] -borderwidth 0 -highlightthickness 0\
-font $font(str) -fg [look objectfg]
bind $t <Key> "$self key %W %x %y %K %A 0"
bind $t <Control-Return> "$self key %W %x %y 10 %A 0"
***************
*** 1497,1501 ****
def* TextBox update_size {} {
! global font look
set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)]
set @topwidth [expr (2* $@ninlets-1) * [look iowidth]]
--- 1490,1494 ----
def* TextBox update_size {} {
! global font
set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)]
set @topwidth [expr (2* $@ninlets-1) * [look iowidth]]
***************
*** 1525,1529 ****
def ObjectBox draw_box {} {
! global look font
super
set xs $@xs
--- 1518,1522 ----
def ObjectBox draw_box {} {
! global font
super
set xs $@xs
***************
*** 1545,1549 ****
$self update_size
super
! global look font
mset {x1 y1} [$self xy]
io_draw $self
--- 1538,1542 ----
$self update_size
super
! global font
mset {x1 y1} [$self xy]
io_draw $self
***************
*** 1767,1772 ****
def Canvas motion {x y mods state} {
! global font canvas
! global tooltip look
set canvas(current) $self
set c .$self.c
--- 1760,1764 ----
def Canvas motion {x y mods state} {
! global font canvas tooltip
set canvas(current) $self
set c .$self.c
***************
*** 2083,2087 ****
def* Canvas select_all {} {
- global look
foreach o $@children {$o selected?= 1}
foreach w $@wires {$w selected?= 1}
--- 2075,2078 ----
***************
*** 2122,2126 ****
def* Canvas clickedit {x y b f} {
- global look
set c .[$self canvas].c
mset {type id} [$self identify_target $x $y $b $f "click"]
--- 2113,2116 ----
***************
*** 2198,2202 ****
def* Canvas unclickedit {x y b} {
- global look
set c .$self.c
puts "_____ unclickedit action:$@action "
--- 2188,2191 ----
***************
*** 2461,2465 ****
# type is i or o
def Box hilite_io {type x y} {
- global look
mset {x1 y1 x2 y2} [$self bbox]
set xs [expr $x2-$x1]
--- 2450,2453 ----
***************
*** 2513,2517 ****
def Wire draw {} {
- global look
#set thick 2
#puts "------- from:$@obj1 outlet:$@port1 to:$@obj2 inlet:$@port2"
--- 2501,2504 ----
***************
*** 2549,2553 ****
#def* Wire select {flag} {
- # global look
# if {$flag} {set colour [look wirefg2]} {set colour [look wirefg]}
# .$@canvas.c itemconfigure ${self}WIRE -fill $colour
--- 2536,2539 ----
***************
*** 2579,2583 ****
proc bluify {colour} {
- global look
scan $colour #%02x%02x%02x r g b
scan [look sliderbg] #%02x%02x%02x R G B
--- 2565,2568 ----
***************
*** 2830,2835 ****
class_new Shadow {} ;# make a Box class inherit from this
def Shadow draw {coords} {
! global look
! set light [darker ${look(objectbg)}]
set dark [darker $light]
$self item SHAD rectangle $coords -fill $dark -outline $light -width 2
--- 2815,2819 ----
class_new Shadow {} ;# make a Box class inherit from this
def Shadow draw {coords} {
! set light [darker [look objectbg]]
set dark [darker $light]
$self item SHAD rectangle $coords -fill $dark -outline $light -width 2
***************
*** 2851,2855 ****
def* MessageBox draw {} {
$self update_size
- global look
mset {x1 y1} [$self xy]
set x2 [expr $x1+$@xs]
--- 2835,2838 ----
***************
*** 2897,2901 ****
def MessageBox bang {flag} {
- global look
.$@canvas.c itemconfigure ${self}BASE -fill \
[if {$flag} {list #ffff00} {list [look objectbg]}]
--- 2880,2883 ----
***************
*** 2906,2910 ****
class_new AtomBox {Box}
def* AtomBox draw_box {} {
! global font look
mset {x1 y1} [$self xy]
set x2 [expr $x1+$@xs]
--- 2888,2892 ----
class_new AtomBox {Box}
def* AtomBox draw_box {} {
! global font
mset {x1 y1} [$self xy]
set x2 [expr $x1+$@xs]
***************
*** 2919,2923 ****
def* AtomBox draw {} {
! global font look
$self update_size
$self draw_box
--- 2901,2905 ----
def* AtomBox draw {} {
! global font
$self update_size
$self draw_box
***************
*** 2949,2953 ****
def* BlueBox draw_box {} {
- global look
super
set xya [$self bbox]
--- 2931,2934 ----
***************
*** 3252,3256 ****
def* AtomBox init {args} {
super
! global font look
eval [concat [list super] $args]
set @clicking 0
--- 3233,3237 ----
def* AtomBox init {args} {
super
! global font
eval [concat [list super] $args]
set @clicking 0
***************
*** 3302,3306 ****
def* FloatAtom key {key shift} {
! global font look
if {[super $key $shift]} {return}
switch $key {
--- 3283,3287 ----
def* FloatAtom key {key shift} {
! global font
if {[super $key $shift]} {return}
switch $key {
***************
*** 3320,3324 ****
def* SymbolAtom key {key shift} {
! global font look
if {[super $key $shift]} {return}
if {[string length $@val] < $@w} {
--- 3301,3305 ----
def* SymbolAtom key {key shift} {
! global font
if {[super $key $shift]} {return}
if {[string length $@val] < $@w} {
***************
*** 3351,3355 ****
def AtomBox update_size {} {
! global font look
#set @textwidth [expr $font(padx)+$font(width)*[string length $@val]]
if {!$@w} [set @w 5]
--- 3332,3336 ----
def AtomBox update_size {} {
! global font
#set @textwidth [expr $font(padx)+$font(width)*[string length $@val]]
if {!$@w} [set @w 5]
***************
*** 3375,3379 ****
def* AtomBox unclick {x y b} {
- global look
set @clicking 0
if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} {
--- 3356,3359 ----
***************
*** 3419,3423 ****
def* NumBox update_size {} {
! global font look
set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]]
set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * [look iowidth]]
--- 3399,3403 ----
def* NumBox update_size {} {
! global font
set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]]
set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * [look iowidth]]
***************
*** 3429,3433 ****
def NumBox draw {} {
$self update_size
! global look font
mset {x1 y1} [$self xy]
set xs [expr 4+10*$@w]
--- 3409,3413 ----
def NumBox draw {} {
$self update_size
! global font
mset {x1 y1} [$self xy]
set xs [expr 4+10*$@w]
***************
*** 3509,3513 ****
def* NumBox unclick {x y b} {
- global look
set @clicking 0
#if {$@oval!=$@val} {
--- 3489,3492 ----
***************
*** 3648,3652 ****
def* Slider draw {} {
- global look
mset {x1 y1 x2 y2} [$self bbox]
set xs $@w
--- 3627,3630 ----
***************
*** 3837,3841 ****
def* Toggle unclick {x y b} {
- global look
set @clicking 0
$@canvas focus= ""
--- 3815,3818 ----
***************
*** 4290,4294 ****
def* Browser list_callback {} {
! global class_list font look
$self search_for_externs
set class_list [luniq [lsort $class_list]]
--- 4267,4271 ----
def* Browser list_callback {} {
! global class_list font
$self search_for_externs
set class_list [luniq [lsort $class_list]]
***************
*** 4330,4334 ****
def* Completion list_callback {} {
! global class_list font look
$self search_for_externs
set class_list [luniq [lsort $class_list]]
--- 4307,4311 ----
def* Completion list_callback {} {
! global class_list font
$self search_for_externs
set class_list [luniq [lsort $class_list]]
***************
*** 4545,4549 ****
proc properties_dialog {self w ok struct} {
! global _ look key
foreach {name label type options} $struct {
set f $w.$name
--- 4522,4526 ----
proc properties_dialog {self w ok struct} {
! global _ key
foreach {name label type options} $struct {
set f $w.$name
***************
*** 4790,4794 ****
def* Dialog choose_col {frame var val} {
- global _ look
set c 0xFFFFFF
set color [tk_chooseColor -title $val -initialcolor $val]
--- 4767,4770 ----
More information about the Pd-cvs
mailing list