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

Don't close MainWindow when first conversion ends

Browse source 
First step in removing the multi-window approach, which got replaced
by multi-document single-window.

Fixes #205.
This commit is contained in:
deeplow 2022-09-30 11:27:57 +01:00
parent f791dc70ab
commit c40502fb46
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dangerzone/gui/main_window.py
View file

@ -54,7 +54,6 @@ class MainWindow(QtWidgets.QMainWindow):
# Content widget, contains all the window content except waiting widget # Content widget, contains all the window content except waiting widget
self.content_widget = ContentWidget(self.dangerzone) self.content_widget = ContentWidget(self.dangerzone)
self.content_widget.close_window.connect(self.close)
# Only use the waiting widget if container runtime isn't available # Only use the waiting widget if container runtime isn't available
if self.dangerzone.is_waiting_finished: if self.dangerzone.is_waiting_finished:
@ -86,6 +85,8 @@ class MainWindow(QtWidgets.QMainWindow):
self.delete_window.emit(self.window_id) self.delete_window.emit(self.window_id)
if platform.system() != "Darwin": if platform.system() != "Darwin":
# in MacOS applications only quit when the user
# explicitly closes them
self.dangerzone.app.quit() self.dangerzone.app.quit()
@ -194,8 +195,6 @@ class WaitingWidget(QtWidgets.QWidget):
class ContentWidget(QtWidgets.QWidget): class ContentWidget(QtWidgets.QWidget):
close_window = QtCore.Signal()
def __init__(self, dangerzone: DangerzoneGui) -> None: def __init__(self, dangerzone: DangerzoneGui) -> None:
super(ContentWidget, self).__init__() super(ContentWidget, self).__init__()
self.dangerzone = dangerzone self.dangerzone = dangerzone
@ -210,12 +209,10 @@ class ContentWidget(QtWidgets.QWidget):
self.settings_widget.document_selected self.settings_widget.document_selected
) )
self.settings_widget.start_clicked.connect(self.start_clicked) self.settings_widget.start_clicked.connect(self.start_clicked)
self.settings_widget.close_window.connect(self._close_window)
self.settings_widget.hide() self.settings_widget.hide()
# Convert # Convert
self.documents_list = DocumentsListWidget(self.dangerzone) self.documents_list = DocumentsListWidget(self.dangerzone)
self.documents_list.close_window.connect(self._close_window)
self.doc_selection_widget.document_selected.connect( self.doc_selection_widget.document_selected.connect(
self.documents_list.document_selected self.documents_list.document_selected
) )
@ -237,9 +234,6 @@ class ContentWidget(QtWidgets.QWidget):
self.settings_widget.hide() self.settings_widget.hide()
self.documents_list.show() self.documents_list.show()
def _close_window(self) -> None:
self.close_window.emit()
class DocSelectionWidget(QtWidgets.QWidget): class DocSelectionWidget(QtWidgets.QWidget):
document_selected = QtCore.Signal(list) document_selected = QtCore.Signal(list)
@ -285,7 +279,6 @@ class DocSelectionWidget(QtWidgets.QWidget):
class SettingsWidget(QtWidgets.QWidget): class SettingsWidget(QtWidgets.QWidget):
start_clicked = QtCore.Signal() start_clicked = QtCore.Signal()
close_window = QtCore.Signal()
def __init__(self, dangerzone: DangerzoneGui) -> None: def __init__(self, dangerzone: DangerzoneGui) -> None:
super(SettingsWidget, self).__init__() super(SettingsWidget, self).__init__()
@ -562,8 +555,6 @@ class ConvertThread(QtCore.QThread):
class DocumentsListWidget(QtWidgets.QListWidget): class DocumentsListWidget(QtWidgets.QListWidget):
close_window = QtCore.Signal()
def __init__(self, dangerzone: DangerzoneGui) -> None: def __init__(self, dangerzone: DangerzoneGui) -> None:
super().__init__() super().__init__()
self.dangerzone = dangerzone self.dangerzone = dangerzone
@ -587,8 +578,6 @@ class DocumentsListWidget(QtWidgets.QListWidget):
class DocumentWidget(QtWidgets.QWidget): class DocumentWidget(QtWidgets.QWidget):
close_window = QtCore.Signal()
def __init__( def __init__(
self, self,
dangerzone: DangerzoneGui, dangerzone: DangerzoneGui,
@ -671,10 +660,3 @@ class DocumentWidget(QtWidgets.QWidget):
# Open # Open
if self.dangerzone.settings.get("open"): if self.dangerzone.settings.get("open"):
self.dangerzone.open_pdf_viewer(self.document.output_filename) self.dangerzone.open_pdf_viewer(self.document.output_filename)
# Quit
if platform.system() == "Darwin":
# In macOS, just close the window
self.close_window.emit()
else:
self.dangerzone.app.quit()