From 985f8fb56d50496996a0f403ad8e7e80c94c5fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Thu, 18 Jan 2018 23:42:34 +0100
Subject: [PATCH 1/3] Fixed error in qube-manager

Last backup timestamp was not correctly processed.
---
 qubesmanager/table_widgets.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qubesmanager/table_widgets.py b/qubesmanager/table_widgets.py
index 06ec486..efa3fe6 100644
--- a/qubesmanager/table_widgets.py
+++ b/qubesmanager/table_widgets.py
@@ -21,6 +21,7 @@
 
 from PyQt4 import QtGui  # pylint: disable=import-error
 from PyQt4 import QtCore  # pylint: disable=import-error
+import datetime
 # pylint: disable=too-few-public-methods
 
 power_order = QtCore.Qt.DescendingOrder
@@ -505,7 +506,8 @@ class VmLastBackupItem(QtGui.QTableWidgetItem):
 
         self.vm = vm
         if getattr(self.vm, 'backup_timestamp', None):
-            self.setText(self.vm.backup_timestamp)
+            self.setText(
+                str(datetime.datetime.fromtimestamp(self.vm.backup_timestamp)))
         else:
             self.setText("")
 

From 2cffffdcfffb79a3c0195243a96bde02f5e5e30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Thu, 18 Jan 2018 23:49:17 +0100
Subject: [PATCH 2/3] Fixed error in qubesmanager utils

Fix in app.labels caused an old workaround to malfunction.

fixes QubesOS/qubes-issues#3475
---
 qubesmanager/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qubesmanager/utils.py b/qubesmanager/utils.py
index f5f66d1..946cbd9 100644
--- a/qubesmanager/utils.py
+++ b/qubesmanager/utils.py
@@ -113,7 +113,7 @@ def prepare_label_choice(widget, holder, propname, default, *args, **kwargs):
         app = holder
 
     return prepare_choice(widget, holder, propname,
-        sorted(app.labels, key=lambda l: l.index),
+        sorted(app.labels.values(), key=lambda l: l.index),
         default, *args,
         icon_getter=(lambda label: QIcon.fromTheme(label.icon)),
         **kwargs)

From 404481cce0d6f567bfeaee2b9de413f17499d6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Thu, 18 Jan 2018 23:52:29 +0100
Subject: [PATCH 3/3] Renamed 'size' to 'disk size' in qube manager

Renamed for increased clarity.
---
 ui/qubemanager.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui
index 4a2cdc9..a066ce6 100644
--- a/ui/qubemanager.ui
+++ b/ui/qubemanager.ui
@@ -211,7 +211,7 @@
       </column>
       <column>
        <property name="text">
-        <string>Size</string>
+        <string>Disk size</string>
        </property>
       </column>
       <column>