Ryan Holmes
dfc5627031
Remove circular import mainFrame <> mainMenuBar
2017-02-07 09:37:20 -05:00
blitzman
542542f48d
import changes to graphframe
2017-02-07 00:33:15 -05:00
Ebag333
d67dbaa0ae
.gitattributes fixing line endings
2017-02-05 15:39:23 -08:00
Ebag333
be66ff1eec
Tox fixes
2017-02-05 15:39:07 -08:00
blitzman
86393d728f
I can't get these files out of "modified". Just commit them to get them out of the way.
2017-02-05 17:56:36 -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
6b6dacf94c
Fix traceback when trying to cancel an amount dialog with nothing in the field
2017-01-28 13:30:14 -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
blitzman
6b3d3ecd93
More import fixes for osx deprecated
2017-01-27 22:25:22 -05:00
blitzman
32dc28f48d
Move CREST import inside a conditional
2017-01-27 22:17:07 -05:00
blitzman
1d69ed7584
Merge branch 'test_import' into development
...
Conflicts:
gui/builtinContextMenus/amount.py
gui/characterEditor.py
gui/itemStats.py
2017-01-27 20:39:54 -05:00
blitzman
fb538027f7
Fix issues with paths and linux / os x
2017-01-27 20:30:11 -05:00
blitzman
cbf7f7d320
Merge branch 'master' into development
2017-01-27 19:39:10 -05:00
blitzmann
4111d670a7
Fix possible issue with floats coming through (see #729 )
2017-01-26 23:52:18 -05:00
blitzmann
397084a9ff
Disable rename and delete button for restricted character on character editor spawn (fix for #930 )
2017-01-26 21:33:13 -05:00
blitzmann
968d633d46
Merge branch 'feature/alphaclones' into development
2017-01-26 19:53:27 -05:00
blitzmann
96c3363edc
Merge branch 'master' into feature/alphaclones
...
Conflicts:
eve.db
2017-01-26 19:39:13 -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
5aff3f007e
Fix crest export
2017-01-25 20:22:07 -05: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
Ebag333
a50e4fcc46
Fix issue caused by file path and import fix merges
2017-01-24 17:37:37 -08:00
Ebag333
ae96ff244e
Fix crest exports
2017-01-24 17:09:48 -08:00
Ebag333
992820ac42
Redirect to correct module
...
Function was moved from service.Fit to service.Port
2017-01-24 16:48:28 -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
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
