summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hills <mark@pogo.org.uk>2010-01-13 20:40:22 (GMT)
committerPaul Mackerras <paulus@samba.org>2010-03-20 09:53:21 (GMT)
commitb9b142ffa218b50dadad091bd660ba801d0ca5d5 (patch)
tree3de93649258ad81a6b55a3868223468407fe0eaf
parent207ad7b8878caa8b1d09c39ea0754f0192daece5 (diff)
downloadgit-b9b142ffa218b50dadad091bd660ba801d0ca5d5.zip
git-b9b142ffa218b50dadad091bd660ba801d0ca5d5.tar.gz
git-b9b142ffa218b50dadad091bd660ba801d0ca5d5.tar.bz2
gitk: Use consistent font for all text input fields
Instead of setting the font for specific widgets, set the font for the widget type. If themed widgets are not available, this is via the X resources. If themed widgets are available, the theme font is used. The exception is the SHA1 ID which is forced to use the fixed-width font, even where themed widgets are used. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk9
1 files changed, 5 insertions, 4 deletions
diff --git a/gitk b/gitk
index ccfc8dd..a47abc1 100755
--- a/gitk
+++ b/gitk
@@ -1877,7 +1877,8 @@ proc setoptions {} {
option add *Menubutton.font uifont startupFile
option add *Label.font uifont startupFile
option add *Message.font uifont startupFile
- option add *Entry.font uifont startupFile
+ option add *Entry.font textfont startupFile
+ option add *Text.font textfont startupFile
option add *Labelframe.font uifont startupFile
option add *Spinbox.font textfont startupFile
option add *Listbox.font mainfont startupFile
@@ -2176,7 +2177,7 @@ proc makewindow {} {
set findstring {}
set fstring .tf.lbar.findstring
lappend entries $fstring
- ${NS}::entry $fstring -width 30 -font textfont -textvariable findstring
+ ${NS}::entry $fstring -width 30 -textvariable findstring
trace add variable findstring write find_change
set findtype [mc "Exact"]
set findtypemenu [makedroplist .tf.lbar.findtype \
@@ -2219,7 +2220,7 @@ proc makewindow {} {
pack .bleft.top.search -side left -padx 5
set sstring .bleft.top.sstring
set searchstring ""
- ${NS}::entry $sstring -width 20 -font textfont -textvariable searchstring
+ ${NS}::entry $sstring -width 20 -textvariable searchstring
lappend entries $sstring
trace add variable searchstring write incrsearch
pack $sstring -side left -expand 1 -fill x
@@ -4042,7 +4043,7 @@ proc vieweditor {top n title} {
} elseif {$type eq "path"} {
${NS}::label $top.l -text $title
pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
- text $top.t -width 40 -height 5 -background $bgcolor -font uifont
+ text $top.t -width 40 -height 5 -background $bgcolor
if {[info exists viewfiles($n)]} {
foreach f $viewfiles($n) {
$top.t insert end $f