From 293f013236cc39c7ac92bb107bea9994bcc9328a Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Sat, 16 Jun 2018 10:13:29 +1000 Subject: [PATCH] Trying more subdued colours for the statuses. - This will also let the cursor line stand out more. --- tests/golden-files/help | 8 ++++---- tests/golden-files/results/python_coverage-hi3_py | 4 ++-- tests/golden-files/results/python_coverage-hi_py | 4 ++-- vigil/__main__.py | 4 ++-- vigil/termstr.py | 7 ++++++- vigil/tools.py | 6 +++--- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/golden-files/help b/tests/golden-files/help index 30c6c25..0ffe8c2 100644 --- a/tests/golden-files/help +++ b/tests/golden-files/help @@ -26,10 +26,10 @@ │ (Bf(B - Resize the focused pane to the full screen. (toggle) │ │ │ │Statuses: │ -│ (B (B Normal │ -│ (B (B Ok │ -│ (B (B Problem │ -│ (B (B Not applicable │ +│ (B (B Normal │ +│ (B (B Ok │ +│ (B (B Problem │ +│ (B (B Not applicable │ │ (B (B Running │ │ (B (B Paused │ │ (B (B Timed out │ diff --git a/tests/golden-files/results/python_coverage-hi3_py b/tests/golden-files/results/python_coverage-hi3_py index 652e03a..47d610d 100644 --- a/tests/golden-files/results/python_coverage-hi3_py +++ b/tests/golden-files/results/python_coverage-hi3_py @@ -1,4 +1,4 @@ (B -(B> def hi():(B -(B> print("hi")(B \ No newline at end of file +(B> def hi():(B +(B> print("hi")(B \ No newline at end of file diff --git a/tests/golden-files/results/python_coverage-hi_py b/tests/golden-files/results/python_coverage-hi_py index 91201fb..c7b8d8a 100644 --- a/tests/golden-files/results/python_coverage-hi_py +++ b/tests/golden-files/results/python_coverage-hi_py @@ -1,4 +1,4 @@ (B -(B> def hi():(B -(B> print "hi"(B \ No newline at end of file +(B> def hi():(B +(B> print "hi"(B \ No newline at end of file diff --git a/vigil/__main__.py b/vigil/__main__.py index 97b6ca7..e96acd4 100755 --- a/vigil/__main__.py +++ b/vigil/__main__.py @@ -161,7 +161,7 @@ def change_background(str_, new_background): def in_green(str_): - return termstr.TermStr(str_, termstr.CharStyle(termstr.Color.green)) + return termstr.TermStr(str_, termstr.CharStyle(termstr.Color.lime)) _UP, _DOWN, _LEFT, _RIGHT = (0, -1), (0, 1), (-1, 0), (1, 0) @@ -446,7 +446,7 @@ class Summary: class Log: _GREY_BOLD_STYLE = termstr.CharStyle(termstr.Color.grey_100, is_bold=True) - _GREEN_STYLE = termstr.CharStyle(termstr.Color.green) + _GREEN_STYLE = termstr.CharStyle(termstr.Color.lime) LOG_PATH = os.path.join(tools.CACHE_PATH, "log") def __init__(self, appearance_changed_event): diff --git a/vigil/termstr.py b/vigil/termstr.py index 194112e..48ccd96 100644 --- a/vigil/termstr.py +++ b/vigil/termstr.py @@ -38,13 +38,18 @@ class Color: black = (0, 0, 0) white = (255, 255, 255) red = (255, 0, 0) - green = (0, 255, 0) + green = (0, 128, 0) blue = (0, 0, 255) + dark_red = (139, 0, 0) + lime = (0, 255, 0) yellow = (255, 255, 0) grey_50 = (50, 50, 50) grey_100 = (100, 100, 100) + grey_150 = (150, 150, 150) light_blue = (90, 90, 255) purple = (200, 0, 200) + brown = (150, 75, 0) + orange = (255, 153, 0) class CharStyle: diff --git a/vigil/tools.py b/vigil/tools.py index cbb089e..6ad4c8c 100644 --- a/vigil/tools.py +++ b/vigil/tools.py @@ -54,9 +54,9 @@ class Status(enum.IntEnum): _STATUS_COLORS = {Status.ok: termstr.Color.green, - Status.problem: termstr.Color.red, - Status.normal: termstr.Color.white, - Status.not_applicable: termstr.Color.grey_100, + Status.problem: termstr.Color.dark_red, + Status.normal: termstr.Color.grey_150, + Status.not_applicable: termstr.Color.brown, Status.running: termstr.Color.light_blue, Status.paused: termstr.Color.yellow, Status.timed_out: termstr.Color.purple}