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

733 Commits

Author SHA1 Message Date
Phoebe
49ca678ff6 [Minor] Clarify Comment
Forgot to update the comment to be about broken plugins instead of no 3.x support ones.
2023-12-15 00:43:48 +01:00
David Sangrey
dac9542557
[Minor] Correct Template S&G
Also includes a minor fix for try/except if coriolis-data is missing
2023-12-13 19:38:42 -05:00
Phoebe
34d91dfb2d [Enhancement] Broken Plugins Popup
- Adds a Popup at startup about Plugins that failed to load.
- Adds entry about broken Plugins in the Settings - Plugins tab.
- Adds corresponding translation entries.
2023-12-14 01:06:09 +01:00
David Sangrey
501e8da268
[2051] Add Default Fallback 2023-11-21 20:48:04 -05:00
David Sangrey
955d72ead2
Re-Add Missing LANG comment
I gotta stop doing that.

Co-authored-by: Phoebe <40956085+C1701D@users.noreply.github.com>
2023-11-21 20:44:53 -05:00
David Sangrey
169cfbfc56
[2051] Alter Open Logic 2023-11-17 21:09:42 -05:00
David Sangrey
c47552d678
[2051] Revert Bool Check 2023-11-17 18:28:11 -05:00
David Sangrey
32cba245cd
[2051] Redo the Time Block 2023-11-17 18:14:25 -05:00
David Sangrey
acfe9f2717
[2051] Wait we did account for that 2023-11-17 18:09:09 -05:00
David Sangrey
ff1f931afd
[2051] EDMC Pass + Readd LANG 2023-11-17 18:07:37 -05:00
David Sangrey
724dd2ce6a
[2051] Main GUI File 2023-11-17 17:46:32 -05:00
David Sangrey
7df1972423
#510 Remove Unused Import 2023-08-06 13:44:34 -04:00
David Sangrey
0d26fbfe89
#510 Add open log folder to prefs menu 2023-08-06 13:36:05 -04:00
David Sangrey
281c93efe3
#510 Add Log File Opener to Help Menu 2023-08-06 01:41:21 -04:00
David Sangrey
3bbae8f71b
#1936 Update Length 2023-08-03 18:51:07 -04:00
David Sangrey
7c77175f2b
#1936 Make About Version Copyable 2023-08-03 16:30:24 -04:00
David Sangrey
5258174283
#2031 Update Station URL Defaults 2023-07-24 16:29:39 -04:00
David Sangrey
86d4d89b94
#2031 Remove EDDB and Bump Version 2023-07-22 09:39:05 -04:00
Athanasius
9f0edc5a29
Merge pull request #1798 from EDCD/fix/1042/centralise-plugin-tracking
Move core plugin 'location' tracking into monitor.py
2023-01-17 11:31:13 +00:00
Athanasius
085159f8cb
When it's a StartUp event say *that*, not Startup
This check in EDMarketConnector.py is explicitly for StartUp (and Loadgame),
not Startup, so have the logging say that.
2023-01-12 15:03:43 +00:00
Athanasius
31e8d0372d
monitor/tracking: Move .station_marketid to state['MarketID']
1. plugins/eddb.py uses this for MarketID-based station URLs.

* So do the 'rename'.
* Remove EDDB tracking in favour of this.
* Update PLUGINS.md
2023-01-11 19:44:44 +00:00
Athanasius
dde0cf876c
monitor/tracking: Move .station to state['StationName']
1. EDDB tracks this.

* So move monitor.station to monitor.state['StationName'].
* PLUGINS.md updated to cite this.
2023-01-11 19:44:41 +00:00
Athanasius
fa1c072d9e
monitor: Change .system to state['SystemName']
1. EDDB plugin needs to track the system name, but we're moving all of that
  into monitor.py.
2. monitor.py was tracking this in monitor.system, but it needs to be in
  monitor.state['SystemName'] in order for plugins to access it.

So, move monitor.system to monitor.state['SystemName'] and update all uses.
2023-01-11 19:44:08 +00:00
Athanasius
6b38de1080
.desktop: Add a file, and adjust icon filename to suit
1. `io.edcd.EDMarketConnector.desktop` based on the flathub one, but with
  reference to v1.5 of the spec (linked in a file comment).
2. As the Icon is specified using `io.edcd.EDMarketConnector`, not only
  `EDMarketConnector`, renamed the .png file and updated the single code
  reference to it.
2023-01-10 14:04:41 +00:00
Athanasius
596df0f987
CAPI 'Save Raw Data': Add '.' between system and station names in filename
It's apparently *always* just mushed them together, but that's really crap.
2023-01-10 11:49:58 +00:00
aussig
c6ec7cc362 Add some string localisations and improve lang comments. 2023-01-03 15:07:52 +00:00
Athanasius
7d4118738b
Add some missing LANG comments, as per script output 2023-01-03 11:46:27 +00:00
Athanasius
a4cd407b89
Add Help > Troubleshooting / Report A Bug 2023-01-03 11:39:47 +00:00
Athanasius
7bfeb5ec62
Actually uncomment plugin_frame.columnconfigure(1, weight=1)
It had been commented to test that it made a difference.
2023-01-02 14:05:07 +00:00
Athanasius
61ad75d52a
Configure per-plugin Frame the same as main Frame
It was observed that some text in the EDMC-Canonn plugin was wrapping in
this branch when the same text doesn't in `develop.  So, tweaked the
plugin_frame setup to match the main UI frame setup:

