/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
* @brief The main DCP-o-matic GUI.
*/
+#include "wx/standard_controls.h"
#include "wx/film_viewer.h"
#include "wx/film_editor.h"
#include "wx/job_manager_view.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/kdm_dialog.h"
#include "wx/self_dkdm_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/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"
#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/ffmpeg_encoder.h"
#include "lib/transcode_job.h"
#include "lib/dkdm_wrapper.h"
+#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>
#include <boost/filesystem.hpp>
#include <boost/noncopyable.hpp>
#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
#include <iostream>
#include <fstream>
/* This is OK as it's only used with DCPOMATIC_WINDOWS */
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using boost::function;
+using boost::is_any_of;
+using boost::algorithm::find;
using dcp::raw_convert;
class FilmChangedClosingDialog : public boost::noncopyable
{
public:
- FilmChangedClosingDialog (string name)
+ explicit FilmChangedClosingDialog (string name)
{
_dialog = new wxMessageDialog (
0,
class FilmChangedDuplicatingDialog : public boost::noncopyable
{
public:
- FilmChangedDuplicatingDialog (string name)
+ explicit FilmChangedDuplicatingDialog (string name)
{
_dialog = new wxMessageDialog (
0,
wxMessageDialog* _dialog;
};
-#define ALWAYS 0x0
-#define NEEDS_FILM 0x1
-#define NOT_DURING_DCP_CREATION 0x2
-#define NEEDS_CPL 0x4
-#define NEEDS_SELECTED_VIDEO_CONTENT 0x8
+#define ALWAYS 0x0
+#define NEEDS_FILM 0x1
+#define NOT_DURING_DCP_CREATION 0x2
+#define NEEDS_CPL 0x4
+#define NEEDS_SINGLE_SELECTED_CONTENT 0x8
+#define NEEDS_SELECTED_CONTENT 0x10
+#define NEEDS_SELECTED_VIDEO_CONTENT 0x20
+#define NEEDS_CLIPBOARD 0x40
+#define NEEDS_ENCRYPTION 0x80
map<wxMenuItem*, int> menu_items;
ID_file_duplicate_and_open,
ID_file_history,
/* Allow spare IDs after _history for the recent files list */
- ID_content_scale_to_fit_width = 100,
+ ID_file_close = 100,
+ ID_edit_copy,
+ ID_edit_paste,
+ ID_content_scale_to_fit_width,
ID_content_scale_to_fit_height,
ID_jobs_make_dcp,
ID_jobs_make_dcp_batch,
ID_jobs_export,
ID_jobs_send_dcp_to_tms,
ID_jobs_show_dcp,
- ID_tools_video_waveform,
+ ID_jobs_open_dcp_in_player,
+ ID_view_closed_captions,
+ ID_view_video_waveform,
ID_tools_hints,
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) */
ID_add_file,
- ID_remove
+ ID_remove,
+ ID_start_stop,
+ ID_timeline,
+ ID_back_frame,
+ ID_forward_frame
};
class DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+ explicit DOMFrame (wxString const & title)
: wxFrame (NULL, -1, title)
, _video_waveform_dialog (0)
, _hints_dialog (0)
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save_as_template, this), ID_file_save_as_template);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate, this), ID_file_duplicate);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate_and_open, this), ID_file_duplicate_and_open);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE);
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_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_export, this), ID_jobs_export);
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::tools_video_waveform, this), ID_tools_video_waveform);
+ 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::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_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);
*/
wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
- _film_viewer = new FilmViewer (overall_panel);
+ _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);
wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
- right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
+ 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);
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 ();
_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 ("");
JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
overall_panel->SetSizer (main_sizer);
- wxAcceleratorEntry accel[2];
+ 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));
+ add_accelerators ();
+ }
+
+ void add_accelerators ()
+ {
+#ifdef __WXOSX__
+ int accelerators = 7;
+#else
+ int accelerators = 6;
+#endif
+ wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove);
+ accel[2].Set (wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
+ accel[3].Set (wxACCEL_CTRL, static_cast<int>('T'), ID_timeline);
+ accel[4].Set (wxACCEL_NORMAL, WXK_LEFT, ID_back_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);
+#endif
Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove);
- wxAcceleratorTable accel_table (2, accel);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop);
+ 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);
SetAcceleratorTable (accel_table);
+ delete[] accel;
+ }
- UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
+ void remove_accelerators ()
+ {
+ SetAcceleratorTable (wxAcceleratorTable ());
}
void remove_clicked (wxCommandEvent& ev)
film->set_name (path.filename().generic_string());
film->write_metadata ();
set_film (film);
+ dcpomatic_log = film->log ();
}
void load_film (boost::filesystem::path file)
}
set_film (film);
+
+ JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(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 (%s)"), p.data(), std_to_wx (e.what()).data()));
+ 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)
_film = film;
_film_viewer->set_film (_film);
_film_editor->set_film (_film);
- delete _video_waveform_dialog;
- _video_waveform_dialog = 0;
+ _controls->set_film (_film);
+ if (_video_waveform_dialog) {
+ _video_waveform_dialog->Destroy ();
+ _video_waveform_dialog = 0;
+ }
set_menu_sensitivity ();
- if (_film->directory()) {
+ if (_film && _film->directory()) {
Config::instance()->add_to_history (_film->directory().get());
}
+ if (_film) {
+ _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
+ _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1));
+ }
}
shared_ptr<Film> film () const {
private:
+ void film_message (string m)
+ {
+ message_dialog (this, std_to_wx(m));
+ }
+
+ void film_change (ChangeType type)
+ {
+ if (type == CHANGE_TYPE_DONE) {
+ set_menu_sensitivity ();
+ }
+ }
+
void file_changed (boost::filesystem::path f)
{
string s = wx_to_std (_("DCP-o-matic"));
int const r = d->ShowModal ();
if (r == wxID_OK && d->check_path() && maybe_save_then_delete_film<FilmChangedClosingDialog>()) {
- new_film (d->path(), d->template_name());
+ try {
+ new_film (d->path(), d->template_name());
+ } catch (boost::filesystem::filesystem_error& e) {
+#ifdef DCPOMATIC_WINDOWS
+ string bad_chars = "<>:\"/|?*";
+ string const filename = d->path().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) {
+ found_bad_chars += bad_chars[i];
+ }
+ }
+ wxString message = _("Could not create folder to store film.");
+ 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());
+ }
+ error_dialog (this, message, std_to_wx(e.what()));
+#else
+ error_dialog (this, _("Could not create folder to store film."), std_to_wx(e.what()));
+#endif
+ }
}
d->Destroy ();
d->Destroy ();
}
+ void file_close ()
+ {
+ if (_film && _film->dirty ()) {
+
+ FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ());
+ int const r = dialog->run ();
+ delete dialog;
+
+ switch (r) {
+ case wxID_NO:
+ /* Don't save and carry on to close */
+ break;
+ case wxID_YES:
+ /* Save and carry on to close */
+ _film->write_metadata ();
+ break;
+ case wxID_CANCEL:
+ /* Stop */
+ return;
+ }
+ }
+
+ set_film (shared_ptr<Film>());
+ }
+
void file_history (wxCommandEvent& event)
{
vector<boost::filesystem::path> history = Config::instance()->history ();
Close (false);
}
+ void edit_copy ()
+ {
+ ContentList const sel = _film_editor->content_panel()->selected();
+ DCPOMATIC_ASSERT (sel.size() == 1);
+ _clipboard = sel.front()->clone();
+ }
+
+ void edit_paste ()
+ {
+ DCPOMATIC_ASSERT (_clipboard);
+
+ PasteDialog* 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()) {
+ if (d->video() && i->video) {
+ DCPOMATIC_ASSERT (_clipboard->video);
+ i->video->take_settings_from (_clipboard->video);
+ }
+ if (d->audio() && i->audio) {
+ DCPOMATIC_ASSERT (_clipboard->audio);
+ i->audio->take_settings_from (_clipboard->audio);
+ }
+
+ if (d->text()) {
+ list<shared_ptr<TextContent> >::iterator j = i->text.begin ();
+ list<shared_ptr<TextContent> >::const_iterator k = _clipboard->text.begin ();
+ while (j != i->text.end() && k != _clipboard->text.end()) {
+ (*j)->take_settings_from (*k);
+ ++j;
+ ++k;
+ }
+ }
+ }
+ }
+ d->Destroy ();
+ }
+
void edit_preferences ()
{
if (!_config_dialog) {
if (!_film->should_be_enough_disk_space (required, available, can_hard_link)) {
wxString message;
if (can_hard_link) {
- message = wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available);
+ message = wxString::Format (_("The DCP for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available. Do you want to continue anyway?"), required, available);
} else {
- message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available);
+ message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available);
}
if (!confirm_dialog (this, message)) {
return;
}
}
- if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) {
+ if (Config::instance()->show_hints_before_make_dcp()) {
HintsDialog* hints = new HintsDialog (this, _film, false);
int const r = hints->ShowModal();
hints->Destroy ();
_film->write_metadata ();
_film->make_dcp ();
} catch (BadSettingError& e) {
- error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
+ error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
} catch (std::exception& e) {
- error_dialog (this, wxString::Format (_("Could not make DCP: %s."), std_to_wx(e.what()).data()));
+ error_dialog (this, wxString::Format (_("Could not make DCP.")), std_to_wx(e.what()));
}
}
_kdm_dialog->Show ();
}
- void jobs_make_dcp_batch ()
+ /** @return false if we succeeded, true if not */
+ bool send_to_other_tool (int port, function<void(boost::filesystem::path)> start, string message)
{
- if (!_film) {
- return;
- }
-
- if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) {
- HintsDialog* hints = new HintsDialog (this, _film, false);
- int const r = hints->ShowModal();
- hints->Destroy ();
- if (r == wxID_CANCEL) {
- return;
- }
- }
-
- _film->write_metadata ();
-
/* i = 0; try to connect via socket
- i = 1; try again, and then try to start the batch converter
+ i = 1; try again, and then try to start the tool
i = 2 onwards; try again.
*/
for (int i = 0; i < 8; ++i) {
try {
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);
- boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (BATCH_JOB_PORT));
+ boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (port));
boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
Socket socket (5);
socket.connect (*endpoint_iterator);
DCPOMATIC_ASSERT (_film->directory ());
- string s = _film->directory()->string ();
- socket.write (s.length() + 1);
- socket.write ((uint8_t *) s.c_str(), s.length() + 1);
+ socket.write (message.length() + 1);
+ socket.write ((uint8_t *) message.c_str(), message.length() + 1);
/* OK\0 */
uint8_t ok[3];
socket.read (ok, 3);
- return;
+ return false;
} catch (exception& e) {
}
if (i == 1) {
- start_batch_converter (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
+ start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
}
dcpomatic_sleep (1);
}
- error_dialog (this, _("Could not find batch converter."));
+ return true;
+ }
+
+ void jobs_make_dcp_batch ()
+ {
+ if (!_film) {
+ return;
+ }
+
+ if (Config::instance()->show_hints_before_make_dcp()) {
+ HintsDialog* hints = new HintsDialog (this, _film, false);
+ int const r = hints->ShowModal();
+ hints->Destroy ();
+ if (r == wxID_CANCEL) {
+ return;
+ }
+ }
+
+ _film->write_metadata ();
+
+ if (send_to_other_tool (BATCH_JOB_PORT, bind (&start_batch_converter, _1), _film->directory()->string())) {
+ error_dialog (this, _("Could not find batch converter."));
+ }
+ }
+
+ void jobs_open_dcp_in_player ()
+ {
+ if (!_film) {
+ return;
+ }
+
+ if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) {
+ error_dialog (this, _("Could not find player."));
+ }
}
void jobs_make_self_dkdm ()
try {
kdm = _film->make_kdm (
Config::instance()->decryption_chain()->leaf(),
- vector<dcp::Certificate> (),
+ 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
+ dcp::MODIFIED_TRANSITIONAL_1,
+ true,
+ 0
);
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
ExportDialog* d = new ExportDialog (this);
if (d->ShowModal() == wxID_OK) {
shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
- job->set_encoder (shared_ptr<FFmpegEncoder> (new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo())));
+ job->set_encoder (
+ shared_ptr<FFmpegEncoder> (
+ new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf())
+ )
+ );
JobManager::instance()->add (job);
}
d->Destroy ();
{
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);
}
}
{
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);
}
}
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)"));
+ 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)"));
+ error_dialog (this, _("Could not show DCP"), _("Could not run konqueror"));
}
}
}
#endif
}
- void tools_video_waveform ()
+ void view_closed_captions ()
+ {
+ _film_viewer->show_closed_captions ();
+ }
+
+ void view_video_waveform ()
{
if (!_video_waveform_dialog) {
_video_waveform_dialog = new VideoWaveformDialog (this, _film, _film_viewer);
_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);
}
bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
bool const have_cpl = _film && !_film->cpls().empty ();
+ bool const have_single_selected_content = _film_editor->content_panel()->selected().size() == 1;
+ 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) {
enabled = false;
}
+ if ((j->second & NEEDS_SELECTED_CONTENT) && !have_selected_content) {
+ enabled = false;
+ }
+
+ if ((j->second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) {
+ enabled = false;
+ }
+
if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) {
enabled = false;
}
+ if ((j->second & NEEDS_CLIPBOARD) && !_clipboard) {
+ enabled = false;
+ }
+
+ if ((j->second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) {
+ enabled = false;
+ }
+
j->first->Enable (enabled);
}
}
_history_position = _file_menu->GetMenuItems().GetCount();
+ _file_menu->AppendSeparator ();
+ add_item (_file_menu, _("&Close\tCtrl-W"), ID_file_close, NEEDS_FILM);
+
#ifndef __WXOSX__
_file_menu->AppendSeparator ();
#endif
add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS);
#endif
+ wxMenu* edit = new wxMenu;
+ add_item (edit, _("Copy settings\tCtrl-C"), ID_edit_copy, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SINGLE_SELECTED_CONTENT);
+ add_item (edit, _("Paste settings...\tCtrl-V"), ID_edit_paste, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SELECTED_CONTENT | NEEDS_CLIPBOARD);
+
#ifdef __WXOSX__
add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
#else
- wxMenu* edit = new wxMenu;
add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
#endif
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 ();
add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
- add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, 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);
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);
+ 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;
+ add_item (view, _("Closed captions..."), ID_view_closed_captions, NEEDS_FILM);
+ add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM);
wxMenu* tools = new wxMenu;
- add_item (tools, _("Video waveform..."), ID_tools_video_waveform, NEEDS_FILM);
add_item (tools, _("Hints..."), ID_tools_hints, 0);
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);
add_item (help, _("Report a problem..."), ID_help_report_a_problem, NEEDS_FILM);
m->Append (_file_menu, _("&File"));
-#ifndef __WXOSX__
m->Append (edit, _("&Edit"));
-#endif
m->Append (content, _("&Content"));
m->Append (jobs_menu, _("&Jobs"));
+ m->Append (view, _("&View"));
m->Append (tools, _("&Tools"));
m->Append (help, _("&Help"));
}
}
_history_items = history.size ();
+
+ dcpomatic_log->set_types (Config::instance()->log_types());
}
void update_checker_state_changed ()
_update_news_requested = false;
}
+ void start_stop_pressed ()
+ {
+ if (_film_viewer->playing()) {
+ _film_viewer->stop();
+ } else {
+ _film_viewer->start();
+ }
+ }
+
+ void timeline_pressed ()
+ {
+ _film_editor->content_panel()->timeline_clicked ();
+ }
+
+ void back_frame ()
+ {
+ _film_viewer->seek_by (-_film_viewer->one_video_frame(), true);
+ }
+
+ void forward_frame ()
+ {
+ _film_viewer->seek_by (_film_viewer->one_video_frame(), true);
+ }
+
FilmEditor* _film_editor;
- FilmViewer* _film_viewer;
+ boost::shared_ptr<FilmViewer> _film_viewer;
+ StandardControls* _controls;
VideoWaveformDialog* _video_waveform_dialog;
HintsDialog* _hints_dialog;
ServersListDialog* _servers_list_dialog;
wxMenuItem* _history_separator;
boost::signals2::scoped_connection _config_changed_connection;
bool _update_news_requested;
+ shared_ptr<Content> _clipboard;
};
static const wxCmdLineEntryDesc command_line_description[] = {
private:
bool OnInit ()
- try
{
- wxInitAllImageHandlers ();
-
- Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
- Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
-
wxSplashScreen* splash = 0;
try {
- if (!Config::have_existing ("config.xml")) {
- wxBitmap bitmap;
- boost::filesystem::path p = shared_path () / "splash.png";
- if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
- splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
- wxYield ();
- }
- }
- } catch (boost::filesystem::filesystem_error& e) {
- /* Maybe we couldn't find the splash image; never mind */
- }
+ wxInitAllImageHandlers ();
- SetAppName (_("DCP-o-matic"));
+ Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
- if (!wxApp::OnInit()) {
- return false;
- }
+ splash = maybe_show_splash ();
+
+ SetAppName (_("DCP-o-matic"));
+
+ 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 ();
- _frame = new DOMFrame (_("DCP-o-matic"));
- SetTopWindow (_frame);
- _frame->Maximize ();
- if (splash) {
- splash->Destroy ();
- }
- _frame->Show ();
+ Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this));
- 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, e.what())));
+ _frame = new DOMFrame (_("DCP-o-matic"));
+ SetTopWindow (_frame);
+ _frame->Maximize ();
+ if (splash) {
+ splash->Destroy ();
+ splash = 0;
}
- }
- 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)) {
- _frame->film()->examine_and_add_content (i);
+ 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 ();
+
+ 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 (!_dcp_to_add.empty ()) {
- _frame->film()->examine_and_add_content (shared_ptr<DCPContent> (new DCPContent (_frame->film(), _dcp_to_add)));
+
+ 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)));
+ }
}
- }
- 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: %s", e.what ()));
- return true;
- }
void OnInitCmdLine (wxCmdLineParser& parser)
{
message_dialog (_frame, std_to_wx (m));
}
+ bool config_bad_signer_chain ()
+ {
+ if (Config::instance()->nagged(Config::NAG_BAD_SIGNER_CHAIN)) {
+ return false;
+ }
+
+ RecreateChainDialog* d = new RecreateChainDialog (_frame);
+ int const r = d->ShowModal ();
+ d->Destroy ();
+ return r == wxID_OK;
+ }
+
DOMFrame* _frame;
shared_ptr<wxTimer> _timer;
string _film_to_load;
projects / dcpomatic.git / blobdiff