From 6186538f700eccba51a762127c0576624ed8b464 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 11 Mar 2020 22:25:42 +0100 Subject: [PATCH 1/2] Fix macOS app bundle ODF extensions .ods .odt application/vnd.oasis.opendocument.spreadsheet ods application/vnd.oasis.opendocument.text odt --- install/pyinstaller/pyinstaller.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/pyinstaller/pyinstaller.spec b/install/pyinstaller/pyinstaller.spec index e4d3203..20b5449 100644 --- a/install/pyinstaller/pyinstaller.spec +++ b/install/pyinstaller/pyinstaller.spec @@ -110,7 +110,7 @@ if p == "Darwin": "CFBundleTypeRole": "Viewer", }, { - "CFBundleTypeExtensions": ["odg"], + "CFBundleTypeExtensions": ["odt"], "CFBundleTypeIconFile": "../macos/document.icns", "CFBundleTypeMIMETypes": [ "application/vnd.oasis.opendocument.text" @@ -119,7 +119,7 @@ if p == "Darwin": "CFBundleTypeRole": "Viewer", }, { - "CFBundleTypeExtensions": ["ops"], + "CFBundleTypeExtensions": ["ods"], "CFBundleTypeIconFile": "../macos/document.icns", "CFBundleTypeMIMETypes": [ "application/vnd.oasis.opendocument.spreadsheet" From 46c741a634d8b34927ddf307e52ddb7e4b1974b7 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 11 Mar 2020 22:43:26 +0100 Subject: [PATCH 2/2] Fix filter ODF extension .ods application/vnd.oasis.opendocument.spreadsheet ods --- dangerzone/doc_selection_widget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dangerzone/doc_selection_widget.py b/dangerzone/doc_selection_widget.py index 44b3b8e..5609135 100644 --- a/dangerzone/doc_selection_widget.py +++ b/dangerzone/doc_selection_widget.py @@ -35,7 +35,7 @@ class DocSelectionWidget(QtWidgets.QWidget): filename = QtWidgets.QFileDialog.getOpenFileName( self, "Open document", - filter="Documents (*.pdf *.docx *.doc *.docm *.xlsx *.xls *.pptx *.ppt *.odt *.odg *.odp *.ops *.jpg *.jpeg *.gif *.png *.tif *.tiff)", + filter="Documents (*.pdf *.docx *.doc *.docm *.xlsx *.xls *.pptx *.ppt *.odt *.odg *.odp *.ods *.jpg *.jpeg *.gif *.png *.tif *.tiff)", ) if filename[0] != "": filename = filename[0]