dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

"Color Correction"

Browse Source
This commit is contained in:
Ryan Holmes
2017-06-12 21:11:10 -04:00
parent 361f7fc5bb
commit 610f501608
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinMarketBrowser/pfSearchBox.py
View File

@@ -226,8 +226,8 @@ class PFSearchBox(wx.Window):
def OnPaint(self, event):
dc = wx.BufferedPaintDC(self)
bkColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
sepColor = colorUtils.GetSuitableColor(bkColor, 0.2)
bkColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
sepColor = colorUtils.GetSuitable(bkColor, 0.2)
rect = self.GetRect()
if self.resized:

2
gui/builtinShipBrowser/categoryItem.py
View File

@@ -100,7 +100,7 @@ class CategoryItem(SFBrowserItem):
# rect = self.GetRect()
self.UpdateElementsPos(mdc)
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
mdc.SetTextForeground(textColor)

4
gui/builtinShipBrowser/fitItem.py
View File

@@ -479,7 +479,7 @@ class FitItem(SFItem.SFBrowserItem):
def DrawItem(self, mdc):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
mdc.SetTextForeground(textColor)
@@ -568,7 +568,7 @@ class FitItem(SFItem.SFBrowserItem):
def RenderBackground(self):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
# activeFitID = self.mainFrame.getActiveFit()
state = self.GetState()

4
gui/builtinShipBrowser/navigationPanel.py
View File

@@ -211,7 +211,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
def DrawItem(self, mdc):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
sepColor = colorUtils.GetSuitableColor(windowColor, 0.2)
@@ -230,7 +230,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
def RenderBackground(self):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
sFactor = 0.1

2
gui/builtinShipBrowser/pfListPane.py
View File

@@ -30,7 +30,7 @@ class PFListPane(wx.ScrolledWindow):
self._wCount = 0
self.itemsHeight = 1
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
self.SetVirtualSize((1, 1))
self.SetScrollRate(0, 1)

2
gui/builtinShipBrowser/pfStaticText.py
View File

@@ -9,7 +9,7 @@ pyfalog = Logger(__name__)
class PFStaticText(wx.Panel):
def __init__(self, parent, label=wx.EmptyString):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=parent.GetSize())
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
mainSizer = wx.BoxSizer(wx.VERTICAL)
text = wx.StaticText(self, wx.ID_ANY, label, wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_CENTRE)

2
gui/builtinShipBrowser/raceSelector.py
View File

@@ -166,7 +166,7 @@ class RaceSelector(wx.Window):
def OnPaint(self, event):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
# bkColor = colorUtils.GetSuitableColor(windowColor, 0.1)
sepColor = colorUtils.GetSuitableColor(windowColor, 0.2)

2
gui/builtinShipBrowser/sfBrowserItem.py
View File

@@ -400,7 +400,7 @@ class SFBrowserItem(wx.Window):
def RenderBackground(self):
rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
state = self.GetState()

2
gui/builtinShipBrowser/shipItem.py
View File

@@ -232,7 +232,7 @@ class ShipItem(SFItem.SFBrowserItem):
def DrawItem(self, mdc):
# rect = self.GetRect()
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
textColor = colorUtils.GetSuitableColor(windowColor, 1)
mdc.SetTextForeground(textColor)

2
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -283,7 +283,7 @@ class ResourcesViewFull(StatsView):
label.SetToolTip(wx.ToolTip("%.1f" % value))
colorWarn = wx.Colour(204, 51, 51)
colorNormal = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT)
colorNormal = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
if usedTurretHardpoints > totalTurretHardpoints:
colorT = colorWarn

2
gui/builtinViews/emptyView.py
View File

@@ -13,7 +13,7 @@ class BlankPage(wx.Panel):
self.parent = parent
self.parent.Bind(EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=None))

4
gui/builtinViews/fittingView.py
View File

@@ -790,11 +790,11 @@ class FittingView(d.Display):
mdc.SelectObject(mbmp)
mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)))
mdc.SetBackground(wx.Brush(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)))
mdc.Clear()
mdc.SetFont(font)
mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT))
mdc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT))
cx = padding
for i, col in enumerate(self.activeColumns):

2
gui/builtinViews/implantEditor.py
View File

@@ -23,7 +23,7 @@ class BaseImplantEditorView(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize,
style=wx.TAB_TRAVERSAL)
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
pmainSizer = wx.BoxSizer(wx.HORIZONTAL)

4
gui/characterEditor.py
View File

@@ -271,7 +271,7 @@ class SkillTreeView(wx.Panel):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize,
style=wx.TAB_TRAVERSAL)
self.charEditor = self.Parent.Parent # first parent is Notebook, second is Character Editor
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
pmainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -609,7 +609,7 @@ class APIView(wx.Panel):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300),
style=wx.TAB_TRAVERSAL)
self.charEditor = self.Parent.Parent # first parent is Notebook, second is Character Editor
self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
self.apiUrlCreatePredefined = "https://community.eveonline.com/support/api-key/CreatePredefined?accessMask=8"
self.apiUrlKeyList = "https://community.eveonline.com/support/api-key/"

4
gui/itemStats.py
View File

@@ -251,8 +251,8 @@ class ItemDescription(wx.Panel):
mainSizer = wx.BoxSizer(wx.VERTICAL)
self.SetSizer(mainSizer)
bgcolor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
fgcolor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT)
bgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
self.description = wx.html.HtmlWindow(self)

6
gui/utils/anim.py
View File

@@ -53,11 +53,11 @@ class LoadAnimation(wx.Window):
def OnPaint(self, event):
rect = self.GetClientRect()
dc = wx.BufferedPaintDC(self)
windowColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)
windowColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
dc.SetBackground(wx.Brush(windowColor))
dc.Clear()
barColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT)
barColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
shadeColor = colorUtils.GetSuitableColor(barColor, 0.75)
barWidth = rect.width / self.bars
@@ -81,7 +81,7 @@ class LoadAnimation(wx.Window):
dc.DrawRectangle(x, y, barWidth, bh)
x += barWidth
textColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT)
textColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
dc.SetTextForeground(textColor)
dc.DrawLabel(self.label, rect, wx.ALIGN_CENTER)