Ebag333
f70d250995
Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion.
2017-03-13 10:11:15 -07:00
blitzman
7115cd178c
Merge branch 'development' into LogBook_v2
...
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
2017-02-25 18:21:07 -05:00
blitzman
2527fe2e1e
Fix the fix for the crash in OS X
2017-02-11 22:20:32 -05:00
blitzman
a4de0f2b5b
Fix crash in OS X
2017-02-11 22:10:53 -05: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
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
af44d878d1
tweak
2017-02-10 00:57:53 -05: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
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
32944f4c9c
More import fixes
2017-02-08 22:47:02 -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
3e916e42f2
pyCharm inspection fixes. Mostly variable refernce issues
2017-02-08 17:55:20 -08:00
Ebag333
e5fb90f017
Fix commit message. LOTS of fixes for flake8.
2017-02-08 14:22:56 -08:00
Ebag333
e18deb5eeb
Roll up #967 and #974
...
Takes the import fixes and cleanup out of those and rolls it into this
one
2017-02-08 13:12:54 -08:00
Ebag333
7a521c655f
Wrap dlg.Destroy() in a Try/Except
...
Conflicts:
gui/mainFrame.py
2017-02-08 00:15:02 -05:00
blitzman
31d74730c5
Add matplotlib version to about window
2017-02-07 19:44:59 -05:00
Ryan Holmes
dfc5627031
Remove circular import mainFrame <> mainMenuBar
2017-02-07 09:37:20 -05: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
a76eef01de
name all ze threads
2017-01-28 17:46:59 -05:00
blitzman
6b3d3ecd93
More import fixes for osx deprecated
2017-01-27 22:25:22 -05:00
Ebag333
a853ed9960
Remove test variable
2017-01-25 18:17:05 -08:00
Ebag333
323a7060ec
Fix import
2017-01-25 17:53:04 -08:00
blitzman
c34d86ba80
Fix XML exports
2017-01-25 20:12:30 -05:00
Ebag333
8095b4852b
Clean up another broken reference. Fix broken XML export.
2017-01-24 21:34:24 -08:00
Ebag333
cc3274f245
Add comment to note special snowflakes needs
2017-01-24 18:21:09 -08:00
Ebag333
fbde9ce7bf
Fix passing the fit into exportXML
2017-01-24 18:13:57 -08:00
blitzman
85131e6166
oh god this isn't gonna work
...
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
2017-01-23 21:06:12 -05:00
Ebag333
d7c71f5d47
fix some, missed import references.
2016-12-15 16:17:10 -08:00
Ebag333
c858fc2859
Remove an inline import. Fix a reference that is missing.
2016-12-15 15:39:19 -08:00
Ebag333
f76f44e9f3
Fix port references, imports, and add some logging
2016-12-15 15:20:29 -08:00
Ebag333
4fb07cc1d0
Bunch of pep8 and inspection cleanup
2016-12-15 12:43:19 -08:00
Ebag333
956fa7a8b7
Fixing some issues due to import cleanup
2016-12-14 13:06:13 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
Ebag333
be53dedb18
Large pep8 compliance to make work for Tox
2016-12-13 21:23:01 -08:00
Ebag333
57f930c83e
Cherry pick commits from @a-tal
2016-12-13 20:35:03 -08:00
a-tal
d3b6bc1c93
so many pep8 fixes
...
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
blitzman
95b3f0a21c
Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts
...
Conflicts:
eos/db/saveddata/fleet.py
eos/db/saveddata/queries.py
gui/additionsPane.py
2016-12-12 00:41:47 -05:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
Ebag333
ea8a4c01cb
Eliminate export calling fit.py (no need)
...
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated. Also spotted an
import reference that got missed.
2016-12-02 12:50:49 -08:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
Ebag333
c30190f63e
Revert "Revert "Purging fleet bonuses from code base""
...
This reverts commit 6e54d6788c
2016-09-15 15:27:30 -07:00
Ebag333
6e54d6788c
Revert "Purging fleet bonuses from code base"
...
This reverts commit 68f45706ab
2016-09-15 15:27:10 -07:00
Ebag333
68f45706ab
Purging fleet bonuses from code base
2016-09-15 15:07:59 -07:00
petosorus
54c950f951
Multibuy format export feature
2016-09-14 23:38:09 +02:00
blitzmann
6e2878194c
Merge branch 'master' into citadel
...
Conflicts:
config.py
service/market.py
2016-07-03 01:10:26 -04:00
Ebag333
b79009517e
Updated po-ta-toe to po-tah-toh
2016-06-16 14:46:22 -07:00
Ebag333
b4694dcf03
Implemented menu option to import default database values
...
Allows for existing databases to be updated with the current default
profiles. Can also be used to inject other defaults (maybe 0 and V
chars?)
2016-06-13 14:13:38 -07:00
