From 05122de12d569ff26b8842f6b7999cddde347683 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 27 Oct 2010 15:53:37 +0300 Subject: [PATCH] Visual stuff --- gui/mainFrame.py | 2 +- gui/shipBrowser.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 68bc21020..32c57ca9d 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -114,7 +114,7 @@ class MainFrame(wx.Frame): tab, _ = self.notebookBrowsers.HitTest(event.Position) if tab != -1: self.notebookBrowsers.SetSelection(tab) - + def CloseCurrentFit(self, evt): self.fitMultiSwitch.removeCurrentTab() diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 7238e29f3..a759e52cf 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -16,7 +16,7 @@ Stage3Selected, EVT_SB_STAGE3_SEL = wx.lib.newevent.NewEvent() class ShipBrowser(wx.Panel): def __init__(self, parent): - wx.Panel.__init__ (self, parent) + wx.Panel.__init__ (self, parent,style = wx.SIMPLE_BORDER if 'wxGTK' in wx.PlatformInfo else wx.DOUBLE_BORDER) self._lastWidth = 0 self._activeStage = 0 @@ -29,9 +29,13 @@ class ShipBrowser(wx.Panel): self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) mainSizer = wx.BoxSizer(wx.VERTICAL) + self.hpane = HeaderPane(self) mainSizer.Add(self.hpane, 0, wx.EXPAND) + self.m_sl2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + mainSizer.Add( self.m_sl2, 0, wx.EXPAND, 0 ) + self.lpane = ListPane(self) mainSizer.Add(self.lpane, 1, wx.EXPAND) self.SetSizer(mainSizer) @@ -175,14 +179,14 @@ class HeaderPane (wx.Panel): self.sbForward.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) self.sl1 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_VERTICAL ) - mainSizer.Add( self.sl1, 0, wx.EXPAND |wx.ALL, 5 ) + mainSizer.Add( self.sl1, 0, wx.EXPAND |wx.LEFT, 5 ) self.sbSearch = PFGenBitmapButton( self, wx.ID_ANY, self.searchBmp, wx.DefaultPosition, bmpSize, wx.BORDER_NONE ) mainSizer.Add(self.sbSearch, 0, wx.LEFT | wx.TOP | wx.BOTTOM | wx.ALIGN_CENTER_VERTICAL , 5) self.sbSearch.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) self.sl2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_VERTICAL ) - mainSizer.Add( self.sl2, 0, wx.EXPAND |wx.ALL, 5 ) + mainSizer.Add( self.sl2, 0, wx.EXPAND |wx.LEFT, 5 ) self.sbNewFit = PFGenBitmapButton( self, wx.ID_ANY, self.newBmp, wx.DefaultPosition, bmpSize, wx.BORDER_NONE ) mainSizer.Add(self.sbNewFit, 0, wx.LEFT | wx.TOP | wx.BOTTOM | wx.ALIGN_CENTER_VERTICAL , 5)