*/
+
/** @file src/tools/dcpomatic.cc
* @brief The main DCP-o-matic GUI.
*/
+
#include "wx/standard_controls.h"
#include "wx/film_viewer.h"
#include "wx/film_editor.h"
#include <shellapi.h>
#endif
#include <boost/filesystem.hpp>
-#include <boost/noncopyable.hpp>
#include <boost/algorithm/string.hpp>
#include <iostream>
#include <fstream>
#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::wcout;
using std::wstring;
using std::wstringstream;
-using std::map;
-using std::make_pair;
-using std::list;
-using std::exception;
-using std::make_shared;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
using boost::optional;
-using boost::function;
using boost::is_any_of;
using boost::algorithm::find;
#if BOOST_VERSION >= 106100
#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"),
_dialog->Destroy ();
}
+ FilmChangedClosingDialog (FilmChangedClosingDialog const&) = delete;
+ FilmChangedClosingDialog& operator= (FilmChangedClosingDialog const&) = delete;
+
int run ()
{
return _dialog->ShowModal ();
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"),
_dialog->Destroy ();
}
+ FilmChangedDuplicatingDialog (FilmChangedDuplicatingDialog const&) = delete;
+ FilmChangedDuplicatingDialog& operator= (FilmChangedDuplicatingDialog const&) = delete;
+
int run ()
{
return _dialog->ShowModal ();
wxMessageDialog* _dialog;
};
+
#define ALWAYS 0x0
#define NEEDS_FILM 0x1
#define NOT_DURING_DCP_CREATION 0x2
#define NEEDS_CLIPBOARD 0x40
#define NEEDS_ENCRYPTION 0x80
+
map<wxMenuItem*, int> menu_items;
enum {
ID_file_close = 100,
ID_edit_copy,
ID_edit_paste,
+ ID_edit_select_all,
ID_jobs_make_dcp,
ID_jobs_make_dcp_batch,
ID_jobs_make_kdms,
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)
- , _dkdm_dialog (0)
- , _templates_dialog (0)
- , _file_menu (0)
- , _history_items (0)
- , _history_position (0)
- , _history_separator (0)
- , _update_news_requested (false)
- , _first_shown_called (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);
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));
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::jobs_make_dcp, this), ID_jobs_make_dcp);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms);
/* 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);
_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()) {
void film_change (ChangeType type)
{
- if (type == CHANGE_TYPE_DONE) {
+ if (type == ChangeType::DONE) {
set_menu_sensitivity ();
}
}
d->Destroy ();
}
+ void edit_select_all ()
+ {
+ _film_editor->content_panel()->select_all();
+ }
+
void edit_preferences ()
{
if (!_config_dialog) {
}
/* 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;
}
if (_dkdm_dialog) {
_dkdm_dialog->Destroy ();
- _dkdm_dialog = 0;
+ _dkdm_dialog = nullptr;
}
_dkdm_dialog = new DKDMDialog (this, _film);
vector<string>(),
d->cpl (),
from, to,
- dcp::MODIFIED_TRANSITIONAL_1,
+ dcp::Formulation::MODIFIED_TRANSITIONAL_1,
true,
0
);
if (kdm) {
if (d->internal ()) {
auto dkdms = Config::instance()->dkdms();
- dkdms->add (shared_ptr<DKDM> (new DKDM (kdm.get())));
+ dkdms->add (make_shared<DKDM>(kdm.get()));
Config::instance()->changed ();
} else {
auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml");
}
list<string> to = { "carl@dcpomatic.com" };
Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
- emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
+ emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
}
d->Destroy ();
add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS);
#endif
- wxMenu* edit = new wxMenu;
+ auto 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);
+ edit->AppendSeparator ();
+ 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 ();
add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
#endif
- wxMenu* jobs_menu = new wxMenu;
+ auto jobs_menu = new wxMenu;
add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
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, _("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);
- 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);
return;
}
- if (uc->state() == UpdateChecker::YES) {
+ 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."));
FilmEditor* _film_editor;
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;
- DKDMDialog* _dkdm_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;
+ 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_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+
/** @class App
* @brief The magic App class for wxWidgets.
*/
public:
App ()
: wxApp ()
- , _frame (0)
- , _splash (0)
{
#ifdef DCPOMATIC_LINUX
XInitThreads ();
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)) {
+ 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 ()) {
+ _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);
+ _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));
}
}
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 (
nullptr,
- wxString::Format (
+ wxString::Format(
_("An exception occurred: %s.\n\n") + REPORT_PROBLEM,
std_to_wx (e.what ())
)
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)
}
}
- DOMFrame* _frame;
- wxSplashScreen* _splash;
+ DOMFrame* _frame = nullptr;
+ wxSplashScreen* _splash = nullptr;
shared_ptr<wxTimer> _timer;
string _film_to_load;
string _film_to_create;
string _dcp_to_add;
};
+
IMPLEMENT_APP (App)
projects / dcpomatic.git / blobdiff