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

CDVD: remove disc selector dialog

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-09-16 00:53:58 +02:00 committed by refractionpcsx2
parent 4b1467ea69
commit b46736836e
8 changed files with 2 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/CMakeLists.txt
View File

@ -272,7 +272,6 @@ set(pcsx2GuiSources
gui/Dialogs/ConfirmationDialogs.cpp
gui/Dialogs/ConvertMemoryCardDialog.cpp
gui/Dialogs/CreateMemoryCardDialog.cpp
gui/Dialogs/DriveSelectorDialog.cpp
gui/Dialogs/FirstTimeWizard.cpp
gui/Dialogs/ImportSettingsDialog.cpp
gui/Dialogs/LogOptionsDialog.cpp

58
pcsx2/gui/Dialogs/DriveSelectorDialog.cpp
View File

@ -1,58 +0,0 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2020 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "Dialogs/ModalPopups.h"
#include "../CDVD/CDVDdiscReader.h"
Dialogs::DriveSelectorDialog::DriveSelectorDialog(wxWindow* parent, wxString curDrive)
: wxDialog(parent, wxID_ANY, "")
{
wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL);
wxStaticBoxSizer* staticSizer = new wxStaticBoxSizer(wxVERTICAL, this, "Source drive...");
wxBoxSizer* btnSizer = new wxBoxSizer(wxHORIZONTAL);
auto drives = GetOpticalDriveList();
wxArrayString driveList;
for (auto i : drives)
{
driveList.Add(i);
}
choiceDrive = new wxChoice(this, wxID_ANY, wxDefaultPosition, {240, 40}, driveList);
int driveIndex = choiceDrive->FindString(curDrive);
if (driveIndex != wxNOT_FOUND)
{
choiceDrive->SetSelection(driveIndex);
}
wxButton* btnOk = new wxButton(this, wxID_OK);
wxButton* btnCancel = new wxButton(this, wxID_CANCEL);
btnSizer->Add(btnOk, wxSizerFlags(1).Expand());
btnSizer->Add(btnCancel, wxSizerFlags(1).Expand().Border(wxLEFT, 5));
staticSizer->Add(choiceDrive, wxSizerFlags(1).Expand().Border(wxTOP, 10).Border(wxLEFT, 7));
topSizer->Add(staticSizer, wxSizerFlags(2).Expand().Border(wxALL, 10));
topSizer->Add(btnSizer, wxSizerFlags(0).Border(wxRIGHT | wxLEFT | wxBOTTOM, 5).Right());
SetSizerAndFit(topSizer);
}
wxString Dialogs::DriveSelectorDialog::GetSelectedDrive()
{
return choiceDrive->GetStringSelection();
}

9
pcsx2/gui/Dialogs/ModalPopups.h
View File

@ -101,15 +101,6 @@ namespace Dialogs
AssertionDialog( const wxString& text, const wxString& stacktrace );
virtual ~AssertionDialog() = default;
};
class DriveSelectorDialog : public wxDialog
{
public:
DriveSelectorDialog( wxWindow* parent, wxString curDrive );
wxString GetSelectedDrive();
private:
wxChoice* choiceDrive;
};
}
wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButtons& buttons );

1
pcsx2/gui/MainFrame.cpp
View File

@ -228,7 +228,6 @@ void MainEmuFrame::ConnectMenus()
Bind(wxEVT_MENU, &MainEmuFrame::Menu_IsoBrowse_Click, this, MenuId_IsoBrowse);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_IsoClear_Click, this, MenuId_IsoClear);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_Iso);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_DiscBrowse_Click, this, MenuId_DriveSelector);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_Disc);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_CdvdSource_Click, this, MenuId_Src_NoDisc);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Ask_On_Boot_Click, this, MenuId_Ask_On_Booting);

2
pcsx2/gui/MainFrame.h
View File

@ -190,7 +190,6 @@ protected:
void Menu_IsoBrowse_Click(wxCommandEvent &event);
void Menu_IsoClear_Click(wxCommandEvent &event);
void Menu_DiscBrowse_Click(wxCommandEvent &event);
void Menu_EnableBackupStates_Click(wxCommandEvent &event);
void Menu_EnablePatches_Click(wxCommandEvent &event);
void Menu_EnableCheats_Click(wxCommandEvent &event);
@ -250,7 +249,6 @@ protected:
void _DoBootCdvd();
bool _DoSelectIsoBrowser( wxString& dest );
bool _DoSelectELFBrowser();
bool _DoSelectDiscBrowser( wxString& driveLetter );
// ------------------------------------------------------------------------
// MainEmuFram Internal API for Populating Main Menu Contents

