merge

2 files changed, 35 insertions, 83 deletions

diff --git a/data/themes/dark.py b/data/themes/dark.py
new file mode 100644
index 00000000..bbe226f8
--- /dev/null
+++ b/data/themes/dark.py
@@ -0,0 +1,35 @@
+import theming
+
+class DarkTheme(theming.Theme):
+    COLOR_INFORMATION_BAR = (-1, 236)
+    COLOR_STATUS_XA = (53, -1)
+    COLOR_STATUS_AWAY = (214, -1)
+    COLOR_STATUS_DND = (160, -1)
+    COLOR_STATUS_CHAT = (34 , -1)
+    COLOR_STATUS_UNAVAILABLE = (242 , -1)
+    COLOR_STATUS_ONLINE = (27 , -1)
+
+    COLOR_VERTICAL_SEPARATOR = (236, -1)
+    COLOR_NEW_TEXT_SEPARATOR = (213, -1)
+    COLOR_MORE_INDICATOR = (6, 4)
+
+    COLOR_HIGHLIGHT_NICK = (236, 202, 'b')
+
+    COLOR_TAB_NORMAL = (-1, 236)
+    COLOR_TAB_CURRENT = (-1, 16)
+    COLOR_TAB_NEW_MESSAGE = (3, 236)
+    COLOR_TAB_HIGHLIGHT = (1, 236)
+    COLOR_TAB_PRIVATE = (2, 236)
+    COLOR_TAB_DISCONNECTED = (13, 236)
+
+    COLOR_TOPIC_BAR = (-1, 236)
+    COLOR_SCROLLABLE_NUMBER = (220, 236, 'b')
+    COLOR_SELECTED_ROW = (-1, 238)
+    COLOR_PRIVATE_NAME = (173, 236)
+    COLOR_CONVERSATION_NAME = (2, 236)
+    COLOR_GROUPCHAT_NAME = (106, 236)
+    COLOR_COLUMN_HEADER = (36, 236)
+
+theme = DarkTheme()
+
+
diff --git a/data/themes/poezio b/data/themes/poezio
deleted file mode 100644
index b5bb6a66..00000000
--- a/data/themes/poezio
+++ /dev/null
@@ -1,83 +0,0 @@
-# A theme file. (the Default one)
-# For more informations, see http://dev.louiz.org/project/poezio/doc/TheThemes
-
-# Message text color
-COLOR_NORMAL_TEXT = 0
-COLOR_INFORMATION_TEXT = 5
-COLOR_HIGHLIGHT_NICK = -46
-
-# User list color
-COLOR_USER_VISITOR = 7
-COLOR_USER_PARTICIPANT = 4
-COLOR_USER_NONE = 0
-COLOR_USER_MODERATOR = 1
-
-# nickname colors
-COLOR_REMOTE_USER = 5
-
-# The character printed in color (COLOR_STATUS_*) before the nickname
-# in the user list
-CHAR_STATUS = ' '
-
-# Separators
-COLOR_VERTICAL_SEPARATOR = 4
-COLOR_NEW_TEXT_SEPARATOR = 2
-COLOR_MORE_INDICATOR = 6
-
-# Time
-COLOR_TIME_SEPARATOR = 6
-COLOR_TIME_LIMITER = 0
-CHAR_TIME_LEFT = ''
-CHAR_TIME_RIGHT = ''
-COLOR_TIME_NUMBERS = 0
-
-# Tabs
-COLOR_TAB_NORMAL = 42
-COLOR_TAB_CURRENT = 56
-COLOR_TAB_NEW_MESSAGE = 49
-COLOR_TAB_HIGHLIGHT = 21
-COLOR_TAB_PRIVATE = 28
-COLOR_TAB_DISCONNECTED = 30
-
-# Nickname colors
-LIST_COLOR_NICKNAMES = [
-    1, 2, 3, 4, 5, 6, -2, -4, -5, -6
-    ]
-COLOR_OWN_NICK = 7
-
-# Status color
-COLOR_STATUS_XA = 49
-COLOR_STATUS_NONE = 0
-COLOR_STATUS_DND = 21
-COLOR_STATUS_AWAY = 35
-COLOR_STATUS_CHAT = 28
-COLOR_STATUS_UNAVAILABLE = 57
-COLOR_STATUS_ONLINE = 41
-
-# Bars
-COLOR_INFORMATION_BAR = 42
-COLOR_TOPIC_BAR = 42
-COLOR_PRIVATE_ROOM_BAR = 28
-COLOR_SCROLLABLE_NUMBER = 39
-COLOR_SELECTED_ROW = 42
-COLOR_PRIVATE_NAME = 42
-COLOR_CONVERSATION_NAME = 42
-COLOR_GROUPCHAT_NAME = 42
-COLOR_COLUMN_HEADER = 36
-
-# Strings for special messages (like join, quit, nick change, etc)
-# Special messages
-CHAR_JOIN = '---->'
-CHAR_QUIT = '<----'
-CHAR_KICK = '-!-'
-
-COLOR_JOIN_CHAR = 4
-COLOR_QUIT_CHAR = 1
-COLOR_KICK_CHAR = 1
-
-# words between ()
-COLOR_CURLYBRACKETED_WORD = 4
-# words between {}
-COLOR_ACCOLADE_WORD = 6
-# words between []
-COLOR_BRACKETED_WORD = 3