dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

refactor quickfit shortcuts with list

Browse Source
This commit is contained in:
Kalu
2015-06-02 11:36:32 +02:00
parent f6bbc6c410
commit 51fed996f1
1 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gui/mainFrame.py
View File

@@ -429,12 +429,6 @@ class MainFrame(wx.Frame):
self.additionstab4 = wx.NewId()
self.additionstab5 = wx.NewId()
self.itemSelect1 = wx.NewId()
self.itemSelect2 = wx.NewId()
self.itemSelect3 = wx.NewId()
self.itemSelect4 = wx.NewId()
self.itemSelect5 = wx.NewId()
# Close Page
self.Bind(wx.EVT_MENU, self.CloseCurrentPage, id=self.closePageId)
self.Bind(wx.EVT_MENU, self.HAddPage, id = self.addPageId)
@@ -449,12 +443,6 @@ class MainFrame(wx.Frame):
self.Bind(wx.EVT_MENU, self.AdditionsTabSelect, id = self.additionstab4)
self.Bind(wx.EVT_MENU, self.AdditionsTabSelect, id = self.additionstab5)
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect1)
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect2)
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect3)
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect4)
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect5)
actb = [(wx.ACCEL_CTRL, ord('T'), self.addPageId),
(wx.ACCEL_CMD, ord('T'), self.addPageId),
@@ -489,14 +477,15 @@ class MainFrame(wx.Frame):
(wx.ACCEL_CMD, ord('2'), self.additionstab2),
(wx.ACCEL_CMD, ord('3'), self.additionstab3),
(wx.ACCEL_CMD, ord('4'), self.additionstab4),
(wx.ACCEL_CMD, ord('5'), self.additionstab5),
(wx.ACCEL_ALT, ord('1'), self.itemSelect1),
(wx.ACCEL_ALT, ord('2'), self.itemSelect2),
(wx.ACCEL_ALT, ord('3'), self.itemSelect3),
(wx.ACCEL_ALT, ord('4'), self.itemSelect4),
(wx.ACCEL_ALT, ord('5'), self.itemSelect5)
(wx.ACCEL_CMD, ord('5'), self.additionstab5)
]
self.itemSelect = []
for i in range(0, 9):
self.itemSelect.append(wx.NewId())
self.Bind(wx.EVT_MENU, self.ItemSelect, id = self.itemSelect[i])
actb.append((wx.ACCEL_ALT, i + 49, self.itemSelect[i]))
atable = wx.AcceleratorTable(actb)
self.SetAcceleratorTable(atable)
@@ -517,16 +506,10 @@ class MainFrame(wx.Frame):
def ItemSelect(self, event):
selItem = None
if event.GetId() == self.itemSelect1:
selItem = 0
if event.GetId() == self.itemSelect2:
selItem = 1
if event.GetId() == self.itemSelect3:
selItem = 2
if event.GetId() == self.itemSelect4:
selItem = 3
if event.GetId() == self.itemSelect5:
selItem = 4
for i in range(0, 9):
if event.GetId() == self.itemSelect[i]:
selItem = i;
if selItem is not None:
wx.PostEvent(self, ItemSelected(itemID=self.marketBrowser.itemView.active[selItem].ID))