diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-02-07 15:52:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-07 15:52:28 -0800 |
commit | 8051a030617cf7d083568cca223bdaa15052c33f (patch) | |
tree | 418b879c1248f01204092c74b116ff8b82146ccf /git-gui/lib/status_bar.tcl | |
parent | e7ec9de67639d7c1715b450f54d297cc38e25867 (diff) | |
parent | 89d61592bddda4dfcb90314be9e06479f712bb7f (diff) | |
download | git-8051a030617cf7d083568cca223bdaa15052c33f.tar.gz git-8051a030617cf7d083568cca223bdaa15052c33f.tar.xz |
Merge git://repo.or.cz/git-guiv1.7.0-rc2
* git://repo.or.cz/git-gui:
git-gui: update french translation
git-gui: update Japanese translation
git-gui: fix shortcut for menu "Commit/Revert Changes"
git-gui: Quote git path when starting another gui in a submodule
git-gui: update Italian translation
git-gui: Update Swedish translation (520t0f0u)
git-gui: use themed tk widgets with Tk 8.5
git-gui: Update German translation (12 new or changed strings).
git-gui: Update translation template
git-gui: Remove unused icon file_parttick
git-gui: use different icon for new and modified files in the index
git-gui: set GIT_DIR and GIT_WORK_TREE after setup
git-gui: update shortcut tools to use _gitworktree
git-gui: handle bare repos correctly
git-gui: handle non-standard worktree locations
git-gui: Support applying a range of changes at once
git-gui: Add a special diff popup menu for submodules
git-gui: Use git diff --submodule when available
Diffstat (limited to 'git-gui/lib/status_bar.tcl')
-rw-r--r-- | git-gui/lib/status_bar.tcl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/git-gui/lib/status_bar.tcl b/git-gui/lib/status_bar.tcl index 51d417755..5fe3aad38 100644 --- a/git-gui/lib/status_bar.tcl +++ b/git-gui/lib/status_bar.tcl @@ -13,14 +13,16 @@ field units {}; # unit of progress field meter {}; # current core git progress meter (if active) constructor new {path} { + global use_ttk NS set w $path set w_l $w.l set w_c $w.c - frame $w \ - -borderwidth 1 \ - -relief sunken - label $w_l \ + ${NS}::frame $w + if {!$use_ttk} { + $w configure -borderwidth 1 -relief sunken + } + ${NS}::label $w_l \ -textvariable @status \ -anchor w \ -justify left @@ -41,8 +43,8 @@ constructor two_line {path} { set w_l $w.l set w_c $w.c - frame $w - label $w_l \ + ${NS}::frame $w + ${NS}::label $w_l \ -textvariable @status \ -anchor w \ -justify left |