Fit add when no tabs available bug fix (create an empty tab first or we will end up with orphan fittingviews) / little cleanup in mainframe.py / added GetPageCount method to PFNotebook
This commit is contained in:
@@ -147,6 +147,9 @@ class PFNotebook(wx.Panel):
|
||||
def GetCurrentPage(self):
|
||||
return self.activePage
|
||||
|
||||
def GetPageCount(self):
|
||||
return len(self.pages)
|
||||
|
||||
def AddPage(self, tabWnd, tabTitle ="Empty Tab", tabImage = None, showClose = True):
|
||||
if self.activePage:
|
||||
self.activePage.Hide()
|
||||
|
||||
@@ -42,6 +42,8 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
|
||||
|
||||
def fitSelected(self, event):
|
||||
count = -1
|
||||
if self.multiSwitch.GetPageCount() == 0:
|
||||
self.multiSwitch.AddPage(wx.Panel(self.multiSwitch, size = (0,0)), "Empty Tab")
|
||||
for index, page in enumerate(self.multiSwitch.pages):
|
||||
try:
|
||||
if page.activeFitID == event.fitID:
|
||||
|
||||
@@ -82,7 +82,7 @@ class MainFrame(wx.Frame):
|
||||
faSizer = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
self.fitMultiSwitch = MultiSwitch(self.FitviewAdditionsPanel)
|
||||
#self.fitMultiSwitch.AddPage()
|
||||
|
||||
faSizer.Add(self.fitMultiSwitch,1,wx.EXPAND)
|
||||
|
||||
self.additionsPane = AdditionsPane(self.FitviewAdditionsPanel)
|
||||
@@ -90,9 +90,8 @@ class MainFrame(wx.Frame):
|
||||
|
||||
self.FitviewAdditionsPanel.SetSizer(faSizer)
|
||||
|
||||
# self.notebookBrowsers = wx.Notebook(self.splitter, wx.ID_ANY)
|
||||
|
||||
self.notebookBrowsers = gui.chromeTabs.PFNotebook(self.splitter, False)
|
||||
# self.notebookBrowsers.Bind(wx.EVT_LEFT_DOWN, self.mouseHit)
|
||||
|
||||
self.marketBrowser = MarketBrowser(self.notebookBrowsers)
|
||||
self.notebookBrowsers.AddPage(self.marketBrowser, "Market", showClose = False)
|
||||
@@ -143,11 +142,6 @@ class MainFrame(wx.Frame):
|
||||
def getActiveView(self):
|
||||
sel = self.fitMultiSwitch.GetSelectedPage()
|
||||
|
||||
# def mouseHit(self, event):
|
||||
# tab, _ = self.notebookBrowsers.HitTest(event.Position)
|
||||
# if tab != -1:
|
||||
# self.notebookBrowsers.SetSelection(tab)
|
||||
|
||||
def CloseCurrentFit(self, evt):
|
||||
ms = self.fitMultiSwitch
|
||||
|
||||
|
||||
Reference in New Issue
Block a user