X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=0b7f632e1ef409613c11263ba8cc78e89c06b7e4;hb=4f4561c4b5bb1e8a2fa8e673606d18ffa25aec6c;hp=be172ed2d0e29b5ec27af78a0f0630704d0eebc4;hpb=33e13c4053138930f4b2f59349e441c76111059d;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index be172ed2d..0b7f632e1 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -18,10 +18,12 @@ */ + /** @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" @@ -56,6 +58,7 @@ #include "lib/analytics.h" #include "lib/emailer.h" #include "lib/config.h" +#include "lib/cross.h" #include "lib/util.h" #include "lib/video_content.h" #include "lib/content.h" @@ -112,21 +115,20 @@ DCPOMATIC_ENABLE_WARNINGS #undef check #endif + using std::cout; -using std::wcout; -using std::string; -using std::vector; -using std::wstring; -using std::wstringstream; -using std::map; -using std::make_pair; -using std::list; +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::dynamic_pointer_cast; +using std::string; +using std::vector; +using std::wcout; using boost::optional; -using boost::function; using boost::is_any_of; using boost::algorithm::find; #if BOOST_VERSION >= 106100 @@ -134,14 +136,15 @@ using namespace boost::placeholders; #endif using dcp::raw_convert; + 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"), @@ -177,8 +180,8 @@ 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"), @@ -207,6 +210,7 @@ private: wxMessageDialog* _dialog; }; + #define ALWAYS 0x0 #define NEEDS_FILM 0x1 #define NOT_DURING_DCP_CREATION 0x2 @@ -217,6 +221,7 @@ private: #define NEEDS_CLIPBOARD 0x40 #define NEEDS_ENCRYPTION 0x80 + map menu_items; enum { @@ -231,6 +236,7 @@ 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, @@ -260,28 +266,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) - , _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); @@ -308,7 +301,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)); @@ -324,6 +317,7 @@ 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::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); @@ -353,7 +347,7 @@ public: /* 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); @@ -379,7 +373,7 @@ public: 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)); @@ -393,12 +387,18 @@ public: #else int accelerators = 6; #endif - wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators]; + auto accel = new wxAcceleratorEntry[accelerators]; + /* [Shortcut] Ctrl+A:Add file(s) to the film */ accel[0].Set (wxACCEL_CTRL, static_cast('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('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('W'), ID_file_close); @@ -484,7 +484,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()) { @@ -717,6 +717,11 @@ private: d->Destroy (); } + void edit_select_all () + { + _film_editor->content_panel()->select_all(); + } + void edit_preferences () { if (!_config_dialog) { @@ -781,8 +786,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; } @@ -825,7 +830,7 @@ private: if (_dkdm_dialog) { _dkdm_dialog->Destroy (); - _dkdm_dialog = 0; + _dkdm_dialog = nullptr; } _dkdm_dialog = new DKDMDialog (this, _film); @@ -928,7 +933,7 @@ private: _("You are making a DKDM which is encrypted by a private key held in" "\n\n%s\n\nIt is VITALLY IMPORTANT " "that you BACK UP THIS FILE 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() ) ); @@ -960,7 +965,7 @@ private: if (kdm) { if (d->internal ()) { auto dkdms = Config::instance()->dkdms(); - dkdms->add (shared_ptr (new DKDM (kdm.get()))); + dkdms->add (make_shared(kdm.get())); Config::instance()->changed (); } else { auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); @@ -1021,36 +1026,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")); - } - } - } -#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")); + if (show_in_file_manager(_film->directory().get(), _film->dir(_film->dcp_name(false)))) { + error_dialog (this, _("Could not show DCP.")); } -#endif } void view_closed_captions () @@ -1105,8 +1083,8 @@ private: void tools_check_for_updates () { - UpdateChecker::instance()->run (); _update_news_requested = true; + UpdateChecker::instance()->run(); } void tools_send_translations () @@ -1302,9 +1280,12 @@ private: 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); @@ -1314,6 +1295,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__ @@ -1326,24 +1308,36 @@ 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* 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 (); + /* [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 (); @@ -1359,11 +1353,11 @@ private: 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); @@ -1515,26 +1509,27 @@ private: FilmEditor* _film_editor; std::shared_ptr _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; - 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 _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 }, @@ -1545,6 +1540,7 @@ static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; + /** @class App * @brief The magic App class for wxWidgets. */ @@ -1553,8 +1549,6 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) - , _splash (0) { #ifdef DCPOMATIC_LINUX XInitThreads (); @@ -1631,23 +1625,23 @@ private: 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 ()); - if (!_content_to_add.empty ()) { + _frame->new_film (_film_to_create, optional()); + 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(new DCPContent(_dcp_to_add))); + _frame->film()->examine_and_add_content(make_shared(_dcp_to_add)); } } @@ -1784,14 +1778,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) @@ -1859,8 +1851,8 @@ private: } } - DOMFrame* _frame; - wxSplashScreen* _splash; + DOMFrame* _frame = nullptr; + wxSplashScreen* _splash = nullptr; shared_ptr _timer; string _film_to_load; string _film_to_create; @@ -1868,4 +1860,5 @@ private: string _dcp_to_add; }; + IMPLEMENT_APP (App)