ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 09:10:35 +03:00
Code Issues Projects Releases Wiki Activity
2,344 Commits 16 Branches 276 Tags
Commit Graph

2344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
3ff9bdcc88 Fix Python 3.8 syntax use in backport to 4.1.x/Python 3.7 2020-12-08 16:08:30 +00:00
Athanasius
2b60220365 EDMarketConnector: popup for "already running" 
* This also refactors code around so that isort and flake8 are happy
  about the module level imports.
 2020-12-08 16:06:50 +00:00
A_D
d650db5a1a Added name mangling support to EDMCContextFilter 
Python name mangling is more about name collisions than actually making
things private.

This commit adds a check to resolve mangled names to their runtime
names, and adds a just-in-case default to fetching the attribute.

Fixes #764
 2020-12-08 15:59:40 +00:00
Athanasius
7be255b8ac Releasing: py2exe via pip / requirements-dev.txt now. 2020-12-08 15:59:28 +00:00
Athanasius
08ac054cce requirements: py2exe now available from pypi, so no need for VCS 2020-12-08 15:58:41 +00:00
Athanasius
654e062966
Merge pull request #790 from J15t98J/patch-1 
Fix dead link in PLUGINS.md
 2020-12-08 15:14:20 +00:00
Joshua Tyler-Jones
1c16b5fae6
Fix dead link in PLUGINS.md 2020-12-08 15:08:27 +00:00
Athanasius
f658660580
Merge pull request #783 from A-UNDERSCORE-D/fix/commodities-csv-not-updated 
Fixed Void Opal name in commodities.csv
 2020-12-04 15:17:44 +00:00
Athanasius
9009dc7340 Merge branch 'main' of https://github.com/EDCD/EDMarketConnector into main 2020-12-03 12:27:38 +00:00
Athanasius
412708b3d1 Issues: Bugs: Emphasise we want BOTH log files. 
Also cleans up the wording, as 4.1.4 has been out months so there'll
always be the -debug log file now.
 2020-12-03 12:26:50 +00:00
A_D
859572e8b6
Fixed Void Opal name 2020-12-02 17:19:27 +02:00
Athanasius
128f22941d
Merge pull request #781 from A-UNDERSCORE-D/fix/779-utf8-file-encodings 
Always read journal with utf-8 in EDMC.py
 2020-12-02 14:22:45 +00:00
A_D
8bb9cecfc0
Explanation comment on try/except 2020-12-02 16:08:06 +02:00
A_D
9ec03008ce
Moved comment to correct place 2020-12-02 16:03:43 +02:00
A_D
977e62188a
Made sure to handle non-utf8 locales 2020-12-02 15:57:42 +02:00
A_D
52d39dc5fd
Moved os.environ above logging import 2020-12-02 15:54:59 +02:00
Athanasius
17ed1ef1db Merge branch 'stable' into main 2020-10-15 11:57:49 +01:00
Athanasius
69c94f0515 appcast 4.1.4 Release/4.1.4 2020-10-15 11:53:06 +01:00
Athanasius
64f203517d Release 4.1.4 2020-10-15 11:49:30 +01:00
Athanasius
3724f30a53
Merge pull request #760 from EDCD/fix/755-4.1.3-not-starting 
Locale: Be even more paranoid about setting UTF-8 encoding
 2020-10-14 20:03:33 +01:00
Athanasius
582b981afa Locale: Be even more paranoid about setting UTF-8 encoding 
* Only set if not on win32, or if we are and a known good version of
 Windows 10 (or later).
 2020-10-14 19:15:48 +01:00
Athanasius
aee4114edd Bug Report Template: git/Linux version info 2020-10-09 09:50:27 +01:00
Athanasius
f3e8dbf7c1 Merge branch 'stable' into main 2020-10-08 15:40:14 +01:00
A_D
beed337c70 Create dependabot config file 
Dependabot will open PRs automatically for us to update dependencies, assuming they have no breaking changes.
 2020-10-08 15:39:24 +01:00
Athanasius
d7641d6858 appcast 4.1.3 Release/4.1.3 2020-10-08 15:28:35 +01:00
Athanasius
187dee5f81 Release 4.1.3 2020-10-08 15:23:47 +01:00
Athanasius
9404ebabee
Merge pull request #743 from EDCD/fix/737-lutris-wine 
try/except ctypes.windll.user32.CalculatePopupWindowPosition
 2020-10-08 15:13:02 +01:00
