undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Color name update

Browse Source 
Color name "green" was darken since Tcl/Tk 7.6.
 Because color name scheme was changed from "X11 colors" to "Web colors".

 Use "lime" to keep colors.

See also:
http://www.tcl.tk/cgi-bin/tct/tip/403.html

Signed-off-by: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>
This commit is contained in:
YOKOTA Hiroshi 2015-10-25 01:58:41 +09:00
parent d70c034a75
commit 66db14c94c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gitk
View File

@ -2251,7 +2251,7 @@ proc makewindow {} {
set h [expr {[font metrics uifont -linespace] + 2}] set h [expr {[font metrics uifont -linespace] + 2}]
set progresscanv .tf.bar.progress set progresscanv .tf.bar.progress
canvas $progresscanv -relief sunken -height $h -borderwidth 2 canvas $progresscanv -relief sunken -height $h -borderwidth 2
set progressitem [$progresscanv create rect -1 0 0 $h -fill green] set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
} }
@ -3379,7 +3379,7 @@ set rectmask {
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00}; 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
} }
image create bitmap reficon-H -background black -foreground green \ image create bitmap reficon-H -background black -foreground lime \
-data $rectdata -maskdata $rectmask -data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \ image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask -data $rectdata -maskdata $rectmask
@ -12170,7 +12170,7 @@ if {[tk windowingsystem] eq "aqua"} {
set extdifftool "meld" set extdifftool "meld"
} }
set colors {green red blue magenta darkgrey brown orange} set colors {lime red blue magenta darkgrey brown orange}
if {[tk windowingsystem] eq "win32"} { if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace set uicolor SystemButtonFace
set uifgcolor SystemButtonText set uifgcolor SystemButtonText
@ -12188,12 +12188,12 @@ if {[tk windowingsystem] eq "win32"} {
} }
set diffcolors {red "#00a000" blue} set diffcolors {red "#00a000" blue}
set diffcontext 3 set diffcontext 3
set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set ignorespace 0 set ignorespace 0
set worddiff "" set worddiff ""
set markbgcolor "#e0e0ff" set markbgcolor "#e0e0ff"
set headbgcolor green set headbgcolor lime
set headfgcolor black set headfgcolor black
set headoutlinecolor black set headoutlinecolor black
set remotebgcolor #ffddaa set remotebgcolor #ffddaa
@ -12208,7 +12208,7 @@ set linehoverfgcolor black
set linehoveroutlinecolor black set linehoveroutlinecolor black
set mainheadcirclecolor yellow set mainheadcirclecolor yellow
set workingfilescirclecolor red set workingfilescirclecolor red
set indexcirclecolor green set indexcirclecolor lime
set circlecolors {white blue gray blue blue} set circlecolors {white blue gray blue blue}
set linkfgcolor blue set linkfgcolor blue
set circleoutlinecolor $fgcolor set circleoutlinecolor $fgcolor