gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing bug

Browse Source
This commit is contained in:
Michael Lazar
2017-09-12 22:03:04 -04:00
parent fb2ede8df7
commit f39fb63bac
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtv/page.py
View File

@@ -51,7 +51,9 @@ class Page(object):
self.nav = None self.nav = None
self.controller = None self.controller = None
self.copy_to_clipboard = copy self.copy_to_clipboard = copy
self.theme_list = ThemeList()
# TODO: does this need to be a global?
self.theme_list = ThemeList(term.theme)
self.active = True self.active = True
self._row = 0 self._row = 0

8
rtv/theme.py
View File

@@ -361,11 +361,11 @@ class Theme(object):
filename = os.path.join(path, '{0}.cfg'.format(name)) filename = os.path.join(path, '{0}.cfg'.format(name))
if os.path.isfile(filename): if os.path.isfile(filename):
return cls.from_file(name, 'installed') return cls.from_file(filename, 'installed')
filename = os.path.join(DEFAULT_THEMES, '{0}.cfg'.format(name)) filename = os.path.join(DEFAULT_THEMES, '{0}.cfg'.format(name))
if os.path.isfile(filename): if os.path.isfile(filename):
return cls.from_file(name, 'preset') return cls.from_file(filename, 'preset')
raise ConfigError('Could not find theme named "{0}"'.format(name)) raise ConfigError('Could not find theme named "{0}"'.format(name))
@@ -517,6 +517,10 @@ class ThemeList(object):
if (theme.source, theme.name) == key: if (theme.source, theme.name) == key:
self.index = i self.index = i
break break
else:
# If the current_theme was set from a custom source it might
# not be a part of the list returned by list_themes().
self.themes.insert(0, self.current_theme)
self.current_theme = self.themes[self.index] self.current_theme = self.themes[self.index]