swaroop: fix up restart-after-crash.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3d74859dc9e139ec9d97e01386386f1f3a562884..ad1dcde90b647d7336e831421122f7e092f71aa2 100644 (file)
--- 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"
@@ -76,6 +79,7 @@
 #include "lib/audio_content.h"
 #include "lib/check_content_change_job.h"
 #include "lib/text_content.h"
+#include "lib/dcpomatic_log.h"
 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
 #include <wx/generic/aboutdlgg.h>
@@ -225,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) */
@@ -311,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);
@@ -323,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);
 
@@ -402,6 +408,7 @@ public:
                film->set_name (path.filename().generic_string());
                film->write_metadata ();
                set_film (film);
+               dcpomatic_log = film->log ();
        }
 
        void load_film (boost::filesystem::path file)
@@ -437,6 +444,7 @@ public:
                _film = film;
                _film_viewer->set_film (_film);
                _film_editor->set_film (_film);
+               _controls->set_film (_film);
                if (_video_waveform_dialog) {
                        _video_waveform_dialog->Destroy ();
                        _video_waveform_dialog = 0;
@@ -873,7 +881,7 @@ private:
        {
                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 ();
+                       (*i)->video->scale_and_crop_to_fit_width (_film);
                }
        }
 
@@ -881,7 +889,7 @@ private:
        {
                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 ();
+                       (*i)->video->scale_and_crop_to_fit_height (_film);
                }
        }
 
@@ -972,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);
@@ -1198,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);
 
@@ -1332,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;
@@ -1445,12 +1474,12 @@ private:
                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 (_frame->film(), _content_to_add)) {
+                               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 (_frame->film(), _dcp_to_add)));
+                               _frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
                        }
                }