From 85644ad097d1cf86adde1ab0709c36254b236a3e Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 7 Jan 2020 15:35:49 -0800 Subject: [PATCH] When passing in a filename, autoselect that document --- dangerzone/__init__.py | 6 ++++-- dangerzone/doc_selection_widget.py | 4 ++-- dangerzone/main_window.py | 6 +++--- dangerzone/settings_widget.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dangerzone/__init__.py b/dangerzone/__init__.py index 6e78734..34b5f13 100644 --- a/dangerzone/__init__.py +++ b/dangerzone/__init__.py @@ -25,6 +25,9 @@ def main(filename): # Common object common = Common() + # Main window + main_window = MainWindow(app, common) + if filename != "": # Validate filename filename = os.path.abspath(os.path.expanduser(filename)) @@ -37,7 +40,6 @@ def main(filename): print("Permission denied") return common.set_document_filename(filename) + main_window.doc_selection_widget.document_selected.emit() - # Main window - main_window = MainWindow(app, common) sys.exit(app.exec_()) diff --git a/dangerzone/doc_selection_widget.py b/dangerzone/doc_selection_widget.py index ecc0aaf..2f865df 100644 --- a/dangerzone/doc_selection_widget.py +++ b/dangerzone/doc_selection_widget.py @@ -2,7 +2,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class DocSelectionWidget(QtWidgets.QWidget): - document_selected = QtCore.pyqtSignal(str) + document_selected = QtCore.pyqtSignal() def __init__(self, common): super(DocSelectionWidget, self).__init__() @@ -38,4 +38,4 @@ class DocSelectionWidget(QtWidgets.QWidget): if filename[0] != "": filename = filename[0] self.common.set_document_filename(filename) - self.document_selected.emit(filename) + self.document_selected.emit() diff --git a/dangerzone/main_window.py b/dangerzone/main_window.py index 34f911c..5f1b006 100644 --- a/dangerzone/main_window.py +++ b/dangerzone/main_window.py @@ -14,8 +14,8 @@ class MainWindow(QtWidgets.QMainWindow): self.common = common self.setWindowTitle("dangerzone") - self.setMinimumWidth(500) - self.setMinimumHeight(400) + self.setMinimumWidth(600) + self.setMinimumHeight(350) # Header logo = QtWidgets.QLabel() @@ -63,7 +63,7 @@ class MainWindow(QtWidgets.QMainWindow): self.show() - def document_selected(self, filename): + def document_selected(self): self.doc_selection_widget.hide() self.settings_widget.show() diff --git a/dangerzone/settings_widget.py b/dangerzone/settings_widget.py index e325222..e24a8c4 100644 --- a/dangerzone/settings_widget.py +++ b/dangerzone/settings_widget.py @@ -102,7 +102,7 @@ class SettingsWidget(QtWidgets.QWidget): else: self.update_checkbox.setCheckState(QtCore.Qt.Unchecked) - def document_selected(self, filename): + def document_selected(self): # Update the danger doc label self.dangerous_doc_label.setText( f"Dangerous: {os.path.basename(self.common.document_filename)}"