Commit Graph

6602 Commits

Author SHA1 Message Date
Ryan Holmes
0b511af48a Remove weird typo, whoops 2019-03-19 11:34:54 -04:00
Ryan Holmes
25bbf3dc03 Move export logic from mainframe to export dialog, and introducing ui blocking for price optimization 2019-03-19 11:34:10 -04:00
DarkPhoenix
72a602b5b0 Merge branch 'master' into price_optimize 2019-03-19 16:45:17 +03:00
Ryan Holmes
d107156341 Fix for sill name getting cutoff on gtk (#1886) 2019-03-19 09:15:09 -04:00
DarkPhoenix
8063647bba Merge branch 'master' into price_optimize 2019-03-19 08:42:06 +03:00
Ryan Holmes
573d8e068c Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-18 22:32:48 -04:00
Ryan Holmes
f6c6f9a0c9 Handle double click event on skill groups in character editor (#1886) 2019-03-18 22:30:54 -04:00
Ryan Holmes
d9c5c9cc0e Merge pull request #1836 from pyfa-org/spoolup
Spoolup
2019-03-18 20:32:18 -04:00
Ryan Holmes
bb7fb022ef fixes for windows and selected menu item 2019-03-18 20:25:28 -04:00
DarkPhoenix
52c9f4076b Change reset label 2019-03-18 20:08:06 +03:00
DarkPhoenix
894231b009 Change selection affix 2019-03-18 19:40:30 +03:00
DarkPhoenix
34fe530ac7 Add current value marker 2019-03-18 19:29:27 +03:00
DarkPhoenix
33b91a79ab Add option to disable this context menu 2019-03-18 18:21:53 +03:00
DarkPhoenix
51180a9375 Put spoolup menu above item stats 2019-03-18 17:54:00 +03:00
DarkPhoenix
6e44963d57 Implement spoolup selection via purely context menu 2019-03-18 17:52:37 +03:00
DarkPhoenix
8114765236 Merge branch 'master' into spoolup 2019-03-18 16:04:45 +03:00
DarkPhoenix
7ddd3a35d1 Merge branch 'master' into price_optimize 2019-03-18 14:34:35 +03:00
DarkPhoenix
52a68adb11 Put character editor window into scope of main window
This fixes various annoying things happening under linux: two separate applications shown when character editor open and various window focus bugs when opening stats of skills in character editor
2019-03-18 14:33:17 +03:00
DarkPhoenix
566e7fd046 Disable UI for duration of price optimization 2019-03-18 13:55:57 +03:00
Ryan Holmes
3c98aad4ba Autosize the item attribute columns (#1878). 2019-03-17 19:35:19 -04:00
Ryan Holmes
0063840cfa Merge branch 'price_optimize' of https://github.com/pyfa-org/Pyfa into price_optimize 2019-03-17 13:18:50 -04:00
Ryan Holmes
96077ed115 Create blocking UI for fit price optimizations 2019-03-17 13:18:42 -04:00
Ryan Holmes
19f02ef914 Align skill column to the right (#1866) 2019-03-17 09:06:47 -04:00
Ryan Holmes
de9ce47bed Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-17 09:01:47 -04:00
Ryan Holmes
ccd3665115 Do not call Layout on the skill tree view. #1866 2019-03-17 09:01:40 -04:00
DarkPhoenix
a35f04cd9a Merge branch 'master' into price_optimize 2019-03-16 13:55:35 +03:00
DarkPhoenix
c6c364c451 Change runtime of combat rig sec modifier 2019-03-16 13:55:13 +03:00
DarkPhoenix
8dcc3f2b51 Merge branch 'master' into price_optimize 2019-03-16 13:30:35 +03:00
DarkPhoenix
42383cef03 Add effect which increases rig strength if system is not hi-sec 2019-03-16 13:29:47 +03:00
DarkPhoenix
579081393b Merge branch 'master' into price_optimize 2019-03-16 01:47:18 +03:00
Ryan Holmes
2290281024 Merge pull request #1869 from IndictionEve/Code_Cleanup_Enums
Code cleanup enums #1862
2019-03-15 18:06:49 -04:00
DarkPhoenix
712c49d129 Merge branch 'master' into price_optimize 2019-03-15 10:14:30 +03:00
Ryan Holmes
ac16b19d93 Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-14 20:15:25 -04:00
Ryan Holmes
51b3cff4a9 Fix for #1877 2019-03-14 20:15:05 -04:00
DarkPhoenix
768b0b3a3a Merge branch 'master' into price_optimize 2019-03-15 01:41:28 +03:00
DarkPhoenix
538271d737 Add UI-specific highIsGood override for web 2019-03-15 01:40:15 +03:00
Ryan Holmes
61da8be732 Few import fixes and some bug fixes 2019-03-14 14:46:01 -04:00
Ryan Holmes
90e275e386 Remove unused import 2019-03-14 14:25:11 -04:00
Ryan Holmes
8e98af8517 Performance improvement when collecting counts for categories. Instead of making n calls for each category to sql, we get a grouped count by shipID, then process this in python, which is much faster. 2019-03-14 14:15:01 -04:00
Ryan Holmes
9a16c579eb fixing various imports to point to eos.const instead of old locations 2019-03-14 12:50:20 -04:00
Indiction
8b864692fb Moved non-EOS enum to new service/const.py. Renamed FittingAttrGroup
to GuiAttrGroup
2019-03-12 23:17:25 +01:00
DarkPhoenix
eaddc942a0 Merge branch 'master' into price_optimize 2019-03-12 14:25:51 +03:00
Ryan Holmes
82c5ae1fe9 some clean up 2019-03-09 20:43:40 -05:00
Ryan Holmes
5c2df66335 #1867 Fix for the image list crash on linux 2019-03-09 20:38:58 -05:00
Indiction
afa8c3c53a Replaced eos.enum by enum. Removed unused enum import.
Found another Enum to move.
2019-03-09 18:59:43 +01:00
Indiction
bd33efa875 Changed FittingSlot to IntEnum 2019-03-09 18:45:28 +01:00
DarkPhoenix
f53c8e9efc Switch "total" and "character" around
So that total is bottom-right item
2019-03-09 17:40:13 +03:00
DarkPhoenix
d2b306d030 Fix export window sizing bug 2019-03-09 17:31:02 +03:00
Indiction
f58c8ec4f9 Added unique to rest except Fittingslot 2019-03-09 15:18:10 +01:00
DarkPhoenix
22fc6cb13c Integrate price optimization with undo/redo 2019-03-09 15:44:50 +03:00