提交 26ae37d6 编写于 作者: S Shawn O. Pearce

git-gui: Show the git-gui library path in 'About git-gui'

Because we now try to automatically guess the library directory
in certain installations users may wonder where git-gui is getting
its supporting files from.  We now display this location in our
About dialog, and we also include the location we are getting our
Git executables from.

Unfortunately users cannot use this 'About git-gui' dialog to
troubleshoot library loading problems; the dialog is defined by
code that exists in the library directory, creating a catch-22.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
上级 5b6ffff6
...@@ -59,7 +59,7 @@ if {$idx ne {}} { ...@@ -59,7 +59,7 @@ if {$idx ne {}} {
} else { } else {
set auto_path [concat [list $oguilib] $auto_path] set auto_path [concat [list $oguilib] $auto_path]
} }
unset -nocomplain oguilib oguirel idx fd unset -nocomplain oguirel idx fd
if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
unset _verbose unset _verbose
......
...@@ -52,7 +52,7 @@ proc save_config {} { ...@@ -52,7 +52,7 @@ proc save_config {} {
} }
proc do_about {} { proc do_about {} {
global appvers copyright global appvers copyright oguilib
global tcl_patchLevel tk_patchLevel global tcl_patchLevel tk_patchLevel
set w .about_dialog set w .about_dialog
...@@ -91,6 +91,10 @@ $copyright" \ ...@@ -91,6 +91,10 @@ $copyright" \
append v ", Tk version $tk_patchLevel" append v ", Tk version $tk_patchLevel"
} }
set d {}
append d "git exec dir: [gitexec]\n"
append d "git-gui lib: $oguilib"
label $w.vers \ label $w.vers \
-text $v \ -text $v \
-padx 5 -pady 5 \ -padx 5 -pady 5 \
...@@ -100,6 +104,15 @@ $copyright" \ ...@@ -100,6 +104,15 @@ $copyright" \
-relief solid -relief solid
pack $w.vers -side top -fill x -padx 5 -pady 5 pack $w.vers -side top -fill x -padx 5 -pady 5
label $w.dirs \
-text $d \
-padx 5 -pady 5 \
-justify left \
-anchor w \
-borderwidth 1 \
-relief solid
pack $w.dirs -side top -fill x -padx 5 -pady 5
menu $w.ctxm -tearoff 0 menu $w.ctxm -tearoff 0
$w.ctxm add command \ $w.ctxm add command \
-label {Copy} \ -label {Copy} \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册