From 52267562bcac3db8ffd748d8190254b3c7d8804b Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Mon, 3 Apr 2023 15:32:57 -0600 Subject: [PATCH] Core: Removed Twitter references from default menu bar --- src/controller/mastodon/handler.py | 2 -- src/wxUI/view.py | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/controller/mastodon/handler.py b/src/controller/mastodon/handler.py index 9125aecd..aa47536d 100644 --- a/src/controller/mastodon/handler.py +++ b/src/controller/mastodon/handler.py @@ -29,7 +29,6 @@ class Handler(object): fav=_("&Add to favorites"), unfav=_("Remove from favorites"), view=_("&Show post"), - view_coordinates=None, view_conversation=_("View conversa&tion"), ocr=None, delete=_("&Delete"), @@ -40,7 +39,6 @@ class Handler(object): addAlias=None, addToList=None, removeFromList=None, - viewLists=None, details=None, favs=None, # In buffer Menu. diff --git a/src/wxUI/view.py b/src/wxUI/view.py index 5d2b2f0c..05d8d896 100644 --- a/src/wxUI/view.py +++ b/src/wxUI/view.py @@ -15,26 +15,29 @@ class mainFrame(wx.Frame): self.menubar_application = wx.Menu() self.manage_accounts = self.menubar_application.Append(wx.ID_ANY, _(u"&Manage accounts")) self.updateProfile = self.menubar_application.Append(wx.ID_ANY, _("&Update profile")) + self.updateProfile.Enable(False) self.show_hide = self.menubar_application.Append(wx.ID_ANY, _(u"&Hide window")) self.menuitem_search = self.menubar_application.Append(wx.ID_ANY, _(u"&Search")) self.lists = self.menubar_application.Append(wx.ID_ANY, _(u"&Lists manager")) + self.lists.Enable(False) self.manageAliases = self.menubar_application.Append(wx.ID_ANY, _("Manage user aliases")) + self.manageAliases.Enable(False) self.keystroke_editor = self.menubar_application.Append(wx.ID_ANY, _(u"&Edit keystrokes")) self.account_settings = self.menubar_application.Append(wx.ID_ANY, _(u"Account se&ttings")) self.prefs = self.menubar_application.Append(wx.ID_PREFERENCES, _(u"&Global settings")) self.close = self.menubar_application.Append(wx.ID_EXIT, _(u"E&xit")) - # Tweet menu + # Compose menu self.menubar_item = wx.Menu() - self.compose = self.menubar_item.Append(wx.ID_ANY, _(u"&Tweet")) + self.compose = self.menubar_item.Append(wx.ID_ANY, _(u"&Post")) self.reply = self.menubar_item.Append(wx.ID_ANY, _(u"Re&ply")) - self.share = self.menubar_item.Append(wx.ID_ANY, _(u"&Retweet")) - self.fav = self.menubar_item.Append(wx.ID_ANY, _(u"&Like")) - self.unfav = self.menubar_item.Append(wx.ID_ANY, _(u"&Unlike")) - self.view = self.menubar_item.Append(wx.ID_ANY, _(u"&Show tweet")) - self.view_coordinates = self.menubar_item.Append(wx.ID_ANY, _(u"View &address")) + self.share = self.menubar_item.Append(wx.ID_ANY, _(u"&Boost")) + self.fav = self.menubar_item.Append(wx.ID_ANY, _(u"&Add to favorites")) + self.unfav = self.menubar_item.Append(wx.ID_ANY, _(u"&Remove from favorites")) + self.view = self.menubar_item.Append(wx.ID_ANY, _(u"&Show post")) self.view_conversation = self.menubar_item.Append(wx.ID_ANY, _(u"View conversa&tion")) self.ocr = self.menubar_item.Append(wx.ID_ANY, _(u"Read text in picture")) + self.ocr.Enable(False) self.delete = self.menubar_item.Append(wx.ID_ANY, _(u"&Delete")) # User menu @@ -43,9 +46,9 @@ class mainFrame(wx.Frame): self.timeline = self.menubar_user.Append(wx.ID_ANY, _(u"&View timeline...")) self.dm = self.menubar_user.Append(wx.ID_ANY, _(u"Direct me&ssage")) self.addAlias = self.menubar_user.Append(wx.ID_ANY, _("Add a&lias")) + self.addAlias.Enable(False) self.addToList = self.menubar_user.Append(wx.ID_ANY, _(u"&Add to list")) self.removeFromList = self.menubar_user.Append(wx.ID_ANY, _(u"R&emove from list")) - self.viewLists = self.menubar_user.Append(wx.ID_ANY, _(u"&View lists")) self.details = self.menubar_user.Append(wx.ID_ANY, _(u"Show user &profile")) self.favs = self.menubar_user.Append(wx.ID_ANY, _(u"V&iew likes"))