Fix some horrors in shipbrowser
This commit is contained in:
@@ -312,6 +312,8 @@ class NavigationPanel(SFItem.SFBrowserItem):
|
|||||||
self.toolbar.AddButton(self.searchBmp, "Search fittings", clickCallback = self.ToggleSearchBox, hoverBitmap = self.searchBmpH)
|
self.toolbar.AddButton(self.searchBmp, "Search fittings", clickCallback = self.ToggleSearchBox, hoverBitmap = self.searchBmpH)
|
||||||
|
|
||||||
self.padding = 4
|
self.padding = 4
|
||||||
|
self.lastSearch = ""
|
||||||
|
|
||||||
self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
|
self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
|
||||||
|
|
||||||
self.BrowserSearchBox = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, (-1,-1), wx.TE_PROCESS_ENTER)
|
self.BrowserSearchBox = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, (-1,-1), wx.TE_PROCESS_ENTER)
|
||||||
@@ -350,6 +352,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def OnBrowserSearchBoxLostFocus(self, event):
|
def OnBrowserSearchBoxLostFocus(self, event):
|
||||||
|
self.lastSearch = self.BrowserSearchBox.GetValue()
|
||||||
self.BrowserSearchBox.Show(False)
|
self.BrowserSearchBox.Show(False)
|
||||||
|
|
||||||
def OnBrowserSearchBoxEsc(self, event):
|
def OnBrowserSearchBoxEsc(self, event):
|
||||||
@@ -1880,7 +1883,7 @@ class FitItem(SFItem.SFBrowserItem):
|
|||||||
sFit.deleteFit(self.fitID)
|
sFit.deleteFit(self.fitID)
|
||||||
|
|
||||||
if self.shipBrowser.GetActiveStage() == 4:
|
if self.shipBrowser.GetActiveStage() == 4:
|
||||||
wx.PostEvent(self.shipBrowser,SearchSelected(text=self.shipBrowser.hpane.lastSearch,back=True))
|
wx.PostEvent(self.shipBrowser,SearchSelected(text=self.shipBrowser.navpanel.lastSearch,back=True))
|
||||||
else:
|
else:
|
||||||
wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID, back=True))
|
wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID, back=True))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user