Clear images when a tab is emptied, don't rename fits to "" if user cancels renaming

This commit is contained in:
cncfanatics
2010-08-25 20:20:25 +02:00
parent a201153b33
commit d4f39bd9b2
3 changed files with 6 additions and 2 deletions

View File

@@ -42,7 +42,7 @@ class Fit(object):
def newFit(self, shipID, name):
fit = eos.types.Fit()
fit.ship = eos.types.Ship(eos.db.getItem(shipID))
fit.name = name
fit.name = name
eos.db.saveddata_session.add(fit)
eos.db.saveddata_session.flush()
return fit.ID

View File

@@ -52,7 +52,7 @@ class FitMultiSwitch(wx.Notebook):
# Get fit name
fitID = self.shipBrowser.getSelectedFitID()
p.view.changeFit(fitID)
self.InsertPage(pos, p, "")
self.setTabTitle(pos, fitID)
wx.CallAfter(self.ChangeSelection, pos)
@@ -65,6 +65,7 @@ class FitMultiSwitch(wx.Notebook):
def setTabTitle(self, tab, fitID):
if fitID == None:
self.SetPageText(tab, "Empty Tab")
self.SetPageImage(tab, -1)
else:
cFit = controller.Fit.getInstance()
fit = cFit.getFit(fitID)

View File

@@ -176,6 +176,9 @@ class ShipBrowser(wx.Panel):
event.Skip()
def changeFitName(self, event):
if event.IsEditCancelled():
return
tree = self.getActiveTree()
item = event.Item
newName = event.Label