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

Fix "open with" on macOS for single files

Browse source 
Fixes partially #268
This commit is contained in:
deeplow 2022-11-28 15:44:15 +00:00
parent af5f7c70d3
commit ce5558b5a2
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dangerzone/gui/__init__.py
View file

@ -19,7 +19,7 @@ from .main_window import MainWindow
class Application(QtWidgets.QApplication): class Application(QtWidgets.QApplication):
document_selected = QtCore.Signal(str) document_selected = QtCore.Signal(list)
application_activated = QtCore.Signal() application_activated = QtCore.Signal()
def __init__(self) -> None: def __init__(self) -> None:
@ -36,7 +36,7 @@ class Application(QtWidgets.QApplication):
if isinstance(event, QtGui.QFileOpenEvent): if isinstance(event, QtGui.QFileOpenEvent):
# Skip file open events in dev mode # Skip file open events in dev mode
if not hasattr(sys, "dangerzone_dev"): if not hasattr(sys, "dangerzone_dev"):
self.document_selected.emit(event.file()) self.document_selected.emit([event.file()])
return True return True
elif event.type() == QtCore.QEvent.ApplicationActivate: elif event.type() == QtCore.QEvent.ApplicationActivate:
self.application_activated.emit() self.application_activated.emit()
@ -79,23 +79,20 @@ def gui_main(filenames: Optional[List[str]]) -> bool:
# Allow Ctrl-C to smoothly quit the program instead of throwing an exception # Allow Ctrl-C to smoothly quit the program instead of throwing an exception
signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGINT, signal.SIG_DFL)
def new_window(filenames: Optional[List[str]] = []) -> MainWindow: def open_files(filenames: List[str] = []) -> None:
window = MainWindow(dangerzone) documents = [Document(filename) for filename in filenames]
if filenames: window.content_widget.doc_selection_widget.documents_selected.emit(documents)
documents = [Document(filename) for filename in filenames]
window.content_widget.doc_selection_widget.documents_selected.emit(
documents
)
return window
window = new_window(filenames) window = MainWindow(dangerzone)
if filenames:
open_files(filenames)
# MacOS: Open a new window, if all windows are closed # MacOS: Open a new window, if all windows are closed
def application_activated() -> None: def application_activated() -> None:
window.show() window.show()
# If we get a file open event, open it # If we get a file open event, open it
app.document_selected.connect(new_window) app.document_selected.connect(open_files)
# If the application is activated and all windows are closed, open a new one # If the application is activated and all windows are closed, open a new one
app.application_activated.connect(application_activated) app.application_activated.connect(application_activated)