dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
6,015 Commits 3 Branches 5 Tags
b4e765abfa828ea4e85cb62166bf1b01854be833
Commit Graph

60 Commits

Author SHA1 Message Date
blitzmann
b30b3fcbf1 Merge branch 'master' into test-3 
Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py
 2017-11-23 11:19:05 -05:00
Ryan Holmes
3b546de070 More deprecated fixes, and re-enable a working stats view 2017-06-14 03:51:40 -04:00
Ryan Holmes
8e4db5a8c3 Do some renaming of some files 2017-06-12 18:08:07 -04:00
petosorus
33410f0618 Formatting 2017-05-30 15:51:48 +02:00
petosorus
1781c6dcf0 total computation + settings 2017-05-24 16:27:32 +02:00
blitzmann
fbf455c9fe Fix for fighter prices (#1178) 2017-05-18 22:28:09 -04:00
Ebag333
994bd72409 Rework pricing. 2017-04-05 14:40:27 -07:00
Ebag333
096842de44 Tox fixes, and catching a few things lost in the merge. 2017-02-11 09:23:23 -08:00
blitzman
5c91f29efb Merge branch 'price-system-selection' of git://github.com/petosorus/Pyfa into petosorus-price-system-selection 
Conflicts:
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/price.py
 2017-02-11 11:36:35 -05:00
petosorus
b6871c72ca Merge remote-tracking branch 'origin/price-system-selection' into price-system-selection 
# Conflicts:
#	gui/builtinStatsViews/priceViewFull.py
 2017-02-09 23:33:14 +01:00
Ebag333
64070a0798 Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later. 2017-02-09 09:36:16 -08:00
petosorus
bfa772609a Transfer of the price dropbox in the preferences pane. 
Moving of the modules list compiling from priceview to price service.
 2017-02-09 18:27:26 +01:00
petosorus
d15acf89ba refresh modules price view 2017-02-09 18:27:26 +01:00
petosorus
d25673b8fe Price listing price panel 2017-02-09 18:27:26 +01:00
Ebag333
7865219164 Add a ton of default values 2017-02-09 00:56:33 -08:00
Ebag333
72633825cf Formatting and layout changes 2017-02-08 23:32:51 -08:00
Ebag333
6e524de320 Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt 2017-02-08 20:15:24 -08:00
blitzman
5d46fe7e4d Merge branch 'master' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py
 2017-01-29 15:02:22 -05:00
blitzman
f010f2fef2 Don't loop through all amounts of cargo and drones just to get the price. (#958) 2017-01-28 13:15:25 -05:00
petosorus
9df54238d9 refresh modules price view 2017-01-05 00:18:20 +01:00
petosorus
fcd934319d Price listing price panel 2017-01-05 00:18:20 +01:00
petosorus
48ccc7ff06 System list 2017-01-05 00:18:17 +01:00
petosorus
edc48f0017 beginnings of price system choice 2017-01-05 00:17:56 +01:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
tgraviou
2f2800c360 System list 2016-11-24 12:00:53 +01:00
tgraviou
7eb3ad98fa beginnings of price system choice 2016-11-21 17:38:28 +01:00
blitzmann
f141fac3a2 Add fighters to overall fitting price (#674) 2016-07-05 23:34:19 -04:00
blitzmann
e8604788df Replace locale formating with regular string formatting due to issues with setting locale. 2016-03-06 11:48:01 -05:00
blitzmann
e9d02ce4c8 Change to use BitmapLoader class 2015-09-24 12:21:50 -04:00
blitzmann
474f270b26 Change to new icon locations 2015-09-24 12:17:17 -04:00
blitzmann
874cf4ef0a Use old price information if update fails. Add "(!)" to show that price is out of date 2015-07-03 02:37:52 -04:00
blitzmann
53c9169043 Simplified price pane. Will show pricing update label and will only clear it when prices are done. Removed all timer code as it makes it overly complicated and I suspect half of it didn't work as intended anyway 2015-06-05 15:39:10 -05:00
blitzmann
70d52fd0b2 Moved price update info to header 2014-11-20 12:27:32 -05:00
blitzmann
20362d2c0c Added thousands separators to price tooltip 2014-10-26 00:18:54 -04:00
blitzmann
c7042f314b Code consistency 2014-07-31 00:14:29 -04:00
blitzmann
5df7e193e7 Cargo works, but needs a more TLC 2014-03-30 17:12:32 -04:00
DarkPhoenix
3488a5d26e Rework number formatter to avoid silly stuff like formatting 999999 with precision of 3 to 1000k instead of 1M 2011-06-24 21:37:41 +04:00
HomeWorld
b35cda3b92 Show a more generalized status for prices fetching stuff as req. in ticket #377 2011-01-08 21:21:26 +02:00
HomeWorld
adae21452a Moved and splitted util.py into gui.utils.numberFormatter and gui.utils.clipboard; GetPartialText moved into gui.utils.drawUtils.py 2010-12-22 17:57:21 +02:00
DarkPhoenix
243291959f Revert "Resolve 352 (Clean up root folder)" 
This reverts commit cede27f1b2.
 2010-12-18 13:46:36 +03:00
DarkPhoenix
cede27f1b2 Resolve 352 (Clean up root folder) 2010-12-18 13:34:51 +03:00
Niklas Bölter
e059c8c7cc refreshPanel+processPrices will now always refresh the panel 2010-12-01 20:10:21 +01:00
cncfanatics
43a49eff74 Don't display that we're fetching if we really aren't 2010-10-29 11:50:25 +02:00
HomeWorld
2d1f742c0c Display optimizations in prices pane, dont mindlessly update static texts if nothing changed 2010-10-10 16:38:09 +03:00
cncfanatics
c41525ff4a Make a slight redesign of the builtins 2010-10-04 09:17:52 +02:00
HomeWorld
978d1e5835 Added togglepanel->header.layout to all statsview comps in refreshPanel 2010-10-03 13:42:19 +03:00
cncfanatics
bdd959d75f Change over the price fetching code to a queue instead of a cv, fix some minor stuff 2010-09-21 20:54:30 +02:00
cncfanatics
993c79f4f5 Rename controller to service 2010-09-18 12:31:22 +02:00
HomeWorld
7afbf1e129 Little fix for the case when we had a timeout while fetching prices and the retry was successful, make sure that we clear the status msg 2010-09-13 14:25:01 +03:00