1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00

289 Commits

Author SHA1 Message Date
Athanasius
c1221fb6fc Change 'Release Notes' URL to use 'Release/A.B.C.D' tag form
Closes #544
2020-07-01 17:11:23 +01:00
Athanasius
38593058f4 Use translations of some words in Python 3.x popup text
'File', 'Settings' and 'Plugins' are defined to have translations for
the menus/tabs texts, so use them.
2020-07-01 15:55:37 +01:00
Athanasius
821111284e Add translations for python 3.x warning popup 2020-07-01 15:55:37 +01:00
Athanasius
314fc7082d Implements 'Help > About' menu item
* Re-uses the 'About {APP}' that was defined because the MacOS version
   always had an 'About' bit.
 * As a side effect of wanting the copyright string in the popup this is
   now defined in config.py, and setup.py has been adjusted to also take
   it from there.
 * The About popup includes a link to the release notes, contingent on
   the git tag existing on github.
 * Only one instance of the popup is allowed at once.
 * There's still a 'TODO' for moving 'Check for updates' into this
   popup.

Addresses issue #509
2020-07-01 15:44:20 +01:00
Bernd Gollesch
77a2a1b533 Use the after method of root to open the messagebox inside the mainloop (fixes #522). 2020-06-21 22:05:12 +02:00
Athanasius
b829c1bbd1 Remove the 'plugins not py 3.x' warning popup from EDMarketConnector.py
This *was* moved to plug.py, and it executing there prevents this
version from actually causing a popup, but it doesn't belong here.
2020-06-21 20:15:33 +01:00
Athanasius
558392d21b Move "plugins need migrating" popup to plug.py
Where it was in EDMarketConnector.py caused issues because then the
main thread was blocking on the popup when other threads expected it to
be running:

---------------------------------------------------------------------
Exception in thread Journal worker:
Traceback (most recent call last):
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\threading.py", line 926, in _bootstrap_inner
    self.run()
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\threading.py", line 870, in run
    self._target(*self._args, **self._kwargs)
  File "C:\Users\Athan\Documents\Devel\EDMarketConnector-python3\monitor.py", line 273, in worker
    self.root.event_generate('<<JournalEvent>>', when="tail")
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\tkinter\__init__.py", line 1673, in event_generate
    self.tk.call(args)
RuntimeError: main thread is not in main loop
---------------------------------------------------------------------

However *now* it pops up before the main UI is running properly at all,
so the EDMC window is likely out of position, and won't be
painted/themed yet.
  This is deemed acceptable for a 'once a day at most' popup.

  The popup title now has 'EDMC: ' at the start to be sure users know
what it's talking about.
  It also has some brief advice about how to disable a plugin.
2020-06-21 17:14:16 +01:00
Athanasius
8690f1bb83 Fix old style 'print ' statements 2020-06-21 16:58:21 +01:00
Athanasius
a40b0e33ca Detect plugins without Python 3.x support and warn user.
To allow users to sort out their plugins before EDMC itself moves to
Python 3.x warn them if any of their enabled, non-stock, plugins do not
have a plugin_start3() method.

  * If any are found without support there's a popup triggered at the
    end of AppWindow initialisation.
  * Then the user can check Settings > Plugins to see a list of the
    plugins without Python 3.x support.
2020-06-21 16:57:37 +01:00
Athanasius
259bb3bbd6 Merge branch 'release-final-python27' into python3 2020-06-21 16:43:02 +01:00
Jonathan Harris
3fe4454888 Fix for DDE registration 2020-06-21 16:32:09 +01:00
Jonathan Harris
d71e3445c7 Allow Windows executable to be invoked from any cwd 2020-06-21 16:31:42 +01:00
Jonathan Harris
3c46e8d5fa All executable files invoked with #!/usr/bin/env python3 2020-06-21 16:28:30 +01:00
Jonathan Harris
a2ea9e014c Change ttk import for consistency 2020-06-21 16:28:30 +01:00
Athanasius
937cd990c6 exe: Removes the previous un-setting of TCL_LIBRARY
This is what was causing py2exe 0.9.3.2's fix for 'import tkinter' to
then fail on .exe run due to unset TCL_LIBRARY.
2020-06-21 16:23:02 +01:00
Athanasius
6adb64913e Revert "Switches to .format() for startup code."
This reverts commit 11194c1374e4e325b523e6a348503dd0bc0d1a6b.
2020-06-21 16:23:00 +01:00
Athanasius
83e925325e EDMarketConnector.py: De-future 2020-06-21 16:23:00 +01:00
Athanasius
868a294b6b Switches to .format() for startup code. 2020-06-21 16:23:00 +01:00
Athanasius
8237a94f72 Fixes __debug__ dump/ file writing.
Similarly to the 'Save Raw Data' fix in 9ccca42b31102fd713b26a7a8223472d364772ab
2020-06-21 16:23:00 +01:00
Athanasius
a56c48437b Fixes File > 'Save Raw Data'
Another str versus bytes issue.  We *do* need the .encode('utf-8') in
this case, else it will assume Windows cp1252 encoding which then can't
encode some characters.  So we switch to binary file mode instead.
2020-06-21 16:23:00 +01:00
Athanasius
1fbdfcc113 Applies "log to file" necessary fix, whether we're forcing it or not. 2020-06-21 16:23:00 +01:00
Athanasius
662d35f0bb Fixes str/bytes issues on "Last updated at" UI update 2020-06-21 16:23:00 +01:00
Athanasius
d0ae621387 Running EDMarketConnector.py 'works'.
First pass utilising 'futurize' to do most of the work.

  There's an issue with ur'\"' in l10n.py which I'm not sure how to
properly fix.

  This now has errors when hitting the 'Update' button.
2020-06-21 16:23:00 +01:00
Athanasius
4d5fa590af New option to NOT check for app updates automatically if in-game.
* Stores disable_autoappupdatecheckingame in settings.
  * If 'disable' is active then once you're in-game WinSparkle auto
    check for updates is disabled.
  * Whatever the state of the option WinSparkle auto updates are
    (re-)enabled when you exit the game to Main Menu or fully.
  * Using 'Help' > 'Check for updates' manually will still always work.

It has been difficult to test the code fully because it isn't easy to
get WinSparkle's registry data about last update check time set just right
to not check immediately, but to do so some reasonable time after you're
in-game and have confirmed the new option setting isn't easy.
  Worst case people won't learn about an update until the next time they
run EDMC.
2020-06-20 20:46:05 +01:00
Athanasius
aa8df90e55 Only warn once in 24 hours about plugins not ready for python 3.x 2020-06-20 14:29:00 +01:00
Athanasius
d3abb6fa1f Detect plugins without Python 3.x support and warn user.
To allow users to sort out their plugins before EDMC itself moves to
Python 3.x warn them if any of their enabled, non-stock, plugins do not
have a plugin_start3() method.

  * If any are found without support there's a popup triggered at the
    end of AppWindow initialisation.
  * Then the user can check Settings > Plugins to see a list of the
    plugins without Python 3.x support.
2020-06-18 19:40:46 +01:00
Athanasius
53bbeca12b Merge branch 'releases'
Release 3.44 just made as pre-release, soon to be live.
2020-06-17 18:15:33 +01:00
Athanasius
f52d4a5e75 Updates various github URLs to EDCD, not Marginal, ones. 2020-06-17 16:41:25 +01:00
Jonathan Harris
8c2775f6d8 Appear on task bar in dark mode on Linux
and so enable minimize button.
Maybe addresses #440
2019-09-30 17:35:22 +01:00
Lysergia
7b291ede3d Set the WM_CLASS Name of the Root Window (#430)
This allows manipulation of the main window by window managers & desktop
environments.
2019-07-21 01:46:00 +01:00
Jonathan Harris
539d252213 Fix for running from arbitrary directory on Linux
Fixes #420
2019-05-26 11:07:29 +01:00
Jonathan Harris
126f51b1d2 Drop "imaging-tk" requirement
Fixes #418
2019-05-21 17:04:14 +02:00
Jonathan Harris
2a557fd37c Drop "keyring" requirement
Ref #418
2019-05-21 16:15:03 +02:00
Jonathan Harris
1ac76d11db Suppress cAPI queries if waiting for Auth callback 2019-04-26 18:10:42 +01:00
Jonathan Harris
70ec257934 Wait til log set up before installing translations 2019-04-09 10:10:33 -07:00
Jonathan Harris
19ccfaf481 Wait for other instance to be responsive before forwarding auth 2019-02-19 18:14:16 +00:00
Jonathan Harris
04ee40ee26 Handle browser invoking the app directly rather than via ShellExecute
Partially addresses #403
2019-02-19 02:53:17 +00:00
Jonathan Harris
8838dde116 More robust handling of cAPI server errors 2019-01-18 13:21:51 +00:00
Jonathan Harris
d8b2cb361b Don't start handlers before main window created 2019-01-15 00:00:46 +00:00
Jonathan Harris
fd492cdf94 Support authentication when running from source
Fixes #395
2019-01-14 21:33:41 +00:00
Jonathan Harris
efdade508d Indicate successful authentication
Fixes #389
2019-01-10 00:01:03 +00:00
Jonathan Harris
5c8f97a8dd Fix for hang on failed authentication through Steam
Fixes #376 & #377
2019-01-03 16:01:44 +00:00
Jonathan Harris
1ae89de163 Fix token expiry handling 2018-12-31 12:35:25 +00:00
Jonathan Harris
0630ff6710 Force re-authentication if credentials entered for wrong Cmdr 2018-12-30 20:09:15 +00:00
Jonathan Harris
687957b775 Add privacy policy 2018-12-28 03:33:07 +00:00
Jonathan Harris
f17f5d3f25 PKCE OAuth2 access to cAPI 2018-12-28 03:32:26 +00:00
Jonathan Harris
cc4390de49 Switch EDDN integration to a plugin 2018-11-18 01:52:05 +00:00
Jonathan Harris
e93265c87a Don't send "ActiveFine" with EDDN Docked messages 2018-11-04 13:10:25 +00:00
Jonathan Harris
10b36aa60b Don't send faction reputation with EDDN Location and FSDJump messages 2018-11-03 10:37:01 +00:00
Jonathan Harris
1578c3aa14 Tidy *_Localised filter 2018-08-01 00:32:08 +01:00