From 51cd76a456a79a1d487b4c3d6010345dc8085415 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 13 Jan 2020 12:02:50 -0800 Subject: [PATCH] Allow browsing for all support file types, update README to include supported file types, and update container that supports them all --- README.md | 15 +++++++++++++++ dangerzone/doc_selection_widget.py | 4 +++- dangerzone/main_window.py | 2 +- share/container | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c28aff8..14b8e60 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,21 @@ Some features: - Dangerzone compresses the safe PDF to reduce file size - After converting, dangerzone lets you open the safe PDF in the PDF viewer of your choice, which allows you to open PDFs and office docs in dangerzone by default so you never accidentally open a dangerous document +Dangerzone can convert these types of document into safe PDFs: + +- PDF (`.pdf`) +- Microsoft Word (`.docx`, `.doc`) +- Microsoft Excel (`.xlsx`, `.xls`) +- Microsoft PowerPoint (`.pptx`, `.ppt`) +- ODF Text (`.odt`) +- ODF Spreadsheet (`.ods`) +- ODF Presentation (`.odp`) +- ODF Graphics (`.odg`) +- Jpeg (`.jpg`, `.jpeg`) +- GIF (`.gif`) +- PNG (`.png`) +- TIFF (`.tif`, `.tiff`) + Dangerzone was inspired by [Qubes trusted PDF](https://blog.invisiblethings.org/2013/02/21/converting-untrusted-pdfs-into-trusted.html), but it works in non-Qubes operating systems and sandboxes the document conversion in containers instead of virtual machines (using [podman](https://podman.io/) for Linux, and Docker for macOS, for now). Podman is like docker but more secure -- it doesn't require a privileged daemon, and containers can be launched without root. Set up a development environment by following [these instructions](/BUILD.md). diff --git a/dangerzone/doc_selection_widget.py b/dangerzone/doc_selection_widget.py index 2f865df..7559673 100644 --- a/dangerzone/doc_selection_widget.py +++ b/dangerzone/doc_selection_widget.py @@ -33,7 +33,9 @@ class DocSelectionWidget(QtWidgets.QWidget): def dangerous_doc_button_clicked(self): filename = QtWidgets.QFileDialog.getOpenFileName( - self, "Open document", filter="Documents (*.pdf *.docx *.xlsx)", + self, + "Open document", + filter="Documents (*.pdf *.docx *.doc *.xlsx *.xls *.pptx *.ppt *.odt *.odg *.odp *.ops *.jpg *.jpeg *.gif *.png *.tif *.tiff)", ) if filename[0] != "": filename = filename[0] diff --git a/dangerzone/main_window.py b/dangerzone/main_window.py index ddf8c35..33dd583 100644 --- a/dangerzone/main_window.py +++ b/dangerzone/main_window.py @@ -16,7 +16,7 @@ class MainWindow(QtWidgets.QMainWindow): self.setWindowIcon(QtGui.QIcon(self.common.get_resource_path("logo.png"))) self.setMinimumWidth(600) - self.setMinimumHeight(350) + self.setMinimumHeight(400) # Header logo = QtWidgets.QLabel() diff --git a/share/container b/share/container index 59e5a66..cab99aa 160000 --- a/share/container +++ b/share/container @@ -1 +1 @@ -Subproject commit 59e5a6618ce391b30b9123d545124d92a223b8dc +Subproject commit cab99aac6a3c69609d4b8a916142227b8600a448