Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui: (26 commits)
git-gui: eliminate _search_exe
git-gui: remove procs gitexec and _git_cmd
git-gui: use dashless 'git cmd' form for read/write
git-gui: default to full copy for linked worktrees
git-gui: use git-clone
git-gui: remove non-ttk code
git-gui: remove ${NS} indirection for ttk
git-gui: always use themed widgets from ttk
git-gui: remove redundant check for Tk >= 8.5
git-gui: remove unreachable Tk 8.4 code
git-gui: remove unused git-version
git-gui: use git_init to create new repository dir
git-gui: git-remote is always available
git-gui: git merge understands --strategy=recursive
git-gui: git-diff knows submodules and textconv
git-gui: git-blame understands -w and textconv
git-gui: git rev-parse knows show_toplevel
git-gui: use git-branch --show-current
git-gui: git-diff-index always knows submodules
git-gui: git ls-files knows --exclude-standard
...
This commit is contained in:
@@ -71,13 +71,12 @@ proc ask_popup {msg} {
|
||||
}
|
||||
|
||||
proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
global use_ttk NS
|
||||
set w .hookfail
|
||||
Dialog $w
|
||||
wm withdraw $w
|
||||
|
||||
${NS}::frame $w.m
|
||||
${NS}::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
|
||||
ttk::frame $w.m
|
||||
ttk::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
-font font_uibold
|
||||
@@ -89,10 +88,10 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
-width 80 -height 10 \
|
||||
-font font_diff \
|
||||
-yscrollcommand [list $w.m.sby set]
|
||||
${NS}::scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
ttk::scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
pack $w.m.l1 -side top -fill x
|
||||
if {$is_fatal} {
|
||||
${NS}::label $w.m.l2 \
|
||||
ttk::label $w.m.l2 \
|
||||
-text [mc "You must correct the above errors before committing."] \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
@@ -106,7 +105,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
$w.m.t insert 1.0 $msg
|
||||
$w.m.t conf -state disabled
|
||||
|
||||
${NS}::button $w.ok -text OK \
|
||||
ttk::button $w.ok -text OK \
|
||||
-width 15 \
|
||||
-command "destroy $w"
|
||||
pack $w.ok -side bottom -anchor e -pady 10 -padx 10
|
||||
|
||||
Reference in New Issue
Block a user