[PD-cvs] pd/src u_main.tk,1.17.2.2,1.17.2.3

Hans-Christoph Steiner eighthave at users.sourceforge.net
Mon Jan 8 04:28:31 CET 2007


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

Modified Files:
      Tag: branch-v0-39-2-extended
	u_main.tk 
Log Message:
fixed up IEMGUI properties panel with labelframes

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -d -r1.17.2.2 -r1.17.2.3
*** u_main.tk	8 Jan 2007 02:07:17 -0000	1.17.2.2
--- u_main.tk	8 Jan 2007 03:28:29 -0000	1.17.2.3
***************
*** 2138,2142 ****
      if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} {
          set $var_iemgui_gn_fs $iemgui_define_min_fontsize
!         $id.gnfs.fs_ent configure -textvariable $var_iemgui_gn_fs
      }
  }
--- 2138,2142 ----
      if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} {
          set $var_iemgui_gn_fs $iemgui_define_min_fontsize
!         $id.label.fs_ent configure -textvariable $var_iemgui_gn_fs
      }
  }
***************
*** 2152,2156 ****
      global $var_iemgui_lcol
      
!     $id.col_example_choose.lb_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
--- 2152,2156 ----
      global $var_iemgui_lcol
      
!     $id.colors.sections.lb_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
***************
*** 2159,2163 ****
      
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
!        $id.col_example_choose.fr_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
--- 2159,2163 ----
      
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
!        $id.colors.sections.fr_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
***************
*** 2165,2169 ****
         -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]]
      } else {
!        $id.col_example_choose.fr_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
--- 2165,2169 ----
         -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]]
      } else {
!        $id.colors.sections.fr_bk configure \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
***************
*** 2256,2260 ****
  
      set $var_iemgui_gn_f $gn_f
! puts stderr "gn_f $var_iemgui_gn_f $gn_f"
  	 switch -- $gn_f {
  		  0 { set current_font "Bitstream Vera Sans Mono"}
--- 2256,2260 ----
  
      set $var_iemgui_gn_f $gn_f
! 
  	 switch -- $gn_f {
  		  0 { set current_font "Bitstream Vera Sans Mono"}
***************
*** 2263,2273 ****
  	 }
  	 set current_font_spec "{$current_font} 12 normal"
! puts stderr "$gn_f $current_font current: $current_font_spec"
! 	 $id.gnfs.popup_label configure -text $current_font \
  		  -font $current_font_spec
! 	 # these act funny, they need to be debugged
! 	 $id.gnam.ent configure -font $current_font_spec
! 	 $id.col_example_choose.fr_bk configure -font $current_font_spec
! 	 $id.col_example_choose.lb_bk configure -font $current_font_spec
  }
  
--- 2263,2272 ----
  	 }
  	 set current_font_spec "{$current_font} 12 normal"
! 
! 	 $id.label.font.popup_label configure -text $current_font \
  		  -font $current_font_spec
! 	 $id.label.name.entry configure -font $current_font_spec
! 	 $id.colors.sections.fr_bk configure -font $current_font_spec
! 	 $id.colors.sections.lb_bk configure -font $current_font_spec
  }
  
***************
*** 2415,2418 ****
--- 2414,2419 ----
      set vid [string trimleft $id .]
  
+ 	 global pd_nt
+ 
      set var_iemgui_wdt [concat iemgui_wdt_$vid]
      global $var_iemgui_wdt
***************
*** 2536,2540 ****
      
      if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } {
!         label $id.space1 -text "---------------------------------"
          pack $id.space1 -side top }
  
--- 2537,2541 ----
      
      if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } {
!         label $id.space1 -text ""
          pack $id.space1 -side top }
  
***************
*** 2565,2585 ****
      if {[eval concat $$var_iemgui_steady] >= 0} {
          pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1}
!     if { $snd != "nosndno" || $rcv != "norcvno" } {
!         label $id.space2 -text "---------------------------------"
!         pack $id.space2 -side top }
      