* `tk.NSEW` not `tk.EW` - didn't fix the problem, but we should match this.
* `.columnconfigure(1, weight=1)` - this actually fixed the problem.
2023-01-02 13:02:22 +00:00
Athanasius
963b115e0e
UI: Name the extra 'alternate' frames: titlebar and menubar
These are used in the non-default themes, as the OS ones are hidden and
replaced by them.

They're created after the rest of the main UI, so come last in the 'children'
list.
2022-12-31 17:12:29 +00:00
Athanasius
a842ce28c6
UI: Create a per-plugin frame in the main UI
* This means all actual plugin UI will be children of this frame, rather than
  the main frame.
2022-12-31 16:52:36 +00:00
Athanasius
ce1303e9e6
UI: Make a frame to hold each plugin's UI
NB: Currently breaks some core/internal plugin code, due to use of
`parent.children` and the like.  That will get addressed in subsequent
commits.
2022-12-31 16:16:52 +00:00
Athanasius
0705d56bb4
Properly name the main UI tk widgets
Unfortunately we can't name the plugin ones, as that's entirely up to their
`plugin_app()` code, and widget names can't be changed after creation.

NB: Each `plugin_hr_X` frame is `grid()`'d to be *before* the plugin in
question, despite being listed *after* in:

    >>> self.w.children['edmarketconnector'].children
2022-12-31 16:08:39 +00:00
Athanasius
80e2aee6bb
updates: Add comment about 'early' import update working after all
Tested both under PyCharm debugging for 'internal', and py2exe-build .exe
for 'external'.  In both cases the 'Help' > 'Check for updates...' works.
2022-12-30 18:17:01 +00:00
Athanasius
ce4ae74434
update checks: Move setup of self.updater before menu entry
Typing this as `update.Updater | None` and having the check
`if self.updater is not None:` causes the menu entry to not even get added,
because `import update` was coming later.

I can't recall why that import/setup was later, but I might be about to find
out again....
2022-12-30 18:10:36 +00:00
aussig
933520c5af Switch to using a bool config value for fleetcarrier CAPI instead of int 2022-12-30 15:39:32 +00:00
aussig
4a2401983d Add preference for enabling / disabling CAPI fleetcarrier endpoint 2022-12-29 14:50:34 +00:00
aussig
1c39ca5eb9 Merge branch 'develop' into feature/847/capi-fleetcarrier 2022-12-24 10:38:22 +00:00
aussig
fc80d8ffd6 Revert "Fix for exceptions thrown on journal events"
This reverts commit 754367618ff273b94ae459544a7c73b86a182499.
2022-12-24 10:18:37 +00:00
Athanasius
81a8122c59
Indent if err: check after plugin dashboard invocation
Adding a mypy-make-happy conditional on the call above means `err` needs
to be inside that as well.
2022-12-24 10:15:41 +00:00
Athanasius
5d1eb9e3b1
Fix "could be None" conditional for call to plug.notify_journal_entry()
In testing the *first* hit on this does have `monitor.cmdr` set, but neither
`monitor.system` or `monitor.station`.  So:

1. Allow those to be `None` in the function signature,
2. Guard against only `monitor.cmdr` being falsey before the call.
3. Move the `if err:` to the same scope.
2022-12-24 10:11:11 +00:00
aussig
754367618f Fix for exceptions thrown on journal events 2022-12-24 09:27:18 +00:00
aussig
41962663d8 Merge branch 'develop' into feature/847/capi-fleetcarrier 2022-12-24 08:21:18 +00:00
A_D
f94072a99e
EDMarketConnector.py: Guard platform specific func
Some callback functions are only used on windows, but defined for
everyone, this causes mypy to fail in fun ways.
2022-12-23 18:17:33 +02:00
Athanasius
b3719347e8
EDMarketConnector: No need for Typing.Dict 2022-12-23 14:47:35 +00:00
Athanasius
eaaa6fead0
Correctly type theme ui_scale variables
Technically `theme.startup_ui_scale` should be `float` to match with
`default_ui_scale` from tkinter, but we store it in the config as `int`,
so go with that.
2022-12-23 14:47:31 +00:00
Athanasius
4de83747f8
EDMarketConnector: More minor type fixes
Also, the killswitch popup ends up un-themed *anyway*, so don't even call
`theme.apply()`.  That function expects a `tk.Tk` not, `Toplevel`, and
doesn't even do anything for a `Toplevel` anyway.
2022-12-23 14:47:30 +00:00
Athanasius
69d764c027
EDMarketConnector: More misc type fixes 2022-12-23 14:47:29 +00:00
Athanasius
e45a89d970
EDMarketConnector.py: Minor type fixes & ttkHyperlink.py too 2022-12-23 14:47:28 +00:00