Commit Graph

2350 Commits

Author SHA1 Message Date
blitzmann
fbf67c134b Merge remote-tracking branch 'origin/singularity' 2015-12-07 19:39:45 -05:00
blitzmann
cbd2ed603f Possible fix for character editor crash 2015-12-06 11:16:54 -05:00
blitzmann
2ac62ece06 Remove erroneous command causing a break in ship booster menu 2015-12-05 22:53:51 -05:00
blitzmann
0a10f2d72a If running under OSX and wx3, override wx.ID_COPY and wx.ID_PASTE. See GH Issue #456 2015-12-04 01:06:35 -05:00
blitzmann
b4373cb0c5 Fix #451 2015-11-29 17:56:39 -05:00
blitzmann
4d701f561e fix booster menu causing crashes (#424) 2015-11-26 18:56:20 -05:00
blitzmann
3b1edd3283 Add error handling to CREST functions when no connection can be made. 2015-11-08 20:07:30 -05:00
blitzmann
2fadaa890b fix save character as on os x 2015-11-08 13:52:53 -05:00
blitzmann
31bdb75c51 Added confirmation dialog when deleting character 2015-11-08 12:49:00 -05:00
blitzmann
0124f63d9a Fix amount change dialog for os x 2015-11-08 12:44:32 -05:00
blitzmann
95dba166eb Remove some debugging prints 2015-11-08 12:37:31 -05:00
blitzmann
83adadd71f Convert pubsub to wx events 2015-11-08 12:33:56 -05:00
blitzmann
febc2eee09 Add some conditionals to disable Attribute Editor for wxPython 2.8 2015-11-06 20:23:09 -05:00
blitzmann
bf0b89f3b5 Old mac client shouldn't even know about CREST / override. Disable all instances of them for this build. 2015-11-03 21:25:52 -05:00
blitzmann
11ebde87c9 Change attr override window from ctrl+a to ctrl+b 2015-11-03 19:38:03 -05:00
blitzmann
09e0a0576c MainFrame pointer was accidentally deleted from characterEditor.py, causing issues. 2015-11-03 19:21:45 -05:00
blitzmann
4b27becb5f Merge branch 'overrides' into singularity
Conflicts:
	eos/db/__init__.py
	eos/db/saveddata/__init__.py
	eos/db/saveddata/queries.py
	gui/mainFrame.py
	gui/mainMenuBar.py
2015-11-02 19:01:12 -05:00
blitzmann
3c055b78d3 Fix clearing of all overrides 2015-11-02 18:55:21 -05:00
blitzmann
ef36dc5ba3 Import/export/clear overrides, add missing files due to bad gitignore entry 2015-11-02 18:45:56 -05:00
blitzmann
d9c710c5a1 Minor improvements 2015-11-01 21:36:04 -05:00
blitzmann
c436e0e669 Create a proper menu item toggle for overrides 2015-11-01 21:19:49 -05:00
blitzmann
e80917e3d1 Things are saved now via GUI 2015-11-01 20:52:22 -05:00
blitzmann
0d0ec42daf Initial GUI commit. Still need to actually handle the attribute change 2015-11-01 19:49:22 -05:00
blitzmann
b701acb275 Overrides work properly now. Currently toggled on/off by opening character editor, this will be taken over by a menu option 2015-11-01 13:02:29 -05:00
blitzmann
3e0b2fd09c Add debug info 2015-10-31 16:52:10 -04:00
blitzmann
c7b8d94e4f Merge branch 'crest_fitting' into singularity 2015-10-31 15:02:24 -04:00
blitzmann
bb4fe63a7c Add CREST preference icon (basic EVE icon), and fix menus when changing modes and whatnot 2015-10-31 14:10:41 -04:00
blitzmann
ccb9e085b2 Setting to change server for CREST, and some other improvements. 2015-10-31 13:20:13 -04:00
blitzmann
aedd7ce2de Add support to delete fit from EVE 2015-10-26 21:27:54 -04:00
blitzmann
b0511ed856 Delete crest chars when changing client settings 2015-10-26 23:54:42 -04:00
blitzmann
7032baa7ef Add some logic to disable from CREST menu items if character is not logged in 2015-10-25 22:02:15 -04:00
blitzmann
b52cbef26f Clean up some imports, get rid of CharacterInfo window. 2015-10-25 21:49:24 -04:00
blitzmann
34f699b96a Use cached_until value for GUI countdown 2015-10-25 21:44:24 -04:00
blitzmann
781abeea53 Implement a character cache, as the database-layer cache is seemingly not working. =/ 2015-10-25 19:41:12 -04:00
blitzmann
6496164d95 Merge branch 'crest_fitting' of https://github.com/DarkFenX/Pyfa into crest_fitting 2015-10-25 18:14:46 -04:00
blitzmann
1ce2921eb7 Put current character info in titlebar, and disable getting image. 2015-10-25 18:14:12 -04:00
blitzmann
9d7a3605dc Use timers properly 2015-10-25 17:52:53 -04:00
blitzmann
056e961ccc use webrowser module to open URIs (had some difficulty with LaunchDefaultBrowser on OS X) 2015-10-25 14:46:24 -04:00
blitzmann
08382db011 Add character management window, ability to add and delete crest characters, and fix issue with not having default client ID available. 2015-10-23 21:26:38 -04:00
blitzmann
9929510e53 More work on CREST stuff. Now implicit character can GET and POST fits. 2015-10-23 19:14:43 -04:00
blitzmann
f6cddcc86d Add to repo missing preferences panel 2015-10-23 19:12:05 -04:00
blitzmann
953a70327a Fix (hack at) pycrest to fix caching issue when getting another character. 2015-10-23 01:21:51 -04:00
blitzmann
6e04c64ffb Changed login box to show currently logged in character with timer, and we now fetch the character image. 2015-10-23 00:52:03 -04:00
blitzmann
e0f99ee133 Start refinement of CREST utilities:
* Add preference page which gives option of implicit grant or user client details
* Improve CREST service
* Changes in pycrest which make things a little easier
2015-10-21 23:10:06 -04:00
blitzmann
8151debfe1 Can now login to SSO from pyfa, which completes basic integration. This is very crude, will be refined. 2015-10-19 20:09:39 -04:00
blitzmann
972df6cad3 Add support for importing CREST fittings from clipboard and through EVE Fittings browser 2015-10-18 23:38:21 -04:00
blitzmann
b1729095a0 Export fitting to EVE, fix json bugs, and include forgotten CREST service. 2015-10-18 17:13:19 -04:00
blitzmann
9269c54434 Implement exporting in CREST format 2015-10-18 01:33:39 -04:00
blitzmann
c4246c0d50 Added CREST service and first pass of fitting resource browsing. I want to completely rework this eventually, but right now just focused on getting a rough draft going. 2015-10-18 00:21:01 -04:00
Will Wykeham
73de795082 Fix click on dummy item 2015-10-13 16:13:35 +01:00