From aefe0dde4399a0540496ba76aeea0cba486913cb Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Sun, 8 Feb 2015 20:21:43 -0500
Subject: [PATCH] Show an icon for VMs whose TemplateVM is running.

https://groups.google.com/d/topic/qubes-users/woHD9RaHvF8/discussion
---
 icons/to-be-outdated.png      | Bin 0 -> 2468 bytes
 qubesmanager/table_widgets.py |  31 ++++++++++++++++++++++---------
 resources.qrc                 |   1 +
 3 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 icons/to-be-outdated.png

diff --git a/icons/to-be-outdated.png b/icons/to-be-outdated.png
new file mode 100644
index 0000000000000000000000000000000000000000..42634dd35d378f38ae76018b4213cb27c130b912
GIT binary patch
literal 2468
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

literal 0
HcmV?d00001

diff --git a/qubesmanager/table_widgets.py b/qubesmanager/table_widgets.py
index 258dd3a..6237537 100644
--- a/qubesmanager/table_widgets.py
+++ b/qubesmanager/table_widgets.py
@@ -459,7 +459,7 @@ class VmUpdateInfoWidget(QWidget):
             self.set_value(value)
 
         def set_value(self, value):
-            if value == "outdated":
+            if value in ("outdated", "to-be-outdated"):
                 self.value = 30
             elif value == "update":
                 self.value = 20
@@ -484,7 +484,7 @@ class VmUpdateInfoWidget(QWidget):
             layout.addWidget(self.icon, alignment=Qt.AlignCenter)
         self.setLayout(layout)
 
-        self.previous_outdated = False
+        self.previous_outdated_state = None
         self.previous_update_recommended = None
         self.value = None
         self.tableItem = VmUpdateInfoWidget.VmUpdateInfoItem(self.value, vm)
@@ -493,13 +493,22 @@ class VmUpdateInfoWidget(QWidget):
         if vm.type == "HVM":
             return
 
-        outdated = vm.is_outdated()
-        if outdated and not self.previous_outdated:
-            self.update_status_widget("outdated")
-        elif not outdated and self.previous_outdated:
-            self.update_status_widget(None)
+        if vm.is_outdated():
+            outdated_state = "outdated"
+        # During TemplateVM shutdown, there's an interval of a few seconds
+        # during which vm.template.is_running() returns false but
+        # vm.is_outdated() does not yet return true, so the icon disappears.
+        # This looks goofy, but we've decided not to fix it at this time
+        # (2015-02-09).
+        elif vm.template and vm.template.is_running():
+            outdated_state = "to-be-outdated"
+        else:
+            outdated_state = None
 
-        self.previous_outdated = outdated
+        if outdated_state != self.previous_outdated_state:
+            self.update_status_widget(outdated_state)
+
+        self.previous_outdated_state = outdated_state
 
         if not vm.is_updateable():
             return
@@ -551,7 +560,11 @@ class VmUpdateInfoWidget(QWidget):
         elif state == "outdated":
             label_text = "<font color=\"red\">VM outdated</font>"
             icon_path = ":/outdated.png"
-            tooltip_text = "The VM must be restarted for its filesystem to reflect the template's recent changes."
+            tooltip_text = "The VM must be restarted for its filesystem to reflect the template's recent committed changes."
+        elif state == "to-be-outdated":
+            label_text = "<font color=\"#800000\">TemplateVM running</font>"
+            icon_path = ":/to-be-outdated.png"
+            tooltip_text = "The TemplateVM must be stopped before changes from its current session can be picked up by this VM."
         elif state == None:
             label_text = ""
             icon_path = None
diff --git a/resources.qrc b/resources.qrc
index 664f506..c9f9172 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -8,6 +8,7 @@
     <file alias="global-settings.png">icons/global-settings.png</file>
     <file alias="off.png">icons/on-icon/off.png</file>
     <file alias="outdated.png">icons/outdated.png</file>
+    <file alias="to-be-outdated.png">icons/to-be-outdated.png</file>
     <file alias="update-recommended.png">icons/update-recommended.png</file>
     <file alias="show-all-running.png">icons/show-all-running.png</file>
     <file alias="mount.png">icons/mount.png</file>