git-gui: Use a grid layout for branch dialog.
Using a stack of frames in the Starting Revision section of the new branch dialog turned out to be a mess. The varying lengths of each label caused the optionMenu widgets to be spread around the screen at unaligned locations, making the interface very kludgy looking. Now we layout the major sections of the branch dialog using grid rather than pack, allowing these widgets to line up vertically in a nice neat column. All extra space is given to column 1, which is where we have located the text fields. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Jan 21, 2007 at 13:56 UTC
66cc17d1d3bead2ebf6fbe41ea31e7ec111d891b
1 file changed
+26
-36
git-gui.sh
+26
-36
@@ -1683,7 +1683,7 @@ proc do_create_branch_action {w} {
1683
global create_branch_checkout create_branch_revtype
1684
global create_branch_head create_branch_trackinghead
1685
1686
- set newbranch [string trim [$w.desc.name.t get 0.0 end]]
1686
+ set newbranch [string trim [$w.desc.name_t get 0.0 end]]
1687
if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1688
tk_messageBox \
1689
-icon error \
@@ -1691,7 +1691,7 @@ proc do_create_branch_action {w} {
1691
-title [wm title $w] \
1692
-parent $w \
1693
-message "Branch '$newbranch' already exists."
1694
- focus $w.desc.name.t
1694
+ focus $w.desc.name_t
1695
return
1696
}
1697
if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
@@ -1701,7 +1701,7 @@ proc do_create_branch_action {w} {
1701
-title [wm title $w] \
1702
-parent $w \
1703
-message "We do not like '$newbranch' as a branch name."
1704
- focus $w.desc.name.t
1704
+ focus $w.desc.name_t
1705
return
1706
}
1707
@@ -1709,7 +1709,7 @@ proc do_create_branch_action {w} {
1709
switch -- $create_branch_revtype {
1710
head {set rev $create_branch_head}
1711
tracking {set rev $create_branch_trackinghead}
1712
- expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
1712
+ expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
1713
}
1714
if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1715
tk_messageBox \
@@ -1778,18 +1778,18 @@ proc do_create_branch {} {
1778
labelframe $w.desc \
1779
-text {Branch Description} \
1780
-font font_ui
1781
- frame $w.desc.name
1782
- label $w.desc.name.l -text {Name:} -font font_ui
1783
- text $w.desc.name.t \
1781
+ label $w.desc.name_l -text {Name:} -font font_ui
1782
+ text $w.desc.name_t \
1783
-borderwidth 1 \
1784
-relief sunken \
1785
-height 1 \
1786
-width 40 \
1787
-font font_ui
1789
- bind $w.desc.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
1790
- bind $w.desc.name.t <Key-Tab> "focus $w.from.exp.t;break"
1791
- bind $w.desc.name.t <Key-Return> "do_create_branch_action $w;break"
1792
- bind $w.desc.name.t <Key> {
1788
+ grid $w.desc.name_l $w.desc.name_t -stick we -padx {0 5}
1789
+ bind $w.desc.name_t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
1790
+ bind $w.desc.name_t <Key-Tab> "focus $w.from.exp_t;break"
1791
+ bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
1792
+ bind $w.desc.name_t <Key> {
1793
if {{%K} ne {BackSpace}
1794
&& {%K} ne {Tab}
1795
&& {%K} ne {Escape}
@@ -1798,9 +1798,7 @@ proc do_create_branch {} {
1798
if {[string first %A {~^:?*[}] >= 0} break
1799
}
1800
}
1801
- pack $w.desc.name.l -side left -padx 5
1802
- pack $w.desc.name.t -side left -fill x -expand 1
1803
- pack $w.desc.name -padx 5 -fill x -expand 1
1801
+ grid columnconfigure $w.desc 1 -weight 1
1802
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1803
1804
set all_trackings [list]
@@ -1816,46 +1814,38 @@ proc do_create_branch {} {
1814
labelframe $w.from \
1815
-text {Starting Revision} \
1816
-font font_ui
1819
- frame $w.from.head
1820
- radiobutton $w.from.head.r \
1817
+ radiobutton $w.from.head_r \
1818
-text {Local Branch:} \
1819
-value head \
1820
-variable create_branch_revtype \
1821
-font font_ui
1825
- eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
1826
- pack $w.from.head.r -side left
1827
- pack $w.from.head.m -side left
1828
- frame $w.from.tracking
1829
- radiobutton $w.from.tracking.r \
1822
+ eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1823
+ grid $w.from.head_r $w.from.head_m -sticky w
1824
+ radiobutton $w.from.tracking_r \
1825
-text {Tracking Branch:} \
1826
-value tracking \
1827
-variable create_branch_revtype \
1828
-font font_ui
1834
- eval tk_optionMenu $w.from.tracking.m \
1829
+ eval tk_optionMenu $w.from.tracking_m \
1830
create_branch_trackinghead \
1831
$all_trackings
1837
- pack $w.from.tracking.r -side left
1838
- pack $w.from.tracking.m -side left
1839
- frame $w.from.exp
1840
- radiobutton $w.from.exp.r \
1832
+ grid $w.from.tracking_r $w.from.tracking_m -sticky w
1833
+ radiobutton $w.from.exp_r \
1834
-text {Revision Expression:} \
1835
-value expression \
1836
-variable create_branch_revtype \
1837
-font font_ui
1845
- text $w.from.exp.t \
1838
+ text $w.from.exp_t \
1839
-borderwidth 1 \
1840
-relief sunken \
1841
-height 1 \
1842
-width 50 \
1843
-font font_ui
1851
- bind $w.from.exp.t <Shift-Key-Tab> "focus $w.desc.name.t;break"
1852
- bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
1853
- bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
1854
- pack $w.from.exp.r -side left
1855
- pack $w.from.exp.t -side left -fill x -expand 1
1856
- pack $w.from.head -padx 5 -fill x -expand 1
1857
- pack $w.from.tracking -padx 5 -fill x -expand 1
1858
- pack $w.from.exp -padx 5 -fill x -expand 1
1844
+ grid $w.from.exp_r $w.from.exp_t -stick we -padx {0 5}
1845
+ bind $w.from.exp_t <Shift-Key-Tab> "focus $w.desc.name_t;break"
1846
+ bind $w.from.exp_t <Key-Tab> "focus $w.postActions.checkout;break"
1847
+ bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
1848
+ grid columnconfigure $w.from 1 -weight 1
1849
pack $w.from -anchor nw -fill x -pady 5 -padx 5
1850
1851
labelframe $w.postActions \
@@ -1868,7 +1858,7 @@ proc do_create_branch {} {
1858
pack $w.postActions.checkout -anchor nw
1859
pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1860
1871
- bind $w <Visibility> "grab $w; focus $w.desc.name.t"
1861
+ bind $w <Visibility> "grab $w; focus $w.desc.name_t"
1862
bind $w <Key-Escape> "destroy $w"
1863
bind $w <Key-Return> "do_create_branch_action $w;break"
1864
wm title $w "[appname] ([reponame]): Create Branch"