From ac810bc36a8db09a6ff2e26d6752a95b66587624 Mon Sep 17 00:00:00 2001 From: Lucas Thode Date: Mon, 25 Oct 2010 19:46:29 -0500 Subject: [PATCH] Revert "Most of the module price column." This reverts commit 42c07c1d7a16aff726b720e93432a8405448862e. --- gui/builtinViewColumns/__init__.py | 2 +- gui/builtinViewColumns/modulePrice.py | 49 -------------------------- gui/fittingView.py | 1 - icons/totalPrice_small.png | Bin 916 -> 0 bytes 4 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 gui/builtinViewColumns/modulePrice.py delete mode 100644 icons/totalPrice_small.png diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index 091d61743..ebf450cb2 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", "modulePrice"] + "capacitorUse", "activityCheckbox", "moduleAmmoIcon"] diff --git a/gui/builtinViewColumns/modulePrice.py b/gui/builtinViewColumns/modulePrice.py deleted file mode 100644 index b9944a2fd..000000000 --- a/gui/builtinViewColumns/modulePrice.py +++ /dev/null @@ -1,49 +0,0 @@ -#=============================================================================== -# 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 637d10c41..b6c16e0a8 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -36,7 +36,6 @@ 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 deleted file mode 100644 index 9c064b3e575a7dd6cdbdd4e9dfad4ae13914eaf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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@