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:
@@ -27,20 +27,20 @@ constructor embed {path title} {
|
||||
}
|
||||
|
||||
method _init {} {
|
||||
global M1B use_ttk NS
|
||||
global M1B
|
||||
|
||||
if {$is_toplevel} {
|
||||
make_dialog top w -autodelete 0
|
||||
wm title $top "[appname] ([reponame]): $t_short"
|
||||
} else {
|
||||
${NS}::frame $w
|
||||
ttk::frame $w
|
||||
}
|
||||
|
||||
set console_cr 1.0
|
||||
set w_t $w.m.t
|
||||
|
||||
${NS}::frame $w.m
|
||||
${NS}::label $w.m.l1 \
|
||||
ttk::frame $w.m
|
||||
ttk::label $w.m.l1 \
|
||||
-textvariable @t_long \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
@@ -78,7 +78,7 @@ method _init {} {
|
||||
"
|
||||
|
||||
if {$is_toplevel} {
|
||||
${NS}::button $w.ok -text [mc "Close"] \
|
||||
ttk::button $w.ok -text [mc "Close"] \
|
||||
-state disabled \
|
||||
-command [list destroy $w]
|
||||
pack $w.ok -side bottom -anchor e -pady 10 -padx 10
|
||||
@@ -207,14 +207,13 @@ method done {ok} {
|
||||
}
|
||||
|
||||
method _sb_set {sb orient first last} {
|
||||
global NS
|
||||
if {![winfo exists $sb]} {
|
||||
if {$first == $last || ($first == 0 && $last == 1)} return
|
||||
if {$orient eq {h}} {
|
||||
${NS}::scrollbar $sb -orient h -command [list $w_t xview]
|
||||
ttk::scrollbar $sb -orient h -command [list $w_t xview]
|
||||
pack $sb -fill x -side bottom -before $w_t
|
||||
} else {
|
||||
${NS}::scrollbar $sb -orient v -command [list $w_t yview]
|
||||
ttk::scrollbar $sb -orient v -command [list $w_t yview]
|
||||
pack $sb -fill y -side right -before $w_t
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user