From e990533f9d6c76260d015a6f7f881f7389465392 Mon Sep 17 00:00:00 2001 From: Peter Gerber Date: Sun, 8 Jul 2018 16:16:29 +0000 Subject: [PATCH 1/3] Qubes Manager: Rename "Disk size" to "Disk usage" What's shown in that column is the disk space that used rather than the size of the full disk. So, let's be clear about that. --- ui/qubemanager.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui index 3adb210..dfd30c9 100644 --- a/ui/qubemanager.ui +++ b/ui/qubemanager.ui @@ -211,7 +211,7 @@ - Disk size + Disk usage From d4ecd23d0ac663a30464450fde51ae8bb95a694d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Wed, 11 Jul 2018 16:13:26 +0200 Subject: [PATCH 2/3] Correct sorting of VMs in Qube Manager Fixed two situations in which there was no sub-sorting alphabetically. fixes QubesOS/qubes-issues#1022 --- qubesmanager/table_widgets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qubesmanager/table_widgets.py b/qubesmanager/table_widgets.py index 8fca4f8..76ad2f8 100644 --- a/qubesmanager/table_widgets.py +++ b/qubesmanager/table_widgets.py @@ -353,6 +353,8 @@ class VmInternalItem(QtGui.QTableWidgetItem): return True elif other.vm.qid == 0: return False + elif self.internal == other.internal: + return self.vm.name < other.vm.name return super(VmInternalItem, self).__lt__(other) except exc.QubesPropertyAccessError: return False @@ -516,6 +518,8 @@ class VmIPItem(QtGui.QTableWidgetItem): return True elif other.vm.qid == 0: return False + elif self.ip == other.ip: + return self.vm.name < other.vm.name return super(VmIPItem, self).__lt__(other) except exc.QubesPropertyAccessError: return False From ce802456268a23251102fcdf18a0bcd597de9975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Wed, 11 Jul 2018 17:58:56 +0200 Subject: [PATCH 3/3] Removed 'close window' button in progress dialogs in Qube Manager The ability to close window suggested to the user (falsely) that they can close the window and thus abort the operation (like deleting a VM). To avoid confusion, the button has been exorcised. fixes QubesOS/qubes-issues#1479 --- qubesmanager/qube_manager.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py index c3e8f07..8222cfc 100644 --- a/qubesmanager/qube_manager.py +++ b/qubesmanager/qube_manager.py @@ -524,6 +524,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() @@ -711,6 +714,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow): progress = QtGui.QProgressDialog( self.tr( "Removing Qube: {0}...").format(vm.name), "", 0, 0) + progress.setWindowFlags(QtCore.Qt.Window | + QtCore.Qt.WindowTitleHint | + QtCore.Qt.CustomizeWindowHint) progress.setCancelButton(None) progress.setModal(True) progress.show() @@ -765,6 +771,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow): progress = QtGui.QProgressDialog( self.tr("Cloning Qube {0} to {1}...").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() @@ -1008,6 +1017,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow): self.tr( "{0}
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()