gui: bump Toga

layday · Jun 11, 2024 · a491abc · a491abc
1 parent 38e938b
commit a491abc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/instawow-gui/src/instawow_gui/app.py b/instawow-gui/src/instawow_gui/app.py
@@ -1,6 +1,3 @@
-# pyright: reportUnknownArgumentType = false
-# pyright: reportUnknownMemberType   = false
-
 from __future__ import annotations
 
 import asyncio
@@ -63,8 +60,6 @@ def on_app_exit(app: toga.App, **kwargs: object):
         self.on_exit = on_app_exit
 
     def startup(self) -> None:
-        self.main_window = toga.MainWindow(title=self.formal_name, size=(800, 600))
-
         if sys.platform == 'win32':
             import ctypes
 
@@ -89,45 +84,39 @@ def dispatch_js_keyboard_event(command: toga.Command, **kwargs: object):
                 ),
                 text='Toggle Search Filter',
                 shortcut=toga.Key.MOD_1 + toga.Key.G,
-                group=toga.Group.EDIT,  # pyright: ignore[reportArgumentType]
+                group=toga.Group.EDIT,
                 section=20,
                 order=10,
             ),
-        )
-        self.commands.add(
             toga.Command(
                 partial(
                     dispatch_js_keyboard_event,
                     action=_TogaSimulateKeypressAction.ActivateViewInstalled,
                 ),
                 text='Installed',
                 shortcut=toga.Key.MOD_1 + toga.Key.L,
-                group=toga.Group.WINDOW,  # pyright: ignore[reportArgumentType]
+                group=toga.Group.WINDOW,
                 section=20,
                 order=10,
             ),
-        )
-        self.commands.add(
             toga.Command(
                 partial(
                     dispatch_js_keyboard_event,
                     action=_TogaSimulateKeypressAction.ActivateViewReconcile,
                 ),
                 text='Unreconciled',
-                group=toga.Group.WINDOW,  # pyright: ignore[reportArgumentType]
+                group=toga.Group.WINDOW,
                 section=20,
                 order=20,
             ),
-        )
-        self.commands.add(
             toga.Command(
                 partial(
                     dispatch_js_keyboard_event,
                     action=_TogaSimulateKeypressAction.ActivateViewSearch,
                 ),
                 text='Search',
                 shortcut=toga.Key.MOD_1 + toga.Key.F,
-                group=toga.Group.WINDOW,  # pyright: ignore[reportArgumentType]
+                group=toga.Group.WINDOW,
                 section=20,
                 order=30,
             ),
@@ -137,7 +126,9 @@ def dispatch_js_keyboard_event(command: toga.Command, **kwargs: object):
 
         self.__start_json_rpc_server(partial(setattr, web_view, 'url'))
 
-        self.main_window.content = web_view
+        self.main_window = toga.MainWindow(
+            title=self.formal_name, size=(800, 600), content=web_view
+        )
         self.main_window.show()
 
 

diff --git a/instawow-gui/src/instawow_gui/json_rpc_server.py b/instawow-gui/src/instawow_gui/json_rpc_server.py
@@ -592,7 +592,8 @@ async def respond(self, config_ctxs: _ConfigBoundCtxCollection) -> SelectFolderR
         def select_folder():
             async def inner() -> Path | None:
                 try:
-                    return await app.main_window.select_folder_dialog(  # pyright: ignore[reportUnknownMemberType]
+                    assert app.main_window
+                    return await app.main_window.select_folder_dialog(
                         'Select folder', self.initial_folder
                     )
                 except ValueError:
@@ -621,6 +622,7 @@ async def respond(self, config_ctxs: _ConfigBoundCtxCollection) -> ConfirmDialog
 
         def confirm():
             async def inner():
+                assert app.main_window
                 return await app.main_window.confirm_dialog(self.title, self.message)
 
             task = asyncio.create_task(inner())

diff --git a/instawow-gui/src/instawow_gui_wrapper/__main__.py b/instawow-gui/src/instawow_gui_wrapper/__main__.py
@@ -6,7 +6,7 @@ def _patch_std_streams() -> None:
     import sys
 
     # These are ``None`` when pythonw is used.
-    if sys.stdout is None or sys.stderr is None:  # pyright: ignore[reportUnnecessaryComparison]
+    if sys.stdout is None or sys.stderr is None:
         sys.stdout = sys.stderr = io.StringIO()
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -35,11 +35,11 @@ dependencies = [
 ]
 optional-dependencies."skeletal-gui" = [
   "aiohttp-rpc >= 1.0.0",
-  "toga-core >= 0.4.2",
+  "toga-core >= 0.4.5",
 ]
 optional-dependencies."gui" = [
   "instawow[skeletal-gui]",
-  "toga >= 0.4.2",
+  "toga >= 0.4.5",
 ]
 optional-dependencies."test" = [
   "anyio >= 4.3.0",