almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Show waiting widget when installing the containre in Linux too

Browse source
This commit is contained in:
Micah Lee 2021-08-04 15:13:48 -07:00
parent 4a4deeb64f
commit 0b1a5b2c2a
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dangerzone/gui/main_window.py
View file

@ -52,15 +52,8 @@ class MainWindow(QtWidgets.QMainWindow):
self.content_widget.close_window.connect(self.close) self.content_widget.close_window.connect(self.close)
# Only use the waiting widget if we have a VM # Only use the waiting widget if we have a VM
if ( self.waiting_widget.show()
self.global_common.vm self.content_widget.hide()
and self.global_common.vm.state != self.global_common.vm.STATE_ON
):
self.waiting_widget.show()
self.content_widget.hide()
else:
self.waiting_widget.hide()
self.content_widget.show()
# Layout # Layout
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
@ -86,6 +79,20 @@ class MainWindow(QtWidgets.QMainWindow):
self.gui_common.app.quit() self.gui_common.app.quit()
class InstallContainerThread(QtCore.QThread):
finished = QtCore.Signal()
def __init__(self, global_common):
super(InstallContainerThread, self).__init__()
self.global_common = global_common
def run(self):
if not self.global_common.is_container_installed():
self.global_common.install_container()
self.finished.emit()
class WaitingWidget(QtWidgets.QWidget): class WaitingWidget(QtWidgets.QWidget):
finished = QtCore.Signal() finished = QtCore.Signal()
@ -111,13 +118,16 @@ class WaitingWidget(QtWidgets.QWidget):
elif platform.system() == "Linux": elif platform.system() == "Linux":
self.label.setText("Installing the Dangerzone container...") self.label.setText("Installing the Dangerzone container...")
self.install_container_t = InstallContainerThread(self.global_common)
self.install_container_t.finished.connect(self.finished)
self.install_container_t.start()
else: else:
self.label.setText("Platform not implemented yet") self.label.setText("Platform not implemented yet")
def vm_state_change(self, state): def vm_state_change(self, state):
if state == self.global_common.vm.STATE_ON: if state == self.global_common.vm.STATE_ON:
self.vm_started.emit() self.finished.emit()
elif state == self.global_common.vm.STATE_FAIL: elif state == self.global_common.vm.STATE_FAIL:
self.label.setText("Dangerzone virtual machine failed to start :(") self.label.setText("Dangerzone virtual machine failed to start :(")
@ -265,7 +275,7 @@ class SettingsWidget(QtWidgets.QWidget):
) )
self.open_checkbox.clicked.connect(self.update_ui) self.open_checkbox.clicked.connect(self.update_ui)
elif platform.system() != "Linux": elif platform.system() == "Linux":
self.open_checkbox = QtWidgets.QCheckBox( self.open_checkbox = QtWidgets.QCheckBox(
"Open safe document after converting, using" "Open safe document after converting, using"
) )