pd/src desire.tk,1.1.2.600.2.118,1.1.2.600.2.119 - Pd-cvs

19 Dec 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv505
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
refixed add_choice (maybe broke it further...)
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.118
retrieving revision 1.1.2.600.2.119
diff -C2 -d -r1.1.2.600.2.118 -r1.1.2.600.2.119
*** desire.tk	19 Dec 2006 21:11:24 -0000	1.1.2.600.2.118
--- desire.tk	19 Dec 2006 21:50:52 -0000	1.1.2.600.2.119
***************
*** 617,625 ****
  }].tcl
if {[file exists $langfile]} {
    #source -encoding utf-8 $langfile
    source $langfile
  } else {
!   source [file join [file dirname [file dirname $argh0]] lib/pd/bin/$langfile]
  }
--- 617,628 ----
  }].tcl
+ proc localedir {x} {file join [file dirname [file dirname $argh0]] lib/pd/bin/$x}
  if {[file exists $langfile]} {
    #source -encoding utf-8 $langfile
+ 	source locale/index.tcl
    source $langfile
  } else {
! 	source [localedir locale/index.tcl]
! 	source [localedir $langfile]
  }
***************
*** 6027,6033 ****
    }
    set trim_name [string trimleft $name "-"]
- 	set _($self:${name}2) [say [lindex $choices $@$name]]
    set _($self:${name}choices) $choices
! 	label $f.butt -textvariable _($self:${name}2) -relief raised -width 20
    balloon $f.butt "click to change setting"
    pack $f.label $f.butt -side left
--- 6030,6037 ----
    }
    set trim_name [string trimleft $name "-"]
    set _($self:${name}choices) $choices
! 	set choice $@$name
! 	if {[string is integer $choice]} {set choice [lindex $choices $choice]}
! 	label $f.butt -text [say $choice] -relief raised -width 20
    balloon $f.butt "click to change setting"
    pack $f.label $f.butt -side left
***************
*** 6808,6813 ****
    } else {
    	set _($self:${trim_var}0) $part
! 	      } 
! 	 super $frame $var $part $val
  }
  #used by choice and devlist
--- 6812,6817 ----
    } else {
    	set _($self:${trim_var}0) $part
! 	}
! 	super $frame $var $part $val
  }
  #used by choice and devlist
***************
*** 7046,7050 ****
  def ClientPrefsDialog dropmenu_set {frame var part val} {
    set @$var $part
! 	set _($self:${var}2) [say $part]
  }
--- 7050,7055 ----
  def ClientPrefsDialog dropmenu_set {frame var part val} {
    set @$var $part
! 	# set _($self:${var}2) [say $part]
! 	$frame.butt configure -text [say $part]
  }