From dc439bf0943db18c90ab97a9a86336ec9885c2c3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:31:53 +0100 Subject: Add a few key shortcuts. --- ChangeLog | 4 ++++ src/tools/dcpomatic.cc | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f028d76f3..4473bf34a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-28 Carl Hetherington + + * Add a few key shortcuts. + 2014-09-16 Carl Hetherington * Version 1.73.7 released. diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index c3dd8cd58..79f9144b5 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -589,10 +589,10 @@ private: void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; - add_item (_file_menu, _("New..."), ID_file_new, ALWAYS); - add_item (_file_menu, _("&Open..."), ID_file_open, ALWAYS); + add_item (_file_menu, _("New...\tCtrl-N"), ID_file_new, ALWAYS); + add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS); _file_menu->AppendSeparator (); - add_item (_file_menu, _("&Save"), ID_file_save, NEEDS_FILM); + add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM); _file_menu->AppendSeparator (); add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM); @@ -620,13 +620,13 @@ private: add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); wxMenu* jobs_menu = new wxMenu; - add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); - add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, NEEDS_FILM); + add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); + add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); 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); wxMenu* tools = new wxMenu; - add_item (tools, _("Hints..."), ID_tools_hints, 0); + add_item (tools, _("Hints...\tCtrl-H"), ID_tools_hints, 0); add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0); -- cgit v1.2.3 From 447b69c23dcf8f316f0d389e1cf2b78ec764fb82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:45:01 +0100 Subject: Another shortcut. --- src/tools/dcpomatic.cc | 10 +++++++++- src/wx/film_editor.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 79f9144b5..e59892d92 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -127,7 +127,9 @@ enum { ID_jobs_show_dcp, ID_tools_hints, ID_tools_encoding_servers, - ID_tools_check_for_updates + ID_tools_check_for_updates, + /* IDs for shortcuts (with no associated menu item) */ + ID_add_file }; class Frame : public wxFrame @@ -186,6 +188,12 @@ public: Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1)); + wxAcceleratorEntry accel[1]; + accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); + Bind (wxEVT_MENU, boost::bind (&FilmEditor::content_add_file_clicked, _film_editor), ID_add_file); + wxAcceleratorTable accel_table (1, accel); + SetAcceleratorTable (accel_table); + /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 56e725113..ba9ff6fa0 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -68,6 +68,8 @@ public: AudioContentList selected_audio_content (); SubtitleContentList selected_subtitle_content (); FFmpegContentList selected_ffmpeg_content (); + + void content_add_file_clicked (); private: void make_dcp_panel (); @@ -79,7 +81,6 @@ private: void use_isdcf_name_toggled (); void edit_isdcf_button_clicked (); void content_selection_changed (); - void content_add_file_clicked (); void content_add_folder_clicked (); void content_remove_clicked (); void content_earlier_clicked (); -- cgit v1.2.3 From 0e0c323833972ea1896c05f50e407b566ca12ead Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:52:33 +0100 Subject: Better error when copying the video file into the DCP fails. --- src/lib/writer.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/writer.cc b/src/lib/writer.cc index dd2e98eee..5af1aea1e 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -45,6 +45,7 @@ #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); #define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); #define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_WARNING); +#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); /* OS X strikes again */ #undef set_key @@ -412,9 +413,12 @@ Writer::finish () boost::system::error_code ec; boost::filesystem::create_hard_link (video_from, video_to, ec); if (ec) { - /* hard link failed; copy instead */ - boost::filesystem::copy_file (video_from, video_to); - LOG_WARNING_NC ("Hard-link failed; fell back to copying"); + LOG_WARNING_NC ("Hard-link failed; copying instead"); + boost::filesystem::copy_file (video_from, video_to, ec); + if (ec) { + LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ()); + throw FileError (ec.message(), video_from); + } } /* And update the asset */ -- cgit v1.2.3 From 71e36b7c6c5500ac29688a34faf0c70d498a1efc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:54:07 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4473bf34a..f676d6b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-28 Carl Hetherington + + * Version 1.73.8 released. + 2014-09-28 Carl Hetherington * Add a few key shortcuts. diff --git a/debian/changelog b/debian/changelog index 16e2e433a..fe31a1bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.7-1) UNRELEASED; urgency=low +dcpomatic (1.73.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -183,8 +183,9 @@ dcpomatic (1.73.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 16 Sep 2014 21:19:53 +0100 + -- Carl Hetherington Sun, 28 Sep 2014 23:54:07 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3b982c952..db0c219ab 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.7devel' +VERSION = '1.73.8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 34f9f492581323f9adfb1edbf69f11b1a5c55110 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:54:07 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index db0c219ab..3da81ce4b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.8' +VERSION = '1.73.8devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8b842865451795d5e8f8b39691c210de1ed5dd4f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Sep 2014 00:03:20 +0100 Subject: Another shortcut. --- src/tools/dcpomatic.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index e59892d92..fa89a4871 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -617,10 +617,10 @@ private: #endif #ifdef __WXOSX__ - add_item (_file_menu, _("&Preferences..."), wxID_PREFERENCES, ALWAYS); + add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else wxMenu* edit = new wxMenu; - add_item (edit, _("&Preferences..."), wxID_PREFERENCES, ALWAYS); + add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #endif wxMenu* content = new wxMenu; -- cgit v1.2.3