[Gitk PATCH 2/6] gitk: Change menus to use accelerated design
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
gitk | 88 +++++++++++++++++++++++++++++++++---------------------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/gitk b/gitk
index 050019c..6298b0a 100755
--- a/gitk
+++ b/gitk
@@ -1795,31 +1795,31 @@ proc makewindow {} {
global have_tk85
menu .bar
- .bar add cascade -label [mc "File"] -menu .bar.file
+ mcw .bar add cascade -label [mc "File"] -menu .bar.file
menu .bar.file
- .bar.file add command -label [mc "Update"] -command updatecommits
- .bar.file add command -label [mc "Reload"] -command reloadcommits
- .bar.file add command -label [mc "Reread references"] -command rereadrefs
- .bar.file add command -label [mc "List references"] -command showrefs
- .bar.file add command -label [mc "Quit"] -command doquit
+ mcw .bar.file add command -label [mc "Update"] -command updatecommits
+ mcw .bar.file add command -label [mc "Reload"] -command reloadcommits
+ mcw .bar.file add command -label [mc "Reread references"] -command rereadrefs
+ mcw .bar.file add command -label [mc "List references"] -command showrefs
+ mcw .bar.file add command -label [mc "Quit"] -command doquit
menu .bar.edit
- .bar add cascade -label [mc "Edit"] -menu .bar.edit
- .bar.edit add command -label [mc "Preferences"] -command doprefs
+ mcw .bar add cascade -label [mc "Edit"] -menu .bar.edit
+ mcw .bar.edit add command -label [mc "Preferences"] -command doprefs
menu .bar.view
- .bar add cascade -label [mc "View"] -menu .bar.view
- .bar.view add command -label [mc "New view..."] -command {newview 0}
- .bar.view add command -label [mc "Edit view..."] -command editview \
+ mcw .bar add cascade -label [mc "View"] -menu .bar.view
+ mcw .bar.view add command -label [mc "New view..."] -command {newview 0}
+ mcw .bar.view add command -label [mc "Edit view..."] -command editview \
-state disabled
- .bar.view add command -label [mc "Delete view"] -command delview -state disabled
- .bar.view add separator
- .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
+ mcw .bar.view add command -label [mc "Delete view"] -command delview -state disabled
+ mcw .bar.view add separator
+ mcw .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
-variable selectedview -value 0
menu .bar.help
- .bar add cascade -label [mc "Help"] -menu .bar.help
- .bar.help add command -label [mc "About gitk"] -command about
- .bar.help add command -label [mc "Key bindings"] -command keys
+ mcw .bar add cascade -label [mc "Help"] -menu .bar.help
+ mcw .bar.help add command -label [mc "About gitk"] -command about
+ mcw .bar.help add command -label [mc "Key bindings"] -command keys
.bar.help configure
. configure -menu .bar
@@ -2201,47 +2201,47 @@ proc makewindow {} {
set rowctxmenu .rowctxmenu
menu $rowctxmenu -tearoff 0
- $rowctxmenu add command -label [mc "Diff this -> selected"] \
+ mcw $rowctxmenu add command -label [mc "Diff this -> selected"] \
-command {diffvssel 0}
- $rowctxmenu add command -label [mc "Diff selected -> this"] \
+ mcw $rowctxmenu add command -label [mc "Diff selected -> this"] \
-command {diffvssel 1}
- $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
- $rowctxmenu add command -label [mc "Create tag"] -command mktag
- $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
- $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
- $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
+ mcw $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
+ mcw $rowctxmenu add command -label [mc "Create tag"] -command mktag
+ mcw $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
+ mcw $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
+ mcw $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
-command cherrypick
- $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
+ mcw $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
-command resethead
set fakerowmenu .fakerowmenu
menu $fakerowmenu -tearoff 0
- $fakerowmenu add command -label [mc "Diff this -> selected"] \
+ mcw $fakerowmenu add command -label [mc "Diff this -> selected"] \
-command {diffvssel 0}
- $fakerowmenu add command -label [mc "Diff selected -> this"] \
+ mcw $fakerowmenu add command -label [mc "Diff selected -> this"] \
-command {diffvssel 1}
- $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
-# $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
-# $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
-# $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
+ mcw $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
+# mcw $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
+# mcw $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
+# mcw $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
set headctxmenu .headctxmenu
menu $headctxmenu -tearoff 0
- $headctxmenu add command -label [mc "Check out this branch"] \
+ mcw $headctxmenu add command -label [mc "Check out this branch"] \
-command cobranch
- $headctxmenu add command -label [mc "Remove this branch"] \
+ mcw $headctxmenu add command -label [mc "Remove this branch"] \
-command rmbranch
global flist_menu
set flist_menu .flistctxmenu
menu $flist_menu -tearoff 0
- $flist_menu add command -label [mc "Highlight this too"] \
+ mcw $flist_menu add command -label [mc "Highlight this too"] \
-command {flist_hl 0}
- $flist_menu add command -label [mc "Highlight this only"] \
+ mcw $flist_menu add command -label [mc "Highlight this only"] \
-command {flist_hl 1}
- $flist_menu add command -label [mc "External diff"] \
+ mcw $flist_menu add command -label [mc "External diff"] \
-command {external_diff}
- $flist_menu add command -label [mc "Blame parent commit"] \
+ mcw $flist_menu add command -label [mc "Blame parent commit"] \
-command {external_blame 1}
}
@@ -3401,8 +3401,8 @@ proc showview {n} {
set curview $n
set selectedview $n
- .bar.view entryconf [mc "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
- .bar.view entryconf [mc "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
+ .bar.view entryconf [mca "&Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
+ .bar.view entryconf [mca "&Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
run refill_reflist
if {![info exists viewcomplete($n)]} {
@@ -7315,9 +7315,9 @@ proc rowmenu {x y id} {
} else {
set menu $fakerowmenu
}
- $menu entryconfigure [mc "Diff this -> selected"] -state $state
- $menu entryconfigure [mc "Diff selected -> this"] -state $state
- $menu entryconfigure [mc "Make patch"] -state $state
+ $menu entryconfigure [mca "Diff &this -> selected"] -state $state
+ $menu entryconfigure [mca "Diff &selected -> this"] -state $state
+ $menu entryconfigure [mca "&Make patch"] -state $state
tk_popup $menu $x $y
}
@@ -10046,8 +10046,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
set viewperm(1) 0
set vdatemode(1) 0
addviewmenu 1
- .bar.view entryconf [mc "Edit view..."] -state normal
- .bar.view entryconf [mc "Delete view"] -state normal
+ .bar.view entryconf [mca "&Edit view..."] -state normal
+ .bar.view entryconf [mca "&Delete view"] -state normal
}
if {[info exists permviews]} {
--
1.6.0.2.308.gef4a
Robin Rosenberg <robin.rosenberg@dewire.com>