From 0162ae5739a3faa7896fc4580817d3ccb2275781 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Sat, 2 May 2015 18:35:11 -0400 Subject: [PATCH 1/2] Initial framework for unified new buffer dialog. --- src/controller/mainController.py | 6 +++++- src/gtkUI/view.py | 4 ++-- src/wxUI/view.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 06c1b403..e98df9ec 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -165,7 +165,7 @@ class Controller(object): widgetUtils.connect_event(self.view, widgetUtils.MENU, self.user_details, menuitem=self.view.details) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.toggle_autoread, menuitem=self.view.autoread) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.toggle_buffer_mute, self.view.mute_buffer) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.open_timeline, self.view.timeline) + widgetUtils.connect_event(self.view, widgetUtils.MENU, self.new_buffer, self.view.newbuffer) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.open_favs_timeline, self.view.favs) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.open_conversation, menuitem=self.view.view_conversation) if widgetUtils.toolkit == "wx": @@ -1267,3 +1267,7 @@ class Controller(object): def __del__(self): config.app.write() + + def new_buffer(self,*args,**kwargs): + #This is a placeholder for the unified new buffer dialog, for now just call self.open_timeline. + return self.open_timeline(*args,**kwargs) \ No newline at end of file diff --git a/src/gtkUI/view.py b/src/gtkUI/view.py index 054c43a3..22092be0 100644 --- a/src/gtkUI/view.py +++ b/src/gtkUI/view.py @@ -81,13 +81,13 @@ class mainFrame(Gtk.Window): # buffer menu buffer = Gtk.Menu() - self.timeline = Gtk.MenuItem(label="New buffer...") + self.newbuffer = Gtk.MenuItem(label="New buffer...") self.load_previous_items = Gtk.MenuItem(label="Load previous items") self.mute_buffer = Gtk.MenuItem(label="Mute") self.autoread = Gtk.MenuItem(label="Autoread") self.clear = Gtk.MenuItem(label="Clear buffer") self.deleteTl = Gtk.MenuItem(label="Destroy") - self.append_to_menu(buffer, self.timeline, self.load_previous_items, self.mute_buffer, self.autoread, self.clear, self.deleteTl) + self.append_to_menu(buffer, self.newbuffer, self.load_previous_items, self.mute_buffer, self.autoread, self.clear, self.deleteTl) buffer_menu = Gtk.MenuItem(label="Buffer") buffer_menu.set_submenu(buffer) menuBar.append(buffer_menu) diff --git a/src/wxUI/view.py b/src/wxUI/view.py index 2cbe2222..16ae83df 100644 --- a/src/wxUI/view.py +++ b/src/wxUI/view.py @@ -56,7 +56,7 @@ class mainFrame(wx.Frame): # buffer menu buffer = wx.Menu() - self.timeline = buffer.Append(wx.NewId(), _(u"&New buffer...")) + self.newbuffer = buffer.Append(wx.NewId(), _(u"&New buffer...")) self.load_previous_items = buffer.Append(wx.NewId(), _(u"&Load previous items")) buffer.AppendSeparator() self.mute_buffer = buffer.AppendCheckItem(wx.NewId(), _(u"&Mute")) @@ -97,7 +97,7 @@ class mainFrame(wx.Frame): (wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('S'), self.unfollow.GetId()), (wx.ACCEL_CTRL, ord('K'), self.block.GetId()), (wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('K'), self.report.GetId()), -(wx.ACCEL_CTRL, ord('I'), self.timeline.GetId()), +(wx.ACCEL_CTRL, ord('I'), self.newbuffer.GetId()), (wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('I'), self.deleteTl.GetId()), (wx.ACCEL_CTRL, ord('M'), self.show_hide.GetId()), (wx.ACCEL_CTRL, ord('P'), self.updateProfile.GetId()), From 42052f5ee7649904af52d828ca9084a951b819b7 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Sat, 2 May 2015 18:42:21 -0400 Subject: [PATCH 2/2] Cleaned up user menu. --- src/controller/mainController.py | 6 ------ src/wxUI/view.py | 11 +---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index e98df9ec..53ad038c 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -148,12 +148,6 @@ class Controller(object): widgetUtils.connect_event(self.view, widgetUtils.MENU, self.delete, self.view.delete) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.follow, menuitem=self.view.follow) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.send_dm, self.view.dm) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.unfollow, menuitem=self.view.unfollow) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.mute, menuitem=self.view.mute) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.unmute, menuitem=self.view.unmute) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.report, menuitem=self.view.report) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.block, menuitem=self.view.block) - widgetUtils.connect_event(self.view, widgetUtils.MENU, self.unblock, menuitem=self.view.unblock) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.get_more_items, menuitem=self.view.load_previous_items) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.clear_buffer, menuitem=self.view.clear) widgetUtils.connect_event(self.view, widgetUtils.MENU, self.remove_buffer, self.view.deleteTl) diff --git a/src/wxUI/view.py b/src/wxUI/view.py index 16ae83df..cd0f0d37 100644 --- a/src/wxUI/view.py +++ b/src/wxUI/view.py @@ -37,13 +37,7 @@ class mainFrame(wx.Frame): # User menu user = wx.Menu() - self.follow = user.Append(wx.NewId(), _(u"&Follow")) - self.unfollow = user.Append(wx.NewId(), _(u"&Unfollow")) - self.mute = user.Append(wx.NewId(), _(u"&Mute")) - self.unmute = user.Append(wx.NewId(), _(u"U&nmute")) - self.report = user.Append(wx.NewId(), _(u"&Report as spam")) - self.block = user.Append(wx.NewId(), _(u"&Block")) - self.unblock = user.Append(wx.NewId(), _(u"Unb&lock")) + self.follow = user.Append(wx.NewId(), _(u"&Actions...")) self.dm = user.Append(wx.NewId(), _(u"Direct me&ssage")) self.addToList = user.Append(wx.NewId(), _(u"&Add to list")) self.addToList.Enable(False) @@ -94,9 +88,6 @@ class mainFrame(wx.Frame): (wx.ACCEL_CTRL, ord('Q'), self.close.GetId()), (wx.ACCEL_CTRL, ord('S'), self.follow.GetId()), -(wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('S'), self.unfollow.GetId()), -(wx.ACCEL_CTRL, ord('K'), self.block.GetId()), -(wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('K'), self.report.GetId()), (wx.ACCEL_CTRL, ord('I'), self.newbuffer.GetId()), (wx.ACCEL_CTRL|wx.ACCEL_SHIFT, ord('I'), self.deleteTl.GetId()), (wx.ACCEL_CTRL, ord('M'), self.show_hide.GetId()),