From b208cd5fd0e247c134b7b85ee693638d65d1f30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Br=C3=B6tzmann?= <mailtrash@posteo.de>
Date: Tue, 9 Jul 2019 10:32:44 +0200
Subject: [PATCH] [omemo] Remove YesNoDialog

---
 omemo/file_crypto.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/omemo/file_crypto.py b/omemo/file_crypto.py
index aeaad1c..699f34f 100644
--- a/omemo/file_crypto.py
+++ b/omemo/file_crypto.py
@@ -35,7 +35,9 @@ from gajim.common import app
 from gajim.common import configpaths
 from gajim.common.const import URIType
 from gajim.plugins.plugins_i18n import _
-from gajim.gtk.dialogs import ErrorDialog, YesNoDialog
+from gajim.gtk.dialogs import ErrorDialog
+from gajim.gtk.dialogs import DialogButton
+from gajim.gtk.dialogs import NewConfirmationDialog
 
 from omemo.gtk.progress import ProgressWindow
 from omemo.backend.aes import aes_decrypt_file
@@ -132,13 +134,20 @@ class FileDecryption:
         file.filepath = os.path.join(DIRECTORY, newfilename)
 
     def finished(self, file):
-        question = _('Do you want to open %s') % file.filename
-        YesNoDialog(_('Open File'), question,
-                    transient_for=self.window,
-                    on_response_yes=(self.open_file, file.filepath))
+        NewConfirmationDialog(
+            _('Open File'),
+            _('Open File?'),
+            _('Do you want to open %s?') % file.filename,
+            [DialogButton.make('Cancel',
+                               text=_('_No')),
+             DialogButton.make('OK',
+                               text=_('_Open'),
+                               callback=self.open_file(file.filepath))],
+            transient_for=self.window).show()
+
         return False
 
-    def open_file(self, checked, path):
+    def open_file(self, path):
         if platform.system() == "Windows":
             os.startfile(path)
         elif platform.system() == "Darwin":