diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-21 13:16:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-21 13:16:17 -0800 |
| commit | d9bb4be53bc5185244b4be9860562a012803bacb (patch) | |
| tree | 399705cdf254f291b50418c2b1fd46586edcb145 /git-gui/git-gui.sh | |
| parent | 79fcbf7e703ca5805ebd46b2c7e09d0703f1c1ff (diff) | |
| parent | 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce (diff) | |
| download | git-d9bb4be53bc5185244b4be9860562a012803bacb.tar.gz | |
Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui
git-gui 0.19.0
* tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui:
git-gui 0.19
git-gui: chmod +x po2msg, windows/git-gui.sh
git-gui: fallback right pane to packed widgets with Tk 8.4
git-gui i18n: Added Bulgarian translation
git-gui l10n: Add 29 more terms to glossary
git-gui i18n: Initial glossary in Bulgarian
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index db46ac50bf..cf2209b4f2 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -3224,18 +3224,28 @@ unset i # -- Diff and Commit Area # -${NS}::panedwindow .vpane.lower -orient vertical -${NS}::frame .vpane.lower.commarea -${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500 -.vpane.lower add .vpane.lower.diff -.vpane.lower add .vpane.lower.commarea -.vpane add .vpane.lower -if {$use_ttk} { - .vpane.lower pane .vpane.lower.diff -weight 1 - .vpane.lower pane .vpane.lower.commarea -weight 0 +if {$have_tk85} { + ${NS}::panedwindow .vpane.lower -orient vertical + ${NS}::frame .vpane.lower.commarea + ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500 + .vpane.lower add .vpane.lower.diff + .vpane.lower add .vpane.lower.commarea + .vpane add .vpane.lower + if {$use_ttk} { + .vpane.lower pane .vpane.lower.diff -weight 1 + .vpane.lower pane .vpane.lower.commarea -weight 0 + } else { + .vpane.lower paneconfigure .vpane.lower.diff -stretch always + .vpane.lower paneconfigure .vpane.lower.commarea -stretch never + } } else { - .vpane.lower paneconfigure .vpane.lower.diff -stretch always - .vpane.lower paneconfigure .vpane.lower.commarea -stretch never + frame .vpane.lower -height 300 -width 400 + frame .vpane.lower.commarea + frame .vpane.lower.diff -relief sunken -borderwidth 1 + pack .vpane.lower.diff -fill both -expand 1 + pack .vpane.lower.commarea -side bottom -fill x + .vpane add .vpane.lower + .vpane paneconfigure .vpane.lower -sticky nsew } # -- Commit Area Buttons |