From a03ef851e33982b2546191de253ea6912beed5d7 Mon Sep 17 00:00:00 2001 From: Jose Manuel Delicado Date: Fri, 5 Aug 2016 15:50:46 +0200 Subject: [PATCH] The buffers dialog in account configuration now includes the buffer translated name --- src/controller/settings.py | 20 +++++++++++--- src/wxUI/dialogs/configuration.py | 46 ++++++++++++++++++------------- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/controller/settings.py b/src/controller/settings.py index 492e634f..73e6dfb2 100644 --- a/src/controller/settings.py +++ b/src/controller/settings.py @@ -19,6 +19,7 @@ import config_utils import BaseHTTPServer log = logging.getLogger("Settings") import keys +from collections import OrderedDict class globalSettingsController(object): def __init__(self): @@ -248,14 +249,25 @@ class accountSettingsController(globalSettingsController): self.dialog.ignored_clients.remove_(id) def get_buffers_list(self): - all_buffers = ['home','mentions','dm','sent_dm','sent_tweets','favorites','followers','friends','blocks','muted','events'] + all_buffers=OrderedDict() + all_buffers['home']=_(u"Home") + all_buffers['mentions']=_(u"Mentions") + all_buffers['dm']=_(u"Direct Messages") + all_buffers['sent_dm']=_(u"Sent direct messages") + all_buffers['sent_tweets']=_(u"Sent tweets") + all_buffers['favorites']=_(u"Likes") + all_buffers['followers']=_(u"Followers") + all_buffers['friends']=_(u"Friends") + all_buffers['blocks']=_(u"Blocked users") + all_buffers['muted']=_(u"Muted users") + all_buffers['events']=_(u"Events") list_buffers = [] hidden_buffers=[] - for i in all_buffers: + for i in all_buffers.keys(): if i in self.config["general"]["buffer_order"]: - list_buffers.append((i, True)) + list_buffers.append((i, all_buffers[i], True)) else: - hidden_buffers.append((i, False)) + hidden_buffers.append((i, all_buffers[i], False)) list_buffers.extend(hidden_buffers) return list_buffers diff --git a/src/wxUI/dialogs/configuration.py b/src/wxUI/dialogs/configuration.py index 0c9a5981..6683b301 100644 --- a/src/wxUI/dialogs/configuration.py +++ b/src/wxUI/dialogs/configuration.py @@ -114,7 +114,7 @@ class other_buffers(wx.Panel): def __init__(self, parent): super(other_buffers, self).__init__(parent) sizer = wx.BoxSizer(wx.VERTICAL) - self.buffers = widgets.list(self, _(u"Buffer"), _(u"Status"), style=wx.LC_SINGLE_SEL|wx.LC_REPORT) + self.buffers = widgets.list(self, _(u"Buffer"), _(u"Name"), _(u"Status"), style=wx.LC_SINGLE_SEL|wx.LC_REPORT) sizer.Add(self.buffers.list, 0, wx.ALL, 5) btnSizer = wx.BoxSizer(wx.HORIZONTAL) self.toggle_state = wx.Button(self, -1, _(u"Show/hide")) @@ -128,10 +128,10 @@ class other_buffers(wx.Panel): def insert_buffers(self, buffers): for i in buffers: - if i[1] == True: - self.buffers.insert_item(False, *[i[0], _(u"Show")]) + if i[2] == True: + self.buffers.insert_item(False, *[i[0], i[1], _(u"Show")]) else: - self.buffers.insert_item(False, *[i[0], _(u"Hide")]) + self.buffers.insert_item(False, *[i[0], i[1], _(u"Hide")]) def connect_hook_func(self, func): self.buffers.list.Bind(wx.EVT_CHAR_HOOK, func) @@ -141,40 +141,48 @@ class other_buffers(wx.Panel): if current == -1: output.speak(_(u"Select a buffer first."), True) return False - if self.buffers.get_text_column(current, 1) == _(u"Hide"): + if self.buffers.get_text_column(current, 2) == _(u"Hide"): output.speak(_(u"The buffer is hidden, show it first."), True) return False if current <= 0: output.speak(_(u"The buffer is already at the top of the list."), True) return False current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0) - current_text_state = self.buffers.get_text_column(self.buffers.get_selected(), 1) + current_name = self.buffers.get_text_column(self.buffers.get_selected(), 1) + current_text_state = self.buffers.get_text_column(self.buffers.get_selected(), 2) text_above = self.buffers.get_text_column(self.buffers.get_selected()-1, 0) - text_above_state = self.buffers.get_text_column(self.buffers.get_selected()-1, 1) + name_above = self.buffers.get_text_column(self.buffers.get_selected()-1, 1) + text_above_state = self.buffers.get_text_column(self.buffers.get_selected()-1, 2) self.buffers.set_text_column(self.buffers.get_selected()-1, 0, current_text) - self.buffers.set_text_column(self.buffers.get_selected()-1, 1, current_text_state) + self.buffers.set_text_column(self.buffers.get_selected()-1, 1, current_name) + self.buffers.set_text_column(self.buffers.get_selected()-1, 2, current_text_state) self.buffers.set_text_column(self.buffers.get_selected(), 0, text_above) - self.buffers.set_text_column(self.buffers.get_selected(), 1, text_above_state) + self.buffers.set_text_column(self.buffers.get_selected(), 1, name_above) + self.buffers.set_text_column(self.buffers.get_selected(), 2, text_above_state) def move_down(self, *args, **kwargs): current = self.buffers.get_selected() if current == -1: output.speak(_(u"Select a buffer first."), True) return False - if self.buffers.get_text_column(current, 1) == _(u"Hide"): + if self.buffers.get_text_column(current, 2) == _(u"Hide"): output.speak(_(u"The buffer is hidden, show it first."), True) return False if current+1 >= self.buffers.get_count(): output.speak(_(u"The buffer is already at the bottom of the list."), True) return False current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0) - current_text_state = self.buffers.get_text_column(self.buffers.get_selected(), 1) + current_name = self.buffers.get_text_column(self.buffers.get_selected(), 1) + current_text_state = self.buffers.get_text_column(self.buffers.get_selected(), 2) text_below = self.buffers.get_text_column(self.buffers.get_selected()+1, 0) - text_below_state = self.buffers.get_text_column(self.buffers.get_selected()+1, 1) + name_below = self.buffers.get_text_column(self.buffers.get_selected()+1, 1) + text_below_state = self.buffers.get_text_column(self.buffers.get_selected()+1, 2) self.buffers.set_text_column(self.buffers.get_selected()+1, 0, current_text) - self.buffers.set_text_column(self.buffers.get_selected()+1, 1, current_text_state) + self.buffers.set_text_column(self.buffers.get_selected()+1, 1, current_name) + self.buffers.set_text_column(self.buffers.get_selected()+1, 2, current_text_state) self.buffers.set_text_column(self.buffers.get_selected(), 0, text_below) - self.buffers.set_text_column(self.buffers.get_selected(), 1, text_below_state) + self.buffers.set_text_column(self.buffers.get_selected(), 1, name_below) + self.buffers.set_text_column(self.buffers.get_selected(), 2, text_below_state) def get_event(self, ev): if ev.GetKeyCode() == wx.WXK_SPACE: @@ -185,16 +193,16 @@ class other_buffers(wx.Panel): def change_selected_item(self): current = self.buffers.get_selected() - text = self.buffers.get_text_column(current, 1) + text = self.buffers.get_text_column(current, 2) if text == _(u"Show"): - self.buffers.set_text_column(current, 1, _(u"Hide")) + self.buffers.set_text_column(current, 2, _(u"Hide")) else: - self.buffers.set_text_column(current, 1, _(u"Show")) - output.speak(self.buffers.get_text_column(current, 1),True) + self.buffers.set_text_column(current, 2, _(u"Show")) + output.speak(self.buffers.get_text_column(current, 2),True) def get_list(self): buffers_list = [] for i in xrange(0, self.buffers.get_count()): - if self.buffers.get_text_column(i, 1) == _(u"Show"): + if self.buffers.get_text_column(i, 2) == _(u"Show"): buffers_list.append(self.buffers.get_text_column(i, 0)) return buffers_list