!     frame $id.snd
!     pack $id.snd -side top
!     label $id.snd.lab -text "   send-symbol:" -width 12  -justify right
!     entry $id.snd.ent -textvariable $var_iemgui_snd -width 23
      if { $snd != "nosndno" } {
!         pack $id.snd.lab $id.snd.ent -side left}
      
!     frame $id.rcv
!     pack $id.rcv -side top
!     label $id.rcv.lab -text "receive-symbol:" -width 12 -justify right
!     entry $id.rcv.ent -textvariable $var_iemgui_rcv -width 23
      if { $rcv != "norcvno" } {
!         pack $id.rcv.lab $id.rcv.ent -side left}
      
  # get the current font name from the int given from C-space (gn_f)
--- 2566,2589 ----
      if {[eval concat $$var_iemgui_steady] >= 0} {
          pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1}
! 
! 	 frame $id.spacer0 -height 4
! 	 pack $id.spacer0 -side top
      
! 	 labelframe $id.s_r -borderwidth 1 -padx 3 -pady 4 -text "messages" \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
! 	 pack $id.s_r -side top
!     frame $id.s_r.send
!     pack $id.s_r.send -side top
!     label $id.s_r.send.lab -text "   send-symbol:" -width 12  -justify right
!     entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22
      if { $snd != "nosndno" } {
!         pack $id.s_r.send.lab $id.s_r.send.ent -side left}
      
!     frame $id.s_r.receive
!     pack $id.s_r.receive -side top
!     label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right
!     entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22
      if { $rcv != "norcvno" } {
!         pack $id.s_r.receive.lab $id.s_r.receive.ent -side left}
      
  # get the current font name from the int given from C-space (gn_f)
***************
*** 2589,2603 ****
      if {[eval concat $$var_iemgui_gn_f] == 2} \
  		  { set current_font "Times" }
      
! 	 labelframe $id.label -borderwidth 1 -text label -padx 1 -pady 1
  	 pack $id.label -side top
      frame $id.label.name
      pack $id.label.name -side top
!     label $id.label.name.label -text "name:" -width 4
      entry $id.label.name.entry -textvariable $var_iemgui_gui_nam -width 30 \
  		  -font [list $current_font 12 normal]
      pack $id.label.name.label $id.label.name.entry -side left
      
!     frame $id.label.xy
      pack $id.label.xy -side top
      label $id.label.xy.x_lab -text "x_off:" -width 6
--- 2593,2611 ----
      if {[eval concat $$var_iemgui_gn_f] == 2} \
  		  { set current_font "Times" }
+ 
+ 	 frame $id.spacer1 -height 7
+ 	 pack $id.spacer1 -side top
      
! 	 labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
  	 pack $id.label -side top
      frame $id.label.name
      pack $id.label.name -side top
!     label $id.label.name.label -text "name:" -width 4 -pady 6
      entry $id.label.name.entry -textvariable $var_iemgui_gui_nam -width 30 \
  		  -font [list $current_font 12 normal]
      pack $id.label.name.label $id.label.name.entry -side left
      
!     frame $id.label.xy -padx 27 -pady 1
      pack $id.label.xy -side top
      label $id.label.xy.x_lab -text "x_off:" -width 6
***************
*** 2609,2619 ****
           $id.label.xy.y_lab $id.label.xy.y_entry -side left
      
!     frame $id.gnfs -pady 2
!     pack $id.gnfs -side top
!     label $id.gnfs.size_label -text "size:" -width 4
!     entry $id.gnfs.fs_ent -textvariable $var_iemgui_gn_fs -width 5
! 	 label $id.gnfs.popup_label -text $current_font -width 24 -relief groove \
! 		  -padx 1 -pady 1 -font {$current_font 12 normal}
!     pack $id.gnfs.popup_label $id.gnfs.size_label $id.gnfs.fs_ent -side left
  	 menu $id.popup
  	 $id.popup add command \
--- 2617,2628 ----
           $id.label.xy.y_lab $id.label.xy.y_entry -side left
      
