From 4e2835531ec54f63dfadc9596471514ae9b30636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Mon, 11 Dec 2017 00:13:15 +0100 Subject: [PATCH] Usability fixes Added label to inform the user only running VMs are listed in backup GUI; made "ignore missing" label clearer. --- qubesmanager/backup.py | 4 -- qubesmanager/backup_utils.py | 9 +-- qubesmanager/restore.py | 4 +- ui/backupdlg.ui | 106 +++++++++++++++++++---------------- ui/restoredlg.ui | 2 +- 5 files changed, 62 insertions(+), 63 deletions(-) diff --git a/qubesmanager/backup.py b/qubesmanager/backup.py index ef79692..1ca9af3 100644 --- a/qubesmanager/backup.py +++ b/qubesmanager/backup.py @@ -105,10 +105,6 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard): self.total_size = 0 - # TODO: is the is_running criterion really necessary? It's designed to - # avoid backuping a VM into itself or surprising the user with starting - # a VM when they didn't plan to. - # TODO: inform the user only running VMs are listed? self.target_vm_list, self.target_vm_idx = utils.prepare_vm_choice( self.appvm_combobox, self.qvm_collection, diff --git a/qubesmanager/backup_utils.py b/qubesmanager/backup_utils.py index 4d21804..3214c42 100644 --- a/qubesmanager/backup_utils.py +++ b/qubesmanager/backup_utils.py @@ -43,12 +43,7 @@ def fill_appvms_list(dialog): if vm.klass == 'TemplateVM' and vm.installed_by_rpm: continue - # TODO: is the is_running criterion really necessary? It's designed to - # avoid backuping a VM into itself or surprising the user with starting - # a VM when they didn't plan to. - # TODO: remove debug - debug = True - if (debug or vm.is_running()) and vm.qid != 0: + if vm.is_running() and vm.qid != 0: dialog.appvm_combobox.addItem(vm.name) @@ -63,7 +58,6 @@ def select_path_button_clicked(dialog, select_file=False): file_dialog.setReadOnly(True) new_path = None - # TODO: check if dom0 is available new_appvm = str(dialog.appvm_combobox.currentText()) vm = dialog.qvm_collection.domains[new_appvm] @@ -78,7 +72,6 @@ def select_path_button_clicked(dialog, select_file=False): dialog.tr("Nothing selected!"), dialog.tr("No file or directory selected.")) - # TODO: check if this works for restore if new_path: dialog.dir_line_edit.setText(new_path) diff --git a/qubesmanager/restore.py b/qubesmanager/restore.py index 4379a78..140e86f 100644 --- a/qubesmanager/restore.py +++ b/qubesmanager/restore.py @@ -121,7 +121,7 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard): self.select_vms_widget.selected_list.clear() self.select_vms_widget.available_list.clear() - self.target_appvm = None # TODO: what is the purpose of this + self.target_appvm = None if self.appvm_combobox.currentIndex() != 0: # An existing appvm chosen self.target_appvm = self.qvm_collection.domains[ str(self.appvm_combobox.currentText())] @@ -134,8 +134,6 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard): self.passphrase_line_edit.text() ) - # TODO: change text of ignore missing to ignore - # missing templates and netvms if self.ignore_missing.isChecked(): self.backup_restore.options.use_default_template = True self.backup_restore.options.use_default_netvm = True diff --git a/ui/backupdlg.ui b/ui/backupdlg.ui index 93e970a..1126671 100644 --- a/ui/backupdlg.ui +++ b/ui/backupdlg.ui @@ -180,53 +180,7 @@ - - - - - 0 - 0 - - - - Backup security - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - <html><head/><body><p>Encryption / Verification<br/>passphrase:</p></body></html> - - - - - - - QLineEdit::Password - - - - - - - <html><head/><body><p>Reenter passphrase:</p></body></html> - - - - - - - QLineEdit::Password - - - - - - - + @@ -279,6 +233,64 @@ save_profile_checkbox + + + + + 0 + 0 + + + + Backup security + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + <html><head/><body><p>Encryption / Verification<br/>passphrase:</p></body></html> + + + + + + + QLineEdit::Password + + + + + + + <html><head/><body><p>Reenter passphrase:</p></body></html> + + + + + + + QLineEdit::Password + + + + + + + + + + + true + + + + NOTE: Only running VMs are listed. + + + diff --git a/ui/restoredlg.ui b/ui/restoredlg.ui index 3b377e4..ba31f6b 100644 --- a/ui/restoredlg.ui +++ b/ui/restoredlg.ui @@ -52,7 +52,7 @@ Ignore missing templates or netvms, restore VMs anyway. - ignore missing + ignore missing templates and net VMs