Merge branch 'phoenix' into py3

This commit is contained in:
Bill Dengler 2017-06-17 01:31:05 +00:00
commit bde1d1fdf0

View File

@ -29,69 +29,69 @@ class dmPanelMenu(wx.Menu):
def __init__(self): def __init__(self):
super(dmPanelMenu, self).__init__() super(dmPanelMenu, self).__init__()
self.reply = wx.MenuItem(self, wx.NewId(), _(u"Re&ply")) self.reply = wx.MenuItem(self, wx.NewId(), _(u"Re&ply"))
self.append(self.reply) self.Append(self.reply)
self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL")) self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL"))
self.append(self.openUrl) self.Append(self.openUrl)
self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio")) self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio"))
self.append(self.play) self.Append(self.play)
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show direct message")) self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show direct message"))
self.append(self.view) self.Append(self.view)
self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard")) self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
self.append(self.copy) self.Append(self.copy)
self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete")) self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
self.append(self.remove) self.Append(self.remove)
self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions...")) self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions..."))
self.append(self.userActions) self.Append(self.userActions)
class sentPanelMenu(wx.Menu): class sentPanelMenu(wx.Menu):
def __init__(self): def __init__(self):
super(sentPanelMenu, self).__init__() super(sentPanelMenu, self).__init__()
self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL")) self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL"))
self.append(self.openUrl) self.Append(self.openUrl)
self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio")) self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio"))
self.append(self.play) self.Append(self.play)
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show tweet")) self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show tweet"))
self.append(self.view) self.Append(self.view)
self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard")) self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
self.append(self.copy) self.Append(self.copy)
self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete")) self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
self.append(self.remove) self.Append(self.remove)
class eventsPanelMenu(wx.Menu): class eventsPanelMenu(wx.Menu):
def __init__(self): def __init__(self):
super(eventsPanelMenu, self).__init__() super(eventsPanelMenu, self).__init__()
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show event")) self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show event"))
self.append(self.view) self.Append(self.view)
self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard")) self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
self.append(self.copy) self.Append(self.copy)
self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete")) self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
self.append(self.remove) self.Append(self.remove)
class peoplePanelMenu(wx.Menu): class peoplePanelMenu(wx.Menu):
def __init__(self): def __init__(self):
super(peoplePanelMenu, self).__init__() super(peoplePanelMenu, self).__init__()
self.reply = wx.MenuItem(self, wx.NewId(), _(u"Direct &message")) self.reply = wx.MenuItem(self, wx.NewId(), _(u"Direct &message"))
self.append(self.reply) self.Append(self.reply)
self.lists = wx.MenuItem(self, wx.NewId(), _(u"&View lists")) self.lists = wx.MenuItem(self, wx.NewId(), _(u"&View lists"))
self.append(self.lists) self.Append(self.lists)
self.lists.Enable(False) self.lists.Enable(False)
self.details = wx.MenuItem(self, wx.NewId(), _(u"Show user &profile")) self.details = wx.MenuItem(self, wx.NewId(), _(u"Show user &profile"))
self.append(self.details) self.Append(self.details)
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show user")) self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show user"))
self.append(self.view) self.Append(self.view)
self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard")) self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
self.append(self.copy) self.Append(self.copy)
self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions...")) self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions..."))
self.append(self.userActions) self.Append(self.userActions)
class trendsPanelMenu(wx.Menu): class trendsPanelMenu(wx.Menu):
def __init__(self): def __init__(self):
super(trendsPanelMenu, self).__init__() super(trendsPanelMenu, self).__init__()
self.search_topic = wx.MenuItem(self, wx.NewId(), _(u"Search topic")) self.search_topic = wx.MenuItem(self, wx.NewId(), _(u"Search topic"))
self.append(self.search_topic) self.Append(self.search_topic)
self.tweetThisTrend = wx.MenuItem(self, wx.NewId(), _(u"&Tweet about this trend")) self.tweetThisTrend = wx.MenuItem(self, wx.NewId(), _(u"&Tweet about this trend"))
self.append(self.tweetThisTrend) self.Append(self.tweetThisTrend)
self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show item")) self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show item"))
self.append(self.view) self.Append(self.view)
self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard")) self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
self.append(self.copy) self.Append(self.copy)