!     frame $id.label.font
!     pack $id.label.font -side top
! 	 label $id.label.font.popup_label -text $current_font -width 25 \
! 		  -relief groove -font {$current_font 12 normal} -padx 0 -pady 1
!     label $id.label.font.size_label -text "size:" -width 4 -pady 6
!     entry $id.label.font.size_entry -textvariable $var_iemgui_gn_fs -width 4
!     pack $id.label.font.popup_label $id.label.font.size_label \
! 		  $id.label.font.size_entry -side left
  	 menu $id.popup
  	 $id.popup add command \
***************
*** 2629,2685 ****
  		  -font {Times 12 normal} \
  		  -command "iemgui_toggle_font $id 2" 
! 	 bind $id.gnfs.popup_label <Button> [list tk_popup $id.popup %X %Y]
      
!     label $id.col_head -text "--------------colors:--------------"
!     pack $id.col_head -side top
      
!     labelframe $id.colors -borderwidth 1 -text colors
!     frame $id.col_select
!     pack $id.col_select -side top
!     radiobutton $id.col_select.radio0 -value 0 -variable $var_iemgui_l2_f1_b0 \
!        -text "background" -width 10 -justify left
!     radiobutton $id.col_select.radio1 -value 1 -variable $var_iemgui_l2_f1_b0 \
!        -text "front" -width 5 -justify left
!     radiobutton $id.col_select.radio2 -value 2 -variable $var_iemgui_l2_f1_b0 \
!        -text "label" -width 5 -justify left
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
!          pack $id.col_select.radio0 $id.col_select.radio1 $id.col_select.radio2 -side left
!        } else {pack $id.col_select.radio0 $id.col_select.radio2 -side left}
      
!     frame $id.col_example_choose
!     pack $id.col_example_choose -side top
!     button $id.col_example_choose.but -text "compose color" -width 12 \
!              -command "iemgui_choose_col_bkfrlb $id"
!     label $id.col_example_choose.dummy1 -text "" -width 1
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
! 		  label $id.col_example_choose.fr_bk -text "o=||=o" -width 6 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
! 				-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
! 				-font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
      } else {
! 		  label $id.col_example_choose.fr_bk -text "o=||=o" -width 6 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! 				-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! 				-font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
  	 }
! 	 label $id.col_example_choose.lb_bk -text "test" -width 7 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
! 		  -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
! 		  -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
      
!     pack $id.col_example_choose.but $id.col_example_choose.dummy1 \
!        $id.col_example_choose.fr_bk $id.col_example_choose.lb_bk -side left
      
!     label $id.space3 -text "------or click color preset:-------"
!     pack $id.space3 -side top
      
!     frame $id.bcol
!     pack $id.bcol -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 16579836 14737632 12369084 16572640 16572608 \
--- 2638,2699 ----
  		  -font {Times 12 normal} \
  		  -command "iemgui_toggle_font $id 2" 
! 	 bind $id.label.font.popup_label <Button> \
! 		  [list tk_popup $id.popup %X %Y]
! 
! 	 frame $id.spacer2 -height 7
! 	 pack $id.spacer2 -side top
      
!     labelframe $id.colors -borderwidth 1 -padx 3 -pady 4 -text "colors" \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
!     pack $id.colors
      
!     frame $id.colors.select
!     pack $id.colors.select -side top
!     radiobutton $id.colors.select.radio0 -value 0 -variable \
! 		  $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left
!     radiobutton $id.colors.select.radio1 -value 1 -variable \
! 		  $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left
!     radiobutton $id.colors.select.radio2 -value 2 -variable \
! 		  $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
! 		  pack $id.colors.select.radio0 $id.colors.select.radio1 \
! 				$id.colors.select.radio2 -side left
! 	 } else {pack $id.colors.select.radio0 $id.colors.select.radio2 -side left}
      
!     frame $id.colors.sections
!     pack $id.colors.sections -side top
!     button $id.colors.sections.but -text "compose color" -width 12 \
!              -command "iemgui_choose_col_bkfrlb $id" -pady 5
!     label $id.colors.sections.dummy1 -text "" -width 1
      if { [eval concat $$var_iemgui_fcol] >= 0 } {
! 		  label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
!        -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \
! 		 -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
      } else {
! 		  label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
!        -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
! 		 -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
  	 }
