...in the default associated app (e.g. in a text editor / IDE). Many times there's the need to quickly open a source file (the one you're looking at in Git GUI) in the predefined text editor / IDE. Of course, the file can be searched for in your preferred file manager or directly in the text editor, but having the option to directly open the current file from Git GUI would be just faster. This change enables just that by: * clicking the diff header path (which is now highlighted as a hyperlink) * or diff header path context menu -> Open; Note: executable files will be run and not opened for editing. Signed-off-by: Zoli Szabó zoli.szabo@xxxxxxxxx [zoli.szabo@xxxxxxxxx] Zoli Szabó (1): git-gui: allow opening currently selected file git-gui.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) base-commit: 23cbe427c44645a3ab0449919e55bade5eb264bc Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-499%2Fzoliszabo%2Fgit-gui%2Fopen-current-file-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-499/zoliszabo/git-gui/open-current-file-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/499 Range-diff vs v1: 1: fce80f1b95 ! 1: a6fde256f8 git-gui: add possibility to open currently selected file @@ -1,6 +1,6 @@ Author: Zoli Szabó <zoli.szabo@xxxxxxxxx> - git-gui: add possibility to open currently selected file + git-gui: allow opening currently selected file ...in the default associated app (e.g. in a text editor / IDE). @@ -9,11 +9,10 @@ the file can be searched for in your preferred file manager or directly in the text editor, but having the option to directly open the current file from Git GUI would be just faster. This change enables just that by: - - Diff header path context menu -> Open; - - or double-clicking the diff header path. + - clicking the diff header path (which is now highlighted as a hyperlink) + - or diff header path context menu -> Open; - One "downside" of the approach is that executable files will be run - and not opened for editing. + Note: executable files will be run and not opened for editing. Signed-off-by: Zoli Szabó <zoli.szabo@xxxxxxxxx> @@ -26,11 +25,12 @@ -proc do_explore {} { - global _gitworktree +- set explorer {} +# Get the system-specific explorer app/command. +proc get_explorer {} { - set explorer {} if {[is_Cygwin] || [is_Windows]} { set explorer "explorer.exe" + } elseif {[is_MacOSX]} { @@ # freedesktop.org-conforming system is our best shot set explorer "xdg-open" @@ -44,9 +44,7 @@ eval exec $explorer [list [file nativename $_gitworktree]] & } -+# Trigger opening a file (relative to the working tree) by the default -+# associated app of the OS (e.g. a text editor or IDE). -+# FIXME: What about executables (will be run, not opened for editing)? ++# Open file relative to the working tree by the default associated app. +proc do_file_open {file} { + global _gitworktree + set explorer [get_explorer] @@ -57,18 +55,30 @@ set is_quitting 0 set ret_code 1 +@@ + -justify left + tlabel .vpane.lower.diff.header.path \ + -background gold \ +- -foreground black \ ++ -foreground blue \ + -anchor w \ +- -justify left ++ -justify left \ ++ -font [eval font create [font configure font_ui] -underline 1] \ ++ -cursor hand2 + pack .vpane.lower.diff.header.status -side left + pack .vpane.lower.diff.header.file -side left + pack .vpane.lower.diff.header.path -fill x @@ -type STRING \ -- $current_diff_path } +$ctxm add command \ + -label [mc Open] \ -+ -command { -+ do_file_open $current_diff_path -+ } ++ -command {do_file_open $current_diff_path} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" -+bind .vpane.lower.diff.header.path <Double-1> {do_file_open $current_diff_path} ++bind .vpane.lower.diff.header.path <Button-1> {do_file_open $current_diff_path} # -- Diff Body # -- gitgitgadget
