[PD-cvs] pd/src desire.tk,1.1.2.428,1.1.2.429

Mathieu Bouchard matju at users.sourceforge.net
Wed Aug 30 20:35:37 CEST 2006


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18117

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed paths for locale and defaults.ddrc.
smaller warning for debug.tcl.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.428
retrieving revision 1.1.2.429
diff -C2 -d -r1.1.2.428 -r1.1.2.429
*** desire.tk	30 Aug 2006 16:54:44 -0000	1.1.2.428
--- desire.tk	30 Aug 2006 18:35:35 -0000	1.1.2.429
***************
*** 39,43 ****
  
  #if {[catch {source profdd.tcl}]} {error_dump}
! if {[catch {source debug.tcl}]} {error_dump}
  
  proc which {file} {
--- 39,47 ----
  
  #if {[catch {source profdd.tcl}]} {error_dump}
! if {[file exists debug.tcl]} {
! 	source debug.tcl
! } else {
! 	puts "not loading debug.tcl, because it isn't there."
! }
  
  proc which {file} {
***************
*** 435,439 ****
  proc look {class k} {global look; return $look($class:$k)}
  
! set cmdline(server) [list [file join [file dirname $argh0] ../bin/pd]]
  set cmdline(rcfilename) ~/.pdrc
  set cmdline(ddrcfilename) ~/.ddrc
--- 439,443 ----
  proc look {class k} {global look; return $look($class:$k)}
  
! set cmdline(server) [file join [file dirname $argh0] ../bin/pd]
  set cmdline(rcfilename) ~/.pdrc
  set cmdline(ddrcfilename) ~/.ddrc
***************
*** 482,496 ****
  
  #set cmdline(server) \"$cmdline(server)\"
! switch -regexp -- $cmdline(lang) {
!   en|english|C      {source locale/english.tcl}
!   fr|francais       {source locale/francais.tcl}
!   de|deutsch        {source locale/deutsch.tcl}
!   ca|catala         {source locale/catala.tcl}
!   es|espanol        {source locale/espanol.tcl}
!   pt|portugues      {source locale/portugues.tcl}
!   it|italiano       {source locale/italiano.tcl}
!   nb|norsk|bokmal   {source locale/bokmal.tcl}
    default {error huh??? unknown lang (locale)}
  }
  #-----------------------------------------------------------------------------------#
  
--- 486,508 ----
  
  #set cmdline(server) \"$cmdline(server)\"
! set langfile locale/[switch -regexp -- $cmdline(lang) {
!   en|english|C      {list english}
!   fr|francais       {list francais}
!   de|deutsch        {list deutsch}
!   ca|catala         {list catala}
!   es|espanol        {list espanol}
!   pt|portugues      {list portugues}
!   it|italiano       {list italiano}
!   nb|norsk|bokmal   {list bokmal}
    default {error huh??? unknown lang (locale)}
+ }].tcl
+ 
+ if {[file exists $langfile]} {
+   source $langfile
+ } else {
+   source [file join [file dirname $argh0] ../lib/pd/bin/$langfile]
+ 
  }
+ 
  #-----------------------------------------------------------------------------------#
  
***************
*** 949,953 ****
  	read_ddrc "defaults.ddrc"
  } else {
! 	read_ddrc [list [file join [file dirname $argh0] "../lib/pd/bin/defaults.ddrc"]]
  }
  read_ddrc
--- 961,965 ----
  	read_ddrc "defaults.ddrc"
  } else {
! 	read_ddrc [file join [file dirname $argh0] "../lib/pd/bin/defaults.ddrc"]
  }
  read_ddrc
***************
*** 1245,1249 ****
      $self subscribe $manager
      $self changed
!     $self canvas= $self
      #not sure if init should be calling pd, but it fixes the editmode bug for now -chun
      pd .$self editmode $@editmode
--- 1257,1261 ----
      $self subscribe $manager
      $self changed
!     $self canvas= $self ;#!@#$ EEVIL
      #not sure if init should be calling pd, but it fixes the editmode bug for now -chun
      pd .$self editmode $@editmode





More information about the Pd-cvs mailing list