Commit Graph

56 Commits

Author SHA1 Message Date
blitzmann
436bee1e85 Start working on a gui to set spoolup options 2019-01-05 22:26:17 -05:00
blitzmann
621672bf34 Some tox fixes 2018-09-15 20:38:08 -04:00
blitzmann
fd83a4b709 Remove drone splitting / merging, and introduce drone change qty 2018-08-18 00:39:05 -04:00
blitzmann
012c5f536b Add mutaplasmid context menu 2018-06-03 16:29:00 -04: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
Ryan Holmes
f24c2ddd22 Get skill list in character editor showing. Mostly doesn't work still 2017-07-02 14:12:00 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
c2cb5d763f Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
2017-06-04 23:33:11 -04:00
petosorus
380f90d065 Price options in context menu 2017-05-24 17:30:55 +02:00
blitzmann
080590a292 Add "Currently Open Fits" context menu for projected and command views 2017-04-13 23:23:48 -04:00
blitzman
4065022866 Initial work on caching command fits unless needing to update. FitChanged event can now carry an action and typeID, only used in the CommandFit context menu (for now, can use this elsewhere). If the module being added or removed, we update the cached list. 2017-03-23 00:38:23 -04:00
Ebag333
e3c2220a1c Fix matplotlib importing 2017-03-16 14:09:10 -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
4ba11d832a Tox fixes, because it's a thing we do now 2017-02-16 23:12:25 -05:00
blitzman
b164b86eda Fix context menu order 2017-02-16 00:18:09 -05:00
blitzman
0a37834fd8 Disable the global module ammo picker for now 2017-02-14 23:20:23 -05:00
Ebag333
159472f82c Tox fixes, and convert all logging string replacement to a standard style. 2017-02-13 13:38:21 -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
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
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
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
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
be53dedb18 Large pep8 compliance to make work for Tox 2016-12-13 21:23:01 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
blitzmann
d71b05095d Clean up 2016-05-15 12:43:24 -04:00
blitzmann
d061a13b58 Move ID pool to context menu class rather than individual menu items 2016-05-15 12:18:56 -04:00
blitzmann
5176cc3b06 Testing a new way of generating context menu id's 2016-05-15 02:35:35 -04:00
blitmann
487f65d62b Fix #233 2015-01-04 17:19:53 -06:00
blitzmann
892c5c5b60 Various event binding fixes for context menus. It's still a mess, but it's not as bad of a mess.
(cherry picked from commit 081e32da6f)
2014-11-30 01:19:10 -05:00
blitzmann
030e6aa9db Instead of sending id, send parent item (which contains ID). This allows us to access the item to modify bitmap or any other value for it. 2014-09-15 15:48:26 -04:00
blitzmann
da047106f3 Implements support for child menus for damage patterns. 2014-09-08 01:11:38 -04:00
DarkPhoenix
3af8792556 Revert "Implement basic context meenu sorting (by source context only for now)"
This reverts commit a2bba48190.
2011-04-25 10:41:55 +04:00
DarkPhoenix
a2bba48190 Implement basic context meenu sorting (by source context only for now) 2011-04-25 00:16:50 +04:00
DarkPhoenix
3c48839569 Rework context menus 2011-04-24 21:58:07 +04:00
cncfanatics
415d15b921 Return None when there's no menu entries 2010-10-30 20:45:03 +02:00
cncfanatics
5c8b18aa28 Fix some bugs and add forgotten files 2010-10-29 11:29:49 +02:00
cncfanatics
bc883685ec Implement basic ammo switching context menu. (still needs much
polishing)
2010-10-19 10:31:52 +02:00
DarkPhoenix
9f9aff0c39 Fix file permissions 2010-10-14 20:32:54 +04:00
cncfanatics
37c34a32f3 Add a V in front of the active damage pattern and allow different
bitmaps per menu item when multiple are passed
2010-10-11 21:54:53 +02:00
cncfanatics
93a1c31292 FIx an oopsie 2010-10-11 09:18:20 +02:00
cncfanatics
1a44b581dd Don't skip the context menu handler, bugs out on mac 2010-10-09 22:42:59 +02:00
HomeWorld
c0fee80773 Revert "test comit"
This reverts commit 2d3868dea9.
2010-10-09 17:07:15 +03:00
HomeWorld
2d3868dea9 test comit 2010-10-09 17:02:46 +03:00
cncfanatics
00c220779d Fix a bug where we'd bind our context menu handler several times,
leading to superfluous handler calls
2010-10-07 08:20:52 +02:00
cncfanatics
a4877514b4 Fix a bug where a context menu was only able to be spawned once and not
reusable
2010-10-07 08:00:16 +02:00
cncfanatics
c0b739b8f7 Fix item stats for skills and move some stuff around 2010-10-06 13:58:42 +02:00