Skip to content

Commit 8e65d38

Browse files
committed
gitk: separate code blocks for configuration dialog
gitk's configuration dialog uses a large number of widgets, and this code is hard to read as there is no easily recognizable grouping or breaks. Help this by adding space between items that occupy a single row in the dialog. Signed-off-by: Mark Levedahl <[email protected]>
1 parent b9f6b82 commit 8e65d38

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

gitk

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11650,6 +11650,7 @@ proc prefspage_general {notebook} {
1165011650
1165111651
ttk::label $page.ldisp -text [mc "Commit list display options"] -font mainfontbold
1165211652
grid $page.ldisp - -sticky w -pady 10
11653+
1165311654
ttk::label $page.spacer -text " "
1165411655
ttk::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
1165511656
ttk::spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
@@ -11658,9 +11659,11 @@ proc prefspage_general {notebook} {
1165811659
ttk::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"]
1165911660
ttk::spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
1166011661
grid x $page.maxpctl $page.maxpct -sticky w
11662+
1166111663
ttk::checkbutton $page.showlocal -text [mc "Show local changes"] \
1166211664
-variable showlocalchanges
1166311665
grid x $page.showlocal -sticky w
11666+
1166411667
ttk::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
1166511668
-variable hideremotes
1166611669
grid x $page.hideremotes -sticky w
@@ -11673,6 +11676,7 @@ proc prefspage_general {notebook} {
1167311676
ttk::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
1167411677
-variable autocopy
1167511678
grid x $page.autocopy -sticky w
11679+
1167611680
if {[haveselectionclipboard]} {
1167711681
ttk::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \
1167811682
-variable autoselect
@@ -11682,12 +11686,14 @@ proc prefspage_general {notebook} {
1168211686
ttk::spinbox $page.autosellen -from 1 -to $hashlength -width 4 -textvariable autosellen
1168311687
ttk::label $page.autosellenl -text [mc "Length of commit ID to copy"]
1168411688
grid x $page.autosellenl $page.autosellen -sticky w
11689+
1168511690
ttk::label $page.kscroll1 -text [mc "Wheel scrolling multiplier"]
1168611691
ttk::spinbox $page.kscroll -from 1 -to 20 -width 4 -textvariable kscroll
1168711692
grid x $page.kscroll1 $page.kscroll -sticky w
1168811693
1168911694
ttk::label $page.ddisp -text [mc "Diff display options"] -font mainfontbold
1169011695
grid $page.ddisp - -sticky w -pady 10
11696+
1169111697
ttk::label $page.tabstopl -text [mc "Tab spacing"]
1169211698
ttk::spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
1169311699
grid x $page.tabstopl $page.tabstop -sticky w
@@ -11703,12 +11709,15 @@ proc prefspage_general {notebook} {
1170311709
ttk::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
1170411710
-variable showneartags
1170511711
grid x $page.ntag -sticky w
11712+
1170611713
ttk::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"]
1170711714
ttk::spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs
1170811715
grid x $page.maxrefsl $page.maxrefs -sticky w
11716+
1170911717
ttk::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \
1171011718
-variable limitdiffs
1171111719
grid x $page.ldiff -sticky w
11720+
1171211721
ttk::checkbutton $page.lattr -text [mc "Support per-file encodings"] \
1171311722
-variable perfile_attrs
1171411723
grid x $page.lattr -sticky w
@@ -11742,6 +11751,7 @@ proc prefspage_colors {notebook} {
1174211751
ttk::label $page.themesel -font mainfontbold \
1174311752
-text [mc "Themes - change requires restart"]
1174411753
grid $page.themesel - -sticky w -pady 10
11754+
1174511755
ttk::label $page.themelabel -text [mc "Theme to use after restart"]
1174611756
makedroplist $page.theme theme {*}[lsort [ttk::style theme names]]
1174711757
grid x $page.themelabel $page.theme -sticky w
@@ -11769,34 +11779,42 @@ proc prefspage_colors {notebook} {
1176911779
ttk::button $page.bgbut -text [mc "Background"] \
1177011780
-command [list choosecolor bgcolor {} $page [mc "background"]]
1177111781
grid x $page.bgbut $page.bg -sticky w
11782+
1177211783
label $page.fg -padx 40 -relief sunk -background $fgcolor
1177311784
ttk::button $page.fgbut -text [mc "Foreground"] \
1177411785
-command [list choosecolor fgcolor {} $page [mc "foreground"]]
1177511786
grid x $page.fgbut $page.fg -sticky w
11787+
1177611788
label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
1177711789
ttk::button $page.diffoldbut -text [mc "Diff: old lines"] \
1177811790
-command [list choosecolor diffcolors 0 $page [mc "diff old lines"]]
1177911791
grid x $page.diffoldbut $page.diffold -sticky w
11792+
1178011793
label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0]
1178111794
ttk::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \
1178211795
-command [list choosecolor diffbgcolors 0 $page [mc "diff old lines bg"]]
1178311796
grid x $page.diffoldbgbut $page.diffoldbg -sticky w
11797+
1178411798
label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
1178511799
ttk::button $page.diffnewbut -text [mc "Diff: new lines"] \
1178611800
-command [list choosecolor diffcolors 1 $page [mc "diff new lines"]]
1178711801
grid x $page.diffnewbut $page.diffnew -sticky w
11802+
1178811803
label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1]
1178911804
ttk::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \
1179011805
-command [list choosecolor diffbgcolors 1 $page [mc "diff new lines bg"]]
1179111806
grid x $page.diffnewbgbut $page.diffnewbg -sticky w
11807+
1179211808
label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
1179311809
ttk::button $page.hunksepbut -text [mc "Diff: hunk header"] \
1179411810
-command [list choosecolor diffcolors 2 $page [mc "diff hunk header"]]
1179511811
grid x $page.hunksepbut $page.hunksep -sticky w
11812+
1179611813
label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
1179711814
ttk::button $page.markbgbut -text [mc "Marked line bg"] \
1179811815
-command [list choosecolor markbgcolor {} $page [mc "marked line background"]]
1179911816
grid x $page.markbgbut $page.markbgsep -sticky w
11817+
1180011818
label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
1180111819
ttk::button $page.selbgbut -text [mc "Select bg"] \
1180211820
-command [list choosecolor selectbgcolor {} $page [mc "background"]]

0 commit comments

Comments
 (0)