gitk: copy existing geometry when substituting

[ian-dotfiles.git] / templates / gitk.in

diff --git a/templates/gitk.in b/templates/gitk.in
index 7cc2d2354560d50f261fec5d6a1efb6f0f12a608..3d11b5b822da6d8265b961f005a277b4c8e84c27 100755 (executable)
--- a/templates/gitk.in
+++ b/templates/gitk.in
@@ -5,16 +5,16 @@ 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}
+set mainfont {sans 9}
+set textfont {monospace 9}
+set uifont {sans 9 bold}
 END
         ;;
 esac
@@ -26,9 +26,11 @@ set maxgraphpct 50
 set maxwidth 16
 set cmitmode patch
 set wrapcomment none
-set autoselect 1
+set autoselect 0
 set autosellen 40
 set showneartags 1
+set maxrefs 20
+set visiblerefs {"master"}
 set hideremotes 0
 set showlocalchanges 1
 set datetimeformat {%Y-%m-%d %H:%M:%S}
@@ -56,7 +58,7 @@ set remotebgcolor #ffddaa
 set tagbgcolor yellow
 set tagfgcolor black
 set tagoutlinecolor black
-set reflinecolor black
+set reflinecolor white
 set filesepbgcolor #aaaaaa
 set filesepfgcolor black
 set linehoverbgcolor #ffff80
@@ -68,5 +70,14 @@ set indexcirclecolor green
 set circlecolors {white blue gray blue blue}
 set linkfgcolor blue
 set circleoutlinecolor black
+END
+
+perl <$HOME/.gitk -ne '
+     next unless m{^set geometry\(};
+     s{^(set geometry\(state\)) .*}{$1 normal};
+     print;
+'
+
+cat <<END
 set permviews {}
 END