mirrors/roar
1
Fork 0
mirror of https://github.com/lalbornoz/roar.git synced 2024-11-22 15:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

MiRCARTGeneralFrame.py: show accelerators (hotkeys) in menus.

Browse Source
This commit is contained in:
Lucio Andrés Illanes Albornoz 2018-01-11 00:45:40 +01:00
parent f65603dd0c
commit 4bc9b61f2c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MiRCARTGeneralFrame.py
View File

@ -42,18 +42,20 @@ NID_TOOLBAR_VSEP = (0x202, TID_NOTHING)
class MiRCARTGeneralFrame(wx.Frame): class MiRCARTGeneralFrame(wx.Frame):
"""XXX""" """XXX"""
itemsById = menuItemsById = toolBarItemsById = None accelItemsById = itemsById = menuItemsById = toolBarItemsById = None
statusBar = toolBars = None statusBar = toolBars = None
panelSkin = sizerSkin = None panelSkin = sizerSkin = None
# {{{ _initAccelTable(self, accelsDescr): XXX # {{{ _initAccelTable(self, accelsDescr): XXX
def _initAccelTable(self, accelsDescr): def _initAccelTable(self, accelsDescr):
accelTableEntries = [wx.AcceleratorEntry() for n in range(len(accelsDescr[2]))] accelTableEntries = [wx.AcceleratorEntry() for n in range(len(accelsDescr[2]))]
self.accelItemsById = {}
for numAccel in range(len(accelsDescr[2])): for numAccel in range(len(accelsDescr[2])):
accelDescr = accelsDescr[2][numAccel] accelDescr = accelsDescr[2][numAccel]
if accelDescr[5] != None: if accelDescr[5] != None:
self.itemsById[accelDescr[0]] = accelDescr self.itemsById[accelDescr[0]] = accelDescr
accelTableEntries[numAccel].Set(*accelDescr[5], accelDescr[0]) accelTableEntries[numAccel].Set(*accelDescr[5], accelDescr[0])
self.accelItemsById[accelDescr[0]] = accelTableEntries[numAccel]
self.Bind(wx.EVT_MENU, self.onInput, id=accelDescr[0]) self.Bind(wx.EVT_MENU, self.onInput, id=accelDescr[0])
return accelTableEntries return accelTableEntries
# }}} # }}}
@ -68,6 +70,8 @@ class MiRCARTGeneralFrame(wx.Frame):
elif menuItem[1] == TID_SELECT: elif menuItem[1] == TID_SELECT:
self.itemsById[menuItem[0]] = menuItem self.itemsById[menuItem[0]] = menuItem
menuItemWindow = menuWindow.AppendRadioItem(menuItem[0], menuItem[3], menuItem[2]) menuItemWindow = menuWindow.AppendRadioItem(menuItem[0], menuItem[3], menuItem[2])
if menuItem[5] != None:
menuItemWindow.SetAccel(self.accelItemsById[menuItem[0]])
self.menuItemsById[menuItem[0]] = menuItemWindow self.menuItemsById[menuItem[0]] = menuItemWindow
self.Bind(wx.EVT_MENU, self.onInput, menuItemWindow) self.Bind(wx.EVT_MENU, self.onInput, menuItemWindow)
if menuItem[6] != None: if menuItem[6] != None:
@ -75,6 +79,8 @@ class MiRCARTGeneralFrame(wx.Frame):
else: else:
self.itemsById[menuItem[0]] = menuItem self.itemsById[menuItem[0]] = menuItem
menuItemWindow = menuWindow.Append(menuItem[0], menuItem[3], menuItem[2]) menuItemWindow = menuWindow.Append(menuItem[0], menuItem[3], menuItem[2])
if menuItem[5] != None:
menuItemWindow.SetAccel(self.accelItemsById[menuItem[0]])
self.menuItemsById[menuItem[0]] = menuItemWindow self.menuItemsById[menuItem[0]] = menuItemWindow
self.Bind(wx.EVT_MENU, self.onInput, menuItemWindow) self.Bind(wx.EVT_MENU, self.onInput, menuItemWindow)
if menuItem[6] != None: if menuItem[6] != None:
@ -150,6 +156,11 @@ class MiRCARTGeneralFrame(wx.Frame):
super().__init__(*args, **kwargs); self.itemsById = {}; super().__init__(*args, **kwargs); self.itemsById = {};
panelSkin = wx.Panel(self, wx.ID_ANY) panelSkin = wx.Panel(self, wx.ID_ANY)
# Initialise accelerators (hotkeys)
accelTable = wx.AcceleratorTable( \
self._initAccelTable(self.LID_ACCELS[2]))
self.SetAcceleratorTable(accelTable)
# Initialise menu bar, menus & menu items # Initialise menu bar, menus & menu items
# Initialise toolbar & toolbar items # Initialise toolbar & toolbar items
menuBar = self._initMenus(self.LID_MENUS[2]) menuBar = self._initMenus(self.LID_MENUS[2])
@ -157,11 +168,6 @@ class MiRCARTGeneralFrame(wx.Frame):
self._initToolBitmaps(self.LID_TOOLBARS[2]) self._initToolBitmaps(self.LID_TOOLBARS[2])
toolBar = self._initToolBars(self.LID_TOOLBARS[2], panelSkin) toolBar = self._initToolBars(self.LID_TOOLBARS[2], panelSkin)
# Initialise accelerators (hotkeys)
accelTable = wx.AcceleratorTable( \
self._initAccelTable(self.LID_ACCELS[2]))
self.SetAcceleratorTable(accelTable)
# Initialise status bar # Initialise status bar
self.statusBar = self.CreateStatusBar() self.statusBar = self.CreateStatusBar()