add support for both grey and white in all color settings

parent b08fc643
......@@ -66,6 +66,11 @@ between. For more detailed information see the or git log.
'random -r 5 10' will give you a random number between 5 and
10
- 'colors' added support for both 'grey' and 'white' in all
color settings. Note: depending on your terminal's color
settings you might not see a difference here, that's not a
bug.
* UI changes
- Use 'GtkSwitch'es instead of 'GtkRadionButton's for main
switches in the UI.
......
......@@ -64,6 +64,10 @@ are supported:
@code{random -r 10} will give you a random number between 0 and 10
@code{random -r 5 10} will give you a random number between 5 and 10
@item @code{colors} added support for both @code{grey} and @code{white} in all
color settings. Note: depending on your terminal's color settings you might not
see a difference here, that's not a bug.
@end itemize
@item UI changes
......
......@@ -36,6 +36,7 @@ if [[ $TERM != *xterm* ]]; then
export blue="\[\033[${style};34m\]"
export magenta="\[\033[${style};35m\]"
export cyan="\[\033[${style};36m\]"
export grey="\[\033[${style};37m\]"
export white="\[\033[${style};97m\]"
export coldblue=$blue
export smoothblue=$blue
......@@ -58,6 +59,7 @@ if [[ $TERM != *xterm* ]]; then
export eblue="\033[${style};34m"
export emagenta="\033[${style};35m"
export ecyan="\033[${style};36m"
export egrey="\033[${style};37m"
export ewhite="\033[${style};97m"
export ecoldblue=$eblue
export esmoothblue=$eblue
......@@ -80,6 +82,7 @@ else
export blue="\[\033[${style};38;5;4m\]"
export magenta="\[\033[${style};38;5;129m\]"
export cyan="\[\033[${style};38;5;6m\]"
export grey="\[\033[${style};38;5;7m\]"
export white="\[\033[${style};38;5;999m\]"
export coldblue="\[\033[${style};38;5;33m\]"
export smoothblue="\[\033[${style};38;5;111m\]"
......@@ -102,6 +105,7 @@ else
export eblue="\033[${style};38;5;4m"
export emagenta="\033[${style};38;5;129m"
export ecyan="\033[${style};38;5;6m"
export egrey="\033[${style};38;5;7m"
export ewhite="\033[${style};38;5;999m"
export ecoldblue="\033[${style};38;5;33m"
export esmoothblue="\033[${style};38;5;111m"
......
......@@ -18,7 +18,8 @@ lyellow="${style};33"
lblue="${style};34"
lmagenta="${style};35"
lcyan="${style};36"
lwhite="${style};37"
lgrey="${style};37"
lwhite="${style};97"
if [[ ${TERM} != *xterm* ]]; then
lcoldblue=${lblue}
......@@ -52,7 +53,7 @@ fi
export lblack lred lgreen lyellow lblue lmagenta lcyan lwhite lcoldblue \
lsmoothblue liceblue lturqoise lsmoothgreen lwinered lbrown lsilver \
locher lorange lpurple lpink lcream
locher lorange lpurple lpink lcream lgrey
lscolors=(exec generic logs deb rpm dirs jpeg png gif mp3 ogg flac tar targz
tarbz2 tarxz zip rar link socket pipe blockdev chardev)
......
......@@ -20,6 +20,7 @@ if [[ $(ini_get enable_colors) == True ]]; then
export lfblue="38;5;4m"
export lfmagenta="38;5;129m"
export lfcyan="38;5;6m"
export lfgrey="38;5;7m"
export lfwhite="38;5;999m"
export lfcoldblue="38;5;33m"
export lfsmoothblue="38;5;111m"
......@@ -43,6 +44,7 @@ if [[ $(ini_get enable_colors) == True ]]; then
export lbblue="44"
export lbmagenta="45"
export lbcyan="46"
export lbgrey="47"
export lbwhite="107"
# blinking text
......
......@@ -197,6 +197,9 @@
<row>
<col id="0" translatable="yes">Cyan</col>
</row>
<row>
<col id="0" translatable="yes">Grey</col>
</row>
<row>
<col id="0" translatable="yes">White</col>
</row>
......@@ -404,6 +407,9 @@
<row>
<col id="0" translatable="yes">Cyan</col>
</row>
<row>
<col id="0" translatable="yes">Grey</col>
</row>
<row>
<col id="0" translatable="yes">White</col>
</row>
......@@ -475,6 +481,9 @@
<row>
<col id="0" translatable="yes">Cyan</col>
</row>
<row>
<col id="0" translatable="yes">Grey</col>
</row>
<row>
<col id="0" translatable="yes">White</col>
</row>
......@@ -590,6 +599,9 @@
<row>
<col id="0" translatable="yes">Cyan</col>
</row>
<row>
<col id="0" translatable="yes">Grey</col>
</row>
<row>
<col id="0" translatable="yes">White</col>
</row>
......@@ -622,6 +634,9 @@
<row>
<col id="0" translatable="yes">Cyan</col>
</row>
<row>
<col id="0" translatable="yes">Grey</col>
</row>
<row>
<col id="0" translatable="yes">White</col>
</row>
......
......@@ -25,20 +25,21 @@ less_foreground_colors = {
4 : "$lfblue",
5 : "$lfmagenta",
6 : "$lfcyan",
7 : "$lfwhite",
8 : "$lfcoldblue",
9 : "$lfsmoothblue",
10 : "$lficeblue",
11 : "$lfturqoise",
12 : "$lfsmoothgreen",
13 : "$lfwinered",
14 : "$lfbrown",
15 : "$lfsilver",
16 : "$lfocher",
17 : "$lforange",
18 : "$lfpurple",
19 : "$lfpink",
20 : "$lfcream",
7 : "$lfgrey",
8 : "$lfwhite",
9 : "$lfcoldblue",
10 : "$lfsmoothblue",
11 : "$lficeblue",
12 : "$lfturqoise",
13 : "$lfsmoothgreen",
14 : "$lfwinered",
15 : "$lfbrown",
16 : "$lfsilver",
17 : "$lfocher",
18 : "$lforange",
19 : "$lfpurple",
20 : "$lfpink",
21 : "$lfcream",
}
less_background_colors = {
......@@ -49,7 +50,8 @@ less_background_colors = {
4 : "$lbblue",
5 : "$lbmagenta",
6 : "$lbcyan",
7 : "$lbwhite",
7 : "$lbgrey",
8 : "$lbwhite",
}
grep_colors = {
......@@ -61,19 +63,20 @@ grep_colors = {
5 : "01;38;5;5",
6 : "01;38;5;6",
7 : "01;38;5;7",
8 : "01;38;5;33",
9 : "01;38;5;111",
10 : "01;38;5;45",
11 : "01;38;5;60",
12 : "01;38;5;42",
13 : "01;38;5;637",
14 : "01;38;5;684",
15 : "01;38;5;761",
16 : "01;38;5;690",
17 : "01;38;5;714",
18 : "01;38;5;604",
19 : "01;38;5;213",
20 : "01;38;5;5344",
8 : "01;38;5;97",
9 : "01;38;5;33",
10 : "01;38;5;111",
11 : "01;38;5;45",
12 : "01;38;5;60",
13 : "01;38;5;42",
14 : "01;38;5;637",
15 : "01;38;5;684",
16 : "01;38;5;761",
17 : "01;38;5;690",
18 : "01;38;5;714",
19 : "01;38;5;604",
20 : "01;38;5;213",
21 : "01;38;5;5344",
}
colors = {
......@@ -84,20 +87,21 @@ colors = {
4 : "$blue",
5 : "$magenta",
6 : "$cyan",
7 : "$white",
8 : "$coldblue",
9 : "$smoothblue",
10 : "$iceblue",
11 : "$turqoise",
12 : "$smoothgreen",
13 : "$winered",
14 : "$brown",
15 : "$silver",
16 : "$ocher",
17 : "$orange",
18 : "$purple",
19 : "$pink",
20 : "$cream",
7 : "$grey",
8 : "$white",
9 : "$coldblue",
10 : "$smoothblue",
11 : "$iceblue",
12 : "$turqoise",
13 : "$smoothgreen",
14 : "$winered",
15 : "$brown",
16 : "$silver",
17 : "$ocher",
18 : "$orange",
19 : "$purple",
20 : "$pink",
21 : "$cream",
}
prompt_styles = {
......@@ -193,20 +197,21 @@ ls_colors = {
4 : "$lblue",
5 : "$lmagenta",
6 : "$lcyan",
7 : "$lwhite",
8 : "$lcoldblue",
9 : "$lsmoothblue",
10 : "$liceblue",
11 : "$lturqoise",
12 : "$lsmoothgreen",
13 : "$lwinered",
14 : "$lbrown",
15 : "$lsilver",
16 : "$locher",
17 : "$lorange",
18 : "$lpurple",
19 : "$lpink",
20 : "$lcream",
7 : "$lgrey",
8 : "$lwhite",
9 : "$lcoldblue",
10 : "$lsmoothblue",
11 : "$liceblue",
12 : "$lturqoise",
13 : "$lsmoothgreen",
14 : "$lwinered",
15 : "$lbrown",
16 : "$lsilver",
17 : "$locher",
18 : "$lorange",
19 : "$lpurple",
20 : "$lpink",
21 : "$lcream",
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment