Commit Graph

148 Commits

Author SHA1 Message Date
blitzmann
337f0a9c8a Fix stretchspacers 2017-11-24 17:23:04 -05:00
blitzmann
6e112b9ed5 Fix issues with merge 2017-11-23 11:38:08 -05:00
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
blitzmann
0f94557699 Use wx.AutoBufferedPaintDC instead of wx.BufferedPaintDC (helps with drawing on linux) 2017-11-21 00:05:52 -05:00
Ryan Holmes
da5aaf2f78 Feature/evemarketdata (#1297)
* Add preliminary support for eve market data

* Break out market sources into their own classes and register them onto the price service. Create preference option to select which source user wants. Default to eve central

* fix tox stuff
2017-09-23 19:39:38 -04:00
Ryan Holmes
987c55ed8f Get preferences dialog up and running 2017-07-02 16:32:39 -04:00
Ryan Holmes
729c46ab00 Revert "Remove EVT_ERASE_BACKGROUND events - pretty sure these were there for older versions of wx where the background wasn't erased properly"
This does help prevent flickering on resizing. Need to research more before removing them

This reverts commit 8c5c7fba29.
2017-06-14 03:57:57 -04:00
Ryan Holmes
4b8f2ce9e7 Deprecation stuff 2017-06-14 01:07:18 -04:00
Ryan Holmes
8c5c7fba29 Remove EVT_ERASE_BACKGROUND events - pretty sure these were there for older versions of wx where the background wasn't erased properly 2017-06-14 01:02:27 -04:00
Ryan Holmes
9d75dea31a "Fix" more spacers 2017-06-12 21:14:45 -04:00
Ryan Holmes
8e4db5a8c3 Do some renaming of some files 2017-06-12 18:08:07 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
86e6250a63 Add strict skills to preference pane 2017-04-22 14:49:13 -04:00
Ryan Holmes
ebda1349cf Add a small delay on key down for market search (#1123)
* Add a small delay on key down for market search

* prevent a double search if user does something like hit enter in the middle of a timer
2017-04-11 23:30:38 -04:00
blitzmann
6f914386ec Remove unused function 2017-04-10 21:58:56 -04:00
blitzmann
efaede0929 Use queries to bulk-delete target resists and damage profiles 2017-04-10 21:49:35 -04:00
Ebag333
73821cbe49 Formatting 2017-04-10 21:41:56 -04:00
Ebag333
e245891cb4 Add delete buttons 2017-04-10 21:40:59 -04:00
Ebag333
994bd72409 Rework pricing. 2017-04-05 14:40:27 -07:00
Ryan Holmes
92722d491f Remove functionality related to auto HTML export (#1088) 2017-04-02 11:46:17 -05:00
blitzman
e7de57fc7a tox fixes 2017-03-26 14:39:45 -04:00
blitzman
d928df9c69 Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now 2017-03-26 14:28:13 -04:00
blitzman
b18bb200a9 Merge branch 'development' into MorePreferences 2017-03-26 13:52:59 -04:00
blitzman
8b124f3194 Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-03-15 00:03:01 -04:00
blitzman
588ac62b6f fix for #1039 2017-03-15 00:02:48 -04:00
Ebag333
8991e1dbad Fix the view. Not sure why it broke (it was working at one point). 2017-03-13 20:09:37 -07:00
blitzman
d5f6f7b37c Disable "minimal" selection for remote reps pane (doesn't work) 2017-03-13 21:49:31 -04:00
blitzman
4ffec21cd3 Add real icons for the new pref pages 2017-03-13 21:46:56 -04:00
Ebag333
da922601cd You say Potatoe, I say tomahtie 2017-03-08 20:59:53 -08:00
Ebag333
9a284bc740 Add preference to disable ship browser tooltip popup. 2017-02-27 14:33:18 -08:00
Ebag333
d67573f83a Add more functionality to preferences window. 2017-02-27 12:05:38 -08:00
Ebag333
370b58d500 Changes required to implement the remote reps pane 2017-02-26 12:42:39 -08:00
Ebag333
712b1811b3 Tox fixes 2017-02-26 11:30:23 -08:00
blitzman
0bc0cb7f82 wx tweaks 2017-02-26 12:27:14 -05:00
Ebag333
b63c5fa1ff Tox fixes 2017-02-26 08:50:13 -08:00
Ebag333
e8101f9410 Embiggen the preference pane window. Change text, and clean up some unused imports. 2017-02-16 10:45:28 -08:00
Ebag333
56f1e9ed3a Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched. 2017-02-16 09:59:56 -08:00
Ebag333
fff67906d6 Migrate files from #868 2017-02-16 08:20:09 -08:00
Ebag333
201d596c80 Initial rollup of #868 2017-02-16 07:38:43 -08:00
blitzman
0dc3eda99f Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-02-13 23:27:40 -05:00
blitzman
2dca9fc3f3 Fix stuff in system pricing feature 2017-02-13 22:27:03 -05:00
Ebag333
096842de44 Tox fixes, and catching a few things lost in the merge. 2017-02-11 09:23:23 -08:00
blitzman
81e5b33bc9 Few tweaks for price system selection 2017-02-11 11:36:53 -05: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
aaece725aa Saving price system preference 2017-02-09 23:26:31 +01: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
Ebag333
11d7f9d029 Make modules static if they do not use self. 2017-02-09 00:04:41 -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
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08:00