Merge branch 'master' into virt-mode-select-fixes

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("")
 

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)

ui/qubemanager.ui

@@ -211,7 +211,7 @@
       </column>
       <column>
        <property name="text">
-        <string>Size</string>
+        <string>Disk size</string>
        </property>
       </column>
       <column>