Re: [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4
Hi All,
Max, you are right, my TK version is 8.4.
I applied the patch and it now works perfectly.
Thanks!!
Benoît
On Tue, Jan 14, 2014 at 5:58 PM, Max Kirillov wrote:
> Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that
> tk < 8.5 does not support -stretch option for panedwindow.
>
> Without the option it's not possible to properly expand the right half -
> the commit area is expanded, while desired behavior is to expand the diff
> area. So the whole feature should be disabled with Tk
> version less than 8.5.
>
> Signed-off-by: Max Kirillov
> ---
> git-gui/git-gui.sh | 32 +---
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index e2e710e..147be8c 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -3196,18 +3196,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
> --
> 1.8.4.2.1566.g3c1a064
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git gui crashes ( v 1.8.5.2)
Hello Jonathan,
Yes, after checking, you are absolutely right, I was on master.
:)
On Mon, Jan 13, 2014 at 7:11 PM, Jonathan Nieder wrote:
> (just cc-ing some area experts)
> Hi Benoît,
>
> Benoît Bourbié wrote:
>
>> git gui crashes on my Linux machin since I updated it to 1.8.5.2.
>
> I assume you mean "master" and not 1.8.5.2, since v1.8.5.2 doesn't
> include the change 918dbf58 (git-gui: right half window is paned,
> 2013-08-21).
>
>> I had the message
>> Error in startup script: unknown option "-stretch"
>> while executing
>> ".vpane.lower paneconfigure .vpane.lower.diff -stretch always"
>> invoked from within
>> "if {$use_ttk} {
>> .vpane.lower pane .vpane.lower.diff -weight 1
>> .vpane.lower pane .vpane.lower.commarea -weight 0
>> } else {
>> .vpane.lower paneconfigure..."
>> (file "git/libexec/git-core/git-gui" line 3233)
>>
>> So, I reverted the change that has been made in git-gui/git-gui.sh
>> (Diff and Commit Area)
>>
>> I replaced
>>
>> ${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
>>
>> by
>>
>> ${NS}::frame .vpane.lower -height 300 -width 400
>> ${NS}::frame .vpane.lower.commarea
>> ${NS}::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
>> if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
>>
>> and now, git gui works as expected.
>
> Thanks,
> Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
git gui crashes ( v 1.8.5.2)
Hello,
git gui crashes on my Linux machin since I updated it to 1.8.5.2.
I had the message
Error in startup script: unknown option "-stretch"
while executing
".vpane.lower paneconfigure .vpane.lower.diff -stretch always"
invoked from within
"if {$use_ttk} {
.vpane.lower pane .vpane.lower.diff -weight 1
.vpane.lower pane .vpane.lower.commarea -weight 0
} else {
.vpane.lower paneconfigure..."
(file "git/libexec/git-core/git-gui" line 3233)
So, I reverted the change that has been made in git-gui/git-gui.sh
(Diff and Commit Area)
I replaced
${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
by
${NS}::frame .vpane.lower -height 300 -width 400
${NS}::frame .vpane.lower.commarea
${NS}::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
if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
and now, git gui works as expected.
Regards,
Benoit
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Typo fix: replacing it's -> its
Signed-off-by: Benoit Bourbie --- INSTALL | 2 +- perl/private-Error.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 2dc3b61..ba01e74 100644 --- a/INSTALL +++ b/INSTALL @@ -101,7 +101,7 @@ Issues of note: - "openssl" library is used by git-imap-send to use IMAP over SSL. If you don't need it, use NO_OPENSSL. - By default, git uses OpenSSL for SHA1 but it will use it's own + By default, git uses OpenSSL for SHA1 but it will use its own library (inspired by Mozilla's) with either NO_OPENSSL or BLK_SHA1. Also included is a version optimized for PowerPC (PPC_SHA1). diff --git a/perl/private-Error.pm b/perl/private-Error.pm index 11e9cd9..ea14ab2 100644 --- a/perl/private-Error.pm +++ b/perl/private-Error.pm @@ -630,7 +630,7 @@ Only one finally block may be specified per try block =head2 CONSTRUCTORS The C object is implemented as a HASH. This HASH is initialized -with the arguments that are passed to it's constructor. The elements +with the arguments that are passed to its constructor. The elements that are used by, or are retrievable by the C class are listed below, other classes may add to these. @@ -763,7 +763,7 @@ to the constructor. =item Error::Simple -This class can be used to hold simple error strings and values. It's +This class can be used to hold simple error strings and values. Its constructor takes two arguments. The first is a text value, the second is a numeric value. These values are what will be returned by the overload methods. -- 1.8.2.470.g21ccebe.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Fixing typos
Very basic documentation typo fixes. Benoît Bourbié (1): Typo fix: replacing it's -> its INSTALL | 2 +- perl/private-Error.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.8.2.470.g21ccebe.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
