From 5e4ea4f0bff490f609666f5055cce4c97569f4d0 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 13:17:46 +0200 Subject: [PATCH 01/14] Proper align stuff in dmgpattern editor --- gui/patternEditor.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index bc956585f..00072d40f 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -92,8 +92,8 @@ class DmgPatternEditorDlg (wx.Dialog): self.expbitmap = bitmapLoader.getBitmap("explosive_big", "icons") dmgeditSizer = wx.FlexGridSizer(2, 4, 0, 2) - dmgeditSizer.AddGrowableCol(1) - dmgeditSizer.AddGrowableCol(2) + dmgeditSizer.AddGrowableCol(0) + dmgeditSizer.AddGrowableCol(3) dmgeditSizer.SetFlexibleDirection(wx.BOTH) dmgeditSizer.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED) @@ -101,28 +101,28 @@ class DmgPatternEditorDlg (wx.Dialog): defSize = wx.Size(width,-1) self.editEm = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, wx.TE_RIGHT) - dmgeditSizer.Add(self.editEm, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.editEm, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) self.bmpEM = wx.StaticBitmap(self, wx.ID_ANY, self.embitmap) - dmgeditSizer.Add(self.bmpEM, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.bmpEM, 0, wx.ALIGN_CENTER_VERTICAL, 5) self.bmpTHERM = wx.StaticBitmap(self, wx.ID_ANY, self.thermbitmap) - dmgeditSizer.Add(self.bmpTHERM, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + dmgeditSizer.Add(self.bmpTHERM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) self.editThermal = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) - dmgeditSizer.Add(self.editThermal, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.editThermal, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) self.editKinetic = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, wx.TE_RIGHT) - dmgeditSizer.Add(self.editKinetic, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.editKinetic, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) self.bmpKIN = wx.StaticBitmap(self, wx.ID_ANY, self.kinbitmap) - dmgeditSizer.Add(self.bmpKIN, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.bmpKIN, 0, wx.ALIGN_CENTER_VERTICAL, 5) self.bmpEXP = wx.StaticBitmap(self, wx.ID_ANY, self.expbitmap) - dmgeditSizer.Add(self.bmpEXP, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + dmgeditSizer.Add(self.bmpEXP, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) self.editExplosive = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) - dmgeditSizer.Add(self.editExplosive, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.editExplosive, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) contentSizer.Add(dmgeditSizer, 1, wx.EXPAND | wx.ALL, 5) self.slfooter = wx.StaticLine(self) @@ -134,17 +134,17 @@ class DmgPatternEditorDlg (wx.Dialog): self.stPercentages = wx.StaticText(self, wx.ID_ANY, u"") self.stPercentages.Wrap(-1) - perSizer.Add(self.stPercentages, 0, wx.BOTTOM | wx.LEFT, 5) + perSizer.Add(self.stPercentages, 0, wx.BOTTOM | wx.TOP | wx.LEFT, 5) - footerSizer.Add(perSizer, 0, 0, 5) + footerSizer.Add(perSizer, 1, wx.ALIGN_CENTER_VERTICAL, 5) self.totSizer = wx.BoxSizer(wx.VERTICAL) - self.stTotal = wx.StaticText(self, wx.ID_ANY, u"") - self.stTotal.Wrap(-1) - self.totSizer.Add(self.stTotal, 0, wx.ALIGN_RIGHT | wx.BOTTOM | wx.RIGHT, 5) +# self.stTotal = wx.StaticText(self, wx.ID_ANY, u"LOL") +# self.stTotal.Wrap(-1) +# self.totSizer.Add(self.stTotal, 0, wx.ALIGN_RIGHT | wx.BOTTOM | wx.RIGHT, 5) - footerSizer.Add(self.totSizer, 1, 0, 5) +# footerSizer.Add(self.totSizer, 1, 0, 5) contentSizer.Add(footerSizer, 0, wx.EXPAND, 5) @@ -158,7 +158,7 @@ class DmgPatternEditorDlg (wx.Dialog): for name, art in importExport: bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON) btn = wx.BitmapButton(self, wx.ID_ANY, bitmap) - + btn.SetMinSize( btn.GetSize() ) btn.SetMaxSize( btn.GetSize() ) @@ -166,7 +166,7 @@ class DmgPatternEditorDlg (wx.Dialog): setattr(self, name, btn) btn.Enable(True) btn.SetToolTipString("%s patterns" % name.capitalize()) - footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL) + footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT) # From ffd972f24ea73d61574b85861cd0ec50b43ed140 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 13:36:35 +0200 Subject: [PATCH 02/14] Realign stuff in dmgpattern editor --- gui/patternEditor.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 00072d40f..83b65f9b6 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -100,29 +100,29 @@ class DmgPatternEditorDlg (wx.Dialog): width = -1 defSize = wx.Size(width,-1) - self.editEm = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, wx.TE_RIGHT) - dmgeditSizer.Add(self.editEm, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) - self.bmpEM = wx.StaticBitmap(self, wx.ID_ANY, self.embitmap) - dmgeditSizer.Add(self.bmpEM, 0, wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.bmpEM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + + self.editEm = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize) + dmgeditSizer.Add(self.editEm, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpTHERM = wx.StaticBitmap(self, wx.ID_ANY, self.thermbitmap) - dmgeditSizer.Add(self.bmpTHERM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + dmgeditSizer.Add(self.bmpTHERM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 25) self.editThermal = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) - dmgeditSizer.Add(self.editThermal, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) - - self.editKinetic = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, wx.TE_RIGHT) - dmgeditSizer.Add(self.editKinetic, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) + dmgeditSizer.Add(self.editThermal, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpKIN = wx.StaticBitmap(self, wx.ID_ANY, self.kinbitmap) - dmgeditSizer.Add(self.bmpKIN, 0, wx.ALIGN_CENTER_VERTICAL, 5) + dmgeditSizer.Add(self.bmpKIN, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + + self.editKinetic = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize) + dmgeditSizer.Add(self.editKinetic, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpEXP = wx.StaticBitmap(self, wx.ID_ANY, self.expbitmap) - dmgeditSizer.Add(self.bmpEXP, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) + dmgeditSizer.Add(self.bmpEXP, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 25) self.editExplosive = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) - dmgeditSizer.Add(self.editExplosive, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5) + dmgeditSizer.Add(self.editExplosive, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) contentSizer.Add(dmgeditSizer, 1, wx.EXPAND | wx.ALL, 5) self.slfooter = wx.StaticLine(self) From ea38fc6c604eb797e0c610d1d4a9995437a58fd4 Mon Sep 17 00:00:00 2001 From: Corollax Date: Fri, 19 Nov 2010 05:42:01 -0600 Subject: [PATCH 03/14] Grouped a few lines together to make it readable Thermal icon lines are with thermal damage box, kinetic with kinetic, etc. --- eos | 2 +- gui/patternEditor.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/eos b/eos index 2f9471309..83f3c3bf5 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 2f9471309e428613c57f5bbd4745af5f6a07f80e +Subproject commit 83f3c3bf5e60fdfbb234afa49bdbb4d976c1c09e diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 83b65f9b6..acbac1339 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -102,25 +102,21 @@ class DmgPatternEditorDlg (wx.Dialog): self.bmpEM = wx.StaticBitmap(self, wx.ID_ANY, self.embitmap) dmgeditSizer.Add(self.bmpEM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) - self.editEm = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize) dmgeditSizer.Add(self.editEm, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpTHERM = wx.StaticBitmap(self, wx.ID_ANY, self.thermbitmap) dmgeditSizer.Add(self.bmpTHERM, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 25) - self.editThermal = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) dmgeditSizer.Add(self.editThermal, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpKIN = wx.StaticBitmap(self, wx.ID_ANY, self.kinbitmap) dmgeditSizer.Add(self.bmpKIN, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 5) - self.editKinetic = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize) dmgeditSizer.Add(self.editKinetic, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) self.bmpEXP = wx.StaticBitmap(self, wx.ID_ANY, self.expbitmap) dmgeditSizer.Add(self.bmpEXP, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 25) - self.editExplosive = IntCtrl(self, wx.ID_ANY, 0, wx.DefaultPosition, defSize, 0) dmgeditSizer.Add(self.editExplosive, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5) @@ -129,7 +125,6 @@ class DmgPatternEditorDlg (wx.Dialog): contentSizer.Add(self.slfooter, 0, wx.EXPAND | wx.TOP, 5) footerSizer = wx.BoxSizer(wx.HORIZONTAL) - perSizer = wx.BoxSizer(wx.VERTICAL) self.stPercentages = wx.StaticText(self, wx.ID_ANY, u"") From cce1d988b99715c9c77dd0528096ab40960fda57 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 13:44:05 +0200 Subject: [PATCH 04/14] Fixed an oopsie --- gui/patternEditor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 83b65f9b6..8ea76ae4c 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -305,7 +305,7 @@ class DmgPatternEditorDlg (wx.Dialog): def processRename(self, event): newName = self.namePicker.GetLineText(0) self.stPercentages.SetLabel("") - self.stTotal.SetLabel("") +# self.stTotal.SetLabel("") p = self.getActivePattern() for pattern in self.choices: if pattern.name == newName and p != pattern: From d17d5428b5765b77fc7b8837fb27cb18e3f960ca Mon Sep 17 00:00:00 2001 From: Corollax Date: Fri, 19 Nov 2010 05:47:58 -0600 Subject: [PATCH 05/14] Comments are for comments, not for old lines Remove unnecessary lines, don't comment them out. --- gui/fittingView.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gui/fittingView.py b/gui/fittingView.py index 7499b9df8..47fd2e129 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -91,7 +91,6 @@ class FittingView(d.Display): self.Show(False) self.parent = parent self.mainFrame.Bind(FIT_CHANGED, self.fitChanged) -# self.mainFrame.Bind(gui.shipBrowser.EVT_FIT_SELECTED, self.fitSelected) self.mainFrame.Bind(gui.shipBrowser.EVT_FIT_RENAMED, self.fitRenamed) self.mainFrame.Bind(gui.shipBrowser.EVT_FIT_REMOVED, self.fitRemoved) self.mainFrame.Bind(gui.marketBrowser.ITEM_SELECTED, self.appendItem) @@ -118,7 +117,6 @@ class FittingView(d.Display): def Destroy(self): self.parent.Unbind(gui.chromeTabs.EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged) self.mainFrame.Unbind(FIT_CHANGED, handler=self.fitChanged) -# self.mainFrame.Unbind(gui.shipBrowser.EVT_FIT_SELECTED, handler=self.fitSelected) self.mainFrame.Unbind(gui.shipBrowser.EVT_FIT_RENAMED, handler=self.fitRenamed) self.mainFrame.Unbind(gui.shipBrowser.EVT_FIT_REMOVED, handler=self.fitRemoved) self.mainFrame.Unbind(gui.marketBrowser.ITEM_SELECTED, handler=self.appendItem) From 53ffee5fd232cb87f23224491b62dfe2926e67d4 Mon Sep 17 00:00:00 2001 From: Corollax Date: Fri, 19 Nov 2010 05:58:02 -0600 Subject: [PATCH 06/14] Removed commented out code Comments are for english, not code. Use git to handle that. --- gui/shipBrowser.py | 68 +--------------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index d58023a5a..c957ed603 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -25,7 +25,6 @@ SearchSelected, EVT_SB_SEARCH_SEL = wx.lib.newevent.NewEvent() class ShipBrowser(wx.Panel): def __init__(self, parent): wx.Panel.__init__ (self, parent,style = 0) - # if 'wxGTK' in wx.PlatformInfo else wx.DOUBLE_BORDER) self._lastWidth = 0 self._activeStage = 1 @@ -83,8 +82,6 @@ class ShipBrowser(wx.Panel): def SizeRefreshList(self, event): ewidth, eheight = event.GetSize() -## if ewidth != self._lastWidth: -## self._lastWidth = ewidth self.Layout() self.lpane.Layout() self.lpane.RefreshList(True) @@ -148,7 +145,6 @@ class ShipBrowser(wx.Panel): self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, fits), race)) self.lpane.RefreshList() -# self.lpane.ShowLoading(False) def stage2(self, event): back = event.back @@ -160,7 +156,6 @@ class ShipBrowser(wx.Panel): self.lastdata = categoryID -# self.lpane.ShowLoading(True) self.lpane.RemoveAllChildren() sMarket = service.Market.getInstance() sMarket.getShipListDelayed(self.stage2Callback, categoryID) @@ -314,16 +309,9 @@ class HeaderPane (wx.Panel): self.sbRewind.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) self.sbRewind.SetBitmapSelected(self.rewBmp) -# self.sbForward = PFGenBitmapButton( self, wx.ID_ANY, self.forwBmp, wx.DefaultPosition, bmpSize, wx.BORDER_NONE ) -# mainSizer.Add(self.sbForward, 0, wx.LEFT | wx.TOP | wx.BOTTOM | wx.ALIGN_CENTER_VERTICAL , 5) -# 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.LEFT, 5 ) -# self.sl2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_VERTICAL ) -# 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) self.sbNewFit.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) @@ -356,10 +344,6 @@ class HeaderPane (wx.Panel): self.SetSizer(mainSizer) -# self.sbForward.Bind(wx.EVT_BUTTON,self.OnForward) -# self.sbForward.Bind( wx.EVT_ENTER_WINDOW, self.OnEnterWForward ) -# self.sbForward.Bind( wx.EVT_LEAVE_WINDOW, self.OnLeaveWForward ) - self.sbReset.Bind(wx.EVT_BUTTON,self.OnReset) self.sbReset.Bind( wx.EVT_ENTER_WINDOW, self.OnEnterWReset ) self.sbReset.Bind( wx.EVT_LEAVE_WINDOW, self.OnLeaveWReset ) @@ -369,7 +353,6 @@ class HeaderPane (wx.Panel): self.sbRewind.Bind( wx.EVT_LEAVE_WINDOW, self.OnLeaveWRewind ) - self.sbSearch.Bind(wx.EVT_BUTTON,self.OnSearch) self.sbSearch.Bind( wx.EVT_ENTER_WINDOW, self.OnEnterWSearch ) self.sbSearch.Bind( wx.EVT_LEAVE_WINDOW, self.OnLeaveWSearch ) @@ -450,18 +433,6 @@ class HeaderPane (wx.Panel): item = menu.Append(-1, txt) menu.Bind(wx.EVT_MENU, self.OnMenuSelected, item) -# if 'wxMSW' in wx.PlatformInfo: -# menu.Break() -# else: -# menu.AppendSeparator() - -# for txt in normalCMItems: -# if txt =="_sep_": -# menu.AppendSeparator() -# else: -# item = menu.Append(-1, txt) -# item.Enable(False) -# menu.Bind(wx.EVT_MENU, self.OnMenuSelected, item) return menu @@ -473,9 +444,6 @@ class HeaderPane (wx.Panel): self.spanel.Show(False) self.toggleSearch = -1 -# if self.menu: -# self.menu.Destroy() - stxt = self.search.GetValue() if stxt not in self.recentSearches: if stxt: @@ -492,6 +460,7 @@ class HeaderPane (wx.Panel): self.toggleSearch = -1 else: event.Skip() + def doSearch(self, event): stxt = self.search.GetValue() if len(stxt) > 2: @@ -499,12 +468,10 @@ class HeaderPane (wx.Panel): def ToggleNewFitSB(self, toggle): self.sbNewFit.Show(toggle) -# self.sl2.Show(toggle) self.Layout() def ToggleFitViewModeSB(self, toggle): self.sbSwitchFitView.Show(toggle) -# self.sl2.Show(toggle) self.Layout() def OnReset(self,event): @@ -534,7 +501,6 @@ class HeaderPane (wx.Panel): self.sbReset.Refresh() event.Skip() - def OnEnterWForward(self, event): if self.toggleSearch != 1: self.stStatus.SetLabel("Forward") @@ -568,7 +534,6 @@ class HeaderPane (wx.Panel): else: self.stStatus.Disable() - self.SetCursor(wx.StockCursor(wx.CURSOR_HAND)) event.Skip() @@ -723,23 +688,6 @@ class ListPane (wx.ScrolledWindow): self.Bind(wx.EVT_SCROLLWIN_LINEUP, self.MScrollUp) self.Bind(wx.EVT_SCROLLWIN_LINEDOWN, self.MScrollDown) self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus) -# self.loadingAnim = wx.animate.Animation(os.path.join(config.pyfaPath,"icons/fit_loading.gif")) -# self.animCtrl = wx.animate.AnimationCtrl(self, -1, self.loadingAnim) -# self.animCtrl.SetUseWindowBackgroundColour() -# self.animCtrl.Hide() - -# def ShowLoading(self, mode = True): -# if mode: -# aweight,aheight = self.animCtrl.GetSize() -# cweight,cheight = self.GetSize() -# ax = (cweight - aweight)/2 -# ay = (cheight - aheight)/2 -# self.animCtrl.SetPosition((ax,ay)) -# self.animCtrl.Show() -# self.animCtrl.Play() -# else: -# self.animCtrl.Stop() -# self.animCtrl.Hide() def OnChildFocus(self, event): event.Skip() @@ -751,7 +699,6 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy -= 12 self.Scroll(0, posy) -# self.RefreshList() event.Skip() def MScrollDown(self, event): @@ -759,7 +706,6 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy += 12 self.Scroll(0, posy) -# self.RefreshList() event.Skip() @@ -803,7 +749,6 @@ class ListPane (wx.ScrolledWindow): # if we need to adjust if new_vs_x != -1 or new_vs_y != -1: - #print "%s: (%s, %s)" % (self.GetName(), new_vs_x, new_vs_y) self.Scroll(new_vs_x, new_vs_y) @@ -920,9 +865,6 @@ class CategoryItem(wx.Window): r.left = 0 r.height = r.height / 2 if self.highlighted: -# mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) -# mdc.Clear() -# mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) sr = 221 sg = 221 @@ -982,10 +924,6 @@ class CategoryItem(wx.Window): fPosX = rect.width - addX - xtext fPosY = (rect.height -ytext)/2 -# if fittings > 0: -# mdc.DrawText(fformat % fittings, fPosX, fPosY) -# else: -# mdc.DrawText(fformat, fPosX, fPosY) event.Skip() @@ -1579,10 +1517,6 @@ class FitItem(wx.Window): if targetWnd == cfitWnd: wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID)) -# elif targetWnd == cfitWnd.view: -# wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID)) -# elif targetWnd.Parent == cfitWnd.view: -# wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID)) elif targetWnd == msWnd: From b76b3fbd50646cee53356e65cf5fac00712ec269 Mon Sep 17 00:00:00 2001 From: Corollax Date: Fri, 19 Nov 2010 06:02:14 -0600 Subject: [PATCH 07/14] Tweaked height of the additions pane Also removed a commented out line. --- gui/additionsPane.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/additionsPane.py b/gui/additionsPane.py index 3ee6f5fb8..e65536ddb 100644 --- a/gui/additionsPane.py +++ b/gui/additionsPane.py @@ -40,10 +40,10 @@ class AdditionsPane(TogglePanel): self.mainFrame = gui.mainFrame.MainFrame.getInstance() -# self.notebook = wx.Notebook(pane) self.notebook = gui.chromeTabs.PFNotebook(pane, False) size = wx.Size() - size.SetHeight(200) + # This size lets you see 4 drones at a time + size.SetHeight(160) self.notebook.SetMinSize(size) baseSizer.Add(self.notebook, 1, wx.EXPAND) self.notebook.AddPage(DroneView(self.notebook), "Drones", showClose = False) From 4ad60373e5cb913af6a484a6f44dd09252200c97 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:11:34 +0200 Subject: [PATCH 08/14] Minor cleanup (made possible to subclass ListPane without too much hassle) --- gui/shipBrowser.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index d58023a5a..2e55cf43f 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -751,7 +751,6 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy -= 12 self.Scroll(0, posy) -# self.RefreshList() event.Skip() def MScrollDown(self, event): @@ -759,7 +758,6 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy += 12 self.Scroll(0, posy) -# self.RefreshList() event.Skip() @@ -813,21 +811,28 @@ class ListPane (wx.ScrolledWindow): self._wList.append(widget) self._wCount += 1 + # Override this method if needed ( return False by default if we do not want to scroll to selected widget) + def IsWidgetSelectedByContext(self, widget): + stage = self.Parent.GetActiveStage() + fit = self.mainFrame.getActiveFit() + if stage == 3 or stage == 4: + if self._wList[widget].GetType() == 3: + if fit == self._wList[widget].fitID: + return True + return False + def RefreshList(self, doRefresh = False): ypos = 0 maxy = 0 scrollTo = 0 - stage = self.Parent.GetActiveStage() - fit = self.mainFrame.getActiveFit() + selected = None for i in xrange( len(self._wList) ): iwidth, iheight = self._wList[i].GetSize() xa, ya = self.CalcScrolledPosition((0, maxy)) self._wList[i].SetPosition((xa, ya)) - if stage == 3 or stage == 4: - if self._wList[i].GetType() == 3: - if fit == self._wList[i].fitID: - selected = self._wList[i] + if self.IsWidgetSelectedByContext(i): + selected = self._wList[i] maxy += iheight self.SetVirtualSize((1, maxy)) From 88d66289da249624089e68b5c71dae7076fcaf9c Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:22:48 +0200 Subject: [PATCH 09/14] Cleaned up Widget List Pane --- gui/shipBrowser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 1bf80e51f..3930a67fc 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -676,15 +676,16 @@ class HeaderPane (wx.Panel): class ListPane (wx.ScrolledWindow): def __init__(self, parent): wx.ScrolledWindow.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(1, 1), style=wx.TAB_TRAVERSAL) + self._wList = [] self._wCount = 0 - self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)) self.SetVirtualSize((1, 1)) self.SetScrollRate(0, 1) + self.Bind(wx.EVT_SCROLLWIN_LINEUP, self.MScrollUp) self.Bind(wx.EVT_SCROLLWIN_LINEDOWN, self.MScrollDown) self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus) @@ -699,6 +700,7 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy -= 12 self.Scroll(0, posy) + event.Skip() def MScrollDown(self, event): @@ -706,6 +708,7 @@ class ListPane (wx.ScrolledWindow): posy = self.GetScrollPos(wx.VERTICAL) posy += 12 self.Scroll(0, posy) + event.Skip() @@ -760,8 +763,9 @@ class ListPane (wx.ScrolledWindow): # Override this method if needed ( return False by default if we do not want to scroll to selected widget) def IsWidgetSelectedByContext(self, widget): + mainFrame = gui.mainFrame.MainFrame.getInstance() stage = self.Parent.GetActiveStage() - fit = self.mainFrame.getActiveFit() + fit = mainFrame.getActiveFit() if stage == 3 or stage == 4: if self._wList[widget].GetType() == 3: if fit == self._wList[widget].fitID: From c4b9773bc264f829d54375f935f07d09fa6fa85e Mon Sep 17 00:00:00 2001 From: Corollax Date: Fri, 19 Nov 2010 06:32:18 -0600 Subject: [PATCH 10/14] Added ctrl+t support to add a tab. Darriele used a different name for the AddTab function, so I just had to change one the call in multiSwitch :) --- gui/mainFrame.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index be3458e8e..bb94a7172 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -80,7 +80,7 @@ class MainFrame(wx.Frame): faSizer = wx.BoxSizer(wx.VERTICAL) self.fitMultiSwitch = MultiSwitch(self.FitviewAdditionsPanel) - #self.fitMultiSwitch.AddTab() + #self.fitMultiSwitch.AddPage() faSizer.Add(self.fitMultiSwitch,1,wx.EXPAND) self.additionsPane = AdditionsPane(self.FitviewAdditionsPanel) @@ -273,7 +273,7 @@ class MainFrame(wx.Frame): def HAddTab(self,event): - self.fitMultiSwitch.AddTab() + self.fitMultiSwitch.AddPage(wx.Panel(self), "Empty Tab") def toggleShipMarket(self, event): sel = self.notebookBrowsers.GetSelection() From b47a2c463e9b93f94aea56d5f8cc87d1381d8a9d Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:33:05 +0200 Subject: [PATCH 11/14] Fixed CTRL+W bind --- gui/mainFrame.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index be3458e8e..e3bc819b2 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -143,7 +143,10 @@ class MainFrame(wx.Frame): # self.notebookBrowsers.SetSelection(tab) def CloseCurrentFit(self, evt): - self.fitMultiSwitch.removeCurrentTab() + ms = self.fitMultiSwitch + page = ms.GetCurrentPage() + if page: + ms.DeletePage(ms.GetPageIndex(page)) def ExitApp(self, evt): try: From 7939d302e1c98e91a8f981e4ea264a0701e2a8f8 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:36:35 +0200 Subject: [PATCH 12/14] Make sure the window have size 0,0 at creation time or it will look nasty till it gets reparented --- gui/mainFrame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 56ef4f839..e85524ac3 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -276,7 +276,7 @@ class MainFrame(wx.Frame): def HAddTab(self,event): - self.fitMultiSwitch.AddPage(wx.Panel(self), "Empty Tab") + self.fitMultiSwitch.AddPage(wx.Panel(self, size = (0,0)), "Empty Tab") def toggleShipMarket(self, event): sel = self.notebookBrowsers.GetSelection() From 967d0cc1370f5a960c09025a5262714b23b53a39 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:46:05 +0200 Subject: [PATCH 13/14] Use methods compatible with wx.notebook for stuff --- gui/mainFrame.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index e85524ac3..f5944f358 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -144,9 +144,10 @@ class MainFrame(wx.Frame): def CloseCurrentFit(self, evt): ms = self.fitMultiSwitch - page = ms.GetCurrentPage() - if page: - ms.DeletePage(ms.GetPageIndex(page)) + + page = ms.GetSelection() + if page is not None: + ms.DeletePage(page) def ExitApp(self, evt): try: From 628b80e515fb76e8799badc8aa7683d4d480f4f8 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 19 Nov 2010 14:51:52 +0200 Subject: [PATCH 14/14] Dont call SetDoubleBuffered at all unless needed --- gui/display.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/display.py b/gui/display.py index 6d6fc2803..f36b1a952 100644 --- a/gui/display.py +++ b/gui/display.py @@ -30,7 +30,8 @@ class Display(wx.ListCtrl): #Autodetect if doubleBuffered is None: - self.SetDoubleBuffered("wxMSW" in wx.PlatformInfo and platform.release() != "XP") + if "wxMSW" in wx.PlatformInfo and platform.release() != "XP": + self.SetDoubleBuffered(True) else: self.SetDoubleBuffered(doubleBuffered)