summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d93f171)
raw | patch | inline | side by side (parent: d93f171)
author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
Tue, 12 May 2009 14:45:06 +0000 (15:45 +0100) | ||
committer | Paul Mackerras <paulus@samba.org> | |
Sat, 16 May 2009 10:17:46 +0000 (20:17 +1000) |
This fixes a typo in the commit selection combobox that prevented it
from working properly, and sets the width of the widget. This also
fixes show_error to handle errors arising before the gui is fully
configured (ie: invalid command line parameters)
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
from working properly, and sets the width of the widget. This also
fixes show_error to handle errors arising before the gui is fully
configured (ie: invalid command line parameters)
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk | patch | blob | history |
index 4526193b3d42a5b7874e0e3aa7014800b6896a48..082fa77513a7aaf41d8c45cf8cdeccd18d8cc882 100755 (executable)
--- a/gitk
+++ b/gitk
proc show_error {w top msg} {
global NS
+ if {![info exists NS]} {set NS ""}
if {[wm state $top] eq "withdrawn"} { wm deiconify $top }
message $w.m -text $msg -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
proc makedroplist {w varname args} {
global use_ttk
if {$use_ttk} {
- set gm [ttk::combobox $w -width 10 -state readonly\
+ set width 0
+ foreach label $args {
+ set cx [string length $label]
+ if {$cx > $width} {set width $cx}
+ }
+ set gm [ttk::combobox $w -width $width -state readonly\
-textvariable $varname -values $args]
} else {
set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
-side left -fill y
set gdttype [mc "containing:"]
- set gm [makedroplist .tf.lbar.gdttype gdtype \
+ set gm [makedroplist .tf.lbar.gdttype gdttype \
[mc "containing:"] \
[mc "touching paths:"] \
[mc "adding/removing string:"]]