Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marta Marczykowska-Górecka 2018-01-19 00:36:38 +01:00
commit f1964f0c5b
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/table_widgets.py
View File

@ -21,6 +21,7 @@
from PyQt4 import QtGui # pylint: disable=import-error from PyQt4 import QtGui # pylint: disable=import-error
from PyQt4 import QtCore # pylint: disable=import-error from PyQt4 import QtCore # pylint: disable=import-error
import datetime
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
power_order = QtCore.Qt.DescendingOrder power_order = QtCore.Qt.DescendingOrder
@ -505,7 +506,8 @@ class VmLastBackupItem(QtGui.QTableWidgetItem):
self.vm = vm self.vm = vm
if getattr(self.vm, 'backup_timestamp', None): if getattr(self.vm, 'backup_timestamp', None):
self.setText(self.vm.backup_timestamp) self.setText(
str(datetime.datetime.fromtimestamp(self.vm.backup_timestamp)))
else: else:
self.setText("") self.setText("")

2
qubesmanager/utils.py
View File

@ -115,7 +115,7 @@ def prepare_label_choice(widget, holder, propname, default, *args, **kwargs):
app = holder app = holder
return prepare_choice(widget, holder, propname, 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, default, *args,
icon_getter=(lambda label: QIcon.fromTheme(label.icon)), icon_getter=(lambda label: QIcon.fromTheme(label.icon)),
**kwargs) **kwargs)

2
ui/qubemanager.ui
View File

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