Cleanup shutdown label initialization

Author: ben-grande

qui/tray/domains.py

@@ -203,19 +203,15 @@ def __init__(
         icon_name="shutdown",
     ):
         if force:
-            super().__init__(
-                vm,
-                label=force_label or _("Force shutdown"),
-                icon_cache=icon_cache,
-                icon_name=icon_name,
-            )
+            init_label = force_label or _("Force shutdown")
         else:
-            super().__init__(
-                vm,
-                label=label or _("Shutdown"),
-                icon_cache=icon_cache,
-                icon_name=icon_name,
-            )
+            init_label = label or _("Shutdown")
+        super().__init__(
+            vm,
+            label=init_label,
+            icon_cache=icon_cache,
+            icon_name=icon_name,
+        )
         self.force = force
         self.follow_shift = follow_shift
 

qui/updater/summary_page.py

@@ -31,8 +31,7 @@
 from typing import Optional, Any
 
 import qubesadmin
-from qubesadmin.utils.shutdown import shutdown
-from qubesadmin.utils.start import start
+import qubesadmin.utils
 
 from qubes_config.widgets.gtk_utils import (
     load_icon,
@@ -315,7 +314,9 @@ async def shutdown_domains(self, to_shutdown):
         """
         Try to shut down vms and wait to finish.
         """
-        failed = await shutdown(domains=to_shutdown, force=True, wait=True)
+        failed = await qubesadmin.utils.shutdown(
+            domains=to_shutdown, force=True, wait=True
+        )
         if not failed:
             return to_shutdown
         self.status = RestartStatus.ERROR_TMPL_DOWN
@@ -334,7 +335,7 @@ async def restart_vms(self, to_restart):
         shutdowns = await self.shutdown_domains(to_restart)
 
         # restart shutdown qubes
-        failed = await start(domains=shutdowns)
+        failed = await qubesadmin.utils.start(domains=shutdowns)
         if not failed:
             return
         for qube, exc in failed.items():