! 	 label $id.colors.sections.lb_bk -text "testlabel" -width 9 \
         -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \
         -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
! 		 -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
! 		 -font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
      
!     pack $id.colors.sections.but $id.colors.sections.dummy1 \
!        $id.colors.sections.fr_bk $id.colors.sections.lb_bk -side left
      
!     frame $id.colors.preset_spacer -pady 7
!     pack $id.colors.preset_spacer -side top
      
!     frame $id.colors.r1
!     pack $id.colors.r1 -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 16579836 14737632 12369084 16572640 16572608 \
***************
*** 2687,2701 ****
  							16579784 14220504 14220540 14476540 } \
  		  {
! 				label $id.bcol.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6
! 				bind $id.bcol.c$i <Button> [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.bcol.c0 $id.bcol.c1 $id.bcol.c2 $id.bcol.c3 $id.bcol.c4 \
!         $id.bcol.c5 $id.bcol.c6 $id.bcol.c7 $id.bcol.c8 $id.bcol.c9 \
!         $id.bcol.c10 $id.bcol.c11 $id.bcol.c12 $id.bcol.c13 -side left
      
!     frame $id.fcol
!     pack $id.fcol -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 10526880 8158332 6316128 16525352 16559172 \
--- 2701,2716 ----
  							16579784 14220504 14220540 14476540 } \
  		  {
! 				label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -padx 7 -pady 0
! 				bind $id.colors.r1.c$i <Button> [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \
! 		  $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \
! 		  $id.colors.r1.c8 $id.colors.r1.c9 $id.colors.r1.c10 $id.colors.r1.c11 \
! 		  $id.colors.r1.c12 $id.colors.r1.c13 -side left
      
!     frame $id.colors.r2
!     pack $id.colors.r2 -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 10526880 8158332 6316128 16525352 16559172 \
***************
*** 2703,2718 ****
  							15263784 1370132 2684148 3952892 } \
  		  {
! 				label $id.fcol.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6
! 				bind  $id.fcol.c$i <Button> \
  					 [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.fcol.c0 $id.fcol.c1 $id.fcol.c2 $id.fcol.c3 $id.fcol.c4 \
!         $id.fcol.c5 $id.fcol.c6 $id.fcol.c7 $id.fcol.c8 $id.fcol.c9 \
!         $id.fcol.c10 $id.fcol.c11 $id.fcol.c12 $id.fcol.c13 -side left
      
!     frame $id.lcol
!     pack $id.lcol -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 4210752 2105376 0 9177096 5779456 \
--- 2718,2734 ----
  							15263784 1370132 2684148 3952892 } \
  		  {
! 				label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -padx 7 -pady 0
! 				bind  $id.colors.r2.c$i <Button> \
  					 [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \
! 		  $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \
! 		  $id.colors.r2.c8 $id.colors.r2.c9 $id.colors.r2.c10 $id.colors.r2.c11 \
! 		  $id.colors.r2.c12 $id.colors.r2.c13 -side left
      
!     frame $id.colors.r3
!     pack $id.colors.r3 -side top
      foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 } \
  		  hexcol { 4210752 2105376 0 9177096 5779456 \
***************
*** 2720,2753 ****
  							7874580 2641940 17488 5256 } \
  		  {
! 				label $id.lcol.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -font {{Bitstream Vera Sans Mono} 2 normal} -padx 7 -pady 6
! 				bind  $id.lcol.c$i <Button> \
  					 [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.lcol.c0 $id.lcol.c1 $id.lcol.c2 $id.lcol.c3 $id.lcol.c4 \
!         $id.lcol.c5 $id.lcol.c6 $id.lcol.c7 $id.lcol.c8 $id.lcol.c9 \
!         $id.lcol.c10 $id.lcol.c11 $id.lcol.c12 $id.lcol.c13 -side left
!     
!     
!     label $id.space4 -text "---------------------------------"
!     pack $id.space4 -side top
      
!     frame $id.cao
      pack $id.cao -side top
      button $id.cao.cancel -text {Cancel} -width 6 \
          -command "iemgui_cancel $id"
      label $id.cao.dummy1 -text "" -width 3
!     button $id.cao.apply -text {Apply} -width 6 \
!         -command "iemgui_apply $id"
!     label $id.cao.dummy2 -text "" -width 3
      button $id.cao.ok -text {OK} -width 6 \
          -command "iemgui_ok $id"
!     pack $id.cao.cancel $id.cao.dummy1 \
!         $id.cao.apply $id.cao.dummy2 \
!         $id.cao.ok -side left
!     
!     label $id.space5 -text ""
!     pack $id.space5 -side top
  
      if {[info tclversion] < 8.4} {
--- 2736,2767 ----
  							7874580 2641940 17488 5256 } \
  		  {
! 				label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \
  					 -activebackground [format "#%6.6x" $hexcol] -relief ridge \
! 					 -padx 7 -pady 0
! 				bind  $id.colors.r3.c$i <Button> \
  					 [format "iemgui_preset_col %s %d" $id $hexcol] 
  		  }
!     pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \
! 		  $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \
! 		  $id.colors.r3.c8 $id.colors.r3.c9 $id.colors.r3.c10 $id.colors.r3.c11 \
! 		  $id.colors.r3.c12 $id.colors.r3.c13 -side left
      
!     frame $id.cao -pady 10
      pack $id.cao -side top
      button $id.cao.cancel -text {Cancel} -width 6 \
          -command "iemgui_cancel $id"
      label $id.cao.dummy1 -text "" -width 3
! # Mac OS X doesn't use Apply buttons
! 	 if {$pd_nt != 2 } {
! 		  button $id.cao.apply -text {Apply} -width 6 -command "iemgui_apply $id"
! 		  label $id.cao.dummy2 -text "" -width 3
! 	 }
      button $id.cao.ok -text {OK} -width 6 \
          -command "iemgui_ok $id"
! 
!     pack $id.cao.cancel $id.cao.dummy1 -side left
! # Mac OS X doesn't use Apply buttons
! 	 if {$pd_nt != 2 } { pack $id.cao.apply $id.cao.dummy2 -side left }
!     pack $id.cao.ok -side left
  
      if {[info tclversion] < 8.4} {
***************
*** 2764,2773 ****
      bind $id.rng.max_ent <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.para.num_ent <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.snd.ent <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.rcv.ent <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.name.entry <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.xy.x_entry <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.xy.y_entry <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.gnfs.fs_ent <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id]
      pdtk_standardkeybindings $id.dim.w_ent
--- 2778,2787 ----
      bind $id.rng.max_ent <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.para.num_ent <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.s_r.send.ent <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.s_r.receive.ent <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.name.entry <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.xy.x_entry <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.label.xy.y_entry <KeyPress-Return> [concat iemgui_ok $id]
!     bind $id.label.font.size_entry <KeyPress-Return> [concat iemgui_ok $id]
      bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id]
      pdtk_standardkeybindings $id.dim.w_ent
***************
*** 2776,2785 ****
      pdtk_standardkeybindings $id.rng.max_ent
      pdtk_standardkeybindings $id.para.num_ent
!     pdtk_standardkeybindings $id.snd.ent
!     pdtk_standardkeybindings $id.rcv.ent
      pdtk_standardkeybindings $id.label.name.entry
      pdtk_standardkeybindings $id.label.xy.x_entry
      pdtk_standardkeybindings $id.label.xy.y_entry
!     pdtk_standardkeybindings $id.gnfs.fs_ent
      pdtk_standardkeybindings $id.cao.ok
      
--- 2790,2799 ----
      pdtk_standardkeybindings $id.rng.max_ent
      pdtk_standardkeybindings $id.para.num_ent
!     pdtk_standardkeybindings $id.s_r.send.ent
!     pdtk_standardkeybindings $id.s_r.receive.ent
      pdtk_standardkeybindings $id.label.name.entry
      pdtk_standardkeybindings $id.label.xy.x_entry
      pdtk_standardkeybindings $id.label.xy.y_entry
!     pdtk_standardkeybindings $id.label.font.size_entry
      pdtk_standardkeybindings $id.cao.ok
      





More information about the Pd-cvs mailing list