X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=6f55b1771b88f2bbbc352520aa7c7deae10005b7;hp=1e93977d7cee5993c0378b40eb48edf2f775d790;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hpb=6c78f6d31a457ad34fb14b7c926fb418b4d6790d

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1e93977d7..6f55b1771 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,89 +18,96 @@
 
 */
 
+
 /** @file  src/tools/dcpomatic.cc
  *  @brief The main DCP-o-matic GUI.
  */
 
-#include "wx/standard_controls.h"
-#include "wx/film_viewer.h"
+
+#include "wx/about_dialog.h"
+#include "wx/content_panel.h"
+#include "wx/dkdm_dialog.h"
+#include "wx/export_subtitles_dialog.h"
+#include "wx/export_video_file_dialog.h"
 #include "wx/film_editor.h"
-#include "wx/job_manager_view.h"
-#include "wx/full_config_dialog.h"
-#include "wx/wx_util.h"
 #include "wx/film_name_location_dialog.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/recreate_chain_dialog.h"
-#include "wx/about_dialog.h"
+#include "wx/film_viewer.h"
+#include "wx/focus_manager.h"
+#include "wx/full_config_dialog.h"
+#include "wx/hints_dialog.h"
+#include "wx/html_dialog.h"
+#include "wx/i18n_hook.h"
+#include "wx/job_manager_view.h"
 #include "wx/kdm_dialog.h"
+#include "wx/nag_dialog.h"
+#include "wx/paste_dialog.h"
+#include "wx/recreate_chain_dialog.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/save_template_dialog.h"
 #include "wx/self_dkdm_dialog.h"
+#include "wx/send_i18n_dialog.h"
 #include "wx/servers_list_dialog.h"
-#include "wx/hints_dialog.h"
-#include "wx/update_dialog.h"
-#include "wx/content_panel.h"
-#include "wx/report_problem_dialog.h"
-#include "wx/video_waveform_dialog.h"
+#include "wx/standard_controls.h"
 #include "wx/system_information_dialog.h"
-#include "wx/save_template_dialog.h"
 #include "wx/templates_dialog.h"
-#include "wx/nag_dialog.h"
-#include "wx/export_dialog.h"
-#include "wx/paste_dialog.h"
-#include "wx/focus_manager.h"
-#include "wx/html_dialog.h"
-#include "wx/initial_setup_dialog.h"
-#include "wx/send_i18n_dialog.h"
-#include "wx/i18n_hook.h"
-#include "lib/film.h"
+#include "wx/update_dialog.h"
+#include "wx/video_waveform_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
 #include "lib/analytics.h"
-#include "lib/emailer.h"
+#include "lib/audio_content.h"
+#include "lib/check_content_job.h"
+#include "lib/cinema.h"
+#include "lib/compose.hpp"
 #include "lib/config.h"
-#include "lib/util.h"
-#include "lib/video_content.h"
 #include "lib/content.h"
-#include "lib/version.h"
-#include "lib/signal_manager.h"
-#include "lib/log.h"
-#include "lib/screen.h"
-#include "lib/job_manager.h"
-#include "lib/exceptions.h"
-#include "lib/cinema.h"
-#include "lib/screen_kdm.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/encode_server_finder.h"
-#include "lib/update_checker.h"
-#include "lib/cross.h"
 #include "lib/content_factory.h"
-#include "lib/compose.hpp"
-#include "lib/cinema_kdms.h"
-#include "lib/dcpomatic_socket.h"
-#include "lib/hints.h"
+#include "lib/cross.h"
+#include "lib/cross.h"
 #include "lib/dcp_content.h"
-#include "lib/ffmpeg_encoder.h"
-#include "lib/transcode_job.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/dcpomatic_socket.h"
 #include "lib/dkdm_wrapper.h"
-#include "lib/audio_content.h"
-#include "lib/check_content_change_job.h"
+#include "lib/emailer.h"
+#include "lib/encode_server_finder.h"
+#include "lib/exceptions.h"
+#include "lib/ffmpeg_encoder.h"
+#include "lib/film.h"
+#include "lib/hints.h"
+#include "lib/job_manager.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/log.h"
+#include "lib/make_dcp.h"
+#include "lib/release_notes.h"
+#include "lib/screen.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/signal_manager.h"
+#include "lib/subtitle_encoder.h"
 #include "lib/text_content.h"
-#include "lib/dcpomatic_log.h"
+#include "lib/transcode_job.h"
+#include "lib/update_checker.h"
+#include "lib/util.h"
+#include "lib/version.h"
+#include "lib/video_content.h"
 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
-#include <wx/generic/aboutdlgg.h>
-#include <wx/stdpaths.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/cmdline.h>
+#include <wx/generic/aboutdlgg.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
+#include <wx/stdpaths.h>
 #include <wx/wxhtml.h>
+LIBDCP_ENABLE_WARNINGS
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
+#endif
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-#include <boost/filesystem.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 #include <iostream>
 #include <fstream>
 /* This is OK as it's only used with DCPOMATIC_WINDOWS */
@@ -110,32 +117,36 @@
 #undef check
 #endif
 
+
 using std::cout;
-using std::wcout;
+using std::dynamic_pointer_cast;
+using std::exception;
+using std::function;
+using std::list;
+using std::make_pair;
+using std::make_shared;
+using std::map;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::wstring;
-using std::wstringstream;
-using std::map;
-using std::make_pair;
-using std::list;
-using std::exception;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::wcout;
 using boost::optional;
-using boost::function;
 using boost::is_any_of;
 using boost::algorithm::find;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
