pd/src u_main.tk,1.17.2.3,1.17.2.4 - Pd-cvs

8 Jan 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32428
Modified Files:
      Tag: branch-v0-39-2-extended
    u_main.tk 
Log Message:
fixed up atom box properties panel
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -d -r1.17.2.3 -r1.17.2.4
*** u_main.tk	8 Jan 2007 03:28:29 -0000	1.17.2.3
--- u_main.tk	8 Jan 2007 04:32:08 -0000	1.17.2.4
***************
*** 1881,1884 ****
--- 1881,1886 ----
      set vid [string trimleft $id .]
+ 	 global pd_nt
+ 
      set var_gatomwidth [concat gatomwidth_$vid]
      global $var_gatomwidth
***************
*** 1905,1989 ****
toplevel $id
!     wm title $id {Atom}
      wm protocol $id WM_DELETE_WINDOW [concat dogatom_cancel $id]
!     frame $id.buttonframe
!     pack $id.buttonframe -side bottom -fill x -pady 2m
!     button $id.buttonframe.cancel -text {Cancel}\
!         -command "dogatom_cancel $id"
!     button $id.buttonframe.apply -text {Apply}\
!         -command "dogatom_apply $id"
!     button $id.buttonframe.ok -text {OK}\
!         -command "dogatom_ok $id"
!     pack $id.buttonframe.cancel -side left -expand 1
!     pack $id.buttonframe.apply -side left -expand 1
!     pack $id.buttonframe.ok -side left -expand 1
!     frame $id.paramsymto
!     pack $id.paramsymto -side bottom
!     label $id.paramsymto.entryname -text {send symbol}
!     entry $id.paramsymto.entry -textvariable $var_gatomsymto -width 20
!     pack $id.paramsymto.entryname $id.paramsymto.entry -side left
!     frame $id.paramsymfrom
!     pack $id.paramsymfrom -side bottom
!     label $id.paramsymfrom.entryname -text {receive symbol}
!     entry $id.paramsymfrom.entry -textvariable $var_gatomsymfrom -width 20
!     pack $id.paramsymfrom.entryname $id.paramsymfrom.entry -side left
!     
!     frame $id.radio
!     pack $id.radio -side bottom
!     label $id.radio.label -text {show label on:}
!     frame $id.radio.l
!     frame $id.radio.r
!     pack $id.radio.label -side top
!     pack $id.radio.l $id.radio.r -side left
!     radiobutton $id.radio.l.radio0 -value 0 \
          -variable $var_gatomwherelabel \
!         -text "left"
!     radiobutton $id.radio.l.radio1 -value 1 \
          -variable $var_gatomwherelabel \
!         -text "right"
!     radiobutton $id.radio.r.radio2 -value 2 \
          -variable $var_gatomwherelabel \
!         -text "top"
!     radiobutton $id.radio.r.radio3 -value 3 \
          -variable $var_gatomwherelabel \
!         -text "bottom"
!     pack $id.radio.l.radio0 $id.radio.l.radio1 -side top -anchor w
!     pack $id.radio.r.radio2 $id.radio.r.radio3 -side top -anchor w
!         
! 
!     frame $id.paramlabel
!     pack $id.paramlabel -side bottom
!     label $id.paramlabel.entryname -text label
!     entry $id.paramlabel.entry -textvariable $var_gatomlabel -width 20
!     pack $id.paramlabel.entryname $id.paramlabel.entry -side left
! 
!     frame $id.paramhi
!     pack $id.paramhi -side bottom
!     label $id.paramhi.entryname -text "upper limit"
!     entry $id.paramhi.entry -textvariable $var_gatomhi -width 8
!     pack $id.paramhi.entryname $id.paramhi.entry -side left
! 
!     frame $id.paramlo
!     pack $id.paramlo -side bottom
!     label $id.paramlo.entryname -text "lower limit"
!     entry $id.paramlo.entry -textvariable $var_gatomlo -width 8
!     pack $id.paramlo.entryname $id.paramlo.entry -side left
!     frame $id.params
!     pack $id.params -side bottom
!     label $id.params.entryname -text width
!     entry $id.params.entry -textvariable $var_gatomwidth -width 4
!     pack $id.params.entryname $id.params.entry -side left
!     bind $id.paramhi.entry <KeyPress-Return> [concat dogatom_ok $id]
!     bind $id.paramlo.entry <KeyPress-Return> [concat dogatom_ok $id]
      bind $id.params.entry <KeyPress-Return> [concat dogatom_ok $id]
!     pdtk_standardkeybindings $id.paramhi.entry
!     pdtk_standardkeybindings $id.paramlo.entry
      pdtk_standardkeybindings $id.params.entry
      $id.params.entry select from 0
--- 1907,2003 ----
toplevel $id
!     wm title $id "atom box properties"
!     wm resizable $id 0 0
      wm protocol $id WM_DELETE_WINDOW [concat dogatom_cancel $id]