63
pcsx2/gui/MainMenuClicks.cpp
View File

@ -354,20 +354,6 @@ bool MainEmuFrame::_DoSelectELFBrowser()
return false;
}
bool MainEmuFrame::_DoSelectDiscBrowser(wxString& driveLetter)
{
DriveSelectorDialog driveDialog(this, g_Conf->Folders.RunDisc.GetPath());
if (driveDialog.ShowModal() != wxID_CANCEL)
{
driveLetter = driveDialog.GetSelectedDrive();
SysUpdateDiscSrcDrive(driveLetter);
return true;
}
return false;
}
void MainEmuFrame::_DoBootCdvd()
{
ScopedCoreThreadPause paused_core;
@ -404,41 +390,6 @@ void MainEmuFrame::_DoBootCdvd()
SysUpdateIsoSrcFile( result );
}
}
else if( g_Conf->CdvdSource == CDVD_SourceType::Disc )
{
#if defined(_WIN32)
const bool driveExists = g_Conf->Folders.RunDisc.DirExists();
#else
const bool driveExists = g_Conf->Folders.RunDisc.Exists();
#endif
if( !driveExists )
{
// The previous mounted disc isn't mounted anymore
wxDialogWithHelpers dialog( this, _("Drive not mounted!") );
dialog += dialog.Heading(
_("An error occured while trying to read drive: ") + g_Conf->Folders.RunDisc.GetPath() + L"\n\n" +
_("Error: The configured drive does not exist. Click OK to select a new drive for CDVD.")
);
// Send event to refresh drive list submenu
wxCommandEvent event(wxEVT_MENU, MenuId_DriveListRefresh);
wxGetApp().ProcessEvent(event);
pxIssueConfirmation( dialog, MsgButtons().OK() );
wxString driveLetter;
if (!_DoSelectDiscBrowser(driveLetter))
{
paused_core.AllowResume();
return;
}
// Refresh again after selection
wxGetApp().ProcessEvent(event);
}
}
if( SysHasValidState() )
{
@ -485,20 +436,6 @@ void MainEmuFrame::Menu_FastBoot_Click( wxCommandEvent &event )
UpdateStatusBar();
}
void MainEmuFrame::Menu_DiscBrowse_Click(wxCommandEvent& event)
{
ScopedCoreThreadPopup core;
wxString driveLetter;
if ( !_DoSelectDiscBrowser(driveLetter) )
{
core.AllowResume();
return;
}
SwapOrReset_Disc(this, core, driveLetter);
}
wxString GetMsg_IsoImageChanged()
{
return _("You have selected the following ISO image into PCSX2:\n\n");

3
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -184,7 +184,6 @@
<ClCompile Include="..\..\gui\Debugger\DebugEvents.cpp" />
<ClCompile Include="..\..\gui\Debugger\DebuggerLists.cpp" />
<ClCompile Include="..\..\gui\Debugger\DisassemblyDialog.cpp" />
<ClCompile Include="..\..\gui\Dialogs\DriveSelectorDialog.cpp" />
<ClCompile Include="..\..\gui\Dialogs\McdConfigDialog.cpp" />
<ClCompile Include="..\..\gui\DriveList.cpp" />
<ClCompile Include="..\..\gui\Panels\MemoryCardListView.cpp" />
@ -625,4 +624,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>

5
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -870,9 +870,6 @@
<ClCompile Include="..\..\CDVD\CDVDdiscReader.cpp">
<Filter>System\Ps2\Iop\CDVD</Filter>
</ClCompile>
<ClCompile Include="..\..\gui\Dialogs\DriveSelectorDialog.cpp">
<Filter>AppHost\Dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\CDVD\CDVDdiscThread.cpp">
<Filter>System\Ps2\Iop\CDVD</Filter>
</ClCompile>
@ -1429,4 +1426,4 @@
<Filter>AppHost\Resources</Filter>
</Manifest>
</ItemGroup>
</Project>
</Project>