diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-03 22:13:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-03 22:13:13 +0100 |
| commit | 52dc2f13d5cd03403da20e1764ba474c829a1a26 (patch) | |
| tree | 28ff84ffc648c499ef3c647c0c85ae15a84d9739 /src/tools | |
| parent | 0226862cd32e8b2a10d0cdc0c9c5e7682d364075 (diff) | |
| parent | c9e807a398ffa4c6ba38a26e2721250bdbef10d7 (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_playlist.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index d3efd1f97..024422965 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1375,7 +1375,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 df49acfac..1e383b39a 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -93,7 +93,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 775349d54..9adef0ab0 100644 --- 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 feac2a915..9c7522bc5 100644 --- 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 e2f2536db..a373d81e6 100644 --- 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")); |