-class FilmChangedClosingDialog : public boost::noncopyable
+
+class FilmChangedClosingDialog
 {
 public:
 	explicit FilmChangedClosingDialog (string name)
 	{
 		_dialog = new wxMessageDialog (
-			0,
-			wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()),
+			nullptr,
+			wxString::Format(_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()),
 			/// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 			/// project (Film) has been changed since it was last saved.
 			_("Film changed"),
@@ -152,6 +163,9 @@ public:
 		_dialog->Destroy ();
 	}
 
+	FilmChangedClosingDialog (FilmChangedClosingDialog const&) = delete;
+	FilmChangedClosingDialog& operator= (FilmChangedClosingDialog const&) = delete;
+
 	int run ()
 	{
 		return _dialog->ShowModal ();
@@ -161,14 +175,15 @@ private:
 	wxMessageDialog* _dialog;
 };
 
-class FilmChangedDuplicatingDialog : public boost::noncopyable
+
+class FilmChangedDuplicatingDialog
 {
 public:
 	explicit FilmChangedDuplicatingDialog (string name)
 	{
 		_dialog = new wxMessageDialog (
-			0,
-			wxString::Format (_("Save changes to film \"%s\" before duplicating?"), std_to_wx (name).data()),
+			nullptr,
+			wxString::Format(_("Save changes to film \"%s\" before duplicating?"), std_to_wx (name).data()),
 			/// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 			/// project (Film) has been changed since it was last saved.
 			_("Film changed"),
@@ -185,6 +200,9 @@ public:
 		_dialog->Destroy ();
 	}
 
+	FilmChangedDuplicatingDialog (FilmChangedDuplicatingDialog const&) = delete;
+	FilmChangedDuplicatingDialog& operator= (FilmChangedDuplicatingDialog const&) = delete;
+
 	int run ()
 	{
 		return _dialog->ShowModal ();
@@ -194,6 +212,7 @@ private:
 	wxMessageDialog* _dialog;
 };
 
+
 #define ALWAYS                        0x0
 #define NEEDS_FILM                    0x1
 #define NOT_DURING_DCP_CREATION       0x2
@@ -204,6 +223,7 @@ private:
 #define NEEDS_CLIPBOARD               0x40
 #define NEEDS_ENCRYPTION              0x80
 
+
 map<wxMenuItem*, int> menu_items;
 
 enum {
@@ -218,25 +238,27 @@ enum {
 	ID_file_close = 100,
 	ID_edit_copy,
 	ID_edit_paste,
-	ID_content_scale_to_fit_width,
-	ID_content_scale_to_fit_height,
+	ID_edit_select_all,
 	ID_jobs_make_dcp,
 	ID_jobs_make_dcp_batch,
 	ID_jobs_make_kdms,
+	ID_jobs_make_dkdms,
 	ID_jobs_make_self_dkdm,
-	ID_jobs_export,
+	ID_jobs_export_video_file,
+	ID_jobs_export_subtitles,
 	ID_jobs_send_dcp_to_tms,
 	ID_jobs_show_dcp,
 	ID_jobs_open_dcp_in_player,
 	ID_view_closed_captions,
 	ID_view_video_waveform,
-	ID_view_system_information,
 	ID_tools_hints,
 	ID_tools_encoding_servers,
 	ID_tools_manage_templates,
 	ID_tools_check_for_updates,
 	ID_tools_send_translations,
+	ID_tools_system_information,
 	ID_tools_restore_default_preferences,
+	ID_tools_export_preferences,
 	ID_help_report_a_problem,
 	/* IDs for shortcuts (with no associated menu item) */
 	ID_add_file,
@@ -247,26 +269,15 @@ enum {
 	ID_forward_frame
 };
 
+
 class DOMFrame : public wxFrame
 {
 public:
-	explicit DOMFrame (wxString const & title)
-		: wxFrame (NULL, -1, title)
-		, _video_waveform_dialog (0)
-		, _system_information_dialog (0)
-		, _hints_dialog (0)
-		, _servers_list_dialog (0)
-		, _config_dialog (0)
-		, _kdm_dialog (0)
-		, _templates_dialog (0)
-		, _file_menu (0)
-		, _history_items (0)
-		, _history_position (0)
-		, _history_separator (0)
-		, _update_news_requested (false)
+	explicit DOMFrame (wxString const& title)
+		: wxFrame (nullptr, -1, title)
 	{
 #if defined(DCPOMATIC_WINDOWS)
-		if (Config::instance()->win32_console ()) {
+		if (Config::instance()->win32_console()) {
 			AllocConsole();
 
 			HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -285,7 +296,7 @@ public:
 		}
 #endif
 
-		wxMenuBar* bar = new wxMenuBar;
+		auto bar = new wxMenuBar;
 		setup_menu (bar);
 		SetMenuBar (bar);
 
@@ -293,7 +304,7 @@ public:
 		SetIcon (wxIcon (std_to_wx ("id")));
 #endif
 
-		_config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+		_config_changed_connection = Config::instance()->Changed.connect(boost::bind(&DOMFrame::config_changed, this, _1));
 		config_changed (Config::OTHER);
 
 		_analytics_message_connection = Analytics::instance()->Message.connect(boost::bind(&DOMFrame::analytics_message, this, _1, _2));
@@ -309,42 +320,45 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this),               wxID_EXIT);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this),               ID_edit_copy);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this),              ID_edit_paste);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_select_all, this),         ID_edit_select_all);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this),        wxID_PREFERENCES);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this),           ID_jobs_make_dcp);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this),          ID_jobs_make_kdms);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this),         ID_jobs_make_dkdms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_video_file, this),  ID_jobs_export_video_file);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_subtitles, this),   ID_jobs_export_subtitles);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this),           ID_jobs_show_dcp);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this),    ID_view_closed_captions);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_video_waveform, this),     ID_view_video_waveform);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_system_information, this), ID_view_system_information);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_hints, this),             ID_tools_hints);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this),  ID_tools_encoding_servers);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_manage_templates, this),  ID_tools_manage_templates);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_send_translations, this), ID_tools_send_translations);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this),ID_tools_system_information);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_export_preferences, this), ID_tools_export_preferences);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this),              wxID_ABOUT);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this),   ID_help_report_a_problem);
 
 		Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
+		Bind (wxEVT_SHOW, boost::bind (&DOMFrame::show, this, _1));
 
 		/* Use a panel as the only child of the Frame so that we avoid
 		   the dark-grey background on Windows.
 		*/
-		wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
+		auto overall_panel = new wxPanel (this, wxID_ANY);
 
 		_film_viewer.reset (new FilmViewer (overall_panel));
 		_controls = new StandardControls (overall_panel, _film_viewer, true);
 		_film_editor = new FilmEditor (overall_panel, _film_viewer);
-		JobManagerView* job_manager_view = new JobManagerView (overall_panel, false);
+		auto job_manager_view = new JobManagerView (overall_panel, false);
 
-		wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
+		auto right_sizer = new wxBoxSizer (wxVERTICAL);
 		right_sizer->Add (_film_viewer->panel(), 2, wxEXPAND | wxALL, 6);
 		right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
 		right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
@@ -355,15 +369,14 @@ public:
 
 		set_menu_sensitivity ();
 
-		_film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1));
 		_film_editor->content_panel()->SelectionChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
-		file_changed ("");
+		set_title ();
 
 		JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
 
 		overall_panel->SetSizer (main_sizer);
 
-		UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+		UpdateChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::update_checker_state_changed, this));
 
 		FocusManager::instance()->SetFocus.connect (boost::bind (&DOMFrame::remove_accelerators, this));
 		FocusManager::instance()->KillFocus.connect (boost::bind (&DOMFrame::add_accelerators, this));
@@ -377,12 +390,18 @@ public:
 #else
 		int accelerators = 6;
 #endif
-		wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
+		std::vector<wxAcceleratorEntry> accel(accelerators);
+		/* [Shortcut] Ctrl+A:Add file(s) to the film */
 		accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
+		/* [Shortcut] Delete:Remove selected content from film */
 		accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove);
