From 0d25eca6e501a6b393c7d23c7f43836b3401ec85 Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Fri, 10 Jun 2016 21:10:04 -0700
Subject: [PATCH 1/3] Added base column

---
 gui/itemStats.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/gui/itemStats.py b/gui/itemStats.py
index ad3e49b6c..21dd9f56d 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -84,9 +84,9 @@ 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((530, 300))
+            self.SetSize((580, 500))
         else:
-            self.SetSize((500, 300))
+            self.SetSize((550, 500))
         #self.SetMaxSize((500, -1))
         self.mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.container = ItemStatsContainer(self, victim, item, itmContext)
@@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ):
         if not item.description:
             return
 
-        desc = item.description.replace("\n", "<br>")
+        desc = item.description.replace("\r", "<br>")
         # Strip font tags
         desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", "\g<inside>", desc)
         # Strip URLs
@@ -341,9 +341,12 @@ class ItemParams (wx.Panel):
 
     def PopulateList(self):
         self.paramList.InsertColumn(0,"Attribute")
-        self.paramList.InsertColumn(1,"Value")
-        self.paramList.SetColumnWidth(1,150)
-        self.paramList.setResizeColumn(1)
+        self.paramList.InsertColumn(1,"Current Value")
+        self.paramList.InsertColumn(2,"Base Value")
+        self.paramList.SetColumnWidth(0,110)
+        self.paramList.SetColumnWidth(1,90)
+        self.paramList.SetColumnWidth(2,90)
+        self.paramList.setResizeColumn(0)
         self.imageList = wx.ImageList(16, 16)
         self.paramList.SetImageList(self.imageList,wx.IMAGE_LIST_SMALL)
 
@@ -354,9 +357,11 @@ class ItemParams (wx.Panel):
         idCount = 0
         for name in names:
             info = self.attrInfo.get(name)
-
-
             att = self.attrValues[name]
+
+            valDefault = getattr(info, "value", None)
+            valueDefault = valDefault if valDefault is not None else att
+
             val = getattr(att, "value", None)
             value = val if val is not None else att
 
@@ -395,8 +400,15 @@ class ItemParams (wx.Panel):
             else:
                 valueUnit = formatAmount(value, 3, 0, 0)
 
+            if self.toggleView != 1:
+                valueUnitDefault = str(valueDefault)
+            elif info and info.unit:
+                valueUnitDefault = self.TranslateValueUnit(valueDefault, info.unit.displayName, info.unit.name)
+            else:
+                valueUnitDefault = formatAmount(valueDefault, 3, 0, 0)
 
             self.paramList.SetStringItem(index, 1, valueUnit)
+            self.paramList.SetStringItem(index, 2, valueUnitDefault)
 
 
 

From 45006fe0439a7ff4af6f434fd561cc26fb85872a Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Sun, 12 Jun 2016 12:30:29 -0700
Subject: [PATCH 2/3] reverted back to original

---
 gui/itemStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/itemStats.py b/gui/itemStats.py
index 21dd9f56d..f93c9a34f 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ):
         if not item.description:
             return
 
-        desc = item.description.replace("\r", "<br>")
+        desc = item.description.replace("\n", "<br>")
         # Strip font tags
         desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", "\g<inside>", desc)
         # Strip URLs

From 32f671b4f278558520461b15a0ee871927efc185 Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Sun, 12 Jun 2016 17:06:28 -0700
Subject: [PATCH 3/3] No longer show "base" column when looking at a market
 item

Since they are identical.
---
 gui/itemStats.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gui/itemStats.py b/gui/itemStats.py
index f93c9a34f..c64164a47 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -342,10 +342,12 @@ class ItemParams (wx.Panel):
     def PopulateList(self):
         self.paramList.InsertColumn(0,"Attribute")
         self.paramList.InsertColumn(1,"Current Value")
-        self.paramList.InsertColumn(2,"Base Value")
+        if self.stuff is not None:
+            self.paramList.InsertColumn(2,"Base Value")
         self.paramList.SetColumnWidth(0,110)
         self.paramList.SetColumnWidth(1,90)
-        self.paramList.SetColumnWidth(2,90)
+        if self.stuff is not None:
+            self.paramList.SetColumnWidth(2,90)
         self.paramList.setResizeColumn(0)
         self.imageList = wx.ImageList(16, 16)
         self.paramList.SetImageList(self.imageList,wx.IMAGE_LIST_SMALL)
@@ -408,7 +410,8 @@ class ItemParams (wx.Panel):
                 valueUnitDefault = formatAmount(valueDefault, 3, 0, 0)
 
             self.paramList.SetStringItem(index, 1, valueUnit)
-            self.paramList.SetStringItem(index, 2, valueUnitDefault)
+            if self.stuff is not None:
+                self.paramList.SetStringItem(index, 2, valueUnitDefault)