ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-14 22:32:11 +03:00
Code Issues Projects Releases Wiki Activity

EDMarketConnector: More minor type fixes

Browse Source 
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.
This commit is contained in:
Athanasius 2022-12-22 17:18:58 +00:00
parent 69d764c027
commit 4de83747f8
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
EDMarketConnector.py
View File

@ -1557,13 +1557,13 @@ class AppWindow(object):
def plugin_error(self, event=None) -> None: def plugin_error(self, event=None) -> None:
"""Display asynchronous error from plugin.""" """Display asynchronous error from plugin."""
if plug.last_error.get('msg'): if plug.last_error.msg:
self.status['text'] = plug.last_error['msg'] self.status['text'] = plug.last_error.msg
self.w.update_idletasks() self.w.update_idletasks()
if not config.get_int('hotkey_mute'): if not config.get_int('hotkey_mute'):
hotkeymgr.play_bad() hotkeymgr.play_bad()
def shipyard_url(self, shipname: str) -> str: def shipyard_url(self, shipname: str) -> str | None:
"""Despatch a ship URL to the configured handler.""" """Despatch a ship URL to the configured handler."""
if not (loadout := monitor.ship()): if not (loadout := monitor.ship()):
logger.warning('No ship loadout, aborting.') logger.warning('No ship loadout, aborting.')
@ -1590,11 +1590,11 @@ class AppWindow(object):
return f'file://localhost/{file_name}' return f'file://localhost/{file_name}'
def system_url(self, system: str) -> str: def system_url(self, system: str) -> str | None:
"""Despatch a system URL to the configured handler.""" """Despatch a system URL to the configured handler."""
return plug.invoke(config.get_str('system_provider'), 'EDSM', 'system_url', monitor.system) return plug.invoke(config.get_str('system_provider'), 'EDSM', 'system_url', monitor.system)
def station_url(self, station: str) -> str: def station_url(self, station: str) -> str | None:
"""Despatch a station URL to the configured handler.""" """Despatch a station URL to the configured handler."""
return plug.invoke(config.get_str('station_provider'), 'eddb', 'station_url', monitor.system, monitor.station) return plug.invoke(config.get_str('station_provider'), 'eddb', 'station_url', monitor.system, monitor.station)
@ -1671,7 +1671,7 @@ class AppWindow(object):
self.resizable(tk.FALSE, tk.FALSE) self.resizable(tk.FALSE, tk.FALSE)
frame = ttk.Frame(self) frame = tk.Frame(self)
frame.grid(sticky=tk.NSEW) frame.grid(sticky=tk.NSEW)
row = 1 row = 1
@ -1684,7 +1684,7 @@ class AppWindow(object):
############################################################ ############################################################
# version <link to changelog> # version <link to changelog>
ttk.Label(frame).grid(row=row, column=0) # spacer tk.Label(frame).grid(row=row, column=0) # spacer
row += 1 row += 1
self.appversion_label = tk.Label(frame, text=appversion()) self.appversion_label = tk.Label(frame, text=appversion())
self.appversion_label.grid(row=row, column=0, sticky=tk.E) self.appversion_label.grid(row=row, column=0, sticky=tk.E)
@ -1792,6 +1792,7 @@ class AppWindow(object):
# First so it doesn't interrupt us # First so it doesn't interrupt us
logger.info('Closing update checker...') logger.info('Closing update checker...')
if self.updater is not None:
self.updater.close() self.updater.close()
# Earlier than anything else so plugin code can't interfere *and* it # Earlier than anything else so plugin code can't interfere *and* it
@ -1941,11 +1942,9 @@ def show_killswitch_poppup(root=None):
idx += 1 idx += 1
idx += 1 idx += 1
ok_button = tk.Button(frame, text="ok", command=tl.destroy) ok_button = tk.Button(frame, text="Ok", command=tl.destroy)
ok_button.grid(columnspan=2, sticky=tk.EW) ok_button.grid(columnspan=2, sticky=tk.EW)
theme.apply(tl)
# Run the app # Run the app
if __name__ == "__main__": # noqa: C901 if __name__ == "__main__": # noqa: C901