From d0fafe7679c26e195246f988c1b5b864573950e2 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 23 Feb 2013 13:57:45 +0400 Subject: [PATCH] Replace non-color names with a bit more descriptive names --- powerline/config_files/colors.json | 50 ++++---- .../colorschemes/shell/solarized.json | 20 ++-- .../colorschemes/tmux/default.json | 16 +-- .../colorschemes/vim/solarized.json | 111 +++++++++--------- .../config_files/colorschemes/wm/default.json | 16 +-- powerline/theme.py | 1 - 6 files changed, 106 insertions(+), 108 deletions(-) diff --git a/powerline/config_files/colors.json b/powerline/config_files/colors.json index e4636a93..9a9c2e16 100644 --- a/powerline/config_files/colors.json +++ b/powerline/config_files/colors.json @@ -3,44 +3,34 @@ "black": 16, "white": 231, - "green": [2, "719e07"], "darkestgreen": 22, "darkgreen": 28, "mediumgreen": 70, "brightgreen": 148, - "cyan": [6, "2aa198"], "darkestcyan": 23, "darkcyan": 74, "mediumcyan": 117, "brightcyan": 159, - "blue": [4, "268bd2"], "darkestblue": 24, "darkblue": 31, - "red": [1, "dc322f"], "darkestred": 52, "darkred": 88, "mediumred": 124, "brightred": 160, "brightestred": 196, - "magenta": [5, "d33682"], - "darkestpurple": 55, "mediumpurple": 98, "brightpurple": 189, - "violet": [13, "6c71c4"], - - "orange": [9, "cb4b16"], "darkorange": 94, "mediumorange": 166, "brightorange": 208, "brightestorange": 214, - "yellow": [3, "b58900"], "brightyellow": 220, "gray0": 233, @@ -55,23 +45,33 @@ "gray9": 250, "gray10": 252, - "base03": [8, "002b36"], - "base02": [0, "073642"], - "base01": [10, "586e75"], - "base00": [11, "657b83"], - "base0": [12, "839496"], - "base1": [14, "93a1a1"], - "base2": [7, "eee8d5"], - "base3": [15, "fdf6e3"], + "gray61": [14, "93a1a1"], + "gray13": [8, "002b36"], - "system_load_good": 106, - "system_load_bad": 178, - "system_load_ugly": 202, + "royalblue5": [0, "073642"], + "darkgreencopper": [10, "586e75"], + "lightskyblue4": [11, "657b83"], + "azure4": [12, "839496"], + "lightyellow": [7, "eee8d5"], + "oldlace": [15, "fdf6e3"], - "weather_temp_cold": 67, - "weather_temp_hot": 166, - "weather_condition_cold": 117, - "weather_condition_hot": 228 + "green": [2, "719e07"], + "cyan": [6, "2aa198"], + "blue": [4, "268bd2"], + "red": [1, "dc322f"], + "magenta": [5, "d33682"], + "violet": [13, "6c71c4"], + "orange": [9, "cb4b16"], + "yellow": [3, "b58900"], + + "lightyellowgreen": 106, + "gold3": 178, + "orangered": 202, + + "steelblue": 67, + "darkorange3": 166, + "skyblue1": 117, + "khaki1": 228 }, "gradients": { "green_yellow_red": [ diff --git a/powerline/config_files/colorschemes/shell/solarized.json b/powerline/config_files/colorschemes/shell/solarized.json index fe3216cd..d847cef6 100644 --- a/powerline/config_files/colorschemes/shell/solarized.json +++ b/powerline/config_files/colorschemes/shell/solarized.json @@ -1,15 +1,15 @@ { "name": "Solarized Dark", "groups": { - "user": { "fg": "base3", "bg": "blue", "attr": ["bold"] }, - "superuser": { "fg": "base3", "bg": "red", "attr": ["bold"] }, - "virtualenv": { "fg": "base3", "bg": "green" }, - "branch": { "fg": "base1", "bg": "base02" }, - "cwd": { "fg": "base2", "bg": "base01" }, - "cwd:current_folder": { "fg": "base3", "bg": "base01", "attr": ["bold"] }, - "cwd:divider": { "fg": "base1", "bg": "base01" }, - "hostname": { "fg": "base3", "bg": "base01" }, - "exit_fail": { "fg": "base3", "bg": "red" }, - "exit_success": { "fg": "base3", "bg": "green" } + "user": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, + "superuser": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }, + "virtualenv": { "fg": "oldlace", "bg": "green" }, + "branch": { "fg": "gray61", "bg": "royalblue5" }, + "cwd": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, + "cwd:divider": { "fg": "gray61", "bg": "darkgreencopper" }, + "hostname": { "fg": "oldlace", "bg": "darkgreencopper" }, + "exit_fail": { "fg": "oldlace", "bg": "red" }, + "exit_success": { "fg": "oldlace", "bg": "green" } } } diff --git a/powerline/config_files/colorschemes/tmux/default.json b/powerline/config_files/colorschemes/tmux/default.json index 37146011..67be9993 100644 --- a/powerline/config_files/colorschemes/tmux/default.json +++ b/powerline/config_files/colorschemes/tmux/default.json @@ -9,17 +9,17 @@ "email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, "hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, "weather": { "fg": "gray8", "bg": "gray0" }, - "weather_temp_cold": { "fg": "weather_temp_cold", "bg": "gray0" }, - "weather_temp_hot": { "fg": "weather_temp_hot", "bg": "gray0" }, - "weather_condition_hot": { "fg": "weather_condition_hot", "bg": "gray0" }, - "weather_condition_snowy": { "fg": "weather_condition_cold", "bg": "gray0" }, - "weather_condition_rainy": { "fg": "weather_condition_cold", "bg": "gray0" }, + "weather_temp_cold": { "fg": "steelblue", "bg": "gray0" }, + "weather_temp_hot": { "fg": "darkorange3", "bg": "gray0" }, + "weather_condition_hot": { "fg": "khaki1", "bg": "gray0" }, + "weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" }, + "weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" }, "uptime": { "fg": "gray8", "bg": "gray0" }, "external_ip": { "fg": "gray8", "bg": "gray0" }, "network_load": { "fg": "gray8", "bg": "gray0" }, "system_load": { "fg": "gray8", "bg": "gray0" }, - "system_load_good": { "fg": "system_load_good", "bg": "gray0" }, - "system_load_bad": { "fg": "system_load_bad", "bg": "gray0" }, - "system_load_ugly": { "fg": "system_load_ugly", "bg": "gray0" } + "system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" }, + "system_load_bad": { "fg": "gold3", "bg": "gray0" }, + "system_load_ugly": { "fg": "orangered", "bg": "gray0" } } } diff --git a/powerline/config_files/colorschemes/vim/solarized.json b/powerline/config_files/colorschemes/vim/solarized.json index 825a4272..6d724b65 100644 --- a/powerline/config_files/colorschemes/vim/solarized.json +++ b/powerline/config_files/colorschemes/vim/solarized.json @@ -1,82 +1,81 @@ { "name": "Solarized Dark", "groups": { - "background": { "fg": "base3", "bg": "base02" }, - "background:divider": { "fg": "base00", "bg": "base02" }, - "mode": { "fg": "base3", "bg": "green", "attr": ["bold"] }, - "modified_indicator": { "fg": "yellow", "bg": "base01", "attr": ["bold"] }, - "paste_indicator": { "fg": "base3", "bg": "orange", "attr": ["bold"] }, - "readonly_indicator": { "fg": "red", "bg": "base01" }, - "branch": { "fg": "base2", "bg": "base01" }, - "branch:divider": { "fg": "base1", "bg": "base01" }, - "file_directory": { "fg": "base2", "bg": "base01" }, - "file_name": { "fg": "base3", "bg": "base01", "attr": ["bold"] }, - "file_size": { "fg": "base3", "bg": "base01" }, - "file_name_no_file": { "fg": "base3", "bg": "base01", "attr": ["bold"] }, - "file_name_empty": { "fg": "base3", "bg": "base01" }, - "file_format": { "fg": "base1", "bg": "base02" }, - "file_encoding": { "fg": "base1", "bg": "base02" }, - "file_type": { "fg": "base1", "bg": "base02" }, - "file_vcs_status": { "fg": "red", "bg": "base01" }, - "file_vcs_status_M": { "fg": "yellow", "bg": "base01" }, - "file_vcs_status_A": { "fg": "green", "bg": "base01" }, - "line_percent": { "fg": "base3", "bg": "base00" }, - "line_current": { "fg": "base03", "bg": "base2", "attr": ["bold"] }, - "line_current_symbol": { "fg": "base03", "bg": "base2" }, - "col_current": { "fg": "base0", "bg": "base2" } + "background": { "fg": "oldlace", "bg": "royalblue5" }, + "background:divider": { "fg": "lightskyblue4", "bg": "royalblue5" }, + "mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] }, + "modified_indicator": { "fg": "yellow", "bg": "darkgreencopper", "attr": ["bold"] }, + "paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, + "readonly_indicator": { "fg": "red", "bg": "darkgreencopper" }, + "branch": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "branch:divider": { "fg": "gray61", "bg": "darkgreencopper" }, + "file_directory": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "file_name": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, + "file_size": { "fg": "oldlace", "bg": "darkgreencopper" }, + "file_name_no_file": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, + "file_name_empty": { "fg": "oldlace", "bg": "darkgreencopper" }, + "file_format": { "fg": "gray61", "bg": "royalblue5" }, + "file_encoding": { "fg": "gray61", "bg": "royalblue5" }, + "file_type": { "fg": "gray61", "bg": "royalblue5" }, + "file_vcs_status": { "fg": "red", "bg": "darkgreencopper" }, + "file_vcs_status_M": { "fg": "yellow", "bg": "darkgreencopper" }, + "file_vcs_status_A": { "fg": "green", "bg": "darkgreencopper" }, + "line_percent": { "fg": "oldlace", "bg": "lightskyblue4" }, + "line_current": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, + "line_current_symbol": { "fg": "gray13", "bg": "lightyellow" }, + "col_current": { "fg": "azure4", "bg": "lightyellow" } }, "mode_translations": { "nc": { "colors": { - "base02": "base02", - "base01": "base02", - "base00": "base02", - "base0": "base01", - "base1": "base00", - "base2": "base0", - "base3": "base1" + "darkgreencopper": "royalblue5", + "lightskyblue4": "royalblue5", + "azure4": "darkgreencopper", + "gray61": "lightskyblue4", + "lightyellow": "azure4", + "oldlace": "gray61" } }, "i": { "groups": { - "background": { "fg": "base3", "bg": "base01" }, - "background:divider": { "fg": "base2", "bg": "base01" }, - "mode": { "fg": "base3", "bg": "blue", "attr": ["bold"] }, - "modified_indicator": { "fg": "yellow", "bg": "base2", "attr": ["bold"] }, - "paste_indicator": { "fg": "base3", "bg": "orange", "attr": ["bold"] }, - "readonly_indicator": { "fg": "red", "bg": "base2" }, - "branch": { "fg": "base01", "bg": "base2" }, - "branch:divider": { "fg": "base00", "bg": "base2" }, - "file_directory": { "fg": "base01", "bg": "base2" }, - "file_name": { "fg": "base02", "bg": "base2", "attr": ["bold"] }, - "file_size": { "fg": "base02", "bg": "base2" }, - "file_name_no_file": { "fg": "base02", "bg": "base2", "attr": ["bold"] }, - "file_name_empty": { "fg": "base02", "bg": "base2" }, - "file_format": { "fg": "base2", "bg": "base01" }, - "file_encoding": { "fg": "base2", "bg": "base01" }, - "file_type": { "fg": "base2", "bg": "base01" }, - "file_vcs_status": { "fg": "red", "bg": "base2" }, - "file_vcs_status_M": { "fg": "yellow", "bg": "base2" }, - "file_vcs_status_A": { "fg": "green", "bg": "base2" }, - "line_percent": { "fg": "base3", "bg": "base1" }, - "line_current": { "fg": "base03", "bg": "base3", "attr": ["bold"] }, - "line_current_symbol": { "fg": "base03", "bg": "base3" }, - "col_current": { "fg": "base0", "bg": "base3" } + "background": { "fg": "oldlace", "bg": "darkgreencopper" }, + "background:divider": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, + "modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] }, + "paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, + "readonly_indicator": { "fg": "red", "bg": "lightyellow" }, + "branch": { "fg": "darkgreencopper", "bg": "lightyellow" }, + "branch:divider": { "fg": "lightskyblue4", "bg": "lightyellow" }, + "file_directory": { "fg": "darkgreencopper", "bg": "lightyellow" }, + "file_name": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, + "file_size": { "fg": "royalblue5", "bg": "lightyellow" }, + "file_name_no_file": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, + "file_name_empty": { "fg": "royalblue5", "bg": "lightyellow" }, + "file_format": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "file_encoding": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "file_type": { "fg": "lightyellow", "bg": "darkgreencopper" }, + "file_vcs_status": { "fg": "red", "bg": "lightyellow" }, + "file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow" }, + "file_vcs_status_A": { "fg": "green", "bg": "lightyellow" }, + "line_percent": { "fg": "oldlace", "bg": "gray61" }, + "line_current": { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] }, + "line_current_symbol": { "fg": "gray13", "bg": "oldlace" }, + "col_current": { "fg": "azure4", "bg": "oldlace" } } }, "v": { "groups": { - "mode": { "fg": "base3", "bg": "orange", "attr": ["bold"] } + "mode": { "fg": "beige", "bg": "orange", "attr": ["bold"] } } }, "V": { "groups": { - "mode": { "fg": "base3", "bg": "orange", "attr": ["bold"] } + "mode": { "fg": "beige", "bg": "orange", "attr": ["bold"] } } }, "R": { "groups": { - "mode": { "fg": "base3", "bg": "red", "attr": ["bold"] } + "mode": { "fg": "beige", "bg": "red", "attr": ["bold"] } } } } diff --git a/powerline/config_files/colorschemes/wm/default.json b/powerline/config_files/colorschemes/wm/default.json index 210b4e4b..90bd6cc4 100644 --- a/powerline/config_files/colorschemes/wm/default.json +++ b/powerline/config_files/colorschemes/wm/default.json @@ -9,17 +9,17 @@ "email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, "hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, "weather": { "fg": "gray8", "bg": "gray0" }, - "weather_temp_cold": { "fg": "weather_temp_cold", "bg": "gray0" }, - "weather_temp_hot": { "fg": "weather_temp_hot", "bg": "gray0" }, - "weather_condition_hot": { "fg": "weather_condition_hot", "bg": "gray0" }, - "weather_condition_snowy": { "fg": "weather_condition_cold", "bg": "gray0" }, - "weather_condition_rainy": { "fg": "weather_condition_cold", "bg": "gray0" }, + "weather_temp_cold": { "fg": "steelblue", "bg": "gray0" }, + "weather_temp_hot": { "fg": "darkorange3", "bg": "gray0" }, + "weather_condition_hot": { "fg": "khaki1", "bg": "gray0" }, + "weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" }, + "weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" }, "uptime": { "fg": "gray8", "bg": "gray0" }, "external_ip": { "fg": "gray8", "bg": "gray0" }, "network_load": { "fg": "gray8", "bg": "gray0" }, "system_load": { "fg": "gray8", "bg": "gray0" }, - "system_load_good": { "fg": "system_load_good", "bg": "gray0" }, - "system_load_bad": { "fg": "system_load_bad", "bg": "gray0" }, - "system_load_ugly": { "fg": "system_load_ugly", "bg": "gray0" } + "system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" }, + "system_load_bad": { "fg": "gold3", "bg": "gray0" }, + "system_load_ugly": { "fg": "orangered", "bg": "gray0" } } } diff --git a/powerline/theme.py b/powerline/theme.py index 14a79021..03e11f48 100644 --- a/powerline/theme.py +++ b/powerline/theme.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from collections import defaultdict from copy import copy from .segment import gen_segment_getter