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

* origin/pr/832:
  Move icon property to baseVM

Pull request description:

Every baseVM has a label, it should
also have an icon.

Fixes QubesOS/qubes-issues#10912

Author: marmarek

qubes/vm/__init__.py

@@ -319,6 +319,23 @@ def klass(self):
         """Domain class name"""
         return type(self).__name__
 
+    @qubes.stateless_property
+    def icon(self) -> str:
+        """freedesktop icon name, suitable for use in
+        :py:meth:`PyQt4.QtGui.QIcon.fromTheme`"""
+        raw_icon_name = self.label.name
+        if self.klass == "TemplateVM":
+            return "templatevm-" + raw_icon_name
+        if self.features.get("servicevm", False):
+            return "servicevm-" + raw_icon_name
+        if self.klass == "DispVM":
+            return "dispvm-" + raw_icon_name
+        if self.klass == "StandaloneVM":
+            return "standalonevm-" + raw_icon_name
+        if self.klass == "RemoteVM":
+            return "remotevm-" + raw_icon_name
+        return "appvm-" + raw_icon_name
+
     def close(self):
         super().close()
         del self.app

qubes/vm/qubesvm.py

@@ -2707,23 +2707,6 @@ def start_time(self):
 
         return None
 
-    @qubes.stateless_property
-    def icon(self) -> str:
-        """freedesktop icon name, suitable for use in
-        :py:meth:`PyQt4.QtGui.QIcon.fromTheme`"""
-        raw_icon_name = self.label.name
-        if self.klass == "TemplateVM":
-            return "templatevm-" + raw_icon_name
-        if self.features.get("servicevm", False):
-            return "servicevm-" + raw_icon_name
-        if self.klass == "DispVM":
-            return "dispvm-" + raw_icon_name
-        if self.klass == "StandaloneVM":
-            return "standalonevm-" + raw_icon_name
-        if self.klass == "RemoteVM":
-            return "remotevm-" + raw_icon_name
-        return "appvm-" + raw_icon_name
-
     @property
     def kernelopts_common(self):
         """Kernel options which should be used in addition to *kernelopts*