diff options
Diffstat (limited to 'src/room.py')
| -rw-r--r-- | src/room.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/room.py b/src/room.py index 83b00e62..b97dd0b6 100644 --- a/src/room.py +++ b/src/room.py @@ -12,7 +12,7 @@ from config import config from logger import logger import common -import theme +from theming import get_theme import logging import curses @@ -24,7 +24,7 @@ class Room(TextBuffer): TextBuffer.__init__(self, messages_nb_limit) self.name = name self.own_nick = nick - self.color_state = theme.COLOR_TAB_NORMAL # color used in RoomInfo + self.color_state = get_theme().COLOR_TAB_NORMAL # color used in RoomInfo self.joined = False # false until self presence is receied self.users = [] # User objects self.topic = '' @@ -35,7 +35,7 @@ class Room(TextBuffer): we can know if we can join it, send messages to it, etc """ self.users = [] - self.color_state = theme.COLOR_TAB_DISCONNECTED + self.color_state = get_theme().COLOR_TAB_DISCONNECTED self.joined = False def get_single_line_topic(self): @@ -59,16 +59,16 @@ class Room(TextBuffer): color = None if not time and nickname and nickname != self.own_nick and self.joined: if self.own_nick.lower() in txt.lower(): - if self.color_state != theme.COLOR_TAB_CURRENT: - self.set_color_state(theme.COLOR_TAB_HIGHLIGHT) - color = theme.COLOR_HIGHLIGHT_NICK + if self.color_state != get_theme().COLOR_TAB_CURRENT: + self.set_color_state(get_theme().COLOR_TAB_HIGHLIGHT) + color = get_theme().COLOR_HIGHLIGHT_NICK else: highlight_words = config.get('highlight_on', '').split(':') for word in highlight_words: if word and word.lower() in txt.lower(): - if self.color_state != theme.COLOR_TAB_CURRENT: - self.set_color_state(theme.COLOR_TAB_HIGHLIGHT) - color = theme.COLOR_HIGHLIGHT_NICK + if self.color_state != get_theme().COLOR_TAB_CURRENT: + self.set_color_state(get_theme().COLOR_TAB_HIGHLIGHT) + color = get_theme().COLOR_HIGHLIGHT_NICK break if color: beep_on = config.get('beep_on', 'highlight private').split() @@ -101,7 +101,7 @@ class Room(TextBuffer): self.log_message(txt, time, nickname) special_message = False if txt.startswith('/me '): - txt = "\x192* \x195" + nickname + ' ' + txt[4:] + txt = "\x192}* \x195}" + nickname + ' ' + txt[4:] special_message = True user = self.get_user_by_name(nickname) if nickname is not None else None if user: @@ -110,18 +110,18 @@ class Room(TextBuffer): user = forced_user if not time and nickname and\ nickname != self.own_nick and\ - self.color_state != theme.COLOR_TAB_CURRENT: - if self.color_state != theme.COLOR_TAB_HIGHLIGHT: - self.set_color_state(theme.COLOR_TAB_NEW_MESSAGE) + self.color_state != get_theme().COLOR_TAB_CURRENT: + if self.color_state != get_theme().COLOR_TAB_HIGHLIGHT: + self.set_color_state(get_theme().COLOR_TAB_NEW_MESSAGE) nick_color = nick_color or None if not nickname or time: - txt = '\x195%s' % (txt,) + txt = '\x195}%s' % (txt,) else: # TODO highlight = self.do_highlight(txt, time, nickname) if highlight: nick_color = highlight if special_message: - txt = '\x195%s' % (txt,) + txt = '\x195}%s' % (txt,) nickname = None time = time or datetime.now() message = Message(txt='%s\x19o'%(txt.replace('\t', ' '),), nick_color=nick_color, |