diff options
| author | comex <comexk@gmail.com> | 2014-09-30 02:51:21 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2014-09-30 02:51:21 -0400 |
| commit | acac5325f5765bbebcc0f8b822e1c3aba4ee7530 (patch) | |
| tree | f2c614677ba6ae5533cdeb779565c02ceef8230b /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 58a29ec0cd03ae9950e645eb532e5b971ffe6947 (diff) | |
| parent | f40e8a5cd00d252282580f943817d7f586140822 (diff) | |
Merge pull request #1134 from RachelBryk/movie-menu
Create new Movie menu.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index db3b1dc3e5..0d62bd5b53 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -157,19 +157,6 @@ wxMenuBar* CFrame::CreateMenu() emulationMenu->Append(IDM_RESET, GetMenuLabel(HK_RESET)); emulationMenu->AppendSeparator(); emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN)); - emulationMenu->AppendSeparator(); - emulationMenu->Append(IDM_RECORD, GetMenuLabel(HK_START_RECORDING)); - emulationMenu->Append(IDM_PLAYRECORD, GetMenuLabel(HK_PLAY_RECORDING)); - emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING)); - emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); - emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); - emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); - emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie); - emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); - emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag); - emulationMenu->Check(IDM_RECORDREADONLY, true); - emulationMenu->AppendSeparator(); - emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString); wxMenu *skippingMenu = new wxMenu; @@ -214,6 +201,21 @@ wxMenuBar* CFrame::CreateMenu() menubar->Append(emulationMenu, _("&Emulation")); + // Movie menu + wxMenu* movieMenu = new wxMenu; + movieMenu->Append(IDM_RECORD, GetMenuLabel(HK_START_RECORDING)); + movieMenu->Append(IDM_PLAYRECORD, GetMenuLabel(HK_PLAY_RECORDING)); + movieMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING)); + movieMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); + movieMenu->Append(IDM_TASINPUT, _("TAS Input")); + movieMenu->AppendSeparator(); + movieMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); + movieMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie); + movieMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); + movieMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag); + movieMenu->Check(IDM_RECORDREADONLY, true); + menubar->Append(movieMenu, _("&Movie")); + // Options menu wxMenu* pOptionsMenu = new wxMenu; pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure...")); @@ -399,10 +401,10 @@ wxString CFrame::GetMenuLabel(int Id) break; case HK_START_RECORDING: - Label = _("Start Re&cording"); + Label = _("Start Re&cording Input"); break; case HK_PLAY_RECORDING: - Label = _("P&lay Recording..."); + Label = _("P&lay Input Recording..."); break; case HK_EXPORT_RECORDING: Label = _("Export Recording..."); |