diff options
| author | mathieui <mathieui@mathieui.net> | 2014-10-31 19:15:57 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2014-10-31 19:16:44 +0100 |
| commit | 1c1ab3cb839e5509db52770e10c7190f844eb2e5 (patch) | |
| tree | b331060b3dc42651e61e4ccb2dfe6af5e2e97752 /src/theming.py | |
| parent | cedc5a6ec80a46437f42464415fd1806049c593d (diff) | |
| parent | ea2b703bfd07d293ba9fdd85ac657275d43da2a7 (diff) | |
| download | poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.gz poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.bz2 poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.xz poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.zip | |
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts:
src/bookmark.py
src/config.py
src/connection.py
src/core/commands.py
src/core/core.py
src/core/handlers.py
src/windows/info_bar.py
src/windows/muc.py
src/windows/roster_win.py
src/windows/text_win.py
src/xhtml.py
Diffstat (limited to 'src/theming.py')
| -rwxr-xr-x | src/theming.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/theming.py b/src/theming.py index 9820addf..1e9d6c40 100755 --- a/src/theming.py +++ b/src/theming.py @@ -301,10 +301,13 @@ class Theme(object): CHAR_QUIT = '<---' CHAR_KICK = '-!-' CHAR_NEW_TEXT_SEPARATOR = '- ' - CHAR_ACK_RECEIVED = '✔' + CHAR_OK = '✔' + CHAR_ERROR = '✖' + CHAR_EMPTY = ' ' + CHAR_ACK_RECEIVED = CHAR_OK CHAR_COLUMN_ASC = ' ▲' CHAR_COLUMN_DESC = ' ▼' - CHAR_ROSTER_ERROR = '✖' + CHAR_ROSTER_ERROR = CHAR_ERROR CHAR_ROSTER_TUNE = '♪' CHAR_ROSTER_ASKED = '?' CHAR_ROSTER_ACTIVITY = 'A' @@ -455,7 +458,7 @@ def update_themes_dir(option=None, value=None): # import from the user-defined prefs themes_dir = path.expanduser( value or - config.get('themes_dir', '') or + config.get('themes_dir') or path.join(os.environ.get('XDG_DATA_HOME') or path.join(os.environ.get('HOME'), '.local', 'share'), 'poezio', 'themes') @@ -482,7 +485,7 @@ def update_themes_dir(option=None, value=None): log.debug('Theme load path: %s', load_path) def reload_theme(): - theme_name = config.get('theme', 'default') + theme_name = config.get('theme') global theme if theme_name == 'default' or not theme_name.strip(): theme = Theme() |