blitzmann
1c16343b46
Merge branch 'master' into test-3
2018-02-24 22:24:16 -05:00
blitzmann
15e60c3d24
Always open imports in a new tab ( #1432 )
2018-02-24 21:11:53 -05:00
blitzmann
73d59569ff
Merge remote-tracking branch 'origin/master' into test-3
...
# Conflicts:
# gui/characterEditor.py
2018-02-23 23:28:33 -05:00
blitzmann
e85d144928
Migrate the Save Character As dialog tot he same dialog / validator as the Edit Character Name ( #1419 )
2018-02-23 23:25:11 -05:00
blitzmann
82e3db1ffb
Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)
2018-02-17 11:10:42 -05:00
blitzmann
50dd74dbe8
Add packaging requirement, and use it's PEP 440 version parsing for version comparisons.
2018-02-10 00:59:25 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
3c405f51d8
Remove platform-specific CREST checks (add for mac-deprecated client)
2017-11-24 17:27:44 -05: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
blitzmann
0f94557699
Use wx.AutoBufferedPaintDC instead of wx.BufferedPaintDC (helps with drawing on linux)
2017-11-21 00:05:52 -05:00
blitzmann
a52b9e58e9
Testing some stuff out
2017-11-18 19:01:05 -05:00
blitzmann
df7dc30e7e
Write out git version information to a file, use in about box, remove all the other stuff until I can format it correctly
2017-11-12 13:13:38 -05:00
blitzmann
cebca64e5e
Fix CREST stuff
2017-11-05 01:43:39 -05:00
Ryan Holmes
dfe3d5c82a
Update forum references ( #1301 )
2017-09-24 18:00:21 -04:00
Ryan Holmes
1082d8a173
fix fix fix
2017-07-02 23:45:28 -04:00
Ryan Holmes
de5a734919
About dialog (looks like shit x_x)
2017-07-02 16:42:22 -04:00
Ryan Holmes
729c46ab00
Revert "Remove EVT_ERASE_BACKGROUND events - pretty sure these were there for older versions of wx where the background wasn't erased properly"
...
This does help prevent flickering on resizing. Need to research more before removing them
This reverts commit 8c5c7fba29
2017-06-14 03:57:57 -04:00
Ryan Holmes
3b546de070
More deprecated fixes, and re-enable a working stats view
2017-06-14 03:51:40 -04:00
Ryan Holmes
8c5c7fba29
Remove EVT_ERASE_BACKGROUND events - pretty sure these were there for older versions of wx where the background wasn't erased properly
2017-06-14 01:02:27 -04:00
Ryan Holmes
bec26d5d05
Fix unable to close window
2017-06-14 00:53:22 -04:00
Ryan Holmes
2bbcd96ce3
Even more fixes
2017-06-13 15:01:30 -04:00
Ryan Holmes
0e7dccccfe
Remove stat panels for now. I HAVE A FRAME SPAWNING OMG
2017-06-12 21:16:21 -04:00
Ryan Holmes
361f7fc5bb
misc fixes
2017-06-12 21:09:50 -04:00
Ryan Holmes
951b35a345
PyDeadObjectError fixes and PFNotebook -> ChromeNotebook renaming
2017-06-12 20:50:05 -04:00
Ryan Holmes
8e4db5a8c3
Do some renaming of some files
2017-06-12 18:08:07 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
Ryan Holmes
a7c89f7b40
break out market browser to individual class files
2017-06-11 17:54:36 -04:00
Ryan Holmes
048ae0205c
Breakout shipBrowser into individual class files
2017-06-11 17:32:43 -04:00
Ryan Holmes
6344f7a975
Merge branch 'master' into bug/char_fixes
2017-05-14 22:56:34 -04:00
Ryan Holmes
da33a372cb
Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. ( #1168 )
2017-05-14 20:52:06 -04:00
blitzmann
79445225de
fix issue with market shortcuts if not active items are present
2017-05-14 02:21:23 -04:00
blitzmann
e2de1565bf
Forgot to add notes to the import fit list. Caused break. Very bad.
2017-05-09 20:59:11 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -04:00
blitzmann
6b22bd189a
Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
...
Conflicts:
eos/config.py
gui/notesView.py
service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb
Merge branch 'feature/recent' into dev
...
Conflicts:
eos/db/saveddata/character.py
eos/db/saveddata/fit.py
Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c
Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.
2017-05-07 02:02:54 -04:00
blitzmann
1222567a4f
Merge branch 'feature/allow-restrictions' into dev.
...
Allows user to turn off most fitting restrictions (#1117 )
2017-05-06 12:11:00 -04:00
blitzmann
32f417ce5a
Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
...
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)
To fix this, simply look at the active fit during FitItem.Refresh()
Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -04:00
blitzmann
c0f74cd0a3
Fix old issue with trying to open previous fits that don't exist.
2017-04-23 23:40:51 -04:00
blitzmann
e94b4a1c18
Fix old issue with trying to open previous fits that don't exist.
2017-04-21 23:43:40 -04:00
blitzmann
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
jeffy-g
e9e8ef964c
refactoring some code and added docstring
...
added stopwatch.py(modify from utils.timer.py) for test
2017-04-05 21:18:30 +09:00
jeffy-g
8fd424814a
edit...
2017-04-03 02:00:10 +09:00
jeffy-g
4d8c3eadbc
pep8
2017-04-03 01:50:26 +09:00
jeffy-g
c560d17bdd
Improved processing status notification for import and export
2017-04-03 01:34:07 +09:00
Ebag333
f70d250995
Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion.
2017-03-13 10:11:15 -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
2527fe2e1e
Fix the fix for the crash in OS X
2017-02-11 22:20:32 -05:00
blitzman
a4de0f2b5b
Fix crash in OS X
2017-02-11 22:10:53 -05: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
