Commit Graph

392 Commits

Author SHA1 Message Date
blitzmann
2ac62ece06 Remove erroneous command causing a break in ship booster menu 2015-12-05 22:53:51 -05:00
blitzmann
4d701f561e fix booster menu causing crashes (#424) 2015-11-26 18:56:20 -05:00
blitzmann
365cacac66 Fix #371 2015-10-02 11:16:41 -04:00
blitzmann
072fac4259 Merge branch 'master' into wx3 2015-09-29 21:35:44 -04:00
blitzmann
2617143330 Fix #363 2015-09-27 18:16:54 -04:00
blitzmann
e9d02ce4c8 Change to use BitmapLoader class 2015-09-24 12:21:50 -04:00
blitzmann
474f270b26 Change to new icon locations 2015-09-24 12:17:17 -04:00
blitzmann
5372f31be8 Revert "Revert "Merge branch 'master' into wx3"". So many reverts.
This reverts commit cca7f1112a.
2015-06-27 21:53:59 -04:00
blitzmann
6d01877d78 Merge branch 'master' into wx3
Conflicts:
	pyfa.py
2015-06-27 19:33:12 -04:00
blitzmann
646f3afd27 Fixed oversights 2015-06-27 19:32:21 -04:00
blitzmann
98815f2b85 Fix #307 by moving menu code to spawn event 2015-06-27 18:18:43 -04:00
blitzmann
dc035469ed Fix background color for certain panels under Linux 2015-06-25 16:09:56 -04:00
blitzmann
f285395e0f Fix black bitmap when dragging fit, closes #303 2015-06-17 19:43:48 -04:00
blitzmann
b54e3aeaf9 See #303 2015-06-16 15:28:23 -04:00
DarkPhoenix
cca7f1112a Revert "Merge branch 'master' into wx3"
This reverts commit 33a0c10650, reversing
changes made to 2077655694.

Reverting merges fucks up git, but oh well - we probably better merge stuff manually rather than fucking up master with wx3 which is apparently buggy
2015-04-30 19:47:15 +03:00
blitzmann
39c14b62fd Merge branch 'master' into wx3 2015-04-17 17:48:56 -04:00
blitzmann
6c19f446be Sort import stage results 2015-02-09 22:44:33 -05:00
blitzmann
dc77ee9353 Add import stage to goTo logic, and fixed a bug with search initiating a goTo to the last hx item 2015-02-09 22:05:56 -05:00
blitzmann
6d29fd6bc1 Simplified stage 3 history handling. Fixes:
* Hitting back button after creating/copying new fit breaks stage
* Importing more than 1 fit while on the search stage and hitting the back button breaks stage
2015-02-08 21:12:56 -05:00
blitzmann
cbcd5ccca5 Fixed bugs:
* Importing 1 fit would open stage3 of that ship, but add incorrect history data.
* Deleting fit from search stage caused blank stage most times, fixed this.
2015-02-08 20:29:54 -05:00
blitzmann
30d2ab23ad Initial support for import stage in shipBrowser. Few bugs, see issue #93 2015-02-08 16:14:52 -05:00
blitzmann
675213f20f Fix #252 2015-01-21 11:18:58 -05:00
DarkPhoenix
e8268633e3 Merge branch 'master' into wx3
Used code from the master on conflicts
2014-12-15 15:45:33 +03:00
DarkPhoenix
3c1bf22e87 Merge branch 'master' into wx3 2014-12-12 14:42:25 +03:00
blitzmann
88074c8516 Fix fonts and lag with OS X 2014-12-11 23:25:44 -05:00
DarkPhoenix
da15b63831 Fix race detection 2014-12-10 01:01:51 +03:00
blitzmann
a603a4359a Fixed font discrepancy from different wxPython versions. 2014-11-08 16:45:09 +02:00
blitzmann
6fafe40f35 Fix for a fix that was removed with a fix (see #62) 2014-11-07 23:17:14 -05:00
blitzmann
ec083428da Fit search shortcut: Fix focus issues for Linux 2014-08-26 16:01:39 -04:00
blitzmann
59be18506c Added "Open in Ship Browser" to fitting context menu, and modified a bit of the history logic in shipBrowser. 2014-08-19 23:50:10 -04:00
blitzmann
9e5f119248 Reduces icon opacity of "Empty Groups" toggle dependant on filtering state. 2014-08-10 17:21:48 -04:00
blitzmann
c7042f314b Code consistency 2014-07-31 00:14:29 -04:00
blitzmann
b31d14158f Added caching to empty group filtering
Stage 2 now sums total fittings in category and sets the cache to True if t_fits > 0
Stage 3 sets the cache to True if number of fits for ship > 0. This takes care of creating new fits

If fit is deleted, and there are no other fits for the ship, it reverts back to stage 2, which should set the correct value in the cache
2014-07-30 16:00:38 -04:00
blitzmann
b3b62fcecc Introduces empty group filtering to ship browser stage 1 2014-07-30 00:40:55 -04:00
blitzmann
a148a6d818 Added some bulk to PFStaticText to allow for more refined layout of text. Will probably increase font size later (it's so teeny!)
(cherry picked from commit 4f0c246e80a6d245bd9bd6be0dc0c0f995e2ae80 branch `tag`)
2014-05-15 01:08:19 -04:00
blitzmann
e87ac96c6c Fix incorrect variable order 2014-03-30 17:12:13 -04:00
blitzmann
035e6cea41 Fixes incorrect setting of draggedFitID when selecting booster from menu 2014-02-26 00:32:07 -05:00
blitzmann
5869fe6d97 Added booster icon
This is technically a button, and acts like a button without a function. Must look into making it a proper icon and not a button.
2014-02-24 03:02:14 -05:00
blitzmann
e877cef3a9 Revert "Added icon to show boosting fits."
This reverts commit f7fdcfcd4e.
2014-02-24 03:00:06 -05:00
blitzmann
f7fdcfcd4e Added icon to show boosting fits. 2014-02-24 02:34:05 -05:00
blitzmann
c6ad328e99 Changed "Set Booster Fit" option to a boolean menu item with fancy checkbox. 2014-02-24 00:56:04 -05:00
blitzmann
b910982994 Bug fix and more work 2014-02-22 01:14:33 -05:00
blitzmann
50ce4d37aa GangView is not aware of changes to booster fits 2014-02-21 21:50:18 -05:00
blitzmann
7579f3c3e1 Fixed cases where fit.booster column might contain null instead of bool 2014-02-20 23:56:50 -05:00
blitzmann
3842913fe1 Added booster fit toggling in database, menu label toggling, and migration code 2014-02-20 23:26:26 -05:00
blitzmann
aaadcb9b45 Add "Flag as Booster" item to fitting menu 2014-02-20 00:57:12 -05:00
DarkPhoenix
782f3cd590 Add support for SoE race. Their ships do not use it yet due to wrong skill requirements 2013-10-08 01:05:46 +04:00
HomeWorld
97f3ccb0f7 Preliminary gang UI stuff 2011-11-21 00:15:13 +04:00
DarkPhoenix
7f35f8f4e9 Do not count wildcards as search symbols when checking character limitations 2011-07-28 19:47:33 +04:00
HomeWorld
10e2b4c4b3 Minor fix for nav panel search ctrl (wxgtk side) 2011-07-21 15:14:05 +03:00