Use more ScopeGuards.

[dcpomatic.git] / src / wx / screen_dialog.cc

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index ecac974e2dc5aa0cacdbebbfe9f17df2f9600283..6d7fb4f031c530a33e7bad64b7cc16a74daa16b4 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -21,27 +21,27 @@
 
 #include "dcpomatic_button.h"
 #include "download_certificate_dialog.h"
+#include "file_dialog.h"
 #include "screen_dialog.h"
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
 #include "lib/compose.hpp"
+#include "lib/scope_guard.h"
 #include "lib/util.h"
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
-using std::cout;
 using std::vector;
-using boost::optional;
 using boost::bind;
+using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -64,14 +64,17 @@ public:
 
        void load_certificate ()
        {
-               auto d = new wxFileDialog (this, _("Trusted Device certificate"));
-               if (d->ShowModal() == wxID_OK) {
-                       try {
-                               _certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
-                               _thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
-                       } catch (dcp::MiscError& e) {
-                               error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
-                       }
+               auto dialog = new FileDialog(this, _("Trusted Device certificate"), wxEmptyString, wxFD_DEFAULT_STYLE, "SelectCertificatePath");
+               ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+               if (!dialog->show()) {
+                       return;
+               }
+
+               try {
+                       _certificate = dcp::Certificate(dcp::file_to_string(dialog->paths()[0]));
+                       _thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
+               } catch (dcp::MiscError& e) {
+                       error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what())));
                }
        }
 
@@ -178,7 +181,8 @@ ScreenDialog::ScreenDialog (
                [] (TrustedDevice const& d, int) {
                        return d.thumbprint();
                },
-               false
+               EditableListTitle::INVISIBLE,
+               EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
                );
 
        _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
@@ -255,11 +259,11 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
 void
 ScreenDialog::get_recipient_from_file ()
 {
-       auto d = new wxFileDialog (this, _("Select Certificate File"));
-       if (d->ShowModal() == wxID_OK) {
-               load_recipient (boost::filesystem::path(wx_to_std(d->GetPath())));
+       auto dialog = new FileDialog(this, _("Select Certificate File"), wxEmptyString, wxFD_DEFAULT_STYLE , "SelectCertificatePath");
+       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       if (dialog->show()) {
+               load_recipient(dialog->paths()[0]);
        }
-       d->Destroy ();
 
        setup_sensitivity ();
 }
@@ -268,12 +272,12 @@ ScreenDialog::get_recipient_from_file ()
 void
 ScreenDialog::download_recipient ()
 {
-       auto d = new DownloadCertificateDialog (this);
-       if (d->ShowModal() == wxID_OK) {
-               set_recipient (d->certificate());
-               checked_set (_recipient_file, d->url());
+       auto dialog = new DownloadCertificateDialog (this);
+       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       if (dialog->ShowModal() == wxID_OK) {
+               set_recipient(dialog->certificate());
+               checked_set(_recipient_file, dialog->url());
        }
-       d->Destroy ();
        setup_sensitivity ();
 }