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

Remove detailed price popups and move price preferences to new preference tab

Browse Source
This commit is contained in:
DarkPhoenix
2019-03-25 15:57:42 +03:00
parent c02cccf415
commit 3229652efa
4 changed files with 43 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gui/builtinStatsViews/priceViewFull.py
View File

@@ -24,7 +24,6 @@ from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from service.price import Fit, Price
from service.settings import PriceMenuSettings
from eos.const import FittingSlot
class PriceViewFull(StatsView):
@@ -91,13 +90,6 @@ class PriceViewFull(StatsView):
ship_price = 0
module_price = 0
module_slot_price = {
FittingSlot.HIGH: 0,
FittingSlot.MED: 0,
FittingSlot.LOW: 0,
FittingSlot.RIG: 0,
FittingSlot.SUBSYSTEM: 0
}
drone_price = 0
fighter_price = 0
cargo_price = 0
@@ -111,8 +103,6 @@ class PriceViewFull(StatsView):
for module in fit.modules:
if not module.isEmpty:
module_price += module.item.price.price
if module.slot in module_slot_price:
module_slot_price[module.slot] += module.item.price.price
if fit.drones:
for drone in fit.drones:
@@ -151,12 +141,7 @@ class PriceViewFull(StatsView):
self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(ship_price)))
self.labelPriceFittings.SetLabel("%s ISK" % formatAmount(module_price, 3, 3, 9, currency=True))
self.labelPriceFittings.SetToolTip(wx.ToolTip('Highs:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.HIGH])+
'Meds:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.MED]) +
'Lows:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.LOW]) +
'Rigs:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.RIG]) +
'Subsystems:\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.SUBSYSTEM])+
'Total:\t\t{:,.2f} ISK \n'.format(module_price)))
self.labelPriceFittings.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(module_price)))
self.labelPriceDrones.SetLabel("%s ISK" % formatAmount(drone_price + fighter_price, 3, 3, 9, currency=True))
self.labelPriceDrones.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(drone_price + fighter_price)))
@@ -164,29 +149,11 @@ class PriceViewFull(StatsView):
self.labelPriceCargobay.SetLabel("%s ISK" % formatAmount(cargo_price, 3, 3, 9, currency=True))
self.labelPriceCargobay.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(cargo_price)))
self.labelPriceCharacter.SetLabel(
"%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True))
self.labelPriceCharacter.SetLabel("%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True))
self.labelPriceCharacter.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(booster_price + implant_price)))
self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(total_price, 3, 3, 9, currency=True))
self.labelPriceTotal.SetToolTip(wx.ToolTip('Ship + Modules:\t{:,.2f} ISK \n'.format(ship_price +
module_price) +
'+ Drones:\t{:,.2f} ISK \n'.format(ship_price +
module_price +
drone_price +
fighter_price) +
'+ Cargo:\t\t{:,.2f} ISK \n'.format(ship_price +
module_price +
drone_price +
fighter_price +
cargo_price) +
'+ Implants:\t{:,.2f} ISK'.format(ship_price +
module_price +
drone_price +
fighter_price +
cargo_price +
implant_price)))
self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(total_price)))
def processPrices(self, prices):
self.refreshPanelPrices(self.fit)

36
gui/builtinStatsViews/priceViewMinimal.py
View File

@@ -24,7 +24,6 @@ from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from service.price import Fit, Price
from service.settings import PriceMenuSettings
from eos.const import FittingSlot
class PriceViewMinimal(StatsView):
@@ -85,13 +84,6 @@ class PriceViewMinimal(StatsView):
ship_price = 0
module_price = 0
module_slot_price = {
FittingSlot.HIGH: 0,
FittingSlot.MED: 0,
FittingSlot.LOW: 0,
FittingSlot.RIG: 0,
FittingSlot.SUBSYSTEM: 0
}
drone_price = 0
fighter_price = 0
cargo_price = 0
@@ -105,8 +97,6 @@ class PriceViewMinimal(StatsView):
for module in fit.modules:
if not module.isEmpty:
module_price += module.item.price.price
if module.slot in module_slot_price:
module_slot_price[module.slot] += module.item.price.price
if fit.drones:
for drone in fit.drones:
@@ -147,31 +137,11 @@ class PriceViewMinimal(StatsView):
self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(ship_price)))
self.labelPriceFittings.SetLabel("%s ISK" % formatAmount(fitting_price, 3, 3, 9, currency=True))
self.labelPriceFittings.SetToolTip(wx.ToolTip('Highs:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.HIGH])+
'Meds:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.MED]) +
'Lows:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.LOW]) +
'Rigs:\t\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.RIG]) +
'Subsystems:\t{:,.2f} ISK \n'.format(module_slot_price[FittingSlot.SUBSYSTEM])+
'Total:\t\t{:,.2f} ISK \n'.format(fitting_price)))
self.labelPriceFittings.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(fitting_price)))
self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(total_price, 3, 3, 9, currency=True))
self.labelPriceTotal.SetToolTip(wx.ToolTip('Ship + Modules:\t{:,.2f} ISK \n'.format(ship_price +
module_price) +
'+ Drones:\t{:,.2f} ISK \n'.format(ship_price +
module_price +
drone_price +
fighter_price) +
'+ Cargo:\t\t{:,.2f} ISK \n'.format(ship_price +
module_price +
drone_price +
fighter_price +
cargo_price) +
'+ Implants:\t{:,.2f} ISK \n'.format(ship_price +
module_price +
drone_price +
fighter_price +
cargo_price +
implant_price)))
self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f} ISK'.format(total_price)))
def processPrices(self, prices):
self.refreshPanelPrices(self.fit)