Hack to allow OS X to find timeline icons when running from the source tree.

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

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 1e222591d7c9f234d06786ec77a0a1674a52961f..181ca74f4008cd897b75861eaba37d676534677f 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -29,6 +29,7 @@
 #include "kdm_advanced_dialog.h"
 #include "name_format_editor.h"
 #include "check_box.h"
+#include "dcpomatic_button.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -66,7 +67,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        }
        type->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
-       wxButton* advanced = new wxButton (this, wxID_ANY, _("Advanced..."));
+       wxButton* advanced = new Button (this, _("Advanced..."));
        type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
        table->Add (type, 1, wxEXPAND);
 
@@ -76,11 +77,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
        dcp::NameFormat::Map titles;
-       titles['f'] = "film name";
-       titles['c'] = "cinema";
-       titles['s'] = "screen";
-       titles['b'] = "from date/time";
-       titles['e'] = "to date/time";
+       titles['f'] = wx_to_std (_("film name"));
+       titles['c'] = wx_to_std (_("cinema"));
+       titles['s'] = wx_to_std (_("screen"));
+       titles['b'] = wx_to_std (_("from date/time"));
+       titles['e'] = wx_to_std (_("to date/time"));
        dcp::NameFormat::Map ex;
        ex['f'] = "Bambi";
        ex['c'] = "Lumière";
@@ -180,7 +181,7 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-       list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+       list<shared_ptr<ScreenKDM> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
        )
 {
        list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);