[PD-cvs] pd/src makefile.in,1.1.1.3.2.12,1.1.1.3.2.12.2.1 s_main.c,1.1.1.4.2.8.4.1,1.1.1.4.2.8.4.2 u_main.tk,1.1.1.4.2.7.4.3,1.1.1.4.2.7.4.4

Sun Feb 22 23:37:46 CET 2004

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

Modified Files:
      Tag: impd_0_37
	makefile.in s_main.c u_main.tk 
Log Message:
"About" now says impd instead of devel; has close button + title
adding u_object.tk file in makefile.in

Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.1.1.3.2.12
retrieving revision 1.1.1.3.2.12.2.1
diff -C2 -d -r1.1.1.3.2.12 -r1.1.1.3.2.12.2.1
*** makefile.in	14 Jan 2004 15:42:49 -0000	1.1.1.3.2.12
--- makefile.in	22 Feb 2004 22:37:37 -0000	1.1.1.3.2.12.2.1
***************
*** 62,69 ****

  all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
!     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk externs

  bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
!     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk

  $(OBJ) : %.o : %.c
--- 62,69 ----

  all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
!     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk externs

  bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
!     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk $(BIN_DIR)/u_object.tk

  $(OBJ) : %.o : %.c
***************
*** 124,127 ****
--- 124,128 ----
  	install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog
  	install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk
+ 	install -m644 u_object.tk $(INSTDIR)/lib/pd/bin/u_object.tk
  	install -d $(INSTDIR)/bin
  	install -m755 $(PDEXEC) $(INSTDIR)/bin/pd

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.1.1.4.2.8.4.1
retrieving revision 1.1.1.4.2.8.4.2
diff -C2 -d -r1.1.1.4.2.8.4.1 -r1.1.1.4.2.8.4.2
*** s_main.c	22 Feb 2004 18:00:47 -0000	1.1.1.4.2.8.4.1
--- s_main.c	22 Feb 2004 22:37:38 -0000	1.1.1.4.2.8.4.2
***************
*** 8,12 ****
   */

! char pd_version[] = "Pd version 0.37.1 devel\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;
--- 8,12 ----
   */

! char pd_version[] = "Pd version 0.37.1 impd\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.1.1.4.2.7.4.3
retrieving revision 1.1.1.4.2.7.4.4
diff -C2 -d -r1.1.1.4.2.7.4.3 -r1.1.1.4.2.7.4.4
*** u_main.tk	22 Feb 2004 20:48:27 -0000	1.1.1.4.2.7.4.3
--- u_main.tk	22 Feb 2004 22:37:38 -0000	1.1.1.4.2.7.4.4
***************
*** 272,281 ****
      set name [format ".help%d" $doc_number]
      toplevel $name
!     text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \
!     	-yscrollcommand "$name.scroll set" -background white
!     scrollbar $name.scroll -command "$name.text yview"
!     pack $name.scroll -side right -fill y
!     pack $name.text -side left -fill both -expand 1
!     
      set f [open $filename]
      while {![eof $f]} {
--- 272,288 ----
      set name [format ".help%d" $doc_number]
      toplevel $name
!     wm title $name $filename
!     frame $name.1
!     frame $name.2
!     text $name.1.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \
!     	-yscrollcommand "$name.1.scroll set" -background white
!     scrollbar $name.1.scroll -command "$name.1.text yview"
!     pack $name.1.scroll -side right -fill y
!     pack $name.1.text -side left -fill both -expand 1
!     button $name.2.close -text Close -command "destroy $name"
!     pack $name.2.close -side right
!     pack $name.1 -fill both -expand 1
!     pack $name.2 -fill x -expand 0
! 
      set f [open $filename]
      while {![eof $f]} {
***************
*** 283,288 ****
  	regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2
      	regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3
!     	$name.text insert end $bigstring3
      }
      close $f
      set doc_number [expr $doc_number + 1] 
--- 290,296 ----
  	regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2
      	regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3
!     	$name.1.text insert end $bigstring3
      }
+     $name.1.text configure -state disabled
      close $f
      set doc_number [expr $doc_number + 1] 
***************
*** 3380,3384 ****
  		set errMsg {}
  		catch {image create photo icon_$im -file $dir/$im.gif } errMsg
! 		if {[string compare "" $errMsg] != 0} { post_to_gui "ERROR: $errMsg\n" }
  	}
  }
--- 3388,3392 ----
  		set errMsg {}
  		catch {image create photo icon_$im -file $dir/$im.gif } errMsg
! 		#if {[string compare "" $errMsg] != 0} { post_to_gui "ERROR: $errMsg\n" }
  	}
  }
***************
*** 3394,3398 ****
  		set BLAH [lindex $b 1]
  		catch {
- 			post_to_gui "butt: $b\n"
  			button "$self.[lindex $b 0]" -image "icon_[lindex $b 0]" -border 1 \
  				-command "pd \[concat $doc $BLAH \\;\]"
--- 3402,3405 ----
***************
*** 3463,3467 ****
  	entry .browser.butt.2 -width 15
  	pack .browser.butt.1 .browser.butt.2 -side left
! 	button .browser.butt.close -text "Close" -command {puts "What did you say?"}
  	pack .browser.butt.close -side right
  	pack .browser.butt -side bottom -fill x -expand no
--- 3470,3474 ----
  	entry .browser.butt.2 -width 15
  	pack .browser.butt.1 .browser.butt.2 -side left
! 	button .browser.butt.close -text "Close" -command "destroy .browser"
  	pack .browser.butt.close -side right
  	pack .browser.butt -side bottom -fill x -expand no
***************
*** 3489,3490 ****
--- 3496,3499 ----
  }

+ # rendering:
+ source u_object.tk