git-gui: Minor options dialog UI cleanups.

Display the name of "this" repository rather than the quite ambiguous
string "This".  The idea is that seeing the name of the directory the
repository is stored in should help jog the user's memory about what
they are setting options for.

Also place the options dialog immediately over the git-gui main window
when it gets opened.  This way the user isn't scrolling very far away
to gain access to the window.  At least on my Mac OS X system not doing
this makes the options dialog open rather far away, thus requiring lots
of mouse activity to reach it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui b/git-gui
index 456f53fdc0f9c5933cc887292a5bd14f7a913174..580110e629ec5f372c91ee2cecd8e749dbf88a18 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -1718,9 +1718,13 @@ proc do_options {} {
        foreach name [array names global_config] {
                set global_config_new($name) $global_config($name)
        }
+       set reponame [lindex [file split \
+               [file normalize [file dirname $gitdir]]] \
+               end]
 
        set w .options_editor
        toplevel $w
+       wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 
        label $w.header -text "$appname Options" \
                -font font_uibold
@@ -1741,7 +1745,7 @@ proc do_options {} {
        pack $w.buttons.cancel -side right
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
-       labelframe $w.repo -text {This Repository} \
+       labelframe $w.repo -text "$reponame Repository" \
                -font font_ui \
                -relief raised -borderwidth 2
        labelframe $w.global -text {Global (All Repositories)} \
@@ -1794,9 +1798,7 @@ proc do_options {} {
 
        bind $w <Visibility> "grab $w; focus $w"
        bind $w <Key-Escape> "destroy $w"
-       wm title $w "$appname ([lindex [file split \
-               [file normalize [file dirname $gitdir]]] \
-               end]): Options"
+       wm title $w "$appname ($reponame): Options"
        tkwait window $w
 }