git-gui: Minor UI layout improvements for console windows.
Moved the Close button over to the lower right corner where our Cancel/Save buttons are in the options dialog. This should fit better with our own look and feel as well as that of most apps on Mac OS X and Windows. Also set the lower status bar in a console window to indicate the process is working and that the user should wait for it to finish. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Nov 12, 2006 at 22:41 UTC
1e5c18fb431c2d2493996e24ea68408e59ef6c16
1 file changed
+5
-7
git-gui
+5
-7
@@ -1478,7 +1478,7 @@ proc hook_failed_popup {hook msg} {
1478
-width 15 \
1479
-font font_ui \
1480
-command "destroy $w"
1481
- pack $w.ok -side bottom
1481
+ pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1482
1483
bind $w <Visibility> "grab $w; focus $w"
1484
bind $w <Key-Return> "destroy $w"
@@ -1515,7 +1515,8 @@ proc console_init {w} {
1515
-font font_diff \
1516
-state disabled \
1517
-yscrollcommand [list $w.m.sby set]
1518
- label $w.m.s -anchor w \
1518
+ label $w.m.s -text {Working... please wait...} \
1519
+ -anchor w \
1520
-justify left \
1521
-font font_uibold
1522
scrollbar $w.m.sby -command [list $w.m.t yview]
@@ -1540,12 +1541,11 @@ proc console_init {w} {
1541
$w.m.t tag remove sel 0.0 end
1542
"
1543
1543
- button $w.ok -text {Running...} \
1544
- -width 15 \
1544
+ button $w.ok -text {Close} \
1545
-font font_ui \
1546
-state disabled \
1547
-command "destroy $w"
1548
- pack $w.ok -side bottom
1548
+ pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1549
1550
bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1551
bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
@@ -1614,12 +1614,10 @@ proc console_read {w fd after} {
1614
if {[catch {close $fd}]} {
1615
if {![winfo exists $w]} {console_init $w}
1616
$w.m.s conf -background red -text {Error: Command Failed}
1617
- $w.ok conf -text Close
1617
$w.ok conf -state normal
1618
set ok 0
1619
} elseif {[winfo exists $w]} {
1620
$w.m.s conf -background green -text {Success}
1622
- $w.ok conf -text Close
1621
$w.ok conf -state normal
1622
set ok 1
1623
}