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("")
diff --git a/qubesmanager/utils.py b/qubesmanager/utils.py
index a8b68f9..4457844 100644
--- a/qubesmanager/utils.py
+++ b/qubesmanager/utils.py
@@ -115,7 +115,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)
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 @@
- Size
+ Disk size