From 5464f2274a86f877608d8b838b513b4c196b0505 Mon Sep 17 00:00:00 2001
From: omegadox <omegadox@gmail.com>
Date: Tue, 23 Dec 2008 08:24:30 +0000
Subject: [PATCH] Added a DVD menu to main frame and small code move.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1631 8ced0084-cf51-0410-be5f-012b33b47a6e
---
Source/Core/Core/Src/HW/DVDInterface.cpp | 2 --
Source/Core/DolphinWX/Src/Frame.cpp | 10 ++++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp
index bab8f64f11..9dd785a4ce 100644
--- a/Source/Core/Core/Src/HW/DVDInterface.cpp
+++ b/Source/Core/Core/Src/HW/DVDInterface.cpp
@@ -223,10 +223,8 @@ void SetDiscInside(bool _DiscInside)
}
void SwapDisc(const char * fileName)
{
- SetLidOpen(true);
VolumeHandler::SetVolumeName(fileName);
DVDInterface::SetDiscInside(VolumeHandler::IsValid());
- SetLidOpen(false);
}
void SetLidOpen(bool _bOpen)
{
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 121482776e..d2c6c7b25f 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -242,6 +242,12 @@ void CFrame::CreateMenu()
#endif
m_pMenuBar->Append(pOptionsMenu, _T("&Options"));
+ //DVD menu
+ wxMenu* dvdMenu = new wxMenu;
+ dvdMenu->Append(IDM_SWAPDISC, _T("S&wap Disc"));
+ dvdMenu->Append(IDM_TOGGLECOVER, _T("Toggle \"DVD co&ver is open\""));
+ m_pMenuBar->Append(dvdMenu, _T("&DVD"));
+
// misc menu
wxMenu* miscMenu = new wxMenu;
miscMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("View &toolbar"));
@@ -251,8 +257,6 @@ void CFrame::CreateMenu()
miscMenu->AppendSeparator();
miscMenu->Append(IDM_MEMCARD, _T("&Memcard manager"));
miscMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
- miscMenu->Append(IDM_SWAPDISC, _T("S&wap Disc"));
- //miscMenu->Append(IDM_TOGGLECOVER, _T("Toggle DVD co&ver is open"));
m_pMenuBar->Append(miscMenu, _T("&Misc"));
// help menu
@@ -689,6 +693,7 @@ void CFrame::OnSwapDisc(wxCommandEvent& event)
{
case IDM_SWAPDISC:
{
+ SetLidOpen(true);
wxString path = wxFileSelector(
_T("Select the Disc to swap"),
wxEmptyString, wxEmptyString, wxEmptyString,
@@ -701,6 +706,7 @@ void CFrame::OnSwapDisc(wxCommandEvent& event)
wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
this);
SwapDisc(path.mb_str());
+ SetLidOpen(false);
break;
}
default: