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
blitzman
330983d9dd
Merge branch 'master' into development
...
Conflicts:
eve.db
2017-01-22 21:10:06 -05:00
Ebag333
b1a6189c55
Revert back to /s for mining. Adds /hour to tooltips.
2017-01-17 09:29:22 -08:00
Ryan Holmes
e45027a66c
Merge pull request #910 from Ebag333/UnicodePaths_v2
...
Unicode Paths 2: The Reckoning
2017-01-14 02:44:24 -05:00
blitzman
468a4644d6
Merge branch 'development'
...
Conflicts:
eos/db/saveddata/queries.py
2017-01-10 22:42:01 -05:00
blitzman
ebc7173c50
Fix issues with unexpected module positions (see #932 )
2017-01-04 23:48:37 -05:00
Ryan Holmes
d489fdd700
Merge pull request #913 from resinneublem/remember-user-filters-take2
...
Remembers user's meta filtering choices
2017-01-04 00:10:48 -05:00
blitzman
5cbffcf3ac
Handle counting number of fits per ship category more efficiently (see #819 )
2017-01-03 01:32:12 -05:00
Resin Neublem
d6db30b7fc
We weren't setting user selection in all branches
...
I heavily refactored the button click handler to make it a little easier to understand
2016-12-28 19:54:37 -05:00
Resin Neublem
a7b6647135
Remembers user's meta filtering choices
...
There is a lot of logic that overwrites the user's choices of meta
filtering on every search.
That's a little too clever. Especially if the user is looking for
different variations of a certain meta.
If a user wants to include the other meta buttons they can re-add them
after filtering.
Extra care has to be taken with Windows. If a button is Enabled=False AND
SetValue=True, then it looks like it's Enabled=True, but clicking it
doesn't do anything. So we handle that logic in it's own class
closes: https://github.com/pyfa-org/Pyfa/issues/818
2016-12-19 22:39:56 -05:00
Ebag333
bef17e53c6
Recreating wheels
2016-12-19 00:11:55 -08:00
Ebag333
d4b6099d6e
Handle unicode, utf8, and windows-1252
...
(cherry picked from commit 0d4f24a
2016-12-18 14:11:55 -08:00
blitzman
ff60538e21
Revert "Merge branch 'Ebag333-UnicodePaths' into development"
...
This reverts commit 8a6ef788b3cf91ae7627
2016-12-18 15:56:06 -05:00
Ryan Holmes
50c6133046
Revert "Remembers user's meta filtering choices"
2016-12-18 10:09:55 -05:00
Ryan Holmes
b7d7b80544
Merge pull request #829 from resinneublem/remember-user-filters
...
Remembers user's meta filtering choices
2016-12-18 10:07:15 -05:00
blitzman
2b9342692d
working commit
2016-12-18 09:45:26 -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
blitzman
57edc32a4b
Clean up new tactical mode stats stuff
...
(cherry picked from commit c9bc234
2016-12-14 12:21:00 -08:00
Ebag333
b529a28715
Implement fittingMode
...
(cherry picked from commit 5eb2fef
2016-12-14 12:18:34 -08:00
Ebag333
ea3a374ced
Add logging, because why not
...
(cherry picked from commit 9403a1f
2016-12-14 12:17:55 -08:00
Ebag333
2eacadf08f
Don't use try for fittingView, and don't show remove item for modes.
...
(cherry picked from commit fd224d6
2016-12-14 12:17:13 -08:00
Ebag333
1a127bb1a6
Add ability to look at tactical mode item info.
...
(cherry picked from commit f5776a0
2016-12-14 12:16:51 -08:00
Ebag333
edfa130939
Fix tooltip order
...
(cherry picked from commit 61d1878
2016-12-14 12:15:09 -08:00
Ebag333
7532bcda08
Clean up some stuff left over from cherry picks
2016-12-14 10:42:04 -08:00
Ebag333
08b5abc7ad
Handle unicode, utf8, and windows-1252
...
(cherry picked from commit 0d4f24a
2016-12-14 10:38:56 -08:00
Ebag333
7bd8ca5a55
Removed actual fleet files. Cleaned up __init__.py that had references.
...
(cherry picked from commit b6c5183
2016-12-14 10:20:20 -08:00
Ebag333
627977ab51
Purging fleet bonuses from code base
...
(cherry picked from commit 68f4570
2016-12-14 10:18:19 -08:00
Ebag333
e3b592977a
Make some imports more explicit
2016-12-13 23:49:37 -08:00
Ebag333
622a734405
remove lazy import. Fix test
2016-12-13 23:35:29 -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
874bfb3305
missed a type
...
(cherry picked from commit f416c77)
2016-12-13 20:18:04 -08:00
a-tal
ab9c925c47
non-standard - use forces coding declarations
...
(cherry picked from commit 6e17d88)
2016-12-13 20:17:56 -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
blitzman
b1bba74c5a
Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths
2016-12-11 23:01:08 -05:00
blitzman
c9bc2341d1
Clean up new tactical mode stats stuff
2016-12-10 02:04:51 -05:00
Ebag333
5eb2fef89c
Implement fittingMode
2016-12-08 18:56:43 -08:00
Ebag333
9403a1fce9
Add logging, because why not
2016-12-08 17:31:04 -08:00
Ebag333
fd224d6781
Don't use try for fittingView, and don't show remove item for modes.
2016-12-08 16:59:26 -08:00
Ebag333
f5776a0cb2
Add ability to look at tactical mode item info.
2016-12-08 13:12:15 -08:00
Ebag333
61d1878494
Fix tooltip order
2016-12-04 22:36:22 -08:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
Ebag333
6ef57e735e
Missed imports. Fixed now.
2016-12-03 06:21:52 -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
