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

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	qubesmanager/table_widgets.py
This commit is contained in:
donoban 2018-07-12 01:42:36 +02:00
commit 8096a50f7f
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubesmanager/qube_manager.py
View File

@ -527,6 +527,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.tr(
"Loading Qube Manager..."), "", 0, 0)
progress.setWindowTitle(self.tr("Qube Manager"))
progress.setWindowFlags(QtCore.Qt.Window |
QtCore.Qt.WindowTitleHint |
QtCore.Qt.CustomizeWindowHint)
progress.setCancelButton(None)
progress.setModal(True)
progress.show()
@ -713,6 +716,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
progress = QtGui.QProgressDialog(
self.tr(
"Removing Qube: <b>{0}</b>...").format(vm.name), "", 0, 0)
progress.setWindowFlags(QtCore.Qt.Window |
QtCore.Qt.WindowTitleHint |
QtCore.Qt.CustomizeWindowHint)
progress.setCancelButton(None)
progress.setModal(True)
progress.show()
@ -767,6 +773,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
progress = QtGui.QProgressDialog(
self.tr("Cloning Qube <b>{0}</b> to <b>{1}</b>...").format(
vm.name, clone_name), "", 0, 0)
progress.setWindowFlags(QtCore.Qt.Window |
QtCore.Qt.WindowTitleHint |
QtCore.Qt.CustomizeWindowHint)
progress.setCancelButton(None)
progress.setModal(True)
progress.show()
@ -1005,6 +1014,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.tr(
"<b>{0}</b><br>Please wait for the updater to "
"launch...").format(vm.name), "", 0, 0)
progress.setWindowFlags(QtCore.Qt.Window |
QtCore.Qt.WindowTitleHint |
QtCore.Qt.CustomizeWindowHint)
progress.setCancelButton(None)
progress.setModal(True)
progress.show()

7
qubesmanager/table_widgets.py
View File

@ -330,18 +330,20 @@ class VmInternalItem(QtGui.QTableWidgetItem):
self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.update()
def update(self):
self.internal = self.vm.features.get('internal', False)
self.setText("Yes" if self.internal else "")
def __lt__(self, other):
if self.qid == 0:
return True
elif other.qid == 0:
return False
elif self.internal == other.internal:
return self.name < other.name
return super(VmInternalItem, self).__lt__(other)
@ -490,6 +492,7 @@ class VmIPItem(QtGui.QTableWidgetItem):
self.vm = vm
self.qid = vm.qid
self.name = vm.name
self.update()
def update(self):
@ -501,6 +504,8 @@ class VmIPItem(QtGui.QTableWidgetItem):
return True
elif other.qid == 0:
return False
elif self.ip == other.ip:
return self.name < other.name
return super(VmIPItem, self).__lt__(other)

2
ui/qubemanager.ui
View File

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