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()),