From 7dd1c638982154f63bef6e0a063dc6d831d31fc7 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 16:19:01 +0300 Subject: [PATCH 1/6] Return 0 price even if price has not been fetched --- eos/saveddata/price.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/price.py b/eos/saveddata/price.py index ee575b70c..a2a630c30 100644 --- a/eos/saveddata/price.py +++ b/eos/saveddata/price.py @@ -49,7 +49,7 @@ class Price(object): @property def price(self): - if self.status in (PriceStatus.fail, PriceStatus.notSupported): + if self.status != PriceStatus.success: return 0 else: return self.__price or 0 From 7bad3bc376d38345e1905f954c33da2adbf302c6 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 17:07:06 +0300 Subject: [PATCH 2/6] Show 'market group' context menu for mutated items as well --- gui/builtinContextMenus/marketJump.py | 8 +++++++- gui/builtinItemStatsViews/itemMutator.py | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/builtinContextMenus/marketJump.py b/gui/builtinContextMenus/marketJump.py index c630312c1..a5d5e8eeb 100644 --- a/gui/builtinContextMenus/marketJump.py +++ b/gui/builtinContextMenus/marketJump.py @@ -26,7 +26,10 @@ class MarketJump(ContextMenu): sMkt = Market.getInstance() item = getattr(selection[0], "item", selection[0]) + isMutated = getattr(selection[0], "isMutated", False) mktGrp = sMkt.getMarketGroupByItem(item) + if mktGrp is None and isMutated: + mktGrp = sMkt.getMarketGroupByItem(selection[0].baseItem) # 1663 is Special Edition Festival Assets, we don't have root group for it if mktGrp is None or mktGrp.ID == 1663: @@ -43,7 +46,10 @@ class MarketJump(ContextMenu): if srcContext in ("fittingCharge", "projectedCharge"): item = selection[0].charge elif hasattr(selection[0], "item"): - item = selection[0].item + if getattr(selection[0], "isMutated", False): + item = selection[0].baseItem + else: + item = selection[0].item else: item = selection[0] diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py index df20f9567..802f8b4f3 100644 --- a/gui/builtinItemStatsViews/itemMutator.py +++ b/gui/builtinItemStatsViews/itemMutator.py @@ -24,6 +24,8 @@ class ItemMutator(wx.Panel): self.activeFit = gui.mainFrame.MainFrame.getInstance().getActiveFit() mainSizer = wx.BoxSizer(wx.VERTICAL) + baseItemSizer = wx.BoxSizer(wx.VERTICAL) + self.goodColor = wx.Colour(96, 191, 0) self.badColor = wx.Colour(255, 64, 0) From a4fae73a1e02202457047c70400eaf49e6732331 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 17:12:21 +0300 Subject: [PATCH 3/6] Make "fill with module" context menu entry disablable via preferences --- gui/builtinContextMenus/fillWithModule.py | 2 ++ gui/builtinPreferenceViews/pyfaContextMenuPreferences.py | 8 ++++++++ service/settings.py | 1 + 3 files changed, 11 insertions(+) diff --git a/gui/builtinContextMenus/fillWithModule.py b/gui/builtinContextMenus/fillWithModule.py index 9e32dbc0d..0dd8d0d91 100644 --- a/gui/builtinContextMenus/fillWithModule.py +++ b/gui/builtinContextMenus/fillWithModule.py @@ -13,6 +13,8 @@ class FillWithModule(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): + if not self.settings.get('moduleFill'): + return False return srcContext in ("fittingModule") def getText(self, itmContext, selection): diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py index 458424dce..7c767c5fb 100644 --- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py +++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py @@ -81,6 +81,11 @@ class PFContextMenuPref(PreferenceView): rbSizerRow3.Add(self.rbBox7, 1, wx.TOP | wx.RIGHT, 5) self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change) + self.rbBox8 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox8.SetSelection(self.settings.get('moduleFill')) + rbSizerRow3.Add(self.rbBox8, 1, wx.TOP | wx.RIGHT, 5) + self.rbBox8.Bind(wx.EVT_RADIOBOX, self.OnSetting8Change) + mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0) panel.SetSizer(mainSizer) @@ -107,6 +112,9 @@ class PFContextMenuPref(PreferenceView): def OnSetting7Change(self, event): self.settings.set('project', event.GetInt()) + def OnSetting8Change(self, event): + self.settings.set('moduleFill', event.GetInt()) + def getImage(self): return BitmapLoader.getBitmap("settings_menu", "gui") diff --git a/service/settings.py b/service/settings.py index 39f8def9c..df5038d1f 100644 --- a/service/settings.py +++ b/service/settings.py @@ -525,6 +525,7 @@ class ContextMenuSettings(object): "tacticalMode" : 1, "targetResists" : 1, "whProjector" : 1, + "moduleFill" : 1, } self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings) From deee6fd6ab30e350ae7223d4ede35364d0dbbe73 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 17:31:45 +0300 Subject: [PATCH 4/6] Make GTK window even bigger by default, and hide description type if there's no description for the item --- gui/builtinItemStatsViews/attributeSlider.py | 1 - gui/builtinItemStatsViews/itemDescription.py | 1 - gui/itemStats.py | 7 ++++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gui/builtinItemStatsViews/attributeSlider.py b/gui/builtinItemStatsViews/attributeSlider.py index e45fa8f49..9e3585ea9 100644 --- a/gui/builtinItemStatsViews/attributeSlider.py +++ b/gui/builtinItemStatsViews/attributeSlider.py @@ -58,7 +58,6 @@ class AttributeSlider(wx.Panel): self.UserMinValue = minValue self.UserMaxValue = maxValue - print(self.UserMinValue, self.UserMaxValue) self.inverse = inverse diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py index 475b88788..9c62dcc78 100644 --- a/gui/builtinItemStatsViews/itemDescription.py +++ b/gui/builtinItemStatsViews/itemDescription.py @@ -15,7 +15,6 @@ class ItemDescription(wx.Panel): fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT) self.description = wx.html.HtmlWindow(self) - if not item.description: return diff --git a/gui/itemStats.py b/gui/itemStats.py index 3768780e2..76172dee7 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -91,7 +91,7 @@ class ItemStatsDialog(wx.Dialog): self.SetMinSize((300, 200)) if "wxGTK" in wx.PlatformInfo: # GTK has huge tab widgets, give it a bit more room - self.SetSize((580, 500)) + self.SetSize((630, 500)) else: self.SetSize((550, 500)) # self.SetMaxSize((500, -1)) @@ -168,8 +168,9 @@ class ItemStatsContainer(wx.Panel): self.mutator = ItemMutator(self.nbContainer, stuff, item) self.nbContainer.AddPage(self.mutator, "Mutations") - self.desc = ItemDescription(self.nbContainer, stuff, item) - self.nbContainer.AddPage(self.desc, "Description") + if item.description: + self.desc = ItemDescription(self.nbContainer, stuff, item) + self.nbContainer.AddPage(self.desc, "Description") self.params = ItemParams(self.nbContainer, stuff, item, context) self.nbContainer.AddPage(self.params, "Attributes") From fc04a32913c645d0465a2ff7de919cbc98fc95c8 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 18:14:46 +0300 Subject: [PATCH 5/6] Add info about base item to mutations tab --- gui/builtinItemStatsViews/itemMutator.py | 16 ++++++++++++---- gui/itemStats.py | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py index 802f8b4f3..9ceeaeb27 100644 --- a/gui/builtinItemStatsViews/itemMutator.py +++ b/gui/builtinItemStatsViews/itemMutator.py @@ -22,9 +22,20 @@ class ItemMutator(wx.Panel): self.item = item self.timer = None self.activeFit = gui.mainFrame.MainFrame.getInstance().getActiveFit() + + font = parent.GetFont() + font.SetWeight(wx.BOLD) + mainSizer = wx.BoxSizer(wx.VERTICAL) - baseItemSizer = wx.BoxSizer(wx.VERTICAL) + sourceItemsSizer = wx.BoxSizer(wx.HORIZONTAL) + sourceItemsSizer.Add(BitmapLoader.getStaticBitmap(stuff.item.iconID, self, "icons"), 0, wx.LEFT, 5) + sourceItemsSizer.Add(BitmapLoader.getStaticBitmap(stuff.mutaplasmid.item.iconID, self, "icons"), 0, wx.LEFT, 0) + sourceItemShort = "{} {}".format(stuff.mutaplasmid.item.name.split(" ")[0], stuff.baseItem.name) + sourceItemText = wx.StaticText(self, wx.ID_ANY, sourceItemShort) + sourceItemText.SetFont(font) + sourceItemsSizer.Add(sourceItemText, 0, wx.LEFT, 10) + mainSizer.Add(sourceItemsSizer, 0, wx.TOP | wx.BOTTOM | wx.EXPAND, 10) self.goodColor = wx.Colour(96, 191, 0) self.badColor = wx.Colour(255, 64, 0) @@ -60,9 +71,6 @@ class ItemMutator(wx.Panel): headingSizer = wx.BoxSizer(wx.HORIZONTAL) - font = parent.GetFont() - font.SetWeight(wx.BOLD) - headingSizer.Add(BitmapLoader.getStaticBitmap(m.attribute.iconID, self, "icons"), 0, wx.RIGHT, 10) displayName = wx.StaticText(self, wx.ID_ANY, m.attribute.displayName) diff --git a/gui/itemStats.py b/gui/itemStats.py index 76172dee7..50a02f065 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -91,7 +91,7 @@ class ItemStatsDialog(wx.Dialog): self.SetMinSize((300, 200)) if "wxGTK" in wx.PlatformInfo: # GTK has huge tab widgets, give it a bit more room - self.SetSize((630, 500)) + self.SetSize((630, 550)) else: self.SetSize((550, 500)) # self.SetMaxSize((500, -1)) From 194ebb96a7e64e9c6cc8a303961130077d3d9ff3 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 18:18:38 +0300 Subject: [PATCH 6/6] Add ruler between base item info and mutation stats --- gui/builtinItemStatsViews/itemMutator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py index 9ceeaeb27..3e9edc582 100644 --- a/gui/builtinItemStatsViews/itemMutator.py +++ b/gui/builtinItemStatsViews/itemMutator.py @@ -35,7 +35,9 @@ class ItemMutator(wx.Panel): sourceItemText = wx.StaticText(self, wx.ID_ANY, sourceItemShort) sourceItemText.SetFont(font) sourceItemsSizer.Add(sourceItemText, 0, wx.LEFT, 10) - mainSizer.Add(sourceItemsSizer, 0, wx.TOP | wx.BOTTOM | wx.EXPAND, 10) + mainSizer.Add(sourceItemsSizer, 0, wx.TOP | wx.EXPAND, 10) + + mainSizer.Add(wx.StaticLine(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL), 0, wx.ALL | wx.EXPAND, 5) self.goodColor = wx.Colour(96, 191, 0) self.badColor = wx.Colour(255, 64, 0)