Commit d57d63e1 authored by Bram Schoenmakers's avatar Bram Schoenmakers

Merge branch 'bgcolors'

parents 4908b64d 1684f33b
...@@ -4,3 +4,5 @@ project_color = ...@@ -4,3 +4,5 @@ project_color =
context_color = context_color =
link_color = link_color =
metadata_color = metadata_color =
focus_background_color =
marked_background_color =
...@@ -24,3 +24,5 @@ project_color = junk ...@@ -24,3 +24,5 @@ project_color = junk
context_color = junk context_color = junk
metadata_color = junk metadata_color = junk
link_color = junk link_color = junk
focus_background_color = junk
marked_background_color = junk
...@@ -154,6 +154,14 @@ class ColorsTest(TopydoTest): ...@@ -154,6 +154,14 @@ class ColorsTest(TopydoTest):
self.assertEqual(color_b, '') self.assertEqual(color_b, '')
self.assertEqual(color_c, '') self.assertEqual(color_c, '')
def test_focus_color(self):
config(p_overrides={('colorscheme', 'focus_background_color'): 'gray'})
self.assertEqual(config().focus_background_color().as_ansi(), '\033[0;37m')
def test_mark_color(self):
config(p_overrides={('colorscheme', 'marked_background_color'): 'blue'})
self.assertEqual(config().marked_background_color().as_ansi(), '\033[0;34m')
def test_empty_color_values(self): def test_empty_color_values(self):
config("test/data/ColorsTest5.conf") config("test/data/ColorsTest5.conf")
project_color = config().project_color().as_ansi(p_decoration='bold') project_color = config().project_color().as_ansi(p_decoration='bold')
......
...@@ -128,6 +128,18 @@ class ConfigTest(TopydoTest): ...@@ -128,6 +128,18 @@ class ConfigTest(TopydoTest):
self.assertEqual(config("test/data/ConfigTest5.conf").link_color().color, 6) self.assertEqual(config("test/data/ConfigTest5.conf").link_color().color, 6)
def test_config24(self): def test_config24(self):
""" No focus background color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").focus_background_color().color, 7)
def test_config25(self):
""" No mark background color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").marked_background_color().color, 4)
def test_config26(self):
self.assertTrue(config("test/data/ConfigTest4.conf").focus_background_color().is_neutral())
self.assertTrue(config("test/data/ConfigTest4.conf").marked_background_color().is_neutral())
def test_config27(self):
""" column_keymap test. """ """ column_keymap test. """
keymap, keystates = config("test/data/ConfigTest6.conf").column_keymap() keymap, keystates = config("test/data/ConfigTest6.conf").column_keymap()
......
...@@ -50,6 +50,8 @@ append_parent_contexts = 0 ...@@ -50,6 +50,8 @@ append_parent_contexts = 0
; context_color = magenta ; context_color = magenta
; metadata_color = green ; metadata_color = green
; link_color = light-cyan ; link_color = light-cyan
; focus_background_color = gray
; marked_background_color = blue
[aliases] [aliases]
;showall = ls -x ;showall = ls -x
......
...@@ -106,6 +106,8 @@ class _Config: ...@@ -106,6 +106,8 @@ class _Config:
'metadata_color': 'green', 'metadata_color': 'green',
'link_color': 'cyan', 'link_color': 'cyan',
'priority_colors': 'A:cyan,B:yellow,C:blue', 'priority_colors': 'A:cyan,B:yellow,C:blue',
'focus_background_color': 'gray',
'marked_background_color': 'blue'
}, },
'aliases': { 'aliases': {
...@@ -367,6 +369,18 @@ class _Config: ...@@ -367,6 +369,18 @@ class _Config:
except ValueError: except ValueError:
return Color(self.cp.get('colorscheme', 'link_color')) return Color(self.cp.get('colorscheme', 'link_color'))
def focus_background_color(self):
try:
return Color(self.cp.getint('colorscheme', 'focus_background_color'))
except ValueError:
return Color(self.cp.get('colorscheme', 'focus_background_color'))
def marked_background_color(self):
try:
return Color(self.cp.getint('colorscheme', 'marked_background_color'))
except ValueError:
return Color(self.cp.get('colorscheme', 'marked_background_color'))
def auto_creation_date(self): def auto_creation_date(self):
try: try:
return self.cp.getboolean('add', 'auto_creation_date') return self.cp.getboolean('add', 'auto_creation_date')
......
...@@ -193,18 +193,20 @@ class UIApplication(CLIApplicationBase): ...@@ -193,18 +193,20 @@ class UIApplication(CLIApplicationBase):
context_color = to_urwid_color(config().context_color()) context_color = to_urwid_color(config().context_color())
metadata_color = to_urwid_color(config().metadata_color()) metadata_color = to_urwid_color(config().metadata_color())
link_color = to_urwid_color(config().link_color()) link_color = to_urwid_color(config().link_color())
focus_background_color = to_urwid_color(config().focus_background_color())
marked_background_color = to_urwid_color(config().marked_background_color())
palette = [ palette = [
(PaletteItem.PROJECT, '', '', '', project_color, ''), (PaletteItem.PROJECT, '', '', '', project_color, ''),
(PaletteItem.PROJECT_FOCUS, '', 'light gray', '', project_color, None), (PaletteItem.PROJECT_FOCUS, '', 'light gray', '', project_color, focus_background_color),
(PaletteItem.CONTEXT, '', '', '', context_color, ''), (PaletteItem.CONTEXT, '', '', '', context_color, ''),
(PaletteItem.CONTEXT_FOCUS, '', 'light gray', '', context_color, None), (PaletteItem.CONTEXT_FOCUS, '', 'light gray', '', context_color, focus_background_color),
(PaletteItem.METADATA, '', '', '', metadata_color, ''), (PaletteItem.METADATA, '', '', '', metadata_color, ''),
(PaletteItem.METADATA_FOCUS, '', 'light gray', '', metadata_color, None), (PaletteItem.METADATA_FOCUS, '', 'light gray', '', metadata_color, focus_background_color),
(PaletteItem.LINK, '', '', '', link_color, ''), (PaletteItem.LINK, '', '', '', link_color, ''),
(PaletteItem.LINK_FOCUS, '', 'light gray', '', link_color, None), (PaletteItem.LINK_FOCUS, '', 'light gray', '', link_color, focus_background_color),
(PaletteItem.DEFAULT_FOCUS, 'black', 'light gray'), (PaletteItem.DEFAULT_FOCUS, '', 'light gray', '', '', focus_background_color),
(PaletteItem.MARKED, '', 'light blue'), (PaletteItem.MARKED, '', 'light blue', '', '', marked_background_color),
] ]
for C in ascii_uppercase: for C in ascii_uppercase:
...@@ -217,7 +219,7 @@ class UIApplication(CLIApplicationBase): ...@@ -217,7 +219,7 @@ class UIApplication(CLIApplicationBase):
'pri_' + C, '', '', '', pri_color, '' 'pri_' + C, '', '', '', pri_color, ''
)) ))
palette.append(( palette.append((
'pri_' + C + '_focus', '', 'light gray', '', pri_color_focus, None 'pri_' + C + '_focus', '', 'light gray', '', pri_color_focus, focus_background_color
)) ))
return palette return palette
......
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