From 3b56b0340dd2e085cca004064380b31fd559222d Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Fri, 14 May 2021 16:31:27 +0200 Subject: [PATCH] ftw: remove the plugin panel --- pcsx2/gui/Dialogs/FirstTimeWizard.cpp | 15 +++++---------- pcsx2/gui/Dialogs/ModalPopups.h | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp index 4c40250ce8..6c85a32673 100644 --- a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp +++ b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp @@ -46,7 +46,7 @@ bool ApplicableWizardPage::PrepForApply() Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent ) : DirPickerPanel( parent, FolderId_Settings, _("Settings"), AddAppName(_("Select a folder for %s settings")) ) { - pxSetToolTip( this, pxEt( L"This is the folder where PCSX2 saves your settings, including settings generated by most plugins (some older plugins may not respect this value)." + pxSetToolTip( this, pxEt( L"This is the folder where PCSX2 saves your settings." ) ); SetStaticDesc( pxE( L"You may optionally specify a location for your PCSX2 settings here. If the location contains existing PCSX2 settings, you will be given the option to import or overwrite them." @@ -95,7 +95,7 @@ Panels::FirstTimeIntroPanel::FirstTimeIntroPanel( wxWindow* parent ) *this += GetCharHeight(); *this += Heading(AddAppName( - pxE( L"This wizard will help guide you through configuring plugins, memory cards, and BIOS. It is recommended if this is your first time installing %s that you view the readme and configuration guide." + pxE( L"This wizard will help guide you through configuring your BIOS. It is recommended if this is your first time installing %s that you view the readme and configuration guide." ) ) ); @@ -117,8 +117,7 @@ Panels::FirstTimeIntroPanel::FirstTimeIntroPanel( wxWindow* parent ) FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) : wxWizard( parent, wxID_ANY, AddAppName(_("%s First Time Configuration")) ) , m_page_intro ( *new ApplicableWizardPage( this ) ) - , m_page_plugins ( *new ApplicableWizardPage( this, &m_page_intro ) ) - , m_page_bios ( *new ApplicableWizardPage( this, &m_page_plugins ) ) + , m_page_bios ( *new ApplicableWizardPage( this, &m_page_intro ) ) , m_panel_Intro ( *new FirstTimeIntroPanel( &m_page_intro )) , m_panel_BiosSel ( *new BiosSelectorPanel( &m_page_bios ) ) @@ -126,7 +125,6 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) // Page 3 - Bios Panel m_page_intro. SetSizer( new wxBoxSizer( wxVERTICAL ) ); - m_page_plugins. SetSizer( new wxBoxSizer( wxVERTICAL ) ); m_page_bios. SetSizer( new wxBoxSizer( wxVERTICAL ) ); m_page_intro += m_panel_Intro | StdExpand(); @@ -141,16 +139,13 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) // Assign page indexes as client data m_page_intro .SetClientData( (void*)0 ); - m_page_plugins .SetClientData( (void*)1 ); - m_page_bios .SetClientData( (void*)2 ); + m_page_bios .SetClientData( (void*)1 ); // Build the forward chain: // (backward chain is built during initialization above) - m_page_intro .SetNext( &m_page_plugins ); - m_page_plugins .SetNext( &m_page_bios ); + m_page_intro .SetNext( &m_page_bios ); GetPageAreaSizer() += m_page_intro; - GetPageAreaSizer() += m_page_plugins; // this doesn't descent from wxDialogWithHelpers, so we need to explicitly // fit and center it. :( diff --git a/pcsx2/gui/Dialogs/ModalPopups.h b/pcsx2/gui/Dialogs/ModalPopups.h index eaf3300881..308328ca6d 100644 --- a/pcsx2/gui/Dialogs/ModalPopups.h +++ b/pcsx2/gui/Dialogs/ModalPopups.h @@ -93,7 +93,6 @@ class FirstTimeWizard : public wxWizard protected: wxWizardPageSimple& m_page_intro; - wxWizardPageSimple& m_page_plugins; wxWizardPageSimple& m_page_bios; wxPanelWithHelpers& m_panel_Intro;