From f16e14e0b4e9f946d3eed34161265f7fef407b6e Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Wed, 14 Jun 2017 15:05:12 -0400 Subject: [PATCH] Fix gauges again, convert remaining IconFromBitmap > Icon --- gui/builtinStatsViews/resistancesViewFull.py | 2 +- gui/builtinStatsViews/resourcesViewFull.py | 2 +- gui/characterEditor.py | 2 +- gui/graphFrame.py | 2 +- gui/itemStats.py | 2 +- gui/preferenceDialog.py | 2 +- gui/propertyEditor.py | 4 ++-- gui/pyfa_gauge.py | 2 -- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 3168df3b8..684a0e617 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -136,7 +136,7 @@ class ResistancesViewFull(StatsView): bc = pgColour[1] currGColour += 1 - lbl = PyGauge(contentPanel, font, (100, 25)) + lbl = PyGauge(contentPanel, font, 100) lbl.SetMinSize((48, 16)) lbl.SetBackgroundColour(wx.Colour(bc[0], bc[1], bc[2])) lbl.SetBarColour(wx.Colour(fc[0], fc[1], fc[2])) diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 0f89fd925..2ab61cf2b 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -179,7 +179,7 @@ class ResourcesViewFull(StatsView): # Gauges modif. - Darriele - gauge = PyGauge(parent, gauge_font) + gauge = PyGauge(parent, gauge_font, 1) gauge.SetValueRange(0, 0) gauge.SetMinSize((self.getTextExtentW("1.999M/1.99M MW"), 23)) gauge.SetFractionDigits(2) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index dc4bbe9b4..088f63156 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -131,7 +131,7 @@ class CharacterEditor(wx.Frame): wx.Frame.__init__(self, parent, id=wx.ID_ANY, title="pyfa: Character Editor", pos=wx.DefaultPosition, size=wx.Size(640, 600), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER) - i = wx.IconFromBitmap(BitmapLoader.getBitmap("character_small", "gui")) + i = wx.Icon(BitmapLoader.getBitmap("character_small", "gui")) self.SetIcon(i) self.mainFrame = parent diff --git a/gui/graphFrame.py b/gui/graphFrame.py index 83cfd4a6b..a0aa52876 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -101,7 +101,7 @@ class GraphFrame(wx.Frame): wx.Frame.__init__(self, parent, title="pyfa: Graph Generator", style=style, size=(520, 390)) - i = wx.IconFromBitmap(BitmapLoader.getBitmap("graphs_small", "gui")) + i = wx.Icon(BitmapLoader.getBitmap("graphs_small", "gui")) self.SetIcon(i) self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.CreateStatusBar() diff --git a/gui/itemStats.py b/gui/itemStats.py index 2a88bb660..f26b6fd88 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -98,7 +98,7 @@ class ItemStatsDialog(wx.Dialog): iconFile = "%s%s%s" % (before, sep, "0%s" % after if len(after) < 2 else after) itemImg = BitmapLoader.getBitmap(iconFile, "icons") if itemImg is not None: - self.SetIcon(wx.IconFromBitmap(itemImg)) + self.SetIcon(wx.Icon(itemImg)) self.SetTitle("%s: %s%s" % ("%s Stats" % itmContext if itmContext is not None else "Stats", item.name, " (%d)" % item.ID if config.debug else "")) diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index f442ff5db..20277bb58 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -27,7 +27,7 @@ class PreferenceDialog(wx.Dialog): def __init__(self, parent): wx.Dialog.__init__(self, parent, id=wx.ID_ANY, size=wx.DefaultSize, style=wx.DEFAULT_DIALOG_STYLE) self.SetTitle("pyfa - Preferences") - i = wx.IconFromBitmap(BitmapLoader.getBitmap("preferences_small", "gui")) + i = wx.Icon(BitmapLoader.getBitmap("preferences_small", "gui")) self.SetIcon(i) mainSizer = wx.BoxSizer(wx.VERTICAL) diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py index 7cf012f08..798e1453e 100644 --- a/gui/propertyEditor.py +++ b/gui/propertyEditor.py @@ -30,7 +30,7 @@ class AttributeEditor(wx.Frame): size=wx.Size(650, 600), style=wx.DEFAULT_FRAME_STYLE | wx.FRAME_FLOAT_ON_PARENT | wx.TAB_TRAVERSAL) - i = wx.IconFromBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui")) + i = wx.Icon(BitmapLoader.getBitmap("fit_rename_small", "gui")) self.SetIcon(i) self.mainFrame = parent @@ -48,7 +48,7 @@ class AttributeEditor(wx.Frame): self.Bind(wx.EVT_MENU, self.OnExport, fileExport) self.Bind(wx.EVT_MENU, self.OnClear, fileClear) - i = wx.IconFromBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui")) + i = wx.Icon(BitmapLoader.getBitmap("fit_rename_small", "gui")) self.SetIcon(i) self.mainFrame = parent diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py index fbfab3322..b41cab8d2 100644 --- a/gui/pyfa_gauge.py +++ b/gui/pyfa_gauge.py @@ -72,9 +72,7 @@ class PyGauge(wx.Window): self.SetToolTip(self._tooltip) self.Bind(wx.EVT_PAINT, self.OnPaint) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_TIMER, self.OnTimer) - self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_ENTER_WINDOW, self.OnWindowEnter) self.Bind(wx.EVT_LEAVE_WINDOW, self.OnWindowLeave)