From 7b01c62e07612a123f3ffe94583f51099e470c3b Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 20 Oct 2014 20:03:16 +0200 Subject: Change the API of Config.get_by_tabname Make the "default" parameter optional and thus move it to the end of the command with the other optional parameters. And change all the calls. --- src/tabs/basetabs.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/tabs/basetabs.py') diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py index c2efc9bc..0fde624c 100644 --- a/src/tabs/basetabs.py +++ b/src/tabs/basetabs.py @@ -592,8 +592,8 @@ class ChatTab(Tab): if not self.is_muc or self.joined: if state in ('active', 'inactive', 'gone') and self.inactive and not always_send: return - if config.get_by_tabname('send_chat_states', True, self.general_jid, True) and \ - self.remote_wants_chatstates is not False: + if (config.get_by_tabname('send_chat_states', self.general_jid) + and self.remote_wants_chatstates is not False): msg = self.core.xmpp.make_message(self.get_dest_jid()) msg['type'] = self.message_type msg['chat_state'] = state @@ -607,7 +607,8 @@ class ChatTab(Tab): on the the current status of the input """ name = self.general_jid - if config.get_by_tabname('send_chat_states', True, name, True) and self.remote_wants_chatstates: + if (config.get_by_tabname('send_chat_states', name) + and self.remote_wants_chatstates): needed = 'inactive' if self.inactive else 'active' self.cancel_paused_delay() if not empty_after: @@ -622,7 +623,7 @@ class ChatTab(Tab): we create a timed event that will put us to paused in a few seconds """ - if not config.get_by_tabname('send_chat_states', True, self.general_jid, True): + if not config.get_by_tabname('send_chat_states', self.general_jid): return if self.timed_event_paused: # check the weakref -- cgit v1.2.3 From f9734cde5623aaf701e222b00d5eebdf7a152772 Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 20 Oct 2014 21:04:14 +0200 Subject: Remove the (sometimes wrong) default values in the config.get() calls --- src/tabs/basetabs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tabs/basetabs.py') diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py index 0fde624c..2f5db40a 100644 --- a/src/tabs/basetabs.py +++ b/src/tabs/basetabs.py @@ -139,7 +139,7 @@ class Tab(object): Returns 1 or 0, depending on if we are using the vertical tab list or not. """ - if config.get('enable_vertical_tab_list', False): + if config.get('enable_vertical_tab_list'): return 0 return 1 @@ -298,7 +298,7 @@ class Tab(object): return False def refresh_tab_win(self): - if config.get('enable_vertical_tab_list', False): + if config.get('enable_vertical_tab_list'): if self.left_tab_win and not self.size.core_degrade_x: self.left_tab_win.refresh() elif not self.size.core_degrade_y: @@ -476,7 +476,7 @@ class ChatTab(Tab): self.update_keys() # Get the logs - log_nb = config.get('load_log', 10) + log_nb = config.get('load_log') logs = self.load_logs(log_nb) if logs: @@ -537,7 +537,7 @@ class ChatTab(Tab): for word in txt.split(): if len(word) >= 4 and word not in words: words.append(word) - words.extend([word for word in config.get('words', '').split(':') if word]) + words.extend([word for word in config.get('words').split(':') if word]) self.input.auto_completion(words, ' ', quotify=False) def on_enter(self): @@ -825,7 +825,7 @@ class OneToOneTab(ChatTab): if attention or empty: features.append(_('attention requests (/attention)')) if (receipts or empty) \ - and config.get('request_message_receipts', True): + and config.get('request_message_receipts'): features.append(_('message delivery receipts')) if len(features) > 1: tail = features.pop() -- cgit v1.2.3 From 0dc36d959868a4448873686e684cb86ecab2d425 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 22 Oct 2014 19:10:40 +0200 Subject: Typo --- src/tabs/basetabs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tabs/basetabs.py') diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py index 2f5db40a..fbf57dc2 100644 --- a/src/tabs/basetabs.py +++ b/src/tabs/basetabs.py @@ -833,7 +833,7 @@ class OneToOneTab(ChatTab): tail = None features_str = ', '.join(features) if tail and empty: - features_str += _(', or %s') % tail + features_str += _(', nor %s') % tail elif tail: features_str += _(' and %s') % tail -- cgit v1.2.3 From d2ca062eaa190cd837c5073ca83e71d2834c7059 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sat, 25 Oct 2014 16:50:19 +0200 Subject: Make the features disco in chat more user-friendly --- src/tabs/basetabs.py | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'src/tabs/basetabs.py') diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py index fbf57dc2..40dcb8e6 100644 --- a/src/tabs/basetabs.py +++ b/src/tabs/basetabs.py @@ -817,32 +817,17 @@ class OneToOneTab(ChatTab): else: self.__initial_disco = True - empty = not any((correct, attention, receipts)) - - features = [] - if correct or empty: - features.append(_('message correction (/correct)')) - if attention or empty: - features.append(_('attention requests (/attention)')) - if (receipts or empty) \ - and config.get('request_message_receipts'): - features.append(_('message delivery receipts')) - if len(features) > 1: - tail = features.pop() - else: - tail = None - features_str = ', '.join(features) - if tail and empty: - features_str += _(', nor %s') % tail - elif tail: - features_str += _(' and %s') % tail - - if empty: - msg = _('\x19%s}This contact does not support %s.') - else: - msg = _('\x19%s}This contact supports %s.') + ok = get_theme().CHAR_OK + nope = get_theme().CHAR_ERROR + + correct = ok if correct else nope + attention = ok if attention else nope + receipts = ok if receipts else nope + + msg = _('\x19%s}Contact supports: correction [%s], ' + 'attention [%s], receipts [%s].') color = dump_tuple(get_theme().COLOR_INFORMATION_TEXT) - msg = msg % (color, features_str) + msg = msg % (color, correct, attention, receipts) self.add_message(msg, typ=0) self.core.refresh_window() -- cgit v1.2.3 From f93f92517d3597aaf69625200f47da7a243b43a8 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 30 Oct 2014 21:43:49 +0100 Subject: Use a space instead of a cross while checking features --- src/tabs/basetabs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tabs/basetabs.py') diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py index 40dcb8e6..1b6e0d4c 100644 --- a/src/tabs/basetabs.py +++ b/src/tabs/basetabs.py @@ -818,7 +818,7 @@ class OneToOneTab(ChatTab): self.__initial_disco = True ok = get_theme().CHAR_OK - nope = get_theme().CHAR_ERROR + nope = get_theme().CHAR_EMPTY correct = ok if correct else nope attention = ok if attention else nope -- cgit v1.2.3