Skip to content

Commit

Permalink
Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jan 21, 2014
2 parents 79fcbf7 + 1b2c79e commit d9bb4be
Show file tree
Hide file tree
Showing 7 changed files with 3,032 additions and 12 deletions.
2 changes: 1 addition & 1 deletion git-gui/GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=0.18.GITGUI
DEF_VER=0.19.GITGUI

LF='
'
Expand Down
32 changes: 21 additions & 11 deletions git-gui/git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit d9bb4be

Please sign in to comment.