From 54efa8319c400060537d9eeb81f1719a93516c0e Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 19 Aug 2010 18:47:42 +0200 Subject: [PATCH] Try an alternative method of switching between ship and marketBrowser --- gui/mainFrame.py | 2 +- gui/mainToolBar.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 1668f0fa2..cc5d00ef3 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -52,7 +52,7 @@ class MainFrame(wx.Frame): self.shipBrowser = ShipBrowser(marketShipBrowserPanel) - self.marketShipBrowserSizer.Add(self.shipBrowser, 1, wx.EXPAND) + #self.marketShipBrowserSizer.Add(self.shipBrowser, 1, wx.EXPAND) statsFitviewPanel = wx.Panel(self.splitter) sizer = wx.BoxSizer(wx.HORIZONTAL) diff --git a/gui/mainToolBar.py b/gui/mainToolBar.py index d513ac10e..c3389762d 100644 --- a/gui/mainToolBar.py +++ b/gui/mainToolBar.py @@ -39,8 +39,14 @@ class MainToolBar(wx.ToolBar): newState = self.GetToolState(10) mainFrame = gui.mainFrame.MainFrame.getInstance() + if newState: mainFrame.shipBrowser.build() + mainFrame.marketShipBrowserSizer.Detach(mainFrame.marketBrowser) + mainFrame.marketShipBrowserSizer.Add(mainFrame.shipBrowser, 1, wx.EXPAND) + else: + mainFrame.marketShipBrowserSizer.Detach(mainFrame.shipBrowser) + mainFrame.marketShipBrowserSizer.Add(mainFrame.marketBrowser, 1, wx.EXPAND) mainFrame.shipBrowser.Show(newState) mainFrame.marketBrowser.Show(not newState)