path: root/gitk
diff options
authorKeith Packard <>2006-04-04 07:19:45 (GMT)
committerPaul Mackerras <>2006-04-05 00:29:47 (GMT)
commit4840be66b10fd5e5d67e27a8d0c67a96d5b8356a (patch)
treeeeb86cefc9710f198c07908df1d4b5d17ad1d57e /gitk
parentce08872259d3036f424070cb5a9a4d5ec67f1f7a (diff)
[PATCH] Provide configurable UI font for gitk
This makes the font used in the UI elements of gitk configurable in the same way the other fonts are. The default fonts used in the Xft build of tk8.5 are particularily horrific, making this change more important there. Signed-off-by: Keith Packard <> Acked-by: Junio C Hamano <> Signed-off-by: Paul Mackerras <>
Diffstat (limited to 'gitk')
1 files changed, 17 insertions, 6 deletions
diff --git a/gitk b/gitk
index 2609921..26fa79a 100755
--- a/gitk
+++ b/gitk
@@ -335,7 +335,7 @@ proc error_popup msg {
proc makewindow {rargs} {
- global canv canv2 canv3 linespc charspc ctext cflist textfont
+ global canv canv2 canv3 linespc charspc ctext cflist textfont mainfont uifont
global findtype findtypemenu findloc findstring fstring geometry
global entries sha1entry sha1string sha1but
global maincursor textcursor curtextcursor
@@ -343,17 +343,21 @@ proc makewindow {rargs} {
menu .bar
.bar add cascade -label "File" -menu .bar.file
+ .bar configure -font $uifont
menu .bar.file
.bar.file add command -label "Update" -command [list updatecommits $rargs]
.bar.file add command -label "Reread references" -command rereadrefs
.bar.file add command -label "Quit" -command doquit
+ .bar.file configure -font $uifont
menu .bar.edit
.bar add cascade -label "Edit" -menu .bar.edit
.bar.edit add command -label "Preferences" -command doprefs
+ .bar.edit configure -font $uifont
.bar add cascade -label "Help" -menu add command -label "About gitk" -command about add command -label "Key bindings" -command keys
+ configure -font $uifont
. configure -menu .bar
if {![info exists geometry(canv1)]} {
@@ -400,7 +404,7 @@ proc makewindow {rargs} {
set entries $sha1entry
set sha1but
button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
- -command gotocommit -width 8
+ -command gotocommit -width 8 -font $uifont
$sha1but conf -disabledforeground [$sha1but cget -foreground]
pack -side left
entry $sha1entry -width 40 -font $textfont -textvariable sha1string
@@ -430,19 +434,24 @@ proc makewindow {rargs} {
-state disabled -width 26
pack -side left -fill y
- button -text "Find" -command dofind
+ button -text "Find" -command dofind -font $uifont
pack -side left
set findstring {}
set fstring
lappend entries $fstring
- entry $fstring -width 30 -font $textfont -textvariable findstring
+ entry $fstring -width 30 -font $textfont -textvariable findstring -font $textfont
pack $fstring -side left -expand 1 -fill x
set findtype Exact
set findtypemenu [tk_optionMenu \
findtype Exact IgnCase Regexp]
+ configure -font $uifont
+ configure -font $uifont
set findloc "All fields"
tk_optionMenu findloc "All fields" Headline \
Comments Author Committer Files Pickaxe
+ configure -font $uifont
+ configure -font $uifont
pack -side right
pack -side right
# for making sure type==Exact whenever loc==Pickaxe
@@ -489,7 +498,7 @@ proc makewindow {rargs} {
frame .ctop.cdet.right
set cflist .ctop.cdet.right.cfiles
listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
- -yscrollcommand " set"
+ -yscrollcommand " set" -font $mainfont
scrollbar -command "$cflist yview"
pack -side right -fill y
pack $cflist -side left -fill both -expand 1
@@ -610,7 +619,7 @@ proc click {w} {
proc savestuff {w} {
- global canv canv2 canv3 ctext cflist mainfont textfont
+ global canv canv2 canv3 ctext cflist mainfont textfont uifont
global stuffsaved findmergefiles maxgraphpct
global maxwidth
@@ -620,6 +629,7 @@ proc savestuff {w} {
set f [open "~/.gitk-new" w]
puts $f [list set mainfont $mainfont]
puts $f [list set textfont $textfont]
+ puts $f [list set uifont $uifont]
puts $f [list set findmergefiles $findmergefiles]
puts $f [list set maxgraphpct $maxgraphpct]
puts $f [list set maxwidth $maxwidth]
@@ -3885,6 +3895,7 @@ if {$tclencoding == {}} {
set mainfont {Helvetica 9}
set textfont {Courier 9}
+set uifont {Helvetica 9 bold}
set findmergefiles 0
set maxgraphpct 50
set maxwidth 16