##// END OF EJS Templates
hgk: added setting of foreground colour...
Robert Bauck Hamar -
r7745:8bfe47e7 default
parent child Browse files
Show More
@@ -439,7 +439,7 b' proc makewindow {} {'
439 global entries sha1entry sha1string sha1but
439 global entries sha1entry sha1string sha1but
440 global maincursor textcursor curtextcursor
440 global maincursor textcursor curtextcursor
441 global rowctxmenu gaudydiff mergemax
441 global rowctxmenu gaudydiff mergemax
442 global hgvdiff bgcolor
442 global hgvdiff bgcolor fgcolor
443
443
444 menu .bar
444 menu .bar
445 .bar add cascade -label "File" -menu .bar.file
445 .bar add cascade -label "File" -menu .bar.file
@@ -547,7 +547,7 b' proc makewindow {} {'
547 .ctop add .ctop.cdet
547 .ctop add .ctop.cdet
548 frame .ctop.cdet.left
548 frame .ctop.cdet.left
549 set ctext .ctop.cdet.left.ctext
549 set ctext .ctop.cdet.left.ctext
550 text $ctext -bg $bgcolor -state disabled -font $textfont \
550 text $ctext -fg $fgcolor -bg $bgcolor -state disabled -font $textfont \
551 -width $geometry(ctextw) -height $geometry(ctexth) \
551 -width $geometry(ctextw) -height $geometry(ctexth) \
552 -yscrollcommand ".ctop.cdet.left.sb set" \
552 -yscrollcommand ".ctop.cdet.left.sb set" \
553 -xscrollcommand ".ctop.cdet.left.hb set" -wrap none
553 -xscrollcommand ".ctop.cdet.left.hb set" -wrap none
@@ -581,7 +581,8 b' proc makewindow {} {'
581
581
582 frame .ctop.cdet.right
582 frame .ctop.cdet.right
583 set cflist .ctop.cdet.right.cfiles
583 set cflist .ctop.cdet.right.cfiles
584 listbox $cflist -bg $bgcolor -selectmode extended -width $geometry(cflistw) \
584 listbox $cflist -fg $fgcolor -bg $bgcolor \
585 -selectmode extended -width $geometry(cflistw) \
585 -yscrollcommand ".ctop.cdet.right.sb set"
586 -yscrollcommand ".ctop.cdet.right.sb set"
586 scrollbar .ctop.cdet.right.sb -command "$cflist yview"
587 scrollbar .ctop.cdet.right.sb -command "$cflist yview"
587 pack .ctop.cdet.right.sb -side right -fill y
588 pack .ctop.cdet.right.sb -side right -fill y
@@ -679,7 +680,7 b' proc click {w} {'
679 proc savestuff {w} {
680 proc savestuff {w} {
680 global canv canv2 canv3 ctext cflist mainfont textfont
681 global canv canv2 canv3 ctext cflist mainfont textfont
681 global stuffsaved findmergefiles gaudydiff maxgraphpct
682 global stuffsaved findmergefiles gaudydiff maxgraphpct
682 global maxwidth authorcolors curidfont bgcolor
683 global maxwidth authorcolors curidfont bgcolor fgcolor
683
684
684 if {$stuffsaved} return
685 if {$stuffsaved} return
685 if {![winfo viewable .]} return
686 if {![winfo viewable .]} return
@@ -722,6 +723,9 b' proc savestuff {w} {'
722 puts $f "#"
723 puts $f "#"
723 puts $f "set authorcolors {$authorcolors}"
724 puts $f "set authorcolors {$authorcolors}"
724 puts $f "set bgcolor $bgcolor"
725 puts $f "set bgcolor $bgcolor"
726 puts $f "#"
727 puts $f "# The text color used in the diff and file list view"
728 puts $f "set fgcolor $fgcolor"
725 close $f
729 close $f
726 file rename -force "~/.hgk-new" "~/.hgk"
730 file rename -force "~/.hgk-new" "~/.hgk"
727 }
731 }
@@ -3894,6 +3898,10 b' set authorcolors {'
3894 }
3898 }
3895 set bgcolor white
3899 set bgcolor white
3896
3900
3901 # This color should probably be some system color (provided by tk),
3902 # but as the bgcolor has always been set to white, I choose to ignore
3903 set fgcolor black
3904
3897 catch {source ~/.hgk}
3905 catch {source ~/.hgk}
3898
3906
3899 if {$curidfont == ""} { # initialize late based on current mainfont
3907 if {$curidfont == ""} { # initialize late based on current mainfont
General Comments 0
You need to be logged in to leave comments. Login now