From 93cce50d006b99b8f2d38de0535864baa8bb706a Mon Sep 17 00:00:00 2001 From: chwons <86314678+chwons@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:26:54 +0900 Subject: [PATCH 1/5] testing --- gui/builtinItemStatsViews/itemDescription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py index e2bc337e8..2f7334c0d 100644 --- a/gui/builtinItemStatsViews/itemDescription.py +++ b/gui/builtinItemStatsViews/itemDescription.py @@ -6,7 +6,7 @@ import re _t = wx.GetTranslation - +# test class ItemDescription(wx.Panel): def __init__(self, parent, stuff, item): wx.Panel.__init__(self, parent) From e7c2f4cff73e6dc1d8e5659b39eaf0a776ddb3ce Mon Sep 17 00:00:00 2001 From: chwons <86314678+chwons@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:47:57 +0900 Subject: [PATCH 2/5] Update itemDescription.py --- gui/builtinItemStatsViews/itemDescription.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py index 2f7334c0d..2afb0be91 100644 --- a/gui/builtinItemStatsViews/itemDescription.py +++ b/gui/builtinItemStatsViews/itemDescription.py @@ -25,9 +25,9 @@ class ItemDescription(wx.Panel): desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P.*?)<( *)/( *)font( *)>", "\g", desc) # Strip URLs desc = re.sub("<( *)a(.*?)>(?P.*?)<( *)/( *)a( *)>", "\g", desc) - desc = "{}".format( - bgcolor.GetAsString(wx.C2S_CSS_SYNTAX), - fgcolor.GetAsString(wx.C2S_CSS_SYNTAX), + desc = "{}".format( + bgcolor.GetAsString(wx.C2S_HTML_SYNTAX), + fgcolor.GetAsString(wx.C2S_HTML_SYNTAX), desc ) From e0f65c237039ce37623189250660975d746d6679 Mon Sep 17 00:00:00 2001 From: chwons <86314678+chwons@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:48:59 +0900 Subject: [PATCH 3/5] Update itemAttributes.py --- gui/builtinItemStatsViews/itemAttributes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py index e020047c8..d6dec97b4 100644 --- a/gui/builtinItemStatsViews/itemAttributes.py +++ b/gui/builtinItemStatsViews/itemAttributes.py @@ -194,6 +194,7 @@ class ItemParams(wx.Panel): attrIcon, attrName, currentVal, baseVal = data attr_item = self.paramList.AppendItem(parent, attrName) + self.paramList.SetItemTextColour(attr_item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) self.paramList.SetItemText(attr_item, currentVal, 1) if self.stuff is not None: @@ -222,6 +223,7 @@ class ItemParams(wx.Panel): heading = data.get("label") header_item = self.paramList.AppendItem(root, heading) + self.paramList.SetItemTextColour(header_item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) for attr in data.get("attributes", []): # Attribute is a "grouped" attr (eg: damage, sensor strengths, etc). Automatically group these into a child item if attr in GroupedAttributes: @@ -232,6 +234,7 @@ class ItemParams(wx.Panel): # create a child item with the groups label item = self.paramList.AppendItem(header_item, grouping[1]) + self.paramList.SetItemTextColour(item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) for attr2 in grouping[0]: # add each attribute in the group self.AddAttribute(item, attr2) @@ -256,6 +259,7 @@ class ItemParams(wx.Panel): # get all attributes in group item = self.paramList.AppendItem(root, grouping[1]) + self.paramList.SetItemTextColour(item, wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) for attr2 in grouping[0]: self.AddAttribute(item, attr2) From 6a01086cf5a73952ce9934e397a5d8a3566f3ae3 Mon Sep 17 00:00:00 2001 From: chwons <86314678+chwons@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:49:27 +0900 Subject: [PATCH 4/5] Update itemTraits.py --- gui/builtinItemStatsViews/itemTraits.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gui/builtinItemStatsViews/itemTraits.py b/gui/builtinItemStatsViews/itemTraits.py index 65fd6d728..6a09691e1 100644 --- a/gui/builtinItemStatsViews/itemTraits.py +++ b/gui/builtinItemStatsViews/itemTraits.py @@ -13,7 +13,12 @@ class ItemTraits(wx.Panel): self.SetSizer(mainSizer) self.traits = wx.html.HtmlWindow(self) - self.traits.SetPage(item.traits.display) + + bgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW) + fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT) + self.traits.SetPage("{}".format( + bgcolor.GetAsString(wx.C2S_HTML_SYNTAX), + fgcolor.GetAsString(wx.C2S_HTML_SYNTAX), item.traits.display)) self.traits.Bind(wx.EVT_CONTEXT_MENU, self.onPopupMenu) self.traits.Bind(wx.EVT_KEY_UP, self.onKeyUp) From d32a8f0b617a94cd142ecb6bb34cab05b9830820 Mon Sep 17 00:00:00 2001 From: chwons <86314678+chwons@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:59:28 +0900 Subject: [PATCH 5/5] stop testing --- gui/builtinItemStatsViews/itemDescription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py index 2afb0be91..292930381 100644 --- a/gui/builtinItemStatsViews/itemDescription.py +++ b/gui/builtinItemStatsViews/itemDescription.py @@ -6,7 +6,7 @@ import re _t = wx.GetTranslation -# test + class ItemDescription(wx.Panel): def __init__(self, parent, stuff, item): wx.Panel.__init__(self, parent)