Merge remote-tracking branch 'origin/master' into commandRefactor

gui/builtinViewColumns/price.py

@@ -45,21 +45,21 @@ class Price(ViewColumn):
             if stuff.isEmpty:
                 return ""
 
-        price = stuff.item.price.price
+        price = stuff.item.price
 
-        if not price:
-            return ""
+        if not price or not price.isValid:
+            return False
 
         if isinstance(stuff, Drone) or isinstance(stuff, Cargo):
-            price *= stuff.amount
+            price.price *= stuff.amount
 
-        return formatAmount(price, 3, 3, 9, currency=True)
+        return formatAmount(price.price, 3, 3, 9, currency=True)
 
     def delayedText(self, mod, display, colItem):
         sPrice = ServicePrice.getInstance()
 
         def callback(item):
-            price = item.item.price
+            price = item[0]
             text = formatAmount(price.price, 3, 3, 9, currency=True) if price.price else ""
             if price.failed:
                 text += " (!)"

gui/copySelectDialog.py

@@ -41,7 +41,7 @@ class CopySelectDialog(wx.Dialog):
                               CopySelectDialog.copyFormatEftImps: "EFT text format",
                               CopySelectDialog.copyFormatXml: "EVE native XML format",
                               CopySelectDialog.copyFormatDna: "A one-line text format",
-                              CopySelectDialog.copyFormatEsi: "A JSON format used for EVE CREST",
+                              CopySelectDialog.copyFormatEsi: "A JSON format used for ESI",
                               CopySelectDialog.copyFormatMultiBuy: "MultiBuy text format",
                               CopySelectDialog.copyFormatEfs: "JSON data format used by EFS"}
         selector = wx.RadioBox(self, wx.ID_ANY, label="Copy to the clipboard using:", choices=copyFormats,