Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gitk: Use explicit RGB green instead of "lime"
author
Paul Mackerras
<paulus@ozlabs.org>
Mon, 12 Dec 2016 00:29:21 +0000
(11:29 +1100)
committer
Paul Mackerras
<paulus@ozlabs.org>
Mon, 12 Dec 2016 00:34:22 +0000
(11:34 +1100)
Some systems don't recognize "lime" as a color, leading to errors when
gitk is run. What we want is a bright green, so use "#00ff00" instead.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
gitk
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
2239d07
)
diff --git
a/gitk
b/gitk
index 413711e4d4f347b702487b2da6bdfc1d2a6d0c7a..c60f180941f192758008c8242e9aadb7039bb072 100755
(executable)
--- a/
gitk
+++ b/
gitk
@@
-2265,7
+2265,7
@@
proc makewindow {} {
set h [expr {[font metrics uifont -linespace] + 2}]
set progresscanv .tf.bar.progress
canvas $progresscanv -relief sunken -height $h -borderwidth 2
set h [expr {[font metrics uifont -linespace] + 2}]
set progresscanv .tf.bar.progress
canvas $progresscanv -relief sunken -height $h -borderwidth 2
- set progressitem [$progresscanv create rect -1 0 0 $h -fill
lime
]
+ set progressitem [$progresscanv create rect -1 0 0 $h -fill
"#00ff00"
]
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
}
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
}
@@
-3398,7
+3398,7
@@
set rectmask {
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
}
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
}
-image create bitmap reficon-H -background black -foreground
lime
\
+image create bitmap reficon-H -background black -foreground
"#00ff00"
\
-data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
-data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
@@
-12293,7
+12293,7
@@
if {[tk windowingsystem] eq "aqua"} {
set extdifftool "meld"
}
set extdifftool "meld"
}
-set colors {
lime
red blue magenta darkgrey brown orange}
+set colors {
"#00ff00"
red blue magenta darkgrey brown orange}
if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace
set uifgcolor SystemButtonText
if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace
set uifgcolor SystemButtonText
@@
-12311,12
+12311,12
@@
if {[tk windowingsystem] eq "win32"} {
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
-set mergecolors {red blue
lime
purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+set mergecolors {red blue
"#00ff00"
purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set ignorespace 0
set worddiff ""
set markbgcolor "#e0e0ff"
set ignorespace 0
set worddiff ""
set markbgcolor "#e0e0ff"
-set headbgcolor
lime
+set headbgcolor
"#00ff00"
set headfgcolor black
set headoutlinecolor black
set remotebgcolor #ffddaa
set headfgcolor black
set headoutlinecolor black
set remotebgcolor #ffddaa
@@
-12331,7
+12331,7
@@
set linehoverfgcolor black
set linehoveroutlinecolor black
set mainheadcirclecolor yellow
set workingfilescirclecolor red
set linehoveroutlinecolor black
set mainheadcirclecolor yellow
set workingfilescirclecolor red
-set indexcirclecolor
lime
+set indexcirclecolor
"#00ff00"
set circlecolors {white blue gray blue blue}
set linkfgcolor blue
set circleoutlinecolor $fgcolor
set circlecolors {white blue gray blue blue}
set linkfgcolor blue
set circleoutlinecolor $fgcolor