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

Added busy_cursor()

Browse Source 
fix https://github.com/QubesOS/qubes-issues/issues/4744
This commit is contained in:
donoban 2019-03-31 19:56:01 +02:00
parent 9750d990a7
commit 8e383e3022
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubesmanager/common_threads.py
View File

@ -20,10 +20,21 @@
# #
from PyQt4 import QtCore # pylint: disable=import-error from PyQt4 import QtCore, QtGui # pylint: disable=import-error
from contextlib import contextmanager
from qubesadmin import exc from qubesadmin import exc
@contextmanager
def busy_cursor():
try:
QtGui.QApplication.setOverrideCursor(QtCore.Qt.BusyCursor)
yield
finally:
QtGui.QApplication.restoreOverrideCursor()
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
class RemoveVMThread(QtCore.QThread): class RemoveVMThread(QtCore.QThread):
def __init__(self, vm): def __init__(self, vm):

34
qubesmanager/qube_manager.py
View File

@ -741,7 +741,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_createvm_triggered') @QtCore.pyqtSlot(name='on_action_createvm_triggered')
def action_createvm_triggered(self): # pylint: disable=no-self-use def action_createvm_triggered(self): # pylint: disable=no-self-use
create_window = create_new_vm.NewVmDlg(self.qt_app, self.qubes_app) with common_threads.busy_cursor():
create_window = create_new_vm.NewVmDlg(self.qt_app, self.qubes_app)
create_window.exec_() create_window.exec_()
def get_selected_vm(self): def get_selected_vm(self):
@ -976,8 +977,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
def action_settings_triggered(self): def action_settings_triggered(self):
vm = self.get_selected_vm() vm = self.get_selected_vm()
if vm: if vm:
settings_window = settings.VMSettingsWindow( with common_threads.busy_cursor():
vm, self.qt_app, "basic") settings_window = settings.VMSettingsWindow(
vm, self.qt_app, "basic")
settings_window.exec_() settings_window.exec_()
vm_deleted = False vm_deleted = False
@ -1003,11 +1005,11 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
def action_appmenus_triggered(self): def action_appmenus_triggered(self):
vm = self.get_selected_vm() vm = self.get_selected_vm()
if vm: if vm:
settings_window = settings.VMSettingsWindow( with common_threads.busy_cursor():
vm, self.qt_app, "applications") settings_window = settings.VMSettingsWindow(
vm, self.qt_app, "applications")
settings_window.exec_() settings_window.exec_()
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_updatevm_triggered') @QtCore.pyqtSlot(name='on_action_updatevm_triggered')
def action_updatevm_triggered(self): def action_updatevm_triggered(self):
@ -1056,16 +1058,18 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_editfwrules_triggered') @QtCore.pyqtSlot(name='on_action_editfwrules_triggered')
def action_editfwrules_triggered(self): def action_editfwrules_triggered(self):
vm = self.get_selected_vm() with common_threads.busy_cursor():
settings_window = settings.VMSettingsWindow(vm, self.qt_app, "firewall") vm = self.get_selected_vm()
settings_window = settings.VMSettingsWindow(vm, self.qt_app, "firewall")
settings_window.exec_() settings_window.exec_()
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_global_settings_triggered') @QtCore.pyqtSlot(name='on_action_global_settings_triggered')
def action_global_settings_triggered(self): # pylint: disable=invalid-name def action_global_settings_triggered(self): # pylint: disable=invalid-name
global_settings_window = global_settings.GlobalSettingsWindow( with common_threads.busy_cursor():
self.qt_app, global_settings_window = global_settings.GlobalSettingsWindow(
self.qubes_app) self.qt_app,
self.qubes_app)
global_settings_window.exec_() global_settings_window.exec_()
# noinspection PyArgumentList # noinspection PyArgumentList
@ -1085,14 +1089,16 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_restore_triggered') @QtCore.pyqtSlot(name='on_action_restore_triggered')
def action_restore_triggered(self): def action_restore_triggered(self):
restore_window = restore.RestoreVMsWindow(self.qt_app, self.qubes_app) with common_threads.busy_cursor():
restore_window = restore.RestoreVMsWindow(self.qt_app, self.qubes_app)
restore_window.exec_() restore_window.exec_()
# noinspection PyArgumentList # noinspection PyArgumentList
@QtCore.pyqtSlot(name='on_action_backup_triggered') @QtCore.pyqtSlot(name='on_action_backup_triggered')
def action_backup_triggered(self): def action_backup_triggered(self):
backup_window = backup.BackupVMsWindow(self.qt_app, self.qubes_app, with common_threads.busy_cursor():
self.dispatcher, self) backup_window = backup.BackupVMsWindow(self.qt_app, self.qubes_app,
self.dispatcher, self)
backup_window.show() backup_window.show()
# noinspection PyArgumentList # noinspection PyArgumentList

5
qubesmanager/settings.py Executable file → Normal file
View File

@ -278,10 +278,13 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
self.tr("ERROR: {0}").format('\n'.join(error))) self.tr("ERROR: {0}").format('\n'.join(error)))
def apply(self): def apply(self):
with common_threads.busy_cursor():
self.save_changes()
self.save_changes() self.save_changes()
def save_and_apply(self): def save_and_apply(self):
self.save_changes() with common_threads.busy_cursor():
self.save_changes()
self.done(0) self.done(0)
def __save_changes__(self): def __save_changes__(self):