+		/* [Shortcut] Space:Start/stop playback */
 		accel[2].Set (wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
+		/* [Shortcut] Ctrl+T:Open timeline window */
 		accel[3].Set (wxACCEL_CTRL, static_cast<int>('T'), ID_timeline);
+		/* [Shortcut] Left arrow:Move back one frame */
 		accel[4].Set (wxACCEL_NORMAL, WXK_LEFT, ID_back_frame);
+		/* [Shortcut] Right arrow:Move forward one frame */
 		accel[5].Set (wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame);
 #ifdef __WXOSX__
 		accel[6].Set (wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
@@ -393,9 +412,8 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::timeline_pressed, this), ID_timeline);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
-		wxAcceleratorTable accel_table (accelerators, accel);
+		wxAcceleratorTable accel_table (accelerators, accel.data());
 		SetAcceleratorTable (accel_table);
-		delete[] accel;
 	}
 
 	void remove_accelerators ()
@@ -412,7 +430,7 @@ public:
 
 	void new_film (boost::filesystem::path path, optional<string> template_name)
 	{
-		shared_ptr<Film> film (new Film (path));
+		auto film = make_shared<Film>(path);
 		if (template_name) {
 			film->use_template (template_name.get());
 		}
@@ -424,8 +442,8 @@ public:
 	void load_film (boost::filesystem::path file)
 	try
 	{
-		shared_ptr<Film> film (new Film (file));
-		list<string> const notes = film->read_metadata ();
+		auto film = make_shared<Film>(file);
+		auto const notes = film->read_metadata ();
 
 		if (film->state_version() == 4) {
 			error_dialog (
@@ -435,18 +453,29 @@ public:
 				);
 		}
 
-		BOOST_FOREACH (string i, notes) {
+		for (auto i: notes) {
 			error_dialog (0, std_to_wx(i));
 		}
 
 		set_film (film);
 
-		JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
+		JobManager::instance()->add(make_shared<CheckContentJob>(film));
 	}
-	catch (std::exception& e) {
-		wxString p = std_to_wx (file.string ());
-		wxCharBuffer b = p.ToUTF8 ();
-		error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx (e.what()));
+	catch (FileNotFoundError& e) {
+		auto const dir = e.file().parent_path();
+		if (boost::filesystem::exists(dir / "ASSETMAP") || boost::filesystem::exists(dir / "ASSETMAP.xml")) {
+			error_dialog (
+				this, _("Could not open this folder as a DCP-o-matic project."),
+				_("It looks like you are trying to open a DCP.  File -> Open is for loading DCP-o-matic projects, not DCPs.  To import a DCP, create a new project with File -> New and then click the \"Add DCP...\" button.")
+				);
+		} else {
+			auto const p = std_to_wx(file.string ());
+			error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
+		}
+
+	} catch (std::exception& e) {
+		auto const p = std_to_wx (file.string());
+		error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
 	}
 
 	void set_film (shared_ptr<Film> film)
@@ -457,7 +486,7 @@ public:
 		_controls->set_film (_film);
 		if (_video_waveform_dialog) {
 			_video_waveform_dialog->Destroy ();
-			_video_waveform_dialog = 0;
+			_video_waveform_dialog = nullptr;
 		}
 		set_menu_sensitivity ();
 		if (_film && _film->directory()) {
@@ -466,8 +495,10 @@ public:
 		if (_film) {
 			_film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
 			_film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1));
+			_film->DirtyChange.connect (boost::bind(&DOMFrame::set_title, this));
 			dcpomatic_log = _film->log ();
 		}
+		set_title ();
 	}
 
 	shared_ptr<Film> film () const {
@@ -476,6 +507,14 @@ public:
 
 private:
 
+	void show (wxShowEvent& ev)
+	{
+		if (ev.IsShown() && !_first_shown_called) {
+			_film_editor->first_shown ();
+			_first_shown_called = true;
+		}
+	}
+
 	void film_message (string m)
 	{
 		message_dialog (this, std_to_wx(m));
@@ -483,24 +522,14 @@ private:
 
 	void film_change (ChangeType type)
 	{
-		if (type == CHANGE_TYPE_DONE) {
+		if (type == ChangeType::DONE) {
 			set_menu_sensitivity ();
 		}
 	}
 
-	void file_changed (boost::filesystem::path f)
-	{
-		string s = wx_to_std (_("DCP-o-matic"));
-		if (!f.empty ()) {
-			s += " - " + f.string ();
-		}
-
-		SetTitle (std_to_wx (s));
-	}
-
 	void file_new ()
 	{
-		FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("New Film"), true);
+		auto d = new FilmNameLocationDialog (this, _("New Film"), true);
 		int const r = d->ShowModal ();
 
 		if (r == wxID_OK && d->check_path() && maybe_save_then_delete_film<FilmChangedClosingDialog>()) {
@@ -509,7 +538,7 @@ private:
 			} catch (boost::filesystem::filesystem_error& e) {
 #ifdef DCPOMATIC_WINDOWS
 				string bad_chars = "<>:\"/|?*";
-				string const filename = d->path().string();
+				string const filename = d->path().filename().string();
 				string found_bad_chars;
 				for (size_t i = 0; i < bad_chars.length(); ++i) {
 					if (filename.find(bad_chars[i]) != string::npos && found_bad_chars.find(bad_chars[i]) == string::npos) {
@@ -517,9 +546,11 @@ private:
 					}
 				}
 				wxString message = _("Could not create folder to store film.");
+				message += "  ";
 				if (!found_bad_chars.empty()) {
-					message += "  ";
 					message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data());
+				} else {
+					message += _("Please check that you do not have Windows controlled folder access enabled for DCP-o-matic.");
 				}
 				error_dialog (this, message, std_to_wx(e.what()));
 #else
@@ -533,7 +564,7 @@ private:
 
 	void file_open ()
 	{
-		wxDirDialog* c = new wxDirDialog (
+		auto c = new wxDirDialog (
 			this,
 			_("Select film to open"),
 			std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()),
@@ -564,7 +595,7 @@ private:
 
 	void file_save_as_template ()
 	{
-		SaveTemplateDialog* d = new SaveTemplateDialog (this);
+		auto d = new SaveTemplateDialog (this);
 		int const r = d->ShowModal ();
 		if (r == wxID_OK) {
 			Config::instance()->save_template (_film, d->name ());
@@ -574,7 +605,7 @@ private:
 
 	void file_duplicate ()
 	{
-		FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false);
+		auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false);
 		int const r = d->ShowModal ();
 
 		if (r == wxID_OK && d->check_path() && maybe_save_film<FilmChangedDuplicatingDialog>()) {
@@ -589,7 +620,7 @@ private:
 
 	void file_duplicate_and_open ()
 	{
-		FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false);
+		auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false);
 		int const r = d->ShowModal ();
 
 		if (r == wxID_OK && d->check_path() && maybe_save_film<FilmChangedDuplicatingDialog>()) {
@@ -607,7 +638,7 @@ private:
 	{
 		if (_film && _film->dirty ()) {
 
-			FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ());
+			auto dialog = new FilmChangedClosingDialog (_film->name ());
 			int const r = dialog->run ();
 			delete dialog;
 
@@ -630,7 +661,7 @@ private:
 
 	void file_history (wxCommandEvent& event)
 	{
-		vector<boost::filesystem::path> history = Config::instance()->history ();
+		auto history = Config::instance()->history ();
 		int n = event.GetId() - ID_file_history;
 		if (n >= 0 && n < static_cast<int> (history.size ()) && maybe_save_then_delete_film<FilmChangedClosingDialog>()) {
 			load_film (history[n]);
@@ -645,7 +676,7 @@ private:
 
 	void edit_copy ()
 	{
-		ContentList const sel = _film_editor->content_panel()->selected();
+		auto const sel = _film_editor->content_panel()->selected();
 		DCPOMATIC_ASSERT (sel.size() == 1);
 		_clipboard = sel.front()->clone();
 	}
@@ -654,9 +685,9 @@ private:
 	{
 		DCPOMATIC_ASSERT (_clipboard);
 
-		PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
+		auto d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
 		if (d->ShowModal() == wxID_OK) {
-			BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) {
+			for (auto i: _film_editor->content_panel()->selected()) {
 				if (d->video() && i->video) {
 					DCPOMATIC_ASSERT (_clipboard->video);
 					i->video->take_settings_from (_clipboard->video);
@@ -667,8 +698,8 @@ private:
 				}
 
 				if (d->text()) {
-					list<shared_ptr<TextContent> >::iterator j = i->text.begin ();
-					list<shared_ptr<TextContent> >::const_iterator k = _clipboard->text.begin ();
+					auto j = i->text.begin ();
+					auto k = _clipboard->text.begin ();
 					while (j != i->text.end() && k != _clipboard->text.end()) {
 						(*j)->take_settings_from (*k);
 						++j;
@@ -680,6 +711,11 @@ private:
 		d->Destroy ();
 	}
 
+	void edit_select_all ()
+	{
+		_film_editor->content_panel()->select_all();
+	}
+
 	void edit_preferences ()
 	{
 		if (!_config_dialog) {
@@ -690,7 +726,7 @@ private:
 
 	void tools_restore_default_preferences ()
 	{
-		wxMessageDialog* d = new wxMessageDialog (
+		auto d = new wxMessageDialog (
 			0,
 			_("Are you sure you want to restore preferences to their defaults?  This cannot be undone."),
 			_("Restore default preferences"),
@@ -705,6 +741,21 @@ private:
 		}
 	}
 
+	void tools_export_preferences ()
+	{
+		auto dialog = new wxFileDialog (
+			this, _("Specify ZIP file"), wxEmptyString, wxT("dcpomatic_config.zip"), wxT("ZIP files (*.zip)|*.zip"),
+			wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+			);
+
+		int const r = dialog->ShowModal ();
+		dialog->Destroy ();
+
+		if (r == wxID_OK) {
+			save_all_config_as_zip (wx_to_std(dialog->GetPath()));
+		}
+	}
+
 	void jobs_make_dcp ()
 	{
 		double required;
@@ -724,7 +775,7 @@ private:
 		}
 
 		if (Config::instance()->show_hints_before_make_dcp()) {
-			HintsDialog* hints = new HintsDialog (this, _film, false);
+			auto hints = new HintsDialog (this, _film, false);
 			int const r = hints->ShowModal();
 			hints->Destroy ();
 			if (r == wxID_CANCEL) {
@@ -744,8 +795,8 @@ private:
 		}
 
 		/* Remove any existing DCP if the user agrees */
-		boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name(), false);
-		if (boost::filesystem::exists (dcp_dir)) {
+		auto const dcp_dir = _film->dir (_film->dcp_name(), false);
+		if (boost::filesystem::exists(dcp_dir)) {
 			if (!confirm_dialog (this, wxString::Format (_("Do you want to overwrite the existing DCP %s?"), std_to_wx(dcp_dir.string()).data()))) {
 				return;
 			}
@@ -757,7 +808,7 @@ private:
 			   a long time, and crashes/power failures are moderately likely.
 			*/
 			_film->write_metadata ();
-			_film->make_dcp ();
+			make_dcp (_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		} catch (BadSettingError& e) {
 			error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
 		} catch (std::exception& e) {
@@ -780,8 +831,23 @@ private:
 		_kdm_dialog->Show ();
 	}
 
+	void jobs_make_dkdms ()
+	{
+		if (!_film) {
+			return;
+		}
+
+		if (_dkdm_dialog) {
+			_dkdm_dialog->Destroy ();
+			_dkdm_dialog = nullptr;
+		}
+
+		_dkdm_dialog = new DKDMDialog (this, _film);
+		_dkdm_dialog->Show ();
+	}
+
 	/** @return false if we succeeded, true if not */
-	bool send_to_other_tool (int port, function<void(boost::filesystem::path)> start, string message)
+	bool send_to_other_tool (int port, function<void()> start, string message)
 	{
 		/* i = 0; try to connect via socket
 		   i = 1; try again, and then try to start the tool
@@ -807,10 +873,10 @@ private:
 			}
 
 			if (i == 1) {
-				start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
+				start ();
 			}
 
-			dcpomatic_sleep (1);
+			dcpomatic_sleep_seconds (1);
 		}
 
 		return true;
@@ -823,7 +889,7 @@ private:
 		}
 
 		if (Config::instance()->show_hints_before_make_dcp()) {
-			HintsDialog* hints = new HintsDialog (this, _film, false);
+			auto hints = new HintsDialog (this, _film, false);
 			int const r = hints->ShowModal();
 			hints->Destroy ();
 			if (r == wxID_CANCEL) {
@@ -833,8 +899,12 @@ private:
 
 		_film->write_metadata ();
 
-		if (send_to_other_tool (BATCH_JOB_PORT, bind (&start_batch_converter, _1), _film->directory()->string())) {
+		if (send_to_other_tool (BATCH_JOB_PORT, &start_batch_converter, _film->directory()->string())) {
+#ifdef DCPOMATIC_OSX
+			error_dialog (this, _("Could not start the batch converter.  You may need to download it from dcpomatic.com."));
+#else
 			error_dialog (this, _("Could not find batch converter."));
+#endif
 		}
 	}
 
@@ -844,8 +914,12 @@ private:
 			return;
 		}
 
-		if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) {
+		if (send_to_other_tool (PLAYER_PLAY_PORT, &start_player, _film->dir(_film->dcp_name(false)).string())) {
+#ifdef DCPOMATIC_OSX
+			error_dialog (this, _("Could not start the player.  You may need to download it from dcpomatic.com."));
+#else
 			error_dialog (this, _("Could not find player."));
+#endif
 		}
 	}
 
@@ -855,7 +929,7 @@ private:
 			return;
 		}
 
-		SelfDKDMDialog* d = new SelfDKDMDialog (this, _film);
+		auto d = new SelfDKDMDialog (this, _film);
 		if (d->ShowModal () != wxID_OK) {
 			d->Destroy ();
 			return;
@@ -868,19 +942,24 @@ private:
 				_("You are making a DKDM which is encrypted by a private key held in"
 				  "\n\n<tt>%s</tt>\n\nIt is <span weight=\"bold\" size=\"larger\">VITALLY IMPORTANT</span> "
 				  "that you <span weight=\"bold\" size=\"larger\">BACK UP THIS FILE</span> since if it is lost "
-				  "your DKDMs (and the DCPs they protect) will become useless."), std_to_wx(Config::config_file().string()).data()
+				  "your DKDMs (and the DCPs they protect) will become useless."), std_to_wx(Config::config_read_file().string()).data()
 				)
 			);
 
+
+		dcp::LocalTime from (Config::instance()->signer_chain()->leaf().not_before());
+		from.add_days (1);
+		dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after());
+		to.add_days (-1);
+
 		optional<dcp::EncryptedKDM> kdm;
 		try {
 			kdm = _film->make_kdm (
 				Config::instance()->decryption_chain()->leaf(),
 				vector<string>(),
 				d->cpl (),
-				dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
-				dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
-				dcp::MODIFIED_TRANSITIONAL_1,
+				from, to,
+				dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 				true,
 				0
 				);
@@ -894,11 +973,11 @@ private:
 
 		if (kdm) {
 			if (d->internal ()) {
-				shared_ptr<DKDMGroup> dkdms = Config::instance()->dkdms ();
-				dkdms->add (shared_ptr<DKDM> (new DKDM (kdm.get())));
+				auto dkdms = Config::instance()->dkdms();
+				dkdms->add (make_shared<DKDM>(kdm.get()));
 				Config::instance()->changed ();
 			} else {
-				boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml");
+				auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml");
 				kdm->as_xml (path);
 			}
 		}
@@ -906,37 +985,48 @@ private:
 		d->Destroy ();
 	}
 
-	void jobs_export ()
+
+	void jobs_export_video_file ()
 	{
-		ExportDialog* d = new ExportDialog (this);
+		auto d = new ExportVideoFileDialog (this, _film->isdcf_name(true));
 		if (d->ShowModal() == wxID_OK) {
-			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
+			if (boost::filesystem::exists(d->path())) {
+				bool ok = confirm_dialog(
+						this,
+						wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(d->path().string()).data())
+						);
+
+				if (!ok) {
+					d->Destroy ();
+					return;
+				}
+			}
+
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 			job->set_encoder (
-				shared_ptr<FFmpegEncoder> (
-					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf())
-					)
+				make_shared<FFmpegEncoder> (
+					_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
 				);
 			JobManager::instance()->add (job);
 		}
 		d->Destroy ();
 	}
 
-	void content_scale_to_fit_width ()
-	{
-		ContentList vc = _film_editor->content_panel()->selected_video ();
-		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_width (_film);
-		}
-	}
 
-	void content_scale_to_fit_height ()
+	void jobs_export_subtitles ()
 	{
-		ContentList vc = _film_editor->content_panel()->selected_video ();
-		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_height (_film);
+		auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop());
+		if (d->ShowModal() == wxID_OK) {
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
+			job->set_encoder (
+				make_shared<SubtitleEncoder>(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font())
+				);
+			JobManager::instance()->add (job);
 		}
+		d->Destroy ();
 	}
 
+
 	void jobs_send_dcp_to_tms ()
 	{
 		_film->send_dcp_to_tms ();
@@ -945,36 +1035,9 @@ private:
 	void jobs_show_dcp ()
 	{
 		DCPOMATIC_ASSERT (_film->directory ());
-#ifdef DCPOMATIC_WINDOWS
-		wstringstream args;
-		args << "/select," << _film->dir (_film->dcp_name(false));
-		ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT);
-#endif
-
-#ifdef DCPOMATIC_LINUX
-		int r = system ("which nautilus");
-		if (WEXITSTATUS (r) == 0) {
-			r = system (String::compose("nautilus \"%1\"", _film->directory()->string()).c_str());
-			if (WEXITSTATUS (r)) {
-				error_dialog (this, _("Could not show DCP."), _("Could not run nautilus"));
-			}
-		} else {
-			int r = system ("which konqueror");
-			if (WEXITSTATUS (r) == 0) {
-				r = system (String::compose ("konqueror \"%1\"", _film->directory()->string()).c_str());
-				if (WEXITSTATUS (r)) {
-					error_dialog (this, _("Could not show DCP"), _("Could not run konqueror"));
-				}
-			}
+		if (show_in_file_manager(_film->directory().get(), _film->dir(_film->dcp_name(false)))) {
+			error_dialog (this, _("Could not show DCP."));
 		}
-#endif
-
-#ifdef DCPOMATIC_OSX
-		int r = system (String::compose ("open -R \"%1\"", _film->dir (_film->dcp_name(false)).string()).c_str());
-		if (WEXITSTATUS (r)) {
-			error_dialog (this, _("Could not show DCP"));
-		}
-#endif
 	}
 
 	void view_closed_captions ()
@@ -991,10 +1054,10 @@ private:
 		_video_waveform_dialog->Show ();
 	}
 
-	void view_system_information ()
+	void tools_system_information ()
 	{
 		if (!_system_information_dialog) {
-			_system_information_dialog = new SystemInformationDialog (this);
+			_system_information_dialog = new SystemInformationDialog (this, _film_viewer);
 		}
 
 		_system_information_dialog->Show ();
@@ -1029,27 +1092,35 @@ private:
 
 	void tools_check_for_updates ()
 	{
-		UpdateChecker::instance()->run ();
 		_update_news_requested = true;
+		UpdateChecker::instance()->run();
 	}
 
 	void tools_send_translations ()
 	{
-		SendI18NDialog* d = new SendI18NDialog (this);
+		auto d = new SendI18NDialog (this);
 		if (d->ShowModal() == wxID_OK) {
 			string body;
 			body += d->name() + "\n";
 			body += d->language() + "\n";
 			body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n";
 			body += "--\n";
-			map<string, string> translations = I18NHook::translations ();
-			for (map<string, string>::const_iterator i = translations.begin(); i != translations.end(); ++i) {
-				body += i->first + "\n" + i->second + "\n\n";
+			auto translations = I18NHook::translations ();
+			for (auto i: translations) {
+				body += i.first + "\n" + i.second + "\n\n";
+			}
+			list<string> to = { "carl@dcpomatic.com" };
+			if (d->email().find("@") == string::npos) {
+				error_dialog (this, _("You must enter a valid email address when sending translations, "
+						      "otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions."));
+			} else {
+				Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
+				try {
+					emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
+				} catch (NetworkError& e) {
+					error_dialog (this, _("Could not send translations"), std_to_wx(e.what()));
+				}
 			}
-			list<string> to;
-			to.push_back ("carl@dcpomatic.com");
-			Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
-			emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
 		}
 
 		d->Destroy ();
@@ -1057,14 +1128,14 @@ private:
 
 	void help_about ()
 	{
-		AboutDialog* d = new AboutDialog (this);
+		auto d = new AboutDialog (this);
 		d->ShowModal ();
 		d->Destroy ();
 	}
 
 	void help_report_a_problem ()
 	{
-		ReportProblemDialog* d = new ReportProblemDialog (this, _film);
+		auto d = new ReportProblemDialog (this, _film);
 		if (d->ShowModal () == wxID_OK) {
 			d->report ();
 		}
@@ -1077,7 +1148,7 @@ private:
 			return true;
 		}
 
-		wxMessageDialog* d = new wxMessageDialog (
+		auto d = new wxMessageDialog (
 			0,
 			_("There are unfinished jobs; are you sure you want to quit?"),
 			_("Unfinished jobs"),
@@ -1098,7 +1169,7 @@ private:
 
 		if (_film && _film->dirty ()) {
 
-			FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ());
+			auto dialog = new FilmChangedClosingDialog (_film->name ());
 			int const r = dialog->run ();
 			delete dialog;
 
@@ -1131,8 +1202,8 @@ private:
 
 	void set_menu_sensitivity ()
 	{
-		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-		list<shared_ptr<Job> >::iterator i = jobs.begin();
+		auto jobs = JobManager::instance()->get ();
+		auto i = jobs.begin();
 		while (i != jobs.end() && (*i)->json_name() != "transcode") {
 			++i;
 		}
@@ -1142,43 +1213,43 @@ private:
 		bool const have_selected_content = !_film_editor->content_panel()->selected().empty();
 		bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty();
 
-		for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
+		for (auto j: menu_items) {
 
 			bool enabled = true;
 
-			if ((j->second & NEEDS_FILM) && !_film) {
+			if ((j.second & NEEDS_FILM) && !_film) {
 				enabled = false;
 			}
 
-			if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) {
+			if ((j.second & NOT_DURING_DCP_CREATION) && dcp_creation) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_CPL) && !have_cpl) {
+			if ((j.second & NEEDS_CPL) && !have_cpl) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_SELECTED_CONTENT) && !have_selected_content) {
+			if ((j.second & NEEDS_SELECTED_CONTENT) && !have_selected_content) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) {
+			if ((j.second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) {
+			if ((j.second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_CLIPBOARD) && !_clipboard) {
+			if ((j.second & NEEDS_CLIPBOARD) && !_clipboard) {
 				enabled = false;
 			}
 
-			if ((j->second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) {
+			if ((j.second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) {
 				enabled = false;
 			}
 
-			j->first->Enable (enabled);
+			j.first->Enable (enabled);
 		}
 	}
 
@@ -1220,16 +1291,19 @@ private:
 
 	void add_item (wxMenu* menu, wxString text, int id, int sens)
 	{
-		wxMenuItem* item = menu->Append (id, text);
+		auto item = menu->Append (id, text);
 		menu_items.insert (make_pair (item, sens));
 	}
 
 	void setup_menu (wxMenuBar* m)
 	{
 		_file_menu = new wxMenu;
+		/* [Shortcut] Ctrl+N:New film */
 		add_item (_file_menu, _("New...\tCtrl-N"), ID_file_new, ALWAYS);
+		/* [Shortcut] Ctrl+O:Open existing film */
 		add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS);
 		_file_menu->AppendSeparator ();
+		/* [Shortcut] Ctrl+S:Save current film */
 		add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM);
 		_file_menu->AppendSeparator ();
 		add_item (_file_menu, _("Save as &template..."), ID_file_save_as_template, NEEDS_FILM);
@@ -1239,6 +1313,7 @@ private:
 		_history_position = _file_menu->GetMenuItems().GetCount();
 
 		_file_menu->AppendSeparator ();
+		/* [Shortcut] Ctrl+W:Close current film */
 		add_item (_file_menu, _("&Close\tCtrl-W"), ID_file_close, NEEDS_FILM);
 
 #ifndef __WXOSX__
@@ -1251,46 +1326,66 @@ private:
 		add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS);
 #endif
 
-		wxMenu* edit = new wxMenu;
+		auto edit = new wxMenu;
+		/* [Shortcut] Ctrl+C:Copy settings from currently selected content */
 		add_item (edit, _("Copy settings\tCtrl-C"), ID_edit_copy, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SINGLE_SELECTED_CONTENT);
+		/* [Shortcut] Ctrl+V:Paste settings into currently selected content */
 		add_item (edit, _("Paste settings...\tCtrl-V"), ID_edit_paste, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SELECTED_CONTENT | NEEDS_CLIPBOARD);
+		edit->AppendSeparator ();
+		/* [Shortcut] Shift+Ctrl+A:Select all content */
+		add_item (edit, _("Select all\tShift-Ctrl-A"), ID_edit_select_all, NEEDS_FILM);
 
 #ifdef __WXOSX__
 		add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #else
+		edit->AppendSeparator ();
+		/* [Shortcut] Ctrl+P:Open preferences window */
 		add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #endif
 
-		wxMenu* content = new wxMenu;
-		add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-		add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-
-		wxMenu* jobs_menu = new wxMenu;
+		auto jobs_menu = new wxMenu;
+		/* [Shortcut] Ctrl+M:Make DCP */
 		add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
+		/* [Shortcut] Ctrl+B:Make DCP in the batch converter*/
 		add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION);
 		jobs_menu->AppendSeparator ();
+		/* [Shortcut] Ctrl+K:Make KDMs */
 		add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
+		/* [Shortcut] Ctrl+D:Make DKDMs */
+		add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
 		add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
 		jobs_menu->AppendSeparator ();
-		add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
+		/* [Shortcut] Ctrl+E:Export video file */
+		add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export_video_file, NEEDS_FILM);
+		add_item (jobs_menu, _("Export subtitles..."), ID_jobs_export_subtitles, NEEDS_FILM);
 		jobs_menu->AppendSeparator ();
 		add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
-		add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+
+#if defined(DCPOMATIC_OSX)
+		add_item (jobs_menu, _("S&how DCP in Finder"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#elif defined(DCPOMATIC_WINDOWS)
+		add_item (jobs_menu, _("S&how DCP in Explorer"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#else
+		add_item (jobs_menu, _("S&how DCP in Files"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#endif
+
 		add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 
-		wxMenu* view = new wxMenu;
+		auto view = new wxMenu;
 		add_item (view, _("Closed captions..."), ID_view_closed_captions, NEEDS_FILM);
 		add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM);
-		add_item (view, _("System information..."), ID_view_system_information, 0);
 
-		wxMenu* tools = new wxMenu;
+		auto tools = new wxMenu;
 		add_item (tools, _("Hints..."), ID_tools_hints, NEEDS_FILM);
 		add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
 		add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0);
 		add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0);
 		add_item (tools, _("Send translations..."), ID_tools_send_translations, 0);
+		add_item (tools, _("System information..."), ID_tools_system_information, 0);
 		tools->AppendSeparator ();
 		add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS);
+		tools->AppendSeparator ();
+		add_item (tools, _("Export preferences..."), ID_tools_export_preferences, ALWAYS);
 
 		wxMenu* help = new wxMenu;
 #ifdef __WXOSX__
@@ -1302,7 +1397,6 @@ private:
 
 		m->Append (_file_menu, _("&File"));
 		m->Append (edit, _("&Edit"));
-		m->Append (content, _("&Content"));
 		m->Append (jobs_menu, _("&Jobs"));
 		m->Append (view, _("&View"));
 		m->Append (tools, _("&Tools"));
@@ -1350,9 +1444,9 @@ private:
 
 		int pos = _history_position;
 
-		/* Clear out non-existant history items before we re-build the menu */
+		/* Clear out non-existent history items before we re-build the menu */
 		Config::instance()->clean_history ();
-		vector<boost::filesystem::path> history = Config::instance()->history ();
+		auto history = Config::instance()->history();
 
 		if (!history.empty ()) {
 			_history_separator = _file_menu->InsertSeparator (pos++);
@@ -1375,7 +1469,7 @@ private:
 
 	void update_checker_state_changed ()
 	{
-		UpdateChecker* uc = UpdateChecker::instance ();
+		auto uc = UpdateChecker::instance ();
 
 		bool const announce =
 			_update_news_requested ||
@@ -1388,11 +1482,11 @@ private:
 			return;
 		}
 
-		if (uc->state() == UpdateChecker::YES) {
-			UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ());
+		if (uc->state() == UpdateChecker::State::YES) {
+			auto dialog = new UpdateDialog (this, uc->stable(), uc->test());
 			dialog->ShowModal ();
 			dialog->Destroy ();
-		} else if (uc->state() == UpdateChecker::FAILED) {
+		} else if (uc->state() == UpdateChecker::State::FAILED) {
 			error_dialog (this, _("The DCP-o-matic download server could not be contacted."));
 		} else {
 			error_dialog (this, _("There are no new versions of DCP-o-matic available."));
@@ -1427,40 +1521,61 @@ private:
 
 	void analytics_message (string title, string html)
 	{
-		HTMLDialog* d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html));
+		auto d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html));
 		d->ShowModal();
 		d->Destroy();
 	}
 
+	void set_title ()
+	{
+		auto s = wx_to_std(_("DCP-o-matic"));
+		if (_film) {
+			if (_film->directory()) {
+				s += " - " + _film->directory()->string();
+			}
+			if (_film->dirty()) {
+				s += " *";
+			}
+		}
+
+		SetTitle (std_to_wx(s));
+	}
+
 	FilmEditor* _film_editor;
-	boost::shared_ptr<FilmViewer> _film_viewer;
+	std::shared_ptr<FilmViewer> _film_viewer;
 	StandardControls* _controls;
-	VideoWaveformDialog* _video_waveform_dialog;
-	SystemInformationDialog* _system_information_dialog;
-	HintsDialog* _hints_dialog;
-	ServersListDialog* _servers_list_dialog;
-	wxPreferencesEditor* _config_dialog;
-	KDMDialog* _kdm_dialog;
-	TemplatesDialog* _templates_dialog;
-	wxMenu* _file_menu;
+	VideoWaveformDialog* _video_waveform_dialog = nullptr;
+	SystemInformationDialog* _system_information_dialog = nullptr;
+	HintsDialog* _hints_dialog = nullptr;
+	ServersListDialog* _servers_list_dialog = nullptr;
+	wxPreferencesEditor* _config_dialog = nullptr;
+	KDMDialog* _kdm_dialog = nullptr;
+	DKDMDialog* _dkdm_dialog = nullptr;
+	TemplatesDialog* _templates_dialog = nullptr;
+	wxMenu* _file_menu = nullptr;
 	shared_ptr<Film> _film;
-	int _history_items;
-	int _history_position;
-	wxMenuItem* _history_separator;
+	int _history_items = 0;
+	int _history_position = 0;
+	wxMenuItem* _history_separator = nullptr;
 	boost::signals2::scoped_connection _config_changed_connection;
 	boost::signals2::scoped_connection _analytics_message_connection;
-	bool _update_news_requested;
+	bool _update_news_requested = false;
 	shared_ptr<Content> _clipboard;
+	bool _first_shown_called = false;
 };
 
+
 static const wxCmdLineEntryDesc command_line_description[] = {
 	{ wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_OPTION, "d", "dcp", "add content DCP", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_SWITCH, "v", "version", "show DCP-o-matic version", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_OPTION, "", "config", "directory containing config.xml and cinemas.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 
+
 /** @class App
  *  @brief The magic App class for wxWidgets.
  */
@@ -1469,13 +1584,15 @@ class App : public wxApp
 public:
 	App ()
 		: wxApp ()
-		, _frame (0)
-		, _splash (0)
-	{}
+	{
+#ifdef DCPOMATIC_LINUX
+		XInitThreads ();
+#endif
+	}
 
 private:
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		try {
 			wxInitAllImageHandlers ();
@@ -1495,10 +1612,9 @@ private:
 			unsetenv ("UBUNTU_MENUPROXY");
 #endif
 
-#ifdef __WXOSX__
-			ProcessSerialNumber serial;
-			GetCurrentProcess (&serial);
-			TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+			dcpomatic_sleep_seconds (1);
+			make_foreground_application ();
 #endif
 
 			dcpomatic_setup_path_encoding ();
@@ -1532,38 +1648,38 @@ private:
 			_frame->Maximize ();
 			close_splash ();
 
-			if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
-				InitialSetupDialog* d = new InitialSetupDialog ();
-				d->ShowModal ();
-				d->Destroy ();
-				Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
+			if (running_32_on_64 ()) {
+				NagDialog::maybe_nag (
+					_frame, Config::NAG_32_ON_64,
+					_("You are running the 32-bit version of DCP-o-matic on a 64-bit version of Windows.  This will limit the memory available to DCP-o-matic and may cause errors.  You are strongly advised to install the 64-bit version of DCP-o-matic."),
+					false);
 			}
 
 			_frame->Show ();
 
-			if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) {
+			signal_manager = new wxSignalManager (this);
+			Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1));
+
+			if (!_film_to_load.empty() && boost::filesystem::is_directory(_film_to_load)) {
 				try {
 					_frame->load_film (_film_to_load);
 				} catch (exception& e) {
-					error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what()));
+					error_dialog (nullptr, std_to_wx(String::compose(wx_to_std(_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what()));
 				}
 			}
 
 			if (!_film_to_create.empty ()) {
-				_frame->new_film (_film_to_create, optional<string> ());
-				if (!_content_to_add.empty ()) {
-					BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
-						_frame->film()->examine_and_add_content (i);
+				_frame->new_film (_film_to_create, optional<string>());
+				if (!_content_to_add.empty()) {
+					for (auto i: content_factory(_content_to_add)) {
+						_frame->film()->examine_and_add_content(i);
 					}
 				}
 				if (!_dcp_to_add.empty ()) {
-					_frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
+					_frame->film()->examine_and_add_content(make_shared<DCPContent>(_dcp_to_add));
 				}
 			}
 
-			signal_manager = new wxSignalManager (this);
-			Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1));
-
 			Bind (wxEVT_TIMER, boost::bind (&App::check, this));
 			_timer.reset (new wxTimer (this));
 			_timer->Start (1000);
@@ -1571,27 +1687,40 @@ private:
 			if (Config::instance()->check_for_updates ()) {
 				UpdateChecker::instance()->run ();
 			}
+
+			auto release_notes = find_release_notes();
+			if (release_notes) {
+				auto notes = new HTMLDialog(nullptr, _("Release notes"), std_to_wx(*release_notes), true);
+				notes->Centre();
+				notes->ShowModal();
+				notes->Destroy();
+			}
 		}
 		catch (exception& e)
 		{
 			if (_splash) {
 				_splash->Destroy ();
-				_splash = 0;
+				_splash = nullptr;
 			}
-			error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what()));
+			error_dialog (nullptr, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what()));
 		}
 
 		return true;
 	}
 
-	void OnInitCmdLine (wxCmdLineParser& parser)
+	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
 		parser.SetSwitchChars (wxT ("-"));
 	}
 
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
+	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
+		if (parser.Found (wxT("version"))) {
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
+			exit (EXIT_SUCCESS);
+		}
+
 		if (parser.GetParamCount() > 0) {
 			if (parser.Found (wxT ("new"))) {
 				_film_to_create = wx_to_std (parser.GetParam (0));
@@ -1610,6 +1739,11 @@ private:
 			_dcp_to_add = wx_to_std (dcp);
 		}
 
+		wxString config;
+		if (parser.Found (wxT("config"), &config)) {
+			State::override_path = wx_to_std (config);
+		}
+
 		return true;
 	}
 
@@ -1619,17 +1753,27 @@ private:
 			throw;
 		} catch (FileError& e) {
 			error_dialog (
-				0,
-				wxString::Format (
+				nullptr,
+				wxString::Format(
 					_("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM,
 					std_to_wx (e.what()),
-					std_to_wx (e.file().string().c_str ())
+					std_to_wx (e.file().string().c_str())
+					)
+				);
+		} catch (boost::filesystem::filesystem_error& e) {
+			error_dialog (
+				nullptr,
+				wxString::Format(
+					_("An exception occurred: %s (%s) (%s)\n\n") + REPORT_PROBLEM,
+					std_to_wx (e.what()),
+					std_to_wx (e.path1().string()),
+					std_to_wx (e.path2().string())
 					)
 				);
 		} catch (exception& e) {
 			error_dialog (
-				0,
-				wxString::Format (
+				nullptr,
+				wxString::Format(
 					_("An exception occurred: %s.\n\n") + REPORT_PROBLEM,
 					std_to_wx (e.what ())
 					)
@@ -1640,14 +1784,14 @@ private:
 	}
 
 	/* An unhandled exception has occurred inside the main event loop */
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		report_exception ();
 		/* This will terminate the program */
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		report_exception ();
 	}
@@ -1677,14 +1821,12 @@ private:
 
 	void config_failed_to_load ()
 	{
-		close_splash ();
 		message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
 	}
 
 	void config_warning (string m)
 	{
-		close_splash ();
-		message_dialog (_frame, std_to_wx (m));
+		message_dialog (_frame, std_to_wx(m));
 	}
 
 	bool config_bad (Config::BadReason reason)
@@ -1693,22 +1835,39 @@ private:
 		   when we open our recreate dialog, close it, *then* try to Destroy the splash (the Destroy fails).
 		*/
 		_splash->Destroy ();
-		_splash = 0;
+		_splash = nullptr;
 
-		Config* config = Config::instance();
+		auto config = Config::instance();
 		switch (reason) {
 		case Config::BAD_SIGNER_UTF8_STRINGS:
 		{
-			if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN)) {
+			if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN_UTF8)) {
 				return false;
 			}
-			RecreateChainDialog* d = new RecreateChainDialog (
+			auto d = new RecreateChainDialog (
 				_frame, _("Recreate signing certificates"),
 				_("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs contains a small error\n"
 				  "which will prevent DCPs from being validated correctly on some systems.  Do you want to re-create\n"
 				  "the certificate chain for signing DCPs and KDMs?"),
 				_("Do nothing"),
-				Config::NAG_BAD_SIGNER_CHAIN
+				Config::NAG_BAD_SIGNER_CHAIN_UTF8
+				);
+			int const r = d->ShowModal ();
+			d->Destroy ();
+			return r == wxID_OK;
+		}
+		case Config::BAD_SIGNER_VALIDITY_TOO_LONG:
+		{
+			if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN_VALIDITY)) {
+				return false;
+			}
+			auto d = new RecreateChainDialog (
+				_frame, _("Recreate signing certificates"),
+				_("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a validity period\n"
+				  "that is too long.  This will cause problems playing back DCPs on some systems.\n"
+				  "Do you want to re-create the certificate chain for signing DCPs and KDMs?"),
+				_("Do nothing"),
+				Config::NAG_BAD_SIGNER_CHAIN_VALIDITY
 				);
 			int const r = d->ShowModal ();
 			d->Destroy ();
@@ -1716,7 +1875,7 @@ private:
 		}
 		case Config::BAD_SIGNER_INCONSISTENT:
 		{
-			RecreateChainDialog* d = new RecreateChainDialog (
+			auto d = new RecreateChainDialog (
 				_frame, _("Recreate signing certificates"),
 				_("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is inconsistent and\n"
 				  "cannot be used.  DCP-o-matic cannot start unless you re-create it.  Do you want to re-create\n"
@@ -1732,7 +1891,7 @@ private:
 		}
 		case Config::BAD_DECRYPTION_INCONSISTENT:
 		{
-			RecreateChainDialog* d = new RecreateChainDialog (
+			auto d = new RecreateChainDialog (
 				_frame, _("Recreate KDM decryption chain"),
 				_("The certificate chain that DCP-o-matic uses for decrypting KDMs is inconsistent and\n"
 				  "cannot be used.  DCP-o-matic cannot start unless you re-create it.  Do you want to re-create\n"
@@ -1752,8 +1911,8 @@ private:
 		}
 	}
 
-	DOMFrame* _frame;
-	wxSplashScreen* _splash;
+	DOMFrame* _frame = nullptr;
+	wxSplashScreen* _splash = nullptr;
 	shared_ptr<wxTimer> _timer;
 	string _film_to_load;
 	string _film_to_create;
@@ -1761,4 +1920,5 @@ private:
 	string _dcp_to_add;
 };
 
+
 IMPLEMENT_APP (App)