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 3148d09d91218dc43c1bef4c36f573b2902681a0..6d7fb4f031c530a33e7bad64b7cc16a74daa16b4 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -21,28 +21,27 @@
 
 #include "dcpomatic_button.h"
 #include "download_certificate_dialog.h"
-#include "file_dialog_wrapper.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
@@ -65,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())));
                }
        }
 
@@ -102,7 +104,13 @@ private:
 
 
 ScreenDialog::ScreenDialog (
-       wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<TrustedDevice> trusted_devices
+       wxWindow* parent,
+       wxString title,
+       string name,
+       string notes,
+       optional<dcp::Certificate> recipient,
+       optional<string> recipient_file,
+       vector<TrustedDevice> trusted_devices
        )
        : wxDialog (parent, wxID_ANY, title)
        , _recipient (recipient)
@@ -136,15 +144,31 @@ ScreenDialog::ScreenDialog (
        _recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
        _recipient_thumbprint->SetFont (font);
        set_recipient (recipient);
+
        _get_recipient_from_file = new Button (this, _("Get from file..."));
        _download_recipient = new Button (this, _("Download..."));
-       s->Add (_recipient_thumbprint, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+       s->Add (_recipient_thumbprint, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT, DCPOMATIC_SIZER_X_GAP);
        s->Add (_get_recipient_from_file, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
        s->Add (_download_recipient, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
        _sizer->Add (s, wxGBPosition (r, 1));
        ++r;
 
-       add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (_sizer, this, _("Filename"), true, wxGBPosition(r, 0));
+       _recipient_file = new wxStaticText (this, wxID_ANY, wxT(""));
+       checked_set (_recipient_file, recipient_file.get_value_or(""));
+       _sizer->Add (_recipient_file, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
+       ++r;
+
+       {
+               int flags = wxALIGN_CENTER_VERTICAL | wxTOP;
+#ifdef __WXOSX__
+               flags |= wxALIGN_RIGHT;
+               auto m = new StaticText (this, _("Other trusted devices") + wxT(":"));
+#else
+               auto m = new StaticText (this, _("Other trusted devices"));
+#endif
+               _sizer->Add (m, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SIZER_Y_GAP);
+       }
        ++r;
 
        vector<EditableListColumn> columns;
@@ -157,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);
@@ -202,6 +227,17 @@ ScreenDialog::recipient () const
 }
 
 
+optional<string>
+ScreenDialog::recipient_file () const
+{
+       auto const f = wx_to_std(_recipient_file->GetLabel());
+       if (f.empty()) {
+               return {};
+       }
+       return f;
+}
+
+
 void
 ScreenDialog::load_recipient (boost::filesystem::path file)
 {
@@ -213,6 +249,7 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
                        return;
                }
                set_recipient (c.leaf ());
+               checked_set (_recipient_file, file.string());
        } catch (dcp::MiscError& e) {
                error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
        }
@@ -222,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 ();
 }
@@ -235,11 +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());
+       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 ();
 }