diff options
author | Florent Le Coz <louiz@louiz.org> | 2012-02-15 20:10:00 +0100 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2012-02-15 20:10:00 +0100 |
commit | 695a7ebebaf6a277420dcb42cd96d92d77df0379 (patch) | |
tree | 8c9da1e5bf988356ad110f42113949aab94a5866 /data | |
parent | 0606c2b351ac87f110e1240d2f4ba1b94b275930 (diff) | |
parent | b89cd8fd8322bf8aa23130398a0a70defcba708d (diff) | |
download | poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.gz poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.bz2 poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.xz poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.zip |
Merge branch 'master' of https://git.louiz.org/poezio
Diffstat (limited to 'data')
-rw-r--r-- | data/default_config.cfg | 13 | ||||
-rw-r--r-- | data/themes/dark.py | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg index e870941d..4188851b 100644 --- a/data/default_config.cfg +++ b/data/default_config.cfg @@ -10,6 +10,10 @@ server = anon.louiz.org # the port you'll use to connect port = 5222 +# Auto-reconnects you when you get disconnected from the server +# defaults to false because it should not be necessary +auto_reconnect = false + # the resource you will use # If it's empty, your resource will be chosen (most likely randomly) by the server # It is not recommended to use a resource that is easy to guess, because it can lead @@ -174,7 +178,8 @@ show_inactive_tabs = true # - private (when a new private message is received, from your contacts or # someone from a MUC) # - message (any message from a MUC) -beep_on = highlight private +# - invite (when you receive an invitation for joining a MUC) +beep_on = highlight private invite # Theme @@ -197,6 +202,12 @@ vertical_tab_list_size = 20 vertical_tab_list_sort = desc +# Show the user list at the bottom when in a MUC +# (useful when you want to look at the bottom of the screen only) +# possible values: desc, asc +user_list_sort = desc + + # The nick of people who join, part, change their status, etc. in a MUC will # be displayed using their nick color if true. display_user_color_in_join_part = false diff --git a/data/themes/dark.py b/data/themes/dark.py index 272c4d91..c7942290 100644 --- a/data/themes/dark.py +++ b/data/themes/dark.py @@ -20,6 +20,7 @@ class DarkTheme(theming.Theme): COLOR_TAB_CURRENT = (-1, 16) COLOR_TAB_NEW_MESSAGE = (3, 236) COLOR_TAB_HIGHLIGHT = (1, 236) + COLOR_TAB_ATTENTION = (6, 236) COLOR_TAB_PRIVATE = (2, 236) COLOR_TAB_DISCONNECTED = (13, 236) @@ -36,6 +37,7 @@ class DarkTheme(theming.Theme): COLOR_VERTICAL_TAB_NEW_MESSAGE = (3, -1) COLOR_VERTICAL_TAB_HIGHLIGHT = (1, -1) COLOR_VERTICAL_TAB_PRIVATE = (2, -1) + COLOR_VERTICAL_TAB_ATTENTION = (6, -1) COLOR_VERTICAL_TAB_DISCONNECTED = (13, -1) |