Ebag333
|
e7a5cb4b1d
|
Don't show both messages if we don't have the zip files
|
2017-02-12 12:21:57 -08:00 |
|
Ebag333
|
441b3f1646
|
Handle print() messages when not frozen and in debug. We only want to exclude handling stacktraces, so the IDE gets clickable line numbers.
|
2017-02-11 11:59:49 -08:00 |
|
Ebag333
|
3b185e1bcb
|
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
|
2017-02-11 11:51:53 -08:00 |
|
Ryan Holmes
|
beed414429
|
Merge pull request #984 from Ebag333/FixToxIssues
Tox fixes, and catching a few things lost in the merge.
|
2017-02-11 13:01:33 -05:00 |
|
Ryan Holmes
|
99b2fdefcc
|
Merge pull request #985 from Ebag333/Travis_Icon
Add Travis Icon
|
2017-02-11 12:59:21 -05:00 |
|
Ebag333
|
9ec6a829c2
|
Revert the revert of the revert.....or something.
|
2017-02-11 09:47:23 -08:00 |
|
Ebag333
|
913f70b24d
|
Fix copy/pasta
|
2017-02-11 09:41:26 -08:00 |
|
Ebag333
|
5a4d68684e
|
Add Travis Icon
|
2017-02-11 09:38:10 -08: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 |
|
blitzman
|
bfcb73f344
|
Fixes for #952
|
2017-02-11 11:12:10 -05:00 |
|
blitzman
|
a2ca5eb8a4
|
fix oops
|
2017-02-11 11:01:39 -05:00 |
|
blitzman
|
f34e564ccd
|
Merge branch 'MatPlotLib' of https://github.com/Ebag333/Pyfa into Ebag333-MatPlotLib
Conflicts:
gui/graphFrame.py
|
2017-02-11 10:53:24 -05:00 |
|
blitzman
|
423a433e16
|
Merge branch 'SorryNotSorryBlitzmann' into development
|
2017-02-11 10:47:22 -05:00 |
|
blitzman
|
bdee8f662c
|
Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann
|
2017-02-11 10:46:59 -05:00 |
|
Ebag333
|
3562577521
|
Tox fix, and catch an extra shadowing
|
2017-02-10 12:06:23 -08:00 |
|
Ebag333
|
8c7682c6d4
|
Little more OCD on cleaning up imports.
|
2017-02-10 12:02:23 -08:00 |
|
Ebag333
|
2b45a16872
|
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
|
2017-02-10 11:50:04 -08:00 |
|
Ebag333
|
73cc17ce72
|
Clean up some more import statements
|
2017-02-10 11:29:52 -08:00 |
|
Ebag333
|
07a2020303
|
Don't try and import an old version and then fail back to the 2.7 version. Just do the 2.7 version. :)
|
2017-02-10 11:22:06 -08:00 |
|
Ebag333
|
0fc45ead6e
|
Catch missing import
|
2017-02-10 11:16:51 -08:00 |
|
Ebag333
|
6b37e2c973
|
More clean handling of possibly missing attributes. Thanks @blitzmann!
|
2017-02-10 10:09:11 -08:00 |
|
Ebag333
|
cdabd83afe
|
Remove old init
|
2017-02-10 07:19:33 -08:00 |
|
Ebag333
|
f610f525ba
|
Use getattr directly, insead of doing a check then setting it (yay for defaults)
|
2017-02-10 06:44:40 -08:00 |
|
Ebag333
|
514f927a56
|
Revert removing call. This class likely needs to be callable.
|
2017-02-10 05:50:32 -08:00 |
|
Ebag333
|
3c641606da
|
Revert until we actually get a Linux developer.
|
2017-02-10 05:41:06 -08:00 |
|
blitzman
|
af44d878d1
|
tweak
|
2017-02-10 00:57:53 -05:00 |
|
blitzman
|
72ebafe925
|
Remove redundant init
|
2017-02-10 00:37:45 -05:00 |
|
blitzman
|
134365c764
|
Reverts commit de87c9, and instead uses the mod variable to access the method needed.
Conflicts:
service/fit.py
|
2017-02-10 00:29:40 -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 |
|
petosorus
|
aaece725aa
|
Saving price system preference
|
2017-02-09 23:26:31 +01:00 |
|
Ebag333
|
228425fdb9
|
Cast to int so we can compare
|
2017-02-09 14:07:37 -08:00 |
|
Ebag333
|
9775d1064e
|
Move import code down into class init
|
2017-02-09 13:27:54 -08:00 |
|
Ebag333
|
1a9591d411
|
pyCharm inspection and code style
|
2017-02-09 10:56:26 -08: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
|
dd9924a7a7
|
Fix issues where we assume something can exist when it may not.
|
2017-02-09 07:22:09 -08:00 |
|
Ebag333
|
0f00b7237a
|
Another classic class conversion
|
2017-02-09 01:02:55 -08:00 |
|
Ebag333
|
579a13da44
|
Tox fixes
|
2017-02-09 00:59:22 -08:00 |
|
Ebag333
|
7865219164
|
Add a ton of default values
|
2017-02-09 00:56:33 -08:00 |
|
Ebag333
|
f2c84692a9
|
Clean up a bunch of unused variables
|
2017-02-09 00:22:14 -08:00 |
|
Ebag333
|
f61aeb8285
|
Fix bug where the toggle button the compare pane didn't do anything. (Need to check toggleView because you can hit both first and second if otherwise.)
|
2017-02-09 00:18:19 -08: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
|
9a137bb158
|
Convert old style classes to new
|
2017-02-08 23:06:39 -08:00 |
|
Ebag333
|
32944f4c9c
|
More import fixes
|
2017-02-08 22:47:02 -08:00 |
|
Ebag333
|
23c6f2add5
|
We have two of the exact same backported file. Get rid of one. Also, handle the except if we can't import so we don't get stacktraces. (Currently the three functions affected are not used.)
|
2017-02-08 22:42:19 -08:00 |
|