diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-08 05:39:08 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-10 05:12:18 (GMT) |
| commit | 13824e2df23c18eab28b2b9a8c112276a84dd419 (patch) | |
| tree | bf7e741c54d533b25b34af9bb3abbaa042fc2e97 | |
| parent | 6bdf5e5f20c792ad0c5d5ba941d7e637aca86d32 (diff) | |
| download | git-13824e2df23c18eab28b2b9a8c112276a84dd419.zip git-13824e2df23c18eab28b2b9a8c112276a84dd419.tar.gz git-13824e2df23c18eab28b2b9a8c112276a84dd419.tar.bz2 | |
git-gui: Bind Cmd-, to Preferences on Mac OS X
A Mac OS X UI convention is to have Cmd-, be the accelerator key
for the preferences window, which by convention is located in the
apple menu under a separator below the about command. We also now
call this "Preferences..." as that is the conventional term used
in English.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | git-gui.sh | 8 | ||||
| -rw-r--r-- | lib/option.tcl | 12 |
2 files changed, 13 insertions, 7 deletions
@@ -2018,8 +2018,12 @@ if {[is_MacOSX]} { .mbar.apple add command -label [mc "About %s" [appname]] \ -command do_about - .mbar.apple add command -label [mc "Options..."] \ - -command do_options + .mbar.apple add separator + .mbar.apple add command \ + -label [mc "Preferences..."] \ + -command do_options \ + -accelerator $M1T-, + bind . <$M1B-,> do_options } else { # -- Edit Menu # diff --git a/lib/option.tcl b/lib/option.tcl index de6bd90..f812e5e 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -78,10 +78,6 @@ proc do_options {} { toplevel $w wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - label $w.header -text [mc "Options"] \ - -font font_uibold - pack $w.header -side top -fill x - frame $w.buttons button $w.buttons.restore -text [mc "Restore Defaults"] \ -default normal \ @@ -199,7 +195,13 @@ proc do_options {} { bind $w <Visibility> "grab $w; focus $w.buttons.save" bind $w <Key-Escape> "destroy $w" bind $w <Key-Return> [list do_save_config $w] - wm title $w [append "[appname] ([reponame]): " [mc "Options"]] + + if {[is_MacOSX]} { + set t [mc "Preferences"] + } else { + set t [mc "Options"] + } + wm title $w "[appname] ([reponame]): $t" tkwait window $w } |