ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1134 from RachelBryk/movie-menu 

Create new Movie menu.
This commit is contained in:
comex 2014-09-30 02:51:21 -04:00
parent 58a29ec0cd f40e8a5cd0
commit acac5325f5
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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...");