undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Ensure tabstop setting gets restored by Cancel button

Browse Source 
We weren't restoring the tabstop setting if the user pressed the
Cancel button in the Edit/Preferences window.  Also improved the
label for the checkbox (made it "Tab spacing" rather than the laconic
"tabstop") and moved it above the "Display nearby tags" checkbox.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2007-10-23 10:33:38 +10:00
parent 7a39a17a87
commit 94503918e4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gitk
View File

@ -7419,7 +7419,7 @@ proc doprefs {} {
return return
} }
foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges \ foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges \
limitdiffs} { limitdiffs tabstop} {
set oldprefs($v) [set $v] set oldprefs($v) [set $v]
} }
toplevel $top toplevel $top
@ -7449,14 +7449,14 @@ proc doprefs {} {
-font optionfont -font optionfont
entry $top.diffopt -width 20 -textvariable diffopts entry $top.diffopt -width 20 -textvariable diffopts
grid x $top.diffoptl $top.diffopt -sticky w grid x $top.diffoptl $top.diffopt -sticky w
label $top.tabstopl -text "Tab spacing" -font optionfont
spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
grid x $top.tabstopl $top.tabstop -sticky w
frame $top.ntag frame $top.ntag
label $top.ntag.l -text "Display nearby tags" -font optionfont label $top.ntag.l -text "Display nearby tags" -font optionfont
checkbutton $top.ntag.b -variable showneartags checkbutton $top.ntag.b -variable showneartags
pack $top.ntag.b $top.ntag.l -side left pack $top.ntag.b $top.ntag.l -side left
grid x $top.ntag -sticky w grid x $top.ntag -sticky w
label $top.tabstopl -text "tabstop" -font optionfont
spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
grid x $top.tabstopl $top.tabstop -sticky w
frame $top.ldiff frame $top.ldiff
label $top.ldiff.l -text "Limit diffs to listed paths" -font optionfont label $top.ldiff.l -text "Limit diffs to listed paths" -font optionfont
checkbutton $top.ldiff.b -variable limitdiffs checkbutton $top.ldiff.b -variable limitdiffs
@ -7547,11 +7547,11 @@ proc setfg {c} {
} }
proc prefscan {} { proc prefscan {} {
global maxwidth maxgraphpct diffopts global oldprefs prefstop
global oldprefs prefstop showneartags showlocalchanges limitdiffs
foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges \ foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges \
limitdiffs} { limitdiffs tabstop} {
global $v
set $v $oldprefs($v) set $v $oldprefs($v)
} }
catch {destroy $prefstop} catch {destroy $prefstop}