Add option to load prefs from ZIP (#2771).

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

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 133cabf9548522f3f294ff0712b5bc69513427b9..9c7522bc589af6f11d846a78fd38071c7063a9c6 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -21,6 +21,7 @@
 #include "wx/about_dialog.h"
 #include "wx/file_dialog.h"
 #include "wx/film_viewer.h"
+#include "wx/id.h"
 #include "wx/nag_dialog.h"
 #include "wx/player_config_dialog.h"
 #include "wx/player_information.h"
@@ -59,7 +60,6 @@
 #include "lib/player.h"
 #include "lib/player_video.h"
 #include "lib/ratio.h"
-#include "lib/scope_guard.h"
 #include "lib/scoped_temporary.h"
 #include "lib/server.h"
 #include "lib/text_content.h"
@@ -71,6 +71,7 @@
 #include <dcp/exceptions.h>
 #include <dcp/filesystem.h>
 #include <dcp/raw_convert.h>
+#include <dcp/scope_guard.h>
 #include <dcp/search.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -119,16 +120,16 @@ using namespace dcpomatic;
 
 
 enum {
-       ID_file_open = 1,
+       ID_file_open = DCPOMATIC_MAIN_MENU,
        ID_file_add_ov,
        ID_file_add_kdm,
        ID_file_save_frame,
        ID_file_history,
        /* Allow spare IDs after _history for the recent files list */
-       ID_file_close = 100,
+       ID_file_close = DCPOMATIC_MAIN_MENU + 100,
        ID_view_cpl,
        /* Allow spare IDs for CPLs */
-       ID_view_full_screen = 200,
+       ID_view_full_screen = DCPOMATIC_MAIN_MENU + 200,
        ID_view_dual_screen,
        ID_view_closed_captions,
        ID_view_scale_appropriate,
@@ -574,7 +575,7 @@ private:
 #endif
 
 #ifdef __WXOSX__
-               auto prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+               auto prefs = _file_menu->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,"));
 #else
                auto edit = new wxMenu;
                auto prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
@@ -707,7 +708,7 @@ private:
                        DCPOMATIC_ASSERT (dcp);
                        try {
                                if (dcp) {
-                                       ScopeGuard sg([this]() {
+                                       dcp::ScopeGuard sg([this]() {
                                                _viewer.set_coalesce_player_changes(false);
                                        });
                                        _viewer.set_coalesce_player_changes(true);