From 8694fb21ec0b15b3af339cf41341cfab76d381aa Mon Sep 17 00:00:00 2001
From: Naglis Jonaitis <naglis@mailbox.org>
Date: Sat, 20 Apr 2024 13:28:26 +0300
Subject: [PATCH] Use `exec` instead of `exec_` for Qt dialogs

`exec_` is being deprecated in favor of `exec`.

Also use `launch()` helper method for `Dialog` subclasses.

Fixes #595
---
 CHANGELOG.md                  |  4 ++++
 dangerzone/gui/logic.py       |  2 +-
 dangerzone/gui/main_window.py | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36ec45425..23c9984e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
 
 ## Unreleased
 
+### Fixed
+
+- Fix a deprecation warning in PySide6, thanks to [@naglis](https://github.com/naglis) ([issue #595](https://github.com/freedomofpress/dangerzone/issues/595))
+
 ## Dangerzone 0.6.1
 
 ### Added
diff --git a/dangerzone/gui/logic.py b/dangerzone/gui/logic.py
index 1be515376..e19c9df6b 100644
--- a/dangerzone/gui/logic.py
+++ b/dangerzone/gui/logic.py
@@ -198,7 +198,7 @@ def clicked_cancel(self) -> None:
         self.done(int(QtWidgets.QDialog.Rejected))
 
     def launch(self) -> int:
-        return self.exec_()
+        return self.exec()
 
 
 class Alert(Dialog):
diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py
index b27a14534..40690dad7 100644
--- a/dangerzone/gui/main_window.py
+++ b/dangerzone/gui/main_window.py
@@ -205,7 +205,7 @@ def show_update_success(self) -> None:
             ok_text="Ok",
             has_cancel=False,
         )
-        update_widget.exec_()
+        update_widget.launch()
 
     def show_update_error(self) -> None:
         """Inform the user about an error during update checks"""
@@ -226,7 +226,7 @@ def show_update_error(self) -> None:
             ok_text="Close",
             has_cancel=False,
         )
-        update_widget.exec_()
+        update_widget.launch()
 
     def toggle_updates_triggered(self) -> None:
         """Change the underlying update check settings based on the user's choice."""
@@ -320,7 +320,7 @@ def closeEvent(self, e: QtGui.QCloseEvent) -> None:
             else:
                 self.dangerzone.app.exit(0)
         else:
-            accept_exit = alert_widget.exec_()
+            accept_exit = alert_widget.launch()
             if not accept_exit:
                 e.ignore()
                 return
@@ -485,7 +485,7 @@ def documents_selected(self, docs: List[Document]) -> None:
                 self.dangerzone,
                 message="Dangerzone does not support adding documents after the conversion has started.",
                 has_cancel=False,
-            ).exec_()
+            ).launch()
             return
 
         # Ensure all files in batch are in the same directory
@@ -495,7 +495,7 @@ def documents_selected(self, docs: List[Document]) -> None:
                 self.dangerzone,
                 message="Dangerzone does not support adding documents from multiple locations.\n\n The newly added documents were ignored.",
                 has_cancel=False,
-            ).exec_()
+            ).launch()
             return
 
         # Clear previously selected documents
@@ -841,7 +841,7 @@ def select_output_directory(self) -> None:
         dialog.setFileMode(QtWidgets.QFileDialog.Directory)
         dialog.setOption(QtWidgets.QFileDialog.ShowDirsOnly, True)
 
-        if dialog.exec_() == QtWidgets.QFileDialog.Accepted:
+        if dialog.exec() == QtWidgets.QFileDialog.Accepted:
             selected_dir = dialog.selectedFiles()[0]
             if selected_dir is not None:
                 self.dangerzone.output_dir = str(selected_dir)