Merge remote-tracking branch 'origin/pr/294'

* origin/pr/294:
  Add preloaded disposable icon to state column
  Add preloaded disposable tooltip

Pull request description:

Fixes: QubesOS/qubes-issues#10639
For: QubesOS/qubes-issues#1512

Author: marmarek

icons/scalable/qubes-preloaded.svg

@@ -53,6 +53,7 @@ def __init__(self, vm):
 
             self.updates_available = False
             self.outdated = False
+            self.is_preload = False
 
             self.label = Gtk.Label(xalign=0)
             if self.vm:
@@ -63,20 +64,37 @@ def __init__(self, vm):
 
             self.outdated_icon = create_icon("outdated")
             self.updateable_icon = create_icon("software-update-available")
+            self.preload_icon = create_icon("qubes-preloaded")
 
             self.outdated_icon.set_no_show_all(True)
             self.updateable_icon.set_no_show_all(True)
+            self.preload_icon.set_no_show_all(True)
 
             self.updateable_icon.set_tooltip_text(_("Updates available"))
             self.outdated_icon.set_tooltip_text(
                 _("Qube must be restarted to reflect changes in template")
             )
+            self.preload_icon.set_tooltip_text(_("Preloaded disposable qube"))
 
             self.update_outdated(False)
             self.update_updateable()
+            self.update_preload()
 
             self.pack_start(self.outdated_icon, False, False, 3)
             self.pack_start(self.updateable_icon, False, True, 3)
+            self.pack_start(self.preload_icon, False, False, 3)
+
+        def update_preload(self):
+            if self.vm is None:
+                return
+            try:
+                is_preload = getattr(self.vm, "is_preload", False)
+            except exc.QubesException:
+                # no access to VM features
+                is_preload = False
+            self.preload_icon.set_visible(is_preload)
+            self.is_preload = is_preload
+            self.update_tooltip()
 
         def update_outdated(self, state):
             self.outdated_icon.set_visible(state)

qui/decorators.py

@@ -522,15 +522,24 @@ async def perform_action(self):
 class InternalInfoItem(Gtk.MenuItem):
     """Internal info label."""
 
-    def __init__(self):
+    def __init__(self, is_preload=False):
         super().__init__()
         self.label = Gtk.Label(xalign=0)
-        self.label.set_markup(_("<b>Internal qube</b>"))
-        self.set_tooltip_text(
-            "Internal qubes are used by the operating system. Do not modify"
-            " them or run programs in them unless you really "
-            "know what you are doing."
+        title = "Internal qube"
+        if is_preload:
+            title += "\n(preloaded)"
+        tooltip = (
+            "Internal qubes are used by the operating system. Do not modify "
+            "them or run programs in them unless you really know what you "
+            "are doing."
         )
+        if is_preload:
+            tooltip += (
+                "\n\nTo configure preloading, see Qubes Global Config and Qube "
+                "Settings"
+            )
+        self.label.set_markup(_("<b>" + title + "</b>"))
+        self.set_tooltip_text(tooltip)
         self.add(self.label)
         self.set_sensitive(False)
 
@@ -625,7 +634,7 @@ def __init__(self, vm, icon_cache):
 class InternalMenu(Gtk.Menu):
     """Sub-menu for Internal qubes"""
 
-    def __init__(self, vm, icon_cache, working_correctly=True):
+    def __init__(self, vm, icon_cache, working_correctly=True, is_preload=False):
         """
         :param vm: relevant Internal qube
         :param icon_cache: IconCache object
@@ -635,7 +644,7 @@ def __init__(self, vm, icon_cache, working_correctly=True):
         super().__init__()
         self.vm = vm
 
-        self.add(InternalInfoItem())
+        self.add(InternalInfoItem(is_preload=is_preload))
 
         logs = [
             (
@@ -749,8 +758,12 @@ def __init__(self, vm, app, icon_cache, state=None):
 
     def _set_submenu(self, state):
         if self.vm.features.get("internal", False):
+            is_preload = getattr(self.vm, "is_preload", False)
             submenu = InternalMenu(
-                self.vm, self.icon_cache, working_correctly=(state == "Running")
+                self.vm,
+                self.icon_cache,
+                working_correctly=(state == "Running"),
+                is_preload=is_preload,
             )
         elif state == "Running":
             submenu = StartedMenu(self.vm, self.app, self.icon_cache)
@@ -919,6 +932,9 @@ def register_events(self):
             "domain-feature-delete:expert-mode", self.debug_change
         )
 
+        self.dispatcher.add_handler(
+            "property-reset:is_preload", self.update_domain_item
+        )
         self.dispatcher.add_handler(
             "domain-feature-set:internal", self.update_domain_item
         )
@@ -1168,6 +1184,9 @@ def update_domain_item(self, vm, event, **kwargs):
 
         item.update_state(state)
 
+        if event == "property-reset:is_preload":
+            item.name.update_preload()
+
         if event == "domain-shutdown":
             self.handle_domain_shutdown(vm)
             # if the VM was shut down, it is no longer outdated

qui/tray/domains.py

@@ -321,6 +321,7 @@ gtk-update-icon-cache %{_datadir}/icons/Adwaita &>/dev/null || :
 /usr/share/icons/hicolor/scalable/apps/qubes-ok.svg
 /usr/share/icons/hicolor/scalable/apps/qubes-padlock.svg
 /usr/share/icons/hicolor/scalable/apps/qubes-policy-editor.svg
+/usr/share/icons/hicolor/scalable/apps/qubes-preloaded.svg
 /usr/share/icons/hicolor/scalable/apps/qubes-question.svg
 /usr/share/icons/hicolor/scalable/apps/qubes-this-device.svg
 /usr/share/icons/hicolor/scalable/apps/qubes-unplug.svg