Merge remote-tracking branch 'upstream/master'
# Conflicts: # qubesmanager/table_widgets.py
This commit is contained in:
commit
8096a50f7f
@ -527,6 +527,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|||||||
self.tr(
|
self.tr(
|
||||||
"Loading Qube Manager..."), "", 0, 0)
|
"Loading Qube Manager..."), "", 0, 0)
|
||||||
progress.setWindowTitle(self.tr("Qube Manager"))
|
progress.setWindowTitle(self.tr("Qube Manager"))
|
||||||
|
progress.setWindowFlags(QtCore.Qt.Window |
|
||||||
|
QtCore.Qt.WindowTitleHint |
|
||||||
|
QtCore.Qt.CustomizeWindowHint)
|
||||||
progress.setCancelButton(None)
|
progress.setCancelButton(None)
|
||||||
progress.setModal(True)
|
progress.setModal(True)
|
||||||
progress.show()
|
progress.show()
|
||||||
@ -713,6 +716,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|||||||
progress = QtGui.QProgressDialog(
|
progress = QtGui.QProgressDialog(
|
||||||
self.tr(
|
self.tr(
|
||||||
"Removing Qube: <b>{0}</b>...").format(vm.name), "", 0, 0)
|
"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.setCancelButton(None)
|
||||||
progress.setModal(True)
|
progress.setModal(True)
|
||||||
progress.show()
|
progress.show()
|
||||||
@ -767,6 +773,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|||||||
progress = QtGui.QProgressDialog(
|
progress = QtGui.QProgressDialog(
|
||||||
self.tr("Cloning Qube <b>{0}</b> to <b>{1}</b>...").format(
|
self.tr("Cloning Qube <b>{0}</b> to <b>{1}</b>...").format(
|
||||||
vm.name, clone_name), "", 0, 0)
|
vm.name, clone_name), "", 0, 0)
|
||||||
|
progress.setWindowFlags(QtCore.Qt.Window |
|
||||||
|
QtCore.Qt.WindowTitleHint |
|
||||||
|
QtCore.Qt.CustomizeWindowHint)
|
||||||
progress.setCancelButton(None)
|
progress.setCancelButton(None)
|
||||||
progress.setModal(True)
|
progress.setModal(True)
|
||||||
progress.show()
|
progress.show()
|
||||||
@ -1005,6 +1014,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|||||||
self.tr(
|
self.tr(
|
||||||
"<b>{0}</b><br>Please wait for the updater to "
|
"<b>{0}</b><br>Please wait for the updater to "
|
||||||
"launch...").format(vm.name), "", 0, 0)
|
"launch...").format(vm.name), "", 0, 0)
|
||||||
|
progress.setWindowFlags(QtCore.Qt.Window |
|
||||||
|
QtCore.Qt.WindowTitleHint |
|
||||||
|
QtCore.Qt.CustomizeWindowHint)
|
||||||
progress.setCancelButton(None)
|
progress.setCancelButton(None)
|
||||||
progress.setModal(True)
|
progress.setModal(True)
|
||||||
progress.show()
|
progress.show()
|
||||||
|
@ -330,18 +330,20 @@ class VmInternalItem(QtGui.QTableWidgetItem):
|
|||||||
|
|
||||||
self.vm = vm
|
self.vm = vm
|
||||||
self.qid = vm.qid
|
self.qid = vm.qid
|
||||||
|
self.name = vm.name
|
||||||
self.update()
|
self.update()
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
self.internal = self.vm.features.get('internal', False)
|
self.internal = self.vm.features.get('internal', False)
|
||||||
self.setText("Yes" if self.internal else "")
|
self.setText("Yes" if self.internal else "")
|
||||||
|
|
||||||
|
|
||||||
def __lt__(self, other):
|
def __lt__(self, other):
|
||||||
if self.qid == 0:
|
if self.qid == 0:
|
||||||
return True
|
return True
|
||||||
elif other.qid == 0:
|
elif other.qid == 0:
|
||||||
return False
|
return False
|
||||||
|
elif self.internal == other.internal:
|
||||||
|
return self.name < other.name
|
||||||
return super(VmInternalItem, self).__lt__(other)
|
return super(VmInternalItem, self).__lt__(other)
|
||||||
|
|
||||||
|
|
||||||
@ -490,6 +492,7 @@ class VmIPItem(QtGui.QTableWidgetItem):
|
|||||||
|
|
||||||
self.vm = vm
|
self.vm = vm
|
||||||
self.qid = vm.qid
|
self.qid = vm.qid
|
||||||
|
self.name = vm.name
|
||||||
self.update()
|
self.update()
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
@ -501,6 +504,8 @@ class VmIPItem(QtGui.QTableWidgetItem):
|
|||||||
return True
|
return True
|
||||||
elif other.qid == 0:
|
elif other.qid == 0:
|
||||||
return False
|
return False
|
||||||
|
elif self.ip == other.ip:
|
||||||
|
return self.name < other.name
|
||||||
return super(VmIPItem, self).__lt__(other)
|
return super(VmIPItem, self).__lt__(other)
|
||||||
|
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@
|
|||||||
</column>
|
</column>
|
||||||
<column>
|
<column>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Disk size</string>
|
<string>Disk usage</string>
|
||||||
</property>
|
</property>
|
||||||
</column>
|
</column>
|
||||||
<column>
|
<column>
|
||||||
|
Loading…
Reference in New Issue
Block a user