From 26ae37d6fc9eeec27a0edf98c820b8a0b98e96f3 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 28 May 2007 11:11:56 -0400 Subject: [PATCH] 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: Shawn O. Pearce --- git-gui.sh | 2 +- lib/option.tcl | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index d238d4523..c1a6b84fa 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -59,7 +59,7 @@ if {$idx ne {}} { } else { 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)}]} { unset _verbose diff --git a/lib/option.tcl b/lib/option.tcl index e06aca59f..9f76f0294 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -52,7 +52,7 @@ proc save_config {} { } proc do_about {} { - global appvers copyright + global appvers copyright oguilib global tcl_patchLevel tk_patchLevel set w .about_dialog @@ -91,6 +91,10 @@ $copyright" \ append v ", Tk version $tk_patchLevel" } + set d {} + append d "git exec dir: [gitexec]\n" + append d "git-gui lib: $oguilib" + label $w.vers \ -text $v \ -padx 5 -pady 5 \ @@ -100,6 +104,15 @@ $copyright" \ -relief solid 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 $w.ctxm add command \ -label {Copy} \ -- 2.26.2