ahamilton/eris
1
0
Fork 0
Code Releases Activity

Made the cursor always white.

Browse source 
- With the dimmer status colors a white cursor always stands out.
- Also made yellow a little darker to help.
This commit is contained in:
Andrew Hamilton 2018-06-16 14:56:20 +10:00
parent f7abd189c3
commit 7d6d9d88eb
4 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/golden-files/help
View file

@ -31,7 +31,7 @@
│ (B (B Problem │ │ (B (B Problem │
│ (B (B Not applicable │ │ (B (B Not applicable │
│ (B (B Running │ │ (B (B Running │
│ (B (B Paused │ │ (B (B Paused │
│ (B (B Timed out │ │ (B (B Timed out │
│ . Pending │ │ . Pending │
│ (BE(B Error │ │ (BE(B Error │

6
vigil/__main__.py
View file

@ -98,10 +98,8 @@ class Entry(collections.UserList):
result_selected = self.widget[self.highlighted] result_selected = self.widget[self.highlighted]
status_color = tools._STATUS_COLORS.get( status_color = tools._STATUS_COLORS.get(
result_selected.status, None) result_selected.status, None)
fg_color = tools.STATUS_CURSOR_COLORS.get(result_selected.status,
termstr.Color.white)
return fill3.Text(termstr.TermStr("+", termstr.CharStyle( return fill3.Text(termstr.TermStr("+", termstr.CharStyle(
fg_color=fg_color, bg_color=status_color))) fg_color=termstr.Color.white, bg_color=status_color)))
def appearance_min(self): def appearance_min(self):
# 'appearance' local variable exists because appearance_cache can # 'appearance' local variable exists because appearance_cache can
@ -894,7 +892,7 @@ class Screen:
progress_bar_size): progress_bar_size):
ordering_text = "directory" if is_directory_sort else "type " ordering_text = "directory" if is_directory_sort else "type "
paused_indicator = (termstr.TermStr("paused ").fg_color( paused_indicator = (termstr.TermStr("paused ").fg_color(
termstr.Color.yellow) if is_paused else termstr.TermStr("running"). termstr.Color.dark_yellow) if is_paused else termstr.TermStr("running").
fg_color(termstr.Color.light_blue)) fg_color(termstr.Color.light_blue))
indicators = " " + paused_indicator + f" order:{ordering_text} " indicators = " " + paused_indicator + f" order:{ordering_text} "
spacing = " " * (width - len(self._STATUS_BAR) - len(indicators)) spacing = " " * (width - len(self._STATUS_BAR) - len(indicators))

2
vigil/termstr.py
View file

@ -43,6 +43,8 @@ class Color:
dark_red = (139, 0, 0) dark_red = (139, 0, 0)
lime = (0, 255, 0) lime = (0, 255, 0)
yellow = (255, 255, 0) yellow = (255, 255, 0)
dark_yellow = (255, 211, 0)
# dark_yellow = (204, 204, 0)
grey_50 = (50, 50, 50) grey_50 = (50, 50, 50)
grey_100 = (100, 100, 100) grey_100 = (100, 100, 100)
grey_150 = (150, 150, 150) grey_150 = (150, 150, 150)

9
vigil/tools.py
View file

@ -58,7 +58,7 @@ _STATUS_COLORS = {Status.ok: termstr.Color.green,
Status.normal: termstr.Color.grey_150, Status.normal: termstr.Color.grey_150,
Status.not_applicable: termstr.Color.grey_100, Status.not_applicable: termstr.Color.grey_100,
Status.running: termstr.Color.light_blue, Status.running: termstr.Color.light_blue,
Status.paused: termstr.Color.yellow, Status.paused: termstr.Color.dark_yellow,
Status.timed_out: termstr.Color.purple} Status.timed_out: termstr.Color.purple}
STATUS_MEANINGS = [ STATUS_MEANINGS = [
(Status.normal, "Normal"), (Status.ok, "Ok"), (Status.normal, "Normal"), (Status.ok, "Ok"),
@ -73,13 +73,6 @@ _STATUS_TO_TERMSTR = {
_STATUS_TO_TERMSTR[Status.error] = termstr.TermStr( _STATUS_TO_TERMSTR[Status.error] = termstr.TermStr(
"E", termstr.CharStyle(bg_color=termstr.Color.red)) "E", termstr.CharStyle(bg_color=termstr.Color.red))
_STATUS_TO_TERMSTR[Status.pending] = "." _STATUS_TO_TERMSTR[Status.pending] = "."
STATUS_CURSOR_COLORS = {Status.ok: termstr.Color.black,
Status.problem: termstr.Color.white,
Status.normal: termstr.Color.black,
Status.not_applicable: termstr.Color.white,
Status.running: termstr.Color.white,
Status.paused: termstr.Color.black,
Status.timed_out: termstr.Color.white}
def get_ls_color_codes(): def get_ls_color_codes():