tclpuks/prgsrc/puks.tcl - diff

Return to puks.tcl CVS log

Up to [Local Repository] / tclpuks / prgsrc

Diff for /tclpuks/prgsrc/puks.tcl between versions 1.3 and 1.5

-version 1.3, 2005/08/29 14:22:27
+version 1.5, 2005/08/29 19:28:13
  Line 62  proc readbuffer {} {
  #   Setup
  ##############################################################
- button .start -text "Start" -command start
- pack .start
- label .pressed
+ # Main menu
- pack .pressed
+ menu .mbar -type menubar -relief ridge -borderwidth 2
+ pack .mbar -fill x
+ menubutton .mbar.file -text File -menu .mbar.file.m -underline 0 \
+         -relief raised -borderwidth 2
+ pack .mbar.file -side left
+ set m [menu .mbar.file.m]
+ $m add command -label "Open" -state disabled
+ $m add command -label "Save as..." -state disabled
+ $m add command -label "Save" -state disabled
+ $m add separator
+ $m add command -label "Quit" -command exit
+ menubutton .mbar.edit -text Edit -underline 0 -state disabled\
+         -relief raised -borderwidth 2
+ pack .mbar.edit -side left
+ menubutton .mbar.help -text Help -menu .mbar.help.m -underline 0\
+         -relief raised -borderwidth 2
+ pack .mbar.help -side right
+ set m [menu .mbar.help.m]
+ $m add command -label "About..." -command {
+     tk_dialog .about "About Puks" \
+             "Система управления кнопками.
+ (C) Teytelman, 2002 (MCR code)
+ (C) Boris Veytsman, 2005 (Tcl/Tk version)"\
+         info  0 "OK"}
+ #Teams
+ frame .teams
+ pack .teams -side top
+ for {set  i 0} {$i < 8} {incr i} {
+     frame .teams.frame($i)
+     pack .teams.frame($i) -side top -fill x
+     label .teams.frame($i).button -text 0
+     pack .teams.frame($i).button -side left
+     entry .teams.frame($i).name -width 60 -textvariable name($i)
+     pack .teams.frame($i).name -side left
+     entry .teams.frame($i).score -width 6 -textvariable score($i)
+     pack .teams.frame($i).score -side left
+ }
+ # Question weight
+ frame .weight
+ set weight 1
+ set doubled 0
+ pack .weight -side top -fill x
+ label .weight.label -text "Цена вопроса"
+ entry .weight.weight -textvariable weight -width 3
+ checkbutton .weight.doubled -variable doubled
+ label .weight.label2 -text "x2"
+ pack .weight.label .weight.weight .weight.doubled .weight.label2 -side left
+ # Buttons and timer
+ frame .control
+ pack .control -side top -fill x
+ frame .control.buttons
+ pack .control.buttons -side left -fill y
+ button .control.buttons.assign -text "Assign  Buttons" -underline 0 -state disabled
+ pack .control.buttons.assign -fill both  -side top
+ bind Button <a> {.control.buttons.assign invoke}
+ button .control.buttons.start -text Start -underline 0 -command "puts A"
+ pack .control.buttons.start -fill both  -side top
+ bind Button <s> {.control.buttons.start invoke}
+ button .control.buttons.stop -text Stop -underline 1 -command "puts B" -state disabled
+ pack .control.buttons.stop -fill both -side top
+ bind Button <t> {.control.buttons.stop invoke}
+ button .control.buttons.reset -text "Reset scores" -underline 0 -state disabled
+ pack .control.buttons.reset -fill both -side top
+ bind Button <r> {.control.buttons.reset invoke}
+ option add *timer.font  -*-palatino-*-r-normal--*-1200-*-*-*-*-*-* widgetDefault
+ label .control.timer -text 0 -border 5 -relief raised -borderwidth 2
+ pack .control.timer -side left -expand 1 -fill x
+ # Status line
+ frame .status -relief sunk -borderwidth 2
+ pack .status -side top -fill x
+ label .status.mcr -relief ridge -text "Not connected" -fg red -width 48
+ pack .status.mcr -side left -fill x
+ label .status.state -relief ridge -text "Idle"
+ pack .status.state -side left -fill x
+ #  button .start -text "Start" -command start
+ #  pack .start
+ #  label .pressed
+ #  pack .pressed
  proc start {} {
- Line 92  proc body  {} {
+ Line 188  proc body  {} {
      after 10 body
  }
- body
+ #body

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3
changed lines
	Added in v.1.5