Merge pull request #25 from Omnikron13/colours

Associative array refactor & (dark) GTK2 theme fixes

Author: schemar

solarize.sh

@@ -29,11 +29,11 @@ A_WINDOW_BG="353945"
 A_DARK_SIDEBAR_FG="bac3cf"
 A_ENTRY_BORDER="cfd6e6"
 ## SVG
-A_BLUE="5294e2"
+A_BLUE="5294e2" # Duplicate of $A_SELECTED_BG
 A_WHITE="f9fafb"
 A_GREY="e7e8eb"
-A_DARK="383c4a"
-A_DARKEST="2f343f"
+A_DARK="383c4a" # Duplicate of $A_BG
+A_DARKEST="2f343f" # Duplicate of $A_WM_ICON_CLOSE_BG
 A_DARKEST2="2f343d"
 A_DARK_BUTTON="353a47"
 A_LIGHT_BUTTON="2d323f"
@@ -53,8 +53,17 @@ A_GNOME_PANEL_BORDER="0f1116"
 A_GTK2_TOOLBAR="70788d"
 A_GTK2_TOOLBAR_DARK="afb8c5"
 A_CLOSE_BUTTON_GREY="f8f8f9"
-## RC
+A_LIGHT_BG="f5f6f7"
+A_SWITCH_OFF_BG="5b627b"
+## GTK2
+A_GTK2_SENSITIVE_STROKE="2b2e39"
 A_GTK2_INSENSITIVE_FG_COLOR="7c818c"
+A_GTK2_INSENSITIVE_STROKE="303440"
+A_GTK2_BUTTON_HOVER="505666"
+A_GTK2_SCROLLBAR_BG="3e434f"
+A_GTK2_SCROLLBAR_FG="767b87"
+A_GTK2_SCROLLBAR_FG_HOVER="8f939d"
+A_GTK2_SLIDER_STROKE="262933"
 
 # Solarized colors
 ## Common
@@ -77,24 +86,81 @@ S_BASE2="eee8d5"
 S_BASE3="fdf6e3"
 
 FILETYPES=('scss' 'svg' 'xpm' 'xml' 'rc')
