|
@@ -249,29 +249,16 @@ class VmShutdownMonitor(QtCore.QObject):
|
|
|
|
|
|
|
|
|
# pylint: disable=too-few-public-methods
|
|
|
-class StartVMThread(QtCore.QThread):
|
|
|
- def __init__(self, vm):
|
|
|
- QtCore.QThread.__init__(self)
|
|
|
- self.vm = vm
|
|
|
- self.msg = None
|
|
|
- self.is_error = False
|
|
|
-
|
|
|
+class StartVMThread(common_threads.QubesThread):
|
|
|
def run(self):
|
|
|
try:
|
|
|
self.vm.start()
|
|
|
except exc.QubesException as ex:
|
|
|
self.msg = ("Error starting Qube!", str(ex))
|
|
|
- self.is_error = True
|
|
|
|
|
|
|
|
|
# pylint: disable=too-few-public-methods
|
|
|
-class UpdateVMThread(QtCore.QThread):
|
|
|
- def __init__(self, vm):
|
|
|
- QtCore.QThread.__init__(self)
|
|
|
- self.vm = vm
|
|
|
- self.msg = None
|
|
|
- self.is_error = False
|
|
|
-
|
|
|
+class UpdateVMThread(common_threads.QubesThread):
|
|
|
def run(self):
|
|
|
try:
|
|
|
if self.vm.qid == 0:
|
|
@@ -301,24 +288,19 @@ class UpdateVMThread(QtCore.QThread):
|
|
|
user="root", wait=False)
|
|
|
except (ChildProcessError, exc.QubesException) as ex:
|
|
|
self.msg = ("Error on qube update!", str(ex))
|
|
|
- self.is_error = True
|
|
|
|
|
|
|
|
|
# pylint: disable=too-few-public-methods
|
|
|
-class RunCommandThread(QtCore.QThread):
|
|
|
+class RunCommandThread(common_threads.QubesThread):
|
|
|
def __init__(self, vm, command_to_run):
|
|
|
- QtCore.QThread.__init__(self)
|
|
|
- self.vm = vm
|
|
|
+ super(RunCommandThread, self).__init__(vm)
|
|
|
self.command_to_run = command_to_run
|
|
|
- self.msg = None
|
|
|
- self.is_error = False
|
|
|
|
|
|
def run(self):
|
|
|
try:
|
|
|
self.vm.run(self.command_to_run)
|
|
|
except (ChildProcessError, exc.QubesException) as ex:
|
|
|
self.msg = ("Error while running command!", str(ex))
|
|
|
- self.is_error = True
|
|
|
|
|
|
|
|
|
class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|
@@ -521,18 +503,17 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|
|
|
|
|
if thread.msg:
|
|
|
(title, msg) = thread.msg
|
|
|
- if thread.is_error:
|
|
|
- QtGui.QMessageBox.warning(
|
|
|
+ if thread.msg_is_success:
|
|
|
+ QtGui.QMessageBox.information(
|
|
|
None,
|
|
|
self.tr(title),
|
|
|
self.tr(msg))
|
|
|
else:
|
|
|
- QtGui.QMessageBox.information(
|
|
|
+ QtGui.QMessageBox.warning(
|
|
|
None,
|
|
|
self.tr(title),
|
|
|
self.tr(msg))
|
|
|
|
|
|
-
|
|
|
self.threads_list.remove(thread)
|
|
|
return
|
|
|
|