Open macOS prefs with Mac-, not Mac-P (#2745).

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6635cdb82abcd364fe96d8e5cace00f154f48258..6e374d4ae9045598b0e610b2c7e75350808d30fc 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1344,7 +1344,7 @@ private:
                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);
+               add_item(_file_menu, _("&Preferences...\tCtrl-,"), wxID_PREFERENCES, ALWAYS);
 #else
                edit->AppendSeparator ();
                /* [Shortcut] Ctrl+P:Open preferences window */

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 6a0e46cf8b462cdeb781766fab41d079c5369068..e476c2163a552a8842b05bc566c37fcba80b3262 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -90,7 +90,7 @@ setup_menu (wxMenuBar* m)
 #endif
 
 #ifdef DCPOMATIC_OSX
-       file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+       file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,"));
 #else
        auto edit = new wxMenu;
        edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 775349d54abfdb64b6564edebced2054d230d149..9adef0ab016ec42a228a2f28900bd30a606dfd54 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -294,7 +294,7 @@ private:
 #endif
 
 #ifdef __WXOSX__
-               file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+               file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,"));
 #else
                wxMenu* edit = new wxMenu;
                edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index feac2a9150ea1f3203e3f5b974c79339deb40bcb..9c7522bc589af6f11d846a78fd38071c7063a9c6 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -575,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"));

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index e2f2536dba878ad98887708ba3cb86a59c5f9bda..a373d81e69e518f329bbd69479f78c4b86534544 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -569,7 +569,7 @@ private:
        {
                auto file = new wxMenu;
 #ifdef __WXOSX__
-               file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+               file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,"));
                file->Append (wxID_EXIT, _("&Exit"));
 #else
                file->Append (wxID_EXIT, _("&Quit"));