From f94a8e6fddb7399de2d901120639f5c485ff0ab4 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Sat, 23 Oct 2010 20:42:27 +0200 Subject: [PATCH 1/4] Changed characterEditor.py to mirror the exact way shipBrowser.py works, this way the character editor will open, fixing ticket 173 --- gui/characterEditor.py | 9 +++------ gui/mainFrame.py | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 0f19b63c0..f7931acbc 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -66,14 +66,11 @@ class CharacterEditor(wx.Frame): self.navSizer.Add(self.skillTreeChoice, 1, wx.ALL | wx.EXPAND, 5) - buttons = (("new", wx.ART_NEW), - ("copy", wx.ART_COPY), - ("rename", bitmapLoader.getBitmap("rename", "icons")), - ("delete", wx.ART_DELETE)) - + buttons = (("new", wx.ART_NEW), ("copy", wx.ART_COPY), ("rename", bitmapLoader.getBitmap("rename", "icons")), ("delete", wx.ART_DELETE)) + size = None for name, art in buttons: - bitmap = wx.ArtProvider.GetBitmap(art) if isinstance(art, unicode) else art + bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON) if name != "rename" else art btn = wx.BitmapButton(self, wx.ID_ANY, bitmap) if size is None: size = btn.GetSize() diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 94c238810..79bfee344 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -52,7 +52,6 @@ class MainFrame(wx.Frame): self.SetMinSize((1000, 700)) self.SetSize((1000, 700)) - self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE) self.notebookBrowsers = wx.Notebook(self.splitter, wx.ID_ANY) From 1510b12d0d139fc48499134e9ddbe1f71274173c Mon Sep 17 00:00:00 2001 From: Weeknie Date: Sat, 23 Oct 2010 22:25:06 +0200 Subject: [PATCH 2/4] Deadspace metagroup is called complex in pyfa, so rewrite when necessairy, fixing ticket 176 --- gui/marketBrowser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 1a1fcbff8..08134fe43 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -139,6 +139,8 @@ class MarketBrowser(wx.Panel): cMarket.disableMetaGroup(btn) metaGroup = item.metaGroup.name.lower() + #In database the metagroup is deadspace, but in pyfa it's called complex, so rewrite + metaGroup = metaGroup if metaGroup != "deadspace" else "complex" getattr(self, metaGroup).SetValue(True) cMarket.activateMetaGroup(metaGroup) self.searching = False From c273e80f3a89ef3cd5ea1602a3d1aa5fa9f8227a Mon Sep 17 00:00:00 2001 From: Corollax Date: Sun, 24 Oct 2010 06:34:52 -0500 Subject: [PATCH 3/4] Updated EOS with the fix to the legion HAM subsystem. --- eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos b/eos index 92f04f4d6..1192d7326 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 92f04f4d6245b7fd42d09750031da683b06b37bc +Subproject commit 1192d73269fca26e926a98c05cf2e4475a680e2b From 34065ade9e63892465fbc7988257584fe11a273d Mon Sep 17 00:00:00 2001 From: Corollax Date: Sun, 24 Oct 2010 07:46:51 -0500 Subject: [PATCH 4/4] Use updated helper method in skill tests --- eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos b/eos index 1192d7326..1746a0168 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 1192d73269fca26e926a98c05cf2e4475a680e2b +Subproject commit 1746a01682b8a49b6debf923bdb067dff9babe1f