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

* origin/pr/444:
  Add preloaded disposable icon to state column
  Add preloaded disposable string to internal column

Author: marmarek

icons/qubes-preloaded.svg

@@ -106,6 +106,11 @@ def __init__(self):
                 "Halted" : QIcon(":/blank"),
                 "Blocked" : QIcon(":/ban"),
                 }
+        self.preloadIcon = QIcon(":/preloaded")
+        self.preloadTooltip = (
+            "Preloaded disposable qube\n\nTo configure preloading, see Qubes Global "
+            "Config and Qube Settings"
+        )
         self.outdatedIcons = {
                 "update" : QIcon(":/updateable"),
                 "outdated" : QIcon(":/outdated"),
@@ -175,6 +180,11 @@ def paint(self, qp, option, index):
                            .pixmap(iconSize))
             left += delta
 
+        if index.data()['is_preload']:
+            qp.drawPixmap(iconRect.translated(left, 0),
+                    self.preloadIcon.pixmap(iconSize))
+            left += delta
+
         qp.restore()
 
     def helpEvent(self, event, view, option, index):
@@ -209,6 +219,7 @@ def helpEvent(self, event, view, option, index):
             else:
                 QToolTip.showText(event.globalPos(),
                     index.data()['power'], view)
+
         else:
             margin = iconRect.left() - option.rect.left()
             left = delta = margin + iconRect.width()
@@ -223,7 +234,18 @@ def helpEvent(self, event, view, option, index):
                             view)
                 # shift the left *only* if the role is True, otherwise we
                 # can assume that that icon doesn't exist at all
-            left += delta
+                left += delta
+
+            if index.data()['is_preload']:
+                if event.pos() in iconRect.translated(left, 0):
+                    # see above (*)
+                    if index != self.lastIndex:
+                        QToolTip.showText(QPoint(), ' ')
+                    QToolTip.showText(event.globalPos(), self.preloadTooltip, view)
+                # shift the left *only* if the role is True, otherwise we
+                # can assume that that icon doesn't exist at all
+                left += delta
+
         self.lastIndex = index
         return True
 
@@ -241,7 +263,7 @@ def __init__(self, vm):
         self.icon = getattr(vm, 'icon', 'appvm-black')
         self.auto_cleanup = getattr(vm, 'auto_cleanup', False)
 
-        self.state = {'power': "", 'outdated': ""}
+        self.state = {'power': "", 'outdated': "", 'is_preload': ""}
         self.updateable = getattr(vm, 'updateable', False)
         self.update(True)
 
@@ -327,6 +349,9 @@ def update(self, update_size_on_disk=False, event=None):
         if not event or event.endswith(':internal'):
             self.internal = manager_utils.get_boolean_feature(
                 self.vm, 'internal')
+        if not event or event.endswith(':is_preload'):
+            self.is_preload = getattr(self.vm, 'is_preload', None)
+            self.state['is_preload'] = getattr(self.vm, 'is_preload', None)
 
         if not event or event.endswith(':ip') or event.endswith(':netvm'):
             if getattr(self.vm, 'netvm', None) \
@@ -467,7 +492,11 @@ def data(self, index, role):
             if col_name == "Disk Usage":
                 return vm.disk
             if col_name == "Internal":
-                return "Yes" if vm.internal else ""
+                if getattr(vm, "is_preload", None):
+                    return "Yes (preloaded)"
+                if vm.internal:
+                    return "Yes"
+                return ""
             if col_name == "IP Address":
                 return vm.ip
             if col_name == "Last backup":
@@ -888,6 +917,8 @@ def __init__(self, qt_app, qubes_app, dispatcher, _parent=None):
         dispatcher.add_handler('domain-add', self.on_domain_added)
         dispatcher.add_handler('domain-delete', self.on_domain_removed)
 
+        dispatcher.add_handler('property-reset:*',
+                               self.on_domain_changed)
         dispatcher.add_handler('property-set:*',
                                self.on_domain_changed)
         dispatcher.add_handler('property-del:*',

qubesmanager/qube_manager.py

@@ -38,6 +38,7 @@
     <file alias="template-switcher.svg">icons/template-switcher.svg</file>
     <file alias="templatevm">icons/templatevm.svg</file>
     <file alias="transient">icons/transient.svg</file>
+    <file alias="preloaded">icons/qubes-preloaded.svg</file>
     <file alias="updateable">icons/updateable.svg</file>
     <file alias="vm-settings">icons/vm-settings.svg</file>
     <file alias="warning">icons/warning.svg</file>