summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-09 01:23:35 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-09 01:23:35 +0100
commitad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f (patch)
tree3f2bbf1be7f753f1c7495f0a60833f469e7f10a7 /data
parent7fadb35fe2e7932a0a4aa6a8184ab6b186669edc (diff)
parent03999f1ef08036b7ea25e2239cf7b6bcdb4d76cc (diff)
downloadpoezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.gz
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.bz2
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.tar.xz
poezio-ad0b3b41ecc0003f3d5b4fdb9799b6e325127e1f.zip
Merge branch 'plugins'
Conflicts: README src/core.py src/tabs.py
Diffstat (limited to 'data')
-rw-r--r--data/default_config.cfg7
-rw-r--r--data/themes/dark.py1
2 files changed, 8 insertions, 0 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index 279f902d..e803a7d1 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -125,6 +125,13 @@ use_log = false
# you want to use instead. This directory will be created if it doesn't exist
log_dir =
+# If plugins_dir is not set, plugins will be loaded from $XDG_DATA_HOME/poezio/plugins.
+# You can specify an other directory to use. It will be created if it doesn't exist
+plugins_dir =
+
+# Space separated list of plugins to load on startup
+plugins_autoload =
+
# the full path to the photo (avatar) you want to use
# it should be less than 16Ko
# The avatar is not set by default, because it slows
diff --git a/data/themes/dark.py b/data/themes/dark.py
index bbe226f8..015e2988 100644
--- a/data/themes/dark.py
+++ b/data/themes/dark.py
@@ -8,6 +8,7 @@ class DarkTheme(theming.Theme):
COLOR_STATUS_CHAT = (34 , -1)
COLOR_STATUS_UNAVAILABLE = (242 , -1)
COLOR_STATUS_ONLINE = (27 , -1)
+ COLOR_STATUS_NONE = (27 , -1)
COLOR_VERTICAL_SEPARATOR = (236, -1)
COLOR_NEW_TEXT_SEPARATOR = (213, -1)