Extract indices array and make some offset constants.

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 576e979e9f8fd4bef6f7474588aebded8fa948d4..1bd5036e71c6aef2fd30a55af10713645928f75c 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -36,7 +36,7 @@ using std::make_shared;
 using boost::bind;
 using boost::optional;
 using std::shared_ptr;
-using boost::function;
+using std::function;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -477,7 +477,7 @@ void
 CertificateChainEditor::export_chain ()
 {
        auto d = new wxFileDialog (
-               this, _("Select Chain File"), wxEmptyString, _("certificate_chain.pem"), wxT("PEM files (*.pem)|*.pem"),
+               this, _("Select Chain File"), wxEmptyString, wxT("certificate_chain.pem"), wxT("PEM files (*.pem)|*.pem"),
                wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                );
 
@@ -652,7 +652,7 @@ CertificateChainEditor::export_private_key ()
        }
 
        auto d = new wxFileDialog (
-               this, _("Select Key File"), wxEmptyString, _("private_key.pem"), wxT ("PEM files (*.pem)|*.pem"),
+               this, _("Select Key File"), wxEmptyString, wxT("private_key.pem"), wxT("PEM files (*.pem)|*.pem"),
                wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                );
 
@@ -846,8 +846,7 @@ KeysPage::export_decryption_certificate ()
        if (!config->dcp_issuer().empty()) {
                default_name += "_" + std_to_wx(careful_string_filter(config->dcp_issuer()));
        }
-       /// TRANSLATORS: this is the suffix of the defautl filename used when exporting KDM decryption leaf certificates
-       default_name += _("_kdm_decryption_cert.pem");
+       default_name += wxT("_kdm_decryption_cert.pem");
 
        auto d = new wxFileDialog (
                _panel, _("Select Certificate File"), wxEmptyString, default_name, wxT("PEM files (*.pem)|*.pem"),
@@ -1082,7 +1081,7 @@ LocationsPage::GetName () const
 wxBitmap
 LocationsPage::GetLargeIcon () const
 {
-       return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
+       return wxBitmap(bitmap_path("locations"), wxBITMAP_TYPE_PNG);
 }
 #endif