From 3cd275027852826233aba71f30d895c1ddb0ff7c Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 31 Oct 2010 10:57:20 +0100 Subject: [PATCH 1/4] Update eos --- eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos b/eos index 533606ff8..5a3d0b5e2 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 533606ff862507e6f53724afabf28335dec7ded3 +Subproject commit 5a3d0b5e2cbbab278990a465affb8b7189084a2f From a0d20614fbc0ddf937d8162514b1c387bd481046 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 31 Oct 2010 10:57:29 +0100 Subject: [PATCH 2/4] Fix accelerator stuff --- gui/mainFrame.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index a4fd3e335..56db77d7f 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -221,8 +221,6 @@ class MainFrame(wx.Frame): menuBar = self.GetMenuBar() # Quit self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT) - # Close Tab - self.Bind(wx.EVT_MENU, self.CloseCurrentFit, id=wx.ID_CLOSE) # Widgets Inspector self.Bind(wx.EVT_MENU, self.openWXInspectTool, id=911) # About @@ -245,11 +243,14 @@ class MainFrame(wx.Frame): #Clipboard exports self.Bind(wx.EVT_MENU, self.exportToClipboard, id=wx.ID_COPY) - hiddenMenu = wx.Menu() - hiddenMenu.Append(9911,"Delete Tab") - self.Bind(wx.EVT_MENU,self.HAddTab, id = 19911) - actb = [(wx.ACCEL_CTRL, ord('T'), 19911), - (wx.ACCEL_CMD, ord('T'), 19911)] + addTabId = wx.NewId() + # Close Tab + self.Bind(wx.EVT_MENU, self.CloseCurrentFit, id=wx.ID_CLOSE) + self.Bind(wx.EVT_MENU,self.HAddTab, id = addTabId) + actb = [(wx.ACCEL_CTRL, ord('T'), addTabId), + (wx.ACCEL_CMD, ord('T'), addTabId), + (wx.ACCEL_CTRL, ord("W"), wx.ID_CLOSE), + (wx.ACCEL_CMD, ord("W"), wx.ID_CLOSE)] atable = wx.AcceleratorTable(actb) self.SetAcceleratorTable(atable) From adb606927f4715065e39213feb2ae290753c6d55 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 31 Oct 2010 11:08:41 +0100 Subject: [PATCH 3/4] Add CTRL+ accelerator to toggle between ship & market browser --- gui/mainFrame.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 262c45fcd..d627f5743 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -246,19 +246,27 @@ class MainFrame(wx.Frame): self.Bind(wx.EVT_MENU, self.exportToClipboard, id=wx.ID_COPY) addTabId = wx.NewId() + toggleShipMarketId = wx.NewId() # Close Tab self.Bind(wx.EVT_MENU, self.CloseCurrentFit, id=wx.ID_CLOSE) self.Bind(wx.EVT_MENU,self.HAddTab, id = addTabId) + self.Bind(wx.EVT_MENU,self.toggleShipMarket, id = toggleShipMarketId) + actb = [(wx.ACCEL_CTRL, ord('T'), addTabId), (wx.ACCEL_CMD, ord('T'), addTabId), (wx.ACCEL_CTRL, ord("W"), wx.ID_CLOSE), - (wx.ACCEL_CMD, ord("W"), wx.ID_CLOSE)] + (wx.ACCEL_CMD, ord("W"), wx.ID_CLOSE), + (wx.ACCEL_CTRL, ord(" "), toggleShipMarketId), + (wx.ACCEL_CMD, ord(" "), toggleShipMarketId)] atable = wx.AcceleratorTable(actb) self.SetAcceleratorTable(atable) def HAddTab(self,event): self.fitMultiSwitch.AddTab() + def toggleShipMarket(self, event): + sel = self.notebookBrowsers.GetSelection() + self.notebookBrowsers.SetSelection(0 if sel == 1 else 1) def clipboardEft(self): sFit = service.Fit.getInstance() From a563db9d57a05eabc426eb26acc2b62748de84aa Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 31 Oct 2010 11:33:01 +0100 Subject: [PATCH 4/4] Update eos --- eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos b/eos index 5a3d0b5e2..50262f50e 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 5a3d0b5e2cbbab278990a465affb8b7189084a2f +Subproject commit 50262f50e0309b6ec01fbe8072846c734fe490b5