X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fgitk.in;h=90a5c353643b77635c17ce06b8e4e4ba442ebe82;hb=b7e3d7a9a1a2c54fa877f26006e7a969c21edfff;hp=242ab793d2953f42ceef1d35803d51ef0468ee3a;hpb=dab278962e3326c5e992fbec019930442bc3b5cb;p=ian-dotfiles.git

diff --git a/templates/gitk.in b/templates/gitk.in
index 242ab79..90a5c35 100755
--- a/templates/gitk.in
+++ b/templates/gitk.in
@@ -5,16 +5,13 @@ set -e
 case "$font" in
 zealot)
         cat <<END
-set mainfont {Helvetica 14}
-set textfont {Courier 14}
-set uifont {Helvetica 14 bold}
+set mainfont {{Nimbus Sans L} 12}
+set textfont {{Courier 10 Pitch} 12}
+set uifont {{Nimbus Sans L} 11 bold}
 END
 	;;
 *)
         cat <<END
-set mainfont {{Bitstream Vera Sans} 8}
-set textfont fixed
-set uifont {Helvetica 9 bold}
 END
         ;;
 esac
@@ -35,14 +32,46 @@ set datetimeformat {%Y-%m-%d %H:%M:%S}
 set limitdiffs 1
 set uicolor grey85
 set want_ttk 1
-set bgcolor white
-set fgcolor black
+set bgcolor #000000
+set fgcolor #ffffff
+set uifgcolor black
+set uifgdisabledcolor #999
 set colors {green red blue magenta darkgrey brown orange}
-set diffcolors {{#ff6b66} #005400 blue}
+set diffcolors {{#ff8888} #88ff88 #8080ff}
+set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
 set markbgcolor #e0e0ff
 set diffcontext 3
-set selectbgcolor gray85
+set selectbgcolor #333366
+set foundbgcolor yellow
+set currentsearchhitbgcolor orange
 set extdifftool meld
 set perfile_attrs 0
+set headbgcolor #00ff00
+set headfgcolor black
+set headoutlinecolor black
+set remotebgcolor #ffddaa
+set tagbgcolor yellow
+set tagfgcolor black
+set tagoutlinecolor black
+set reflinecolor white
+set filesepbgcolor #aaaaaa
+set filesepfgcolor black
+set linehoverbgcolor #ffff80
+set linehoverfgcolor black
+set linehoveroutlinecolor black
+set mainheadcirclecolor yellow
+set workingfilescirclecolor red
+set indexcirclecolor green
+set circlecolors {white blue gray blue blue}
+set linkfgcolor blue
+set circleoutlinecolor black
+set geometry(main) 1245x1535+0+0
+set geometry(state) normal
+set geometry(topwidth) 1245
+set geometry(topheight) 982
+set geometry(pwsash0) "833 1"
+set geometry(pwsash1) "1038 1"
+set geometry(botwidth) 900
+set geometry(botheight) 548
 set permviews {}
 END