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

Revert "Revert "Revert "rm -rf pyfa on ctrl+w"""

Browse Source 
This reverts commit c5186d9c75.
This commit is contained in:
cncfanatics
2010-11-23 08:59:35 +01:00
parent 0a90fe9a17
commit d60f85db0d
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/chromeTabs.py
View File

@@ -118,7 +118,6 @@ class PFNotebook(wx.Panel):
else: else:
oldPage.Destroy() oldPage.Destroy()
page.Reparent(self.pageContainer) page.Reparent(self.pageContainer)
self.tabsContainer.tabs[i].closeButton =True
if self.activePage == page: if self.activePage == page:
self.ShowActive() self.ShowActive()
@@ -142,9 +141,6 @@ class PFNotebook(wx.Panel):
def GetPageIndex(self, page): def GetPageIndex(self, page):
return self.pages.index(page) if page in self.pages else None return self.pages.index(page) if page in self.pages else None
def CanClosePage(self, pageIndex):
return self.tabsContainer.tabs[pageIndex].closeButton
def GetSelection(self): def GetSelection(self):
return self.GetPageIndex(self.activePage) return self.GetPageIndex(self.activePage)
@@ -191,7 +187,6 @@ class PFNotebook(wx.Panel):
self.ShowActive() self.ShowActive()
else: else:
self.activePage = None self.activePage = None
self.AddPage(wx.Panel(self, size = (0,0)), "Empty Tab", showClose = False)
def SwitchPages(self, src, dest, internal = False): def SwitchPages(self, src, dest, internal = False):

7
gui/mainFrame.py
View File

@@ -147,12 +147,7 @@ class MainFrame(wx.Frame):
page = ms.GetSelection() page = ms.GetSelection()
if page is not None: if page is not None:
if ms.CanClosePage(page): ms.DeletePage(page)
ms.DeletePage(page)
if ms.GetPageCount() == 0:
ms.AddPage(wx.Panel(self, size = (0,0)), "Empty Tab", showClose = False )
else:
self.Close()
def ExitApp(self, evt): def ExitApp(self, evt):
try: try:

6
gui/multiSwitch.py
View File

@@ -23,7 +23,7 @@ import gui.chromeTabs
class MultiSwitch(gui.chromeTabs.PFNotebook): class MultiSwitch(gui.chromeTabs.PFNotebook):
def __init__(self, parent): def __init__(self, parent):
gui.chromeTabs.PFNotebook.__init__(self, parent) gui.chromeTabs.PFNotebook.__init__(self, parent)
self.AddPage(showClose = False) self.AddPage()
self.handlers = handlers = [] self.handlers = handlers = []
for type in TabSpawner.tabTypes: for type in TabSpawner.tabTypes:
handlers.append(type(self)) handlers.append(type(self))
@@ -37,12 +37,12 @@ class MultiSwitch(gui.chromeTabs.PFNotebook):
if h: if h:
h(type, info) h(type, info)
def AddPage(self, tabWnd=None, tabTitle="Empty Tab", tabImage=None, showClose = True): def AddPage(self, tabWnd=None, tabTitle="Empty Tab", tabImage=None):
if tabWnd is None: if tabWnd is None:
tabWnd = wx.Panel(self, size=(0, 0)) tabWnd = wx.Panel(self, size=(0, 0))
tabWnd.handleDrag = lambda type, info: self.handleDrag(type, info, False) tabWnd.handleDrag = lambda type, info: self.handleDrag(type, info, False)
gui.chromeTabs.PFNotebook.AddPage(self, tabWnd, tabTitle, tabImage, showClose) gui.chromeTabs.PFNotebook.AddPage(self, tabWnd, tabTitle, tabImage, True)
class TabSpawner(object): class TabSpawner(object):