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

Merge master.kernel.org:/pub/scm/gitk/gitk

Browse Source 
* master.kernel.org:/pub/scm/gitk/gitk:
  gitk: Fix enabling/disabling of menu items on Mac OS X
This commit is contained in:
Junio C Hamano 2006-11-29 14:24:51 -08:00
commit 03f99c03f8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gitk
View File

@ -554,7 +554,7 @@ proc makewindow {} {
pack .ctop.top.lbar.vlabel -side left -fill y pack .ctop.top.lbar.vlabel -side left -fill y
global viewhlmenu selectedhlview global viewhlmenu selectedhlview
set viewhlmenu [tk_optionMenu .ctop.top.lbar.vhl selectedhlview None] set viewhlmenu [tk_optionMenu .ctop.top.lbar.vhl selectedhlview None]
$viewhlmenu entryconf 0 -command delvhighlight $viewhlmenu entryconf None -command delvhighlight
$viewhlmenu conf -font $uifont $viewhlmenu conf -font $uifont
.ctop.top.lbar.vhl conf -font $uifont .ctop.top.lbar.vhl conf -font $uifont
pack .ctop.top.lbar.vhl -side left -fill y pack .ctop.top.lbar.vhl -side left -fill y
@ -1474,7 +1474,7 @@ proc doviewmenu {m first cmd op argv} {
proc allviewmenus {n op args} { proc allviewmenus {n op args} {
global viewhlmenu global viewhlmenu
doviewmenu .bar.view 7 [list showview $n] $op $args doviewmenu .bar.view 5 [list showview $n] $op $args
doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
} }
@ -1516,7 +1516,7 @@ proc newviewok {top n} {
set viewperm($n) $newviewperm($n) set viewperm($n) $newviewperm($n)
if {$newviewname($n) ne $viewname($n)} { if {$newviewname($n) ne $viewname($n)} {
set viewname($n) $newviewname($n) set viewname($n) $newviewname($n)
doviewmenu .bar.view 7 [list showview $n] \ doviewmenu .bar.view 5 [list showview $n] \
entryconf [list -label $viewname($n)] entryconf [list -label $viewname($n)]
doviewmenu $viewhlmenu 1 [list addvhighlight $n] \ doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
entryconf [list -label $viewname($n) -value $viewname($n)] entryconf [list -label $viewname($n) -value $viewname($n)]
@ -1632,8 +1632,8 @@ proc showview {n} {
set curview $n set curview $n
set selectedview $n set selectedview $n
.bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}] .bar.view entryconf Edit* -state [expr {$n == 0? "disabled": "normal"}]
.bar.view entryconf 3 -state [expr {$n == 0? "disabled": "normal"}] .bar.view entryconf Delete* -state [expr {$n == 0? "disabled": "normal"}]
if {![info exists viewdata($n)]} { if {![info exists viewdata($n)]} {
set pending_select $selid set pending_select $selid
@ -4899,9 +4899,9 @@ proc rowmenu {x y id} {
} else { } else {
set state normal set state normal
} }
$rowctxmenu entryconfigure 0 -state $state $rowctxmenu entryconfigure "Diff this*" -state $state
$rowctxmenu entryconfigure 1 -state $state $rowctxmenu entryconfigure "Diff selected*" -state $state
$rowctxmenu entryconfigure 2 -state $state $rowctxmenu entryconfigure "Make patch" -state $state
set rowmenuid $id set rowmenuid $id
tk_popup $rowctxmenu $x $y tk_popup $rowctxmenu $x $y
} }
@ -6305,8 +6305,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {}} {
set viewargs(1) $revtreeargs set viewargs(1) $revtreeargs
set viewperm(1) 0 set viewperm(1) 0
addviewmenu 1 addviewmenu 1
.bar.view entryconf 2 -state normal .bar.view entryconf Edit* -state normal
.bar.view entryconf 3 -state normal .bar.view entryconf Delete* -state normal
} }
if {[info exists permviews]} { if {[info exists permviews]} {