!     frame $id.params -height 7
!     pack $id.params -side top
!     label $id.params.entryname -text "width"
!     entry $id.params.entry -textvariable $var_gatomwidth -width 4
!     pack $id.params.entryname $id.params.entry -side left
!     labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
! 	 pack $id.limits -side top -fill x
!     frame $id.limits.lower
!     pack $id.limits.lower -side left
!     label $id.limits.lower.entryname -text "lower"
!     entry $id.limits.lower.entry -textvariable $var_gatomlo -width 8
!     pack $id.limits.lower.entryname $id.limits.lower.entry -side left
!     frame $id.limits.upper
!     pack $id.limits.upper -side left
!     frame $id.limits.upper.spacer -width 20
!     label $id.limits.upper.entryname -text "upper"
!     entry $id.limits.upper.entry -textvariable $var_gatomhi -width 8
!     pack  $id.limits.upper.spacer $id.limits.upper.entryname \
! 		  $id.limits.upper.entry -side left
!     frame $id.spacer1 -height 7
!     pack $id.spacer1 -side top
! 
!     labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
! 	 pack $id.label -side top -fill x
!     frame $id.label.name
!     pack $id.label.name -side top
!     entry $id.label.name.entry -textvariable $var_gatomlabel -width 33
!     pack $id.label.name.entry -side left
!     frame $id.label.radio
!     pack $id.label.radio -side top
!     radiobutton $id.label.radio.left -value 0 \
          -variable $var_gatomwherelabel \
!         -text "left   "  -justify left
!     radiobutton $id.label.radio.right -value 1 \
          -variable $var_gatomwherelabel \
!         -text "right" -justify left
!     radiobutton $id.label.radio.top -value 2 \
          -variable $var_gatomwherelabel \
!         -text "top" -justify left
!     radiobutton $id.label.radio.bottom -value 3 \
          -variable $var_gatomwherelabel \
!         -text "bottom" -justify left
!     pack $id.label.radio.left -side left -anchor w
!     pack $id.label.radio.right -side right -anchor w
!     pack $id.label.radio.top -side top -anchor w
!     pack $id.label.radio.bottom -side bottom -anchor w
!     frame $id.spacer2 -height 7
!     pack $id.spacer2 -side top
+     labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
+ 		  -font {{Bitstream Vera Sans Mono} 12 bold}
+ 	 pack $id.s_r -side top -fill x
+     frame $id.s_r.paramsymto
+     pack $id.s_r.paramsymto -side top -anchor e
+     label $id.s_r.paramsymto.entryname -text "send symbol"
+     entry $id.s_r.paramsymto.entry -textvariable $var_gatomsymto -width 21
+     pack $id.s_r.paramsymto.entry $id.s_r.paramsymto.entryname -side right
+     frame $id.s_r.paramsymfrom
+     pack $id.s_r.paramsymfrom -side top -anchor e
+     label $id.s_r.paramsymfrom.entryname -text "receive symbol"
+     entry $id.s_r.paramsymfrom.entry -textvariable $var_gatomsymfrom -width 21
+     pack $id.s_r.paramsymfrom.entry $id.s_r.paramsymfrom.entryname -side right
+         
+     frame $id.buttonframe -pady 5
+     pack $id.buttonframe -side top -fill x -pady 2m
+     button $id.buttonframe.cancel -text {Cancel}\
+         -command "dogatom_cancel $id"
+     pack $id.buttonframe.cancel -side left -expand 1
+ # Mac OS X doesn't use Apply buttons
+ 	 if {$pd_nt != 2} {
+     button $id.buttonframe.apply -text {Apply}\
+         -command "dogatom_apply $id"
+     pack $id.buttonframe.apply -side left -expand 1
+ 	 }
+     button $id.buttonframe.ok -text {OK}\
+         -command "dogatom_ok $id"
+     pack $id.buttonframe.ok -side left -expand 1
!     bind $id.limits.upper.entry <KeyPress-Return> [concat dogatom_ok $id]
!     bind $id.limits.lower.entry <KeyPress-Return> [concat dogatom_ok $id]
      bind $id.params.entry <KeyPress-Return> [concat dogatom_ok $id]
!     pdtk_standardkeybindings $id.limits.upper.entry
!     pdtk_standardkeybindings $id.limits.lower.entry
      pdtk_standardkeybindings $id.params.entry
      $id.params.entry select from 0
***************
*** 2873,2876 ****
--- 2887,2891 ----
      toplevel $id
      wm title $id {array}
+     wm resizable $id 0 0
      wm protocol $id WM_DELETE_WINDOW [concat array_cancel $id]
***************
*** 2907,2920 ****
if {$newone != 0} {
!         frame $id.radio
!         pack $id.radio -side top
!         radiobutton $id.radio.radio0 -value 0 \
              -variable $var_array_otherflag \
              -text "in new graph"
!         radiobutton $id.radio.radio1 -value 1 \
              -variable $var_array_otherflag \
              -text "in last graph"
!         pack $id.radio.radio0 -side top -anchor w
!         pack $id.radio.radio1 -side top -anchor w
      } else {    
          checkbutton $id.deleteme -text {delete me} \
--- 2922,2935 ----
if {$newone != 0} {
!         frame $id.label.radio
!         pack $id.label.radio -side top
!         radiobutton $id.label.radio.radio0 -value 0 \
              -variable $var_array_otherflag \
              -text "in new graph"
!         radiobutton $id.label.radio.radio1 -value 1 \
              -variable $var_array_otherflag \
              -text "in last graph"
!         pack $id.label.radio.radio0 -side top -anchor w
!         pack $id.label.radio.radio1 -side top -anchor w
      } else {    
          checkbutton $id.deleteme -text {delete me} \