X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=b337ff10208ba7265dd37c697dd9824187b56915;hb=9549ecffd4b63e48a2a3f4c58033691a36eee111;hp=7197ee8cace71b004665e2e40f61734a0a69ca27;hpb=866552989b82ed28964172fce1dd6b787589f8d7;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7197ee8ca..b337ff102 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -22,7 +22,7 @@
  *  @brief The main DCP-o-matic GUI.
  */
 
-#include "wx/controls.h"
+#include "wx/standard_controls.h"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
@@ -47,7 +47,10 @@
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/initial_setup_dialog.h"
+#include "wx/send_i18n_dialog.h"
+#include "wx/i18n_hook.h"
 #include "lib/film.h"
+#include "lib/emailer.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
@@ -226,6 +229,7 @@ enum {
 	ID_tools_encoding_servers,
 	ID_tools_manage_templates,
 	ID_tools_check_for_updates,
+	ID_tools_send_translations,
 	ID_tools_restore_default_preferences,
 	ID_help_report_a_problem,
 	/* IDs for shortcuts (with no associated menu item) */
@@ -312,6 +316,7 @@ public:
 		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_restore_default_preferences, this), ID_tools_restore_default_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);
@@ -324,7 +329,7 @@ public:
 		wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
 
 		_film_viewer.reset (new FilmViewer (overall_panel));
-		_controls = new Controls (overall_panel, _film_viewer);
+		_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);
 
@@ -334,8 +339,8 @@ public:
 		right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 
 		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-		main_sizer->Add (_film_editor, 1, wxEXPAND | wxALL, 6);
-		main_sizer->Add (right_sizer, 2, wxEXPAND | wxALL, 6);
+		main_sizer->Add (_film_editor, 0, wxEXPAND | wxALL, 6);
+		main_sizer->Add (right_sizer, 1, wxEXPAND | wxALL, 6);
 
 		set_menu_sensitivity ();
 
@@ -975,6 +980,26 @@ private:
 		_update_news_requested = true;
 	}
 
+	void tools_send_translations ()
+	{
+		SendI18NDialog* d = new SendI18NDialog (this);
+		if (d->ShowModal() == wxID_OK) {
+			string body;
+			body += d->name() + "\n";
+			body += d->language() + "\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";
+			}
+			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);
+		}
+
+		d->Destroy ();
+	}
+
 	void help_about ()
 	{
 		AboutDialog* d = new AboutDialog (this);
@@ -1201,6 +1226,7 @@ private:
 		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);
 		tools->AppendSeparator ();
 		add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS);
 
@@ -1335,7 +1361,7 @@ private:
 
 	FilmEditor* _film_editor;
 	boost::shared_ptr<FilmViewer> _film_viewer;
-	Controls* _controls;
+	StandardControls* _controls;
 	VideoWaveformDialog* _video_waveform_dialog;
 	HintsDialog* _hints_dialog;
 	ServersListDialog* _servers_list_dialog;
@@ -1374,107 +1400,112 @@ public:
 private:
 
 	bool OnInit ()
-	try
 	{
-		wxInitAllImageHandlers ();
+		wxSplashScreen* splash = 0;
+		try {
+			wxInitAllImageHandlers ();
 
-		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
-		Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+			Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+			Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
-		wxSplashScreen* splash = maybe_show_splash ();
+			splash = maybe_show_splash ();
 
-		SetAppName (_("DCP-o-matic"));
+			SetAppName (_("DCP-o-matic"));
 
-		if (!wxApp::OnInit()) {
-			return false;
-		}
+			if (!wxApp::OnInit()) {
+				return false;
+			}
 
 #ifdef DCPOMATIC_LINUX
-		unsetenv ("UBUNTU_MENUPROXY");
+			unsetenv ("UBUNTU_MENUPROXY");
 #endif
 
 #ifdef __WXOSX__
-		ProcessSerialNumber serial;
-		GetCurrentProcess (&serial);
-		TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+			ProcessSerialNumber serial;
+			GetCurrentProcess (&serial);
+			TransformProcessType (&serial, kProcessTransformToForegroundApplication);
 #endif
 
-		dcpomatic_setup_path_encoding ();
+			dcpomatic_setup_path_encoding ();
 
-		/* Enable i18n; this will create a Config object
-		   to look for a force-configured language.  This Config
-		   object will be wrong, however, because dcpomatic_setup
-		   hasn't yet been called and there aren't any filters etc.
-		   set up yet.
-		*/
-		dcpomatic_setup_i18n ();
+			/* Enable i18n; this will create a Config object
+			   to look for a force-configured language.  This Config
+			   object will be wrong, however, because dcpomatic_setup
+			   hasn't yet been called and there aren't any filters etc.
+			   set up yet.
+			*/
+			dcpomatic_setup_i18n ();
 
-		/* Set things up, including filters etc.
-		   which will now be internationalised correctly.
-		*/
-		dcpomatic_setup ();
+			/* Set things up, including filters etc.
+			   which will now be internationalised correctly.
+			*/
+			dcpomatic_setup ();
 
-		/* Force the configuration to be re-loaded correctly next
-		   time it is needed.
-		*/
-		Config::drop ();
+			/* Force the configuration to be re-loaded correctly next
+			   time it is needed.
+			*/
+			Config::drop ();
 
-		Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this));
+			Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this));
 
-		_frame = new DOMFrame (_("DCP-o-matic"));
-		SetTopWindow (_frame);
-		_frame->Maximize ();
-		if (splash) {
-			splash->Destroy ();
-		}
+			_frame = new DOMFrame (_("DCP-o-matic"));
+			SetTopWindow (_frame);
+			_frame->Maximize ();
+			if (splash) {
+				splash->Destroy ();
+				splash = 0;
+			}
 
-		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 (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
+				InitialSetupDialog* d = new InitialSetupDialog ();
+				d->ShowModal ();
+				d->Destroy ();
+				Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
+			}
 
-		_frame->Show ();
+			_frame->Show ();
 
-		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()));
+			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()));
+				}
 			}
-		}
 
-		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);
+			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);
+					}
+				}
+				if (!_dcp_to_add.empty ()) {
+					_frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
 				}
 			}
-			if (!_dcp_to_add.empty ()) {
-				_frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
-			}
-		}
 
-		signal_manager = new wxSignalManager (this);
-		Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
+			signal_manager = new wxSignalManager (this);
+			Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
-		Bind (wxEVT_TIMER, boost::bind (&App::check, this));
-		_timer.reset (new wxTimer (this));
-		_timer->Start (1000);
+			Bind (wxEVT_TIMER, boost::bind (&App::check, this));
+			_timer.reset (new wxTimer (this));
+			_timer->Start (1000);
 
-		if (Config::instance()->check_for_updates ()) {
-			UpdateChecker::instance()->run ();
+			if (Config::instance()->check_for_updates ()) {
+				UpdateChecker::instance()->run ();
+			}
+		}
+		catch (exception& e)
+		{
+			if (splash) {
+				splash->Destroy ();
+			}
+			error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what()));
 		}
 
 		return true;
 	}
-	catch (exception& e)
-	{
-		error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what()));
-		return true;
-	}
 
 	void OnInitCmdLine (wxCmdLineParser& parser)
 	{