-ARC_COLORS=(      "$A_BASE"   "$A_TEXT"  "$A_BG"     "$A_FG"    "$A_SELECTED_FG" "$A_SELECTED_BG" "$A_WARNING" "$A_ERROR" "$A_SUCCESS" "$A_DESTRUCTIVE" "$A_SUGGESTED" "$A_DROP_TARGET" "$A_WM_BUTTON_CLOSE_BG" "$A_WM_BUTTON_CLOSE_HOVER_BG" "$A_WM_BUTTON_CLOSE_ACTIVE_BG" "$A_WM_ICON_CLOSE_BG" "$A_WM_BUTTON_HOVER_BG" "$A_WM_BUTTON_ACTIVE_BG" "$A_WM_BUTTON_HOVER_BORDER" "$A_WM_ICON_BG" "$A_WM_ICON_UNFOCUSED_BG" "$A_WM_ICON_HOVER_BG" "$A_WM_ICON_ACTIVE_BG" "$A_WINDOW_BG" "$A_DARK_SIDEBAR_FG" "$A_ENTRY_BORDER" "$A_BLUE" "$A_WHITE" "$A_GREY"  "$A_DARK"   "$A_DARKEST" "$A_DARKEST2" "$A_DARK_BUTTON" "$A_LIGHT_BUTTON" "$A_OTHER_LIGHT_BUTTON" "$A_MODAL"  "$A_ASSET_DARK" "$A_ASSET_DARK2" "$A_ASSET_GREY" "$A_ASSET_BORDER" "$A_ASSET_LIGHTER_BG" "$A_ASSET_LIGHTER_BG_FIX" "$A_ASSET_VARIOUS_DARK1" "$A_ASSET_VARIOUS_DARK2" "$A_ASSET_VARIOUS_DARK3" "$A_GNOME_PANEL_BG" "$A_GNOME_PANEL_BORDER" "$A_GTK2_TOOLBAR" "$A_GTK2_TOOLBAR_DARK" "$A_CLOSE_BUTTON_GREY"  "$A_GTK2_INSENSITIVE_FG_COLOR")
-SOLARIZED_COLORS=("$S_BASE03" "$S_BASE0" "$S_BASE02" "$S_BASE0" "$S_BASE3"       "$S_BLUE"        "$S_ORANGE"  "$S_RED"   "$S_GREEN"   "$S_RED"          "$S_CYAN"     "$S_YELLOW"      "$S_RED"                "$S_ORANGE"                   "$S_RED"                       "$S_BASE03"           "$S_BASE00"             "$S_BLUE"                "$S_BASE03"                 "$S_BASE1"      "$S_BASE00"               "$S_BASE1"            "$S_BASE3"             "$S_BASE02"    "$S_BASE00"          "$S_BASE00"       "$S_BLUE" "$S_BASE3" "$S_BASE2" "$S_BASE03" "$S_BASE03"  "$S_BASE03"   "$S_BASE03"      "$S_BASE02"       "$S_BASE02"             "$S_BASE03" "$S_BASE03"     "$S_BASE02"      "$S_BASE00"     "$S_BASE00"       "$S_BASE02"           "$S_BASE02"               "$S_BASE00"              "$S_BASE03"              "$S_BASE03"              "$S_BASE03"         "$S_BASE03"             "$S_BASE0"        "$S_BASE00"            "$S_BASE02"             "$S_BASE01")
+declare -A REPLACE
+REPLACE[$A_BASE]=$S_BASE03
+REPLACE[$A_TEXT]=$S_BASE0
+REPLACE[$A_BG]=$S_BASE02
+REPLACE[$A_FG]=$S_BASE0
+REPLACE[$A_SELECTED_FG]=$S_BASE3
+REPLACE[$A_SELECTED_BG]=$S_BLUE
+REPLACE[$A_WARNING]=$S_ORANGE
+REPLACE[$A_ERROR]=$S_RED
+REPLACE[$A_SUCCESS]=$S_GREEN
+REPLACE[$A_DESTRUCTIVE]=$S_RED
+REPLACE[$A_SUGGESTED]=$S_CYAN
+REPLACE[$A_DROP_TARGET]=$S_YELLOW
+REPLACE[$A_WM_BUTTON_CLOSE_BG]=$S_RED
+REPLACE[$A_WM_BUTTON_CLOSE_HOVER_BG]=$S_ORANGE
+REPLACE[$A_WM_BUTTON_CLOSE_ACTIVE_BG]=$S_RED
+REPLACE[$A_WM_ICON_CLOSE_BG]=$S_BASE03
+REPLACE[$A_WM_BUTTON_HOVER_BG]=$S_BASE00
+REPLACE[$A_WM_BUTTON_ACTIVE_BG]=$S_BLUE
+REPLACE[$A_WM_BUTTON_HOVER_BORDER]=$S_BASE03
+REPLACE[$A_WM_ICON_BG]=$S_BASE1
+REPLACE[$A_WM_ICON_UNFOCUSED_BG]=$S_BASE00
+REPLACE[$A_WM_ICON_HOVER_BG]=$S_BASE1
+REPLACE[$A_WM_ICON_ACTIVE_BG]=$S_BASE3
+REPLACE[$A_WINDOW_BG]=$S_BASE02
+REPLACE[$A_DARK_SIDEBAR_FG]=$S_BASE00
+REPLACE[$A_ENTRY_BORDER]=$S_BASE00
+REPLACE[$A_WHITE]=$S_BASE3
+REPLACE[$A_GREY]=$S_BASE2
+REPLACE[$A_DARKEST2]=$S_BASE03
+REPLACE[$A_DARK_BUTTON]=$S_BASE03
+REPLACE[$A_LIGHT_BUTTON]=$S_BASE02
+REPLACE[$A_MODAL]=$S_BASE03
+REPLACE[$A_ASSET_DARK]=$S_BASE03
+REPLACE[$A_ASSET_DARK2]=$S_BASE02
+REPLACE[$A_ASSET_GREY]=$S_BASE00
+REPLACE[$A_ASSET_BORDER]=$S_BASE00
+REPLACE[$A_ASSET_VARIOUS_DARK1]=$S_BASE00
+REPLACE[$A_ASSET_VARIOUS_DARK2]=$S_BASE03
+REPLACE[$A_ASSET_VARIOUS_DARK3]=$S_BASE03
+REPLACE[$A_GNOME_PANEL_BG]=$S_BASE03
+REPLACE[$A_GNOME_PANEL_BORDER]=$S_BASE03
+REPLACE[$A_GTK2_TOOLBAR]=$S_BASE0
+REPLACE[$A_GTK2_TOOLBAR_DARK]=$S_BASE00
+REPLACE[$A_CLOSE_BUTTON_GREY]=$S_BASE02
+REPLACE[$A_LIGHT_BG]=$S_BASE2
+REPLACE[$A_GTK2_INSENSITIVE_FG_COLOR]=$S_BASE01
+REPLACE[$A_SWITCH_OFF_BG]=$S_BASE01
+# GTK2 tweaks
+REPLACE[$A_ASSET_LIGHTER_BG]="033441"
+REPLACE[$A_ASSET_LIGHTER_BG_FIX]="033441"
+REPLACE[$A_OTHER_LIGHT_BUTTON]="003340"
+REPLACE[$A_GTK2_SENSITIVE_STROKE]="041f26"
+REPLACE[$A_GTK2_INSENSITIVE_STROKE]="052932"
+REPLACE[$A_GTK2_BUTTON_HOVER]="00475a"
+REPLACE[$A_GTK2_SCROLLBAR_BG]="002731"
+REPLACE[$A_GTK2_SCROLLBAR_FG]="395c64"
+REPLACE[$A_GTK2_SCROLLBAR_FG_HOVER]="2c525b"
+REPLACE[$A_GTK2_SLIDER_STROKE]="041f26"
 
 CWD=`pwd`
 
 echo "### Replacing arc colors with solarized colors"
 for filetype in "${FILETYPES[@]}"
 do
     echo "## Replacing in ${filetype}"
-    for index in ${!ARC_COLORS[*]}
+    for K in ${!REPLACE[@]}
     do
-        find . -name "*.${filetype}" -exec sed -i "s/${ARC_COLORS[$index]}/${SOLARIZED_COLORS[$index]}/Ig" {} \;
+        find . -name "*.${filetype}" -exec sed -i "s/${K}/${REPLACE[$K]}/Ig" {} \;
     done
 done
 echo "## Replacing in gtk-2.0 rc"
-for index in ${!ARC_COLORS[*]}
+for K in ${!REPLACE[@]}
 do
-    find . -type f -name "gtkrc*" -exec sed -i "s/${ARC_COLORS[$index]}/${SOLARIZED_COLORS[$index]}/Ig" {} \;
+    find . -type f -name "gtkrc*" -exec sed -i "s/${K}/${REPLACE[$K]}/Ig" {} \;
 done
 
 echo ""