From 50020159bbc4183610dd256865ab2019e8fe2677 Mon Sep 17 00:00:00 2001 From: Lucas Thode Date: Mon, 25 Oct 2010 12:20:11 -0500 Subject: [PATCH] Most of the module price column. (It appears and has the correct icon, but the data isn't available due to a synchronization issue between the market service and the GUI. --- gui/builtinViewColumns/__init__.py | 2 +- gui/builtinViewColumns/modulePrice.py | 49 ++++++++++++++++++++++++++ gui/fittingView.py | 1 + icons/totalPrice_small.png | Bin 0 -> 916 bytes 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gui/builtinViewColumns/modulePrice.py create mode 100644 icons/totalPrice_small.png diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index ebf450cb2..091d61743 100644 --- a/gui/builtinViewColumns/__init__.py +++ b/gui/builtinViewColumns/__init__.py @@ -1,3 +1,3 @@ __all__ = ["moduleState", "moduleNameOrSlot", "attributeDisplay", "maxRange", "name", "droneDps", "droneNameAmount", "droneCheckbox", "moduleAmmo", - "capacitorUse", "activityCheckbox", "moduleAmmoIcon"] + "capacitorUse", "activityCheckbox", "moduleAmmoIcon", "modulePrice"] diff --git a/gui/builtinViewColumns/modulePrice.py b/gui/builtinViewColumns/modulePrice.py new file mode 100644 index 000000000..8f304453f --- /dev/null +++ b/gui/builtinViewColumns/modulePrice.py @@ -0,0 +1,49 @@ +#=============================================================================== +# Copyright (C) 2010 Diego Duclos, Lucas Thode +# +# This file is part of pyfa. +# +# pyfa is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# pyfa is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with pyfa. If not, see . +#=============================================================================== + +from gui.viewColumn import ViewColumn +from gui import bitmapLoader +import service + +class ModulePrice(ViewColumn): + name = "Module Price" + def __init__(self, fittingView, params): + ViewColumn.__init__(self, fittingView) + bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons") + if bitmap: + self.imageId = fittingView.imageList.Add(bitmap) + else: + self.imageId = -1 + + + def getText(self, mod): + itemPrice = None + def callback(requests): + itemPrice = requests[0].price + + service.Market.getInstance().getPrices([mod.ID], callback) + if itemPrice is not None: + return "%.0f" % itemPrice + else: + return "" + + def getImageId(self, mod): + return -1 + +ModulePrice.register() diff --git a/gui/fittingView.py b/gui/fittingView.py index b6c16e0a8..637d10c41 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -36,6 +36,7 @@ class FittingView(d.Display): "Capacitor Usage", "attr:power", "attr:cpu", + "Module Price", "attr:trackingSpeed", "Max range", "Module Ammo", diff --git a/icons/totalPrice_small.png b/icons/totalPrice_small.png new file mode 100644 index 0000000000000000000000000000000000000000..9c064b3e575a7dd6cdbdd4e9dfad4ae13914eaf6 GIT binary patch literal 916 zcmV;F18e+=P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igi5 z5HTeFsMSsY00R_BL_t(I%dL}ZNRx3C#-DfZF6M2srfHeYITbHW%}gt2UZB*(B1@&R zEDS42i;AKuBS$%cBN?BK|2N1akB8iq+@9S!=kbi3JOuSdr;Eb=qcAZ4M44FH4?P!xqSMez(1?gwXyD{O^)40V4q0pK_bm!zNEAC^@2@M-WW z54V8{lZEd4GWc^}0FddwbFD5PO9|K>n?A>*eP6YA!pYVaj~bM{ACymd$?==R`uqFh z_hjZas(LgR2{;B>M1=P9XZ1V_0NVXl$UFn3b9mqL#g8|US2EcW5a}_d!qo^Akh9^%jr^q_rEZm>4 z%EQIUtDvC)qmEvzw%WV)hmZHWvf1>E$z)Oj_(;<%3&mnlv{O)k7wsn6IYJ|0eaM=X z4mABrJ8O~>E>9BV<8SfeFJsPSWab>Ydb)AIQ83#Woig+LXb1tB930Yf&C{B+%KYS! z;W1xtYoT96NQhlio}$`lG8aE7DZL+kHak)pwmz3_m^j$MjCfmAn)d)ESieAImgdZ> zYM=E*Z45TXZHqCQnXzues9xStSbTe?wY}A6Ltxs=<`%zounxR*G%E#w=y!|&FlRJQ zPkq(4wKTm{R#iTze)qP$bbj2}W!8_8S->)3CR5hSmpbS`rh3$U^}UTv6#&eC^>tS6 qo&dlF;9_Ub7uyKz1pp}g5B&fO@