Athanasius
5effd044ac try/except ctypes.windll.user32.CalculatePopupWindowPosition 
As we can't rely on the is_wine check, use an exception for this.
 2020-10-08 14:55:32 +01:00
Athanasius
0091267c00 Merge branch 'stable' into main 2020-10-08 14:47:01 +01:00
Athanasius
e515c5b3e0 setup.py: Check we're running under Python 3.7.x 2020-10-08 14:20:03 +01:00
Athanasius
ec8c95b1a8 Merge branch 'fix/734-revert-gdiscaling' into main 2020-10-07 18:09:48 +01:00
Athanasius
a6b23e741d Remove gdiScaling from EDMarketConnector.manifest 
* This causes dpiAware to not work.
* Without dpiAware text is blurry under UI scaling.
* The bug with wrongly sized tkinter.ttk.RadioButton elements has been
  fixed in Tcl/Tk source, but no new release made yet, so the bug
  lingers in all released Python versions.
 2020-10-07 18:07:43 +01:00
Athanasius
b977e93c63 Merge branch 'releases' into stable 2020-10-07 10:26:02 +01:00
Athanasius
b87ed70edb Merge tag 'release/4.1.2' into releases 
Release 4.1.2
 2020-10-07 10:25:27 +01:00
Athanasius
be716cfd27 Merge branch 'stable' of https://github.com/EDCD/EDMarketConnector into stable 2020-10-07 10:18:23 +01:00
Athanasius
7c699c9552 Merge branch 'fix/edmc-boolean-oops' into release-4.1.2 Release/4.1.2 2020-10-07 10:17:58 +01:00
Athanasius
5bbeeeee32 appcast 4.1.2 2020-10-07 10:12:38 +01:00
Athanasius
42b71e8d26 Release 4.1.2 2020-10-07 10:08:40 +01:00
Athanasius
56d7730249
Merge pull request #740 from EDCD/fix/edmc-boolean-oops 
EDMC: Revert accidental change of boolean logic
 2020-10-07 10:01:16 +01:00
Athanasius
72119d6818 EDMC: Revert accidental change of boolean logic 
not (A or B) != not A or B

Although "not A and not B" would be equivalent.
 2020-10-07 09:58:51 +01:00
Athanasius
c9cab1ada3 Merge branch 'release-4.1.1' into main 2020-10-06 16:43:13 +01:00
Athanasius
a2bda910e6 appcast 4.1.1 2020-10-06 16:41:01 +01:00
Athanasius
f3667dc09c Merge branch 'release-4.1.1' into releases 2020-10-06 16:38:07 +01:00
Athanasius
5d8b56d45a Merge branch 'release-4.1.1' into stable 2020-10-06 16:37:53 +01:00
Athanasius
4ee2957913 Release 4.1.1 Release/4.1.1 2020-10-06 16:29:04 +01:00
Athanasius
97d42e8806
Merge pull request #738 from EDCD/fix/revert-unicode-changes 
Fix/revert unicode changes
 2020-10-06 16:22:32 +01:00
Athanasius
58bf8466ae locale: Remove conditional on locale setting & comments cleanup 
* We're using try/except so can just attempt the setting of a UTF-8
  encoding.  In cases where it doesn't work we'll have some obvious log
  output to help diagnose any issues it causes later.

* Cleaned up the comments to be more 'why' than 'what'.
 2020-10-06 16:16:21 +01:00
Athanasius
2b65bbd768 Re-instate the non-tkinter file dialog. 
* This will be gated behind win32 *and* not a UTF-8 encoding.  This way
  where we should be able to use tkinter.filedialog, we do.
 2020-10-06 15:49:17 +01:00
Athanasius
b235684dd6 Only attempt locale changes if *not* running frozen on win32. 
Any running from source, or on a non-win32 platform will attempt to
force UTF-8 encoding.

For frozen win32 we'll rely on the windows manifest setting.  On too-old
versions of Windows we'll have to ensure all code works with non-UTF-8
encodings.
 2020-10-06 15:16:15 +01:00
Athanasius
fb21cdfa94 Add reporting of Windows version at startup. 2020-10-06 15:03:51 +01:00