From 12cbeb228895f3a66489fbeb7499551ed5297050 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 8 Jun 2017 14:14:56 +0200 Subject: [PATCH] Remove DVD root and apploader path settings --- Source/Core/Core/ConfigManager.cpp | 4 -- Source/Core/Core/ConfigManager.h | 2 - Source/Core/DolphinQt2/Settings/PathPane.cpp | 45 ++----------------- Source/Core/DolphinQt2/Settings/PathPane.h | 4 -- .../Core/DolphinWX/Config/PathConfigPane.cpp | 41 +++-------------- Source/Core/DolphinWX/Config/PathConfigPane.h | 4 -- 6 files changed, 9 insertions(+), 91 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 9a605fd563..cda249379c 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -252,8 +252,6 @@ void SConfig::SaveCoreSettings(IniFile& ini) core->Set("FPRF", bFPRF); core->Set("AccurateNaNs", bAccurateNaNs); core->Set("DefaultISO", m_strDefaultISO); - core->Set("DVDRoot", m_strDVDRoot); - core->Set("Apploader", m_strApploader); core->Set("EnableCheats", bEnableCheats); core->Set("SelectedLanguage", SelectedLanguage); core->Set("OverrideGCLang", bOverrideGCLanguage); @@ -568,8 +566,6 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("CPUThread", &bCPUThread, true); core->Get("SyncOnSkipIdle", &bSyncGPUOnSkipIdleHack, true); core->Get("DefaultISO", &m_strDefaultISO); - core->Get("DVDRoot", &m_strDVDRoot); - core->Get("Apploader", &m_strApploader); core->Get("EnableCheats", &bEnableCheats, false); core->Get("SelectedLanguage", &SelectedLanguage, 0); core->Get("OverrideGCLang", &bOverrideGCLanguage, false); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index fa31751331..d7b3d1c77d 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -197,8 +197,6 @@ struct SConfig : NonCopyable std::string m_strBootROM; std::string m_strSRAM; std::string m_strDefaultISO; - std::string m_strDVDRoot; - std::string m_strApploader; std::string m_strWiiSDCardPath; std::string m_perfDir; diff --git a/Source/Core/DolphinQt2/Settings/PathPane.cpp b/Source/Core/DolphinQt2/Settings/PathPane.cpp index 2d21f20112..12faaa8af0 100644 --- a/Source/Core/DolphinQt2/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt2/Settings/PathPane.cpp @@ -48,27 +48,6 @@ void PathPane::BrowseDefaultGame() } } -void PathPane::BrowseDVDRoot() -{ - QString dir = QFileDialog::getExistingDirectory(this, tr("Select DVD Root"), QDir::currentPath()); - if (!dir.isEmpty()) - { - m_dvd_edit->setText(dir); - SConfig::GetInstance().m_strDVDRoot = dir.toStdString(); - } -} - -void PathPane::BrowseApploader() -{ - QString file = QFileDialog::getOpenFileName(this, tr("Select an Apploader"), QDir::currentPath(), - tr("Apploaders (*.img)")); - if (!file.isEmpty()) - { - m_app_edit->setText(file); - SConfig::GetInstance().m_strApploader = file.toStdString(); - } -} - void PathPane::BrowseWiiNAND() { QString dir = @@ -127,32 +106,14 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_game_edit, 0, 1); layout->addWidget(game_open, 0, 2); - m_dvd_edit = new QLineEdit(QString::fromStdString(SConfig::GetInstance().m_strDVDRoot)); - connect(m_dvd_edit, &QLineEdit::editingFinished, - [=] { SConfig::GetInstance().m_strDVDRoot = m_dvd_edit->text().toStdString(); }); - QPushButton* dvd_open = new QPushButton; - connect(dvd_open, &QPushButton::clicked, this, &PathPane::BrowseDVDRoot); - layout->addWidget(new QLabel(tr("DVD Root:")), 1, 0); - layout->addWidget(m_dvd_edit, 1, 1); - layout->addWidget(dvd_open, 1, 2); - - m_app_edit = new QLineEdit(QString::fromStdString(SConfig::GetInstance().m_strApploader)); - connect(m_app_edit, &QLineEdit::editingFinished, - [=] { SConfig::GetInstance().m_strApploader = m_app_edit->text().toStdString(); }); - QPushButton* app_open = new QPushButton; - connect(app_open, &QPushButton::clicked, this, &PathPane::BrowseApploader); - layout->addWidget(new QLabel(tr("Apploader:")), 2, 0); - layout->addWidget(m_app_edit, 2, 1); - layout->addWidget(app_open, 2, 2); - m_nand_edit = new QLineEdit(QString::fromStdString(SConfig::GetInstance().m_NANDPath)); connect(m_nand_edit, &QLineEdit::editingFinished, [=] { SConfig::GetInstance().m_NANDPath = m_nand_edit->text().toStdString(); }); QPushButton* nand_open = new QPushButton; connect(nand_open, &QPushButton::clicked, this, &PathPane::BrowseWiiNAND); - layout->addWidget(new QLabel(tr("Wii NAND Root:")), 3, 0); - layout->addWidget(m_nand_edit, 3, 1); - layout->addWidget(nand_open, 3, 2); + layout->addWidget(new QLabel(tr("Wii NAND Root:")), 1, 0); + layout->addWidget(m_nand_edit, 1, 1); + layout->addWidget(nand_open, 1, 2); return layout; } diff --git a/Source/Core/DolphinQt2/Settings/PathPane.h b/Source/Core/DolphinQt2/Settings/PathPane.h index 753c5001c4..2d0f0b190c 100644 --- a/Source/Core/DolphinQt2/Settings/PathPane.h +++ b/Source/Core/DolphinQt2/Settings/PathPane.h @@ -19,8 +19,6 @@ public: private: void Browse(); void BrowseDefaultGame(); - void BrowseDVDRoot(); - void BrowseApploader(); void BrowseWiiNAND(); QGroupBox* MakeGameFolderBox(); QGridLayout* MakePathsLayout(); @@ -28,7 +26,5 @@ private: QListWidget* m_path_list; QLineEdit* m_game_edit; - QLineEdit* m_dvd_edit; - QLineEdit* m_app_edit; QLineEdit* m_nand_edit; }; diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp index ec3376acc2..0d54738192 100644 --- a/Source/Core/DolphinWX/Config/PathConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/PathConfigPane.cpp @@ -45,14 +45,6 @@ void PathConfigPane::InitializeGUI() wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.tgc;*.wbfs;*.ciso;*.gcz;*.wad|%s", wxGetTranslation(wxALL_FILES)), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN | wxFLP_SMALL); - m_dvd_root_dirpicker = - new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose a DVD root directory:"), - wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL | wxDIRP_SMALL); - m_apploader_path_filepicker = new wxFilePickerCtrl( - this, wxID_ANY, wxEmptyString, - _("Choose file to use as apploader: (applies to discs constructed from directories only)"), - _("apploader (.img)") + wxString::Format("|*.img|%s", wxGetTranslation(wxALL_FILES)), - wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN | wxFLP_SMALL); m_nand_root_dirpicker = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose a NAND root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL | wxDIRP_SMALL); @@ -82,21 +74,15 @@ void PathConfigPane::InitializeGUI() picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Default ISO:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); picker_sizer->Add(m_default_iso_filepicker, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND); - picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("DVD Root:")), wxGBPosition(1, 0), + picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Wii NAND Root:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - picker_sizer->Add(m_dvd_root_dirpicker, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND); - picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Apploader:")), wxGBPosition(2, 0), + picker_sizer->Add(m_nand_root_dirpicker, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND); + picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Dump Path:")), wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - picker_sizer->Add(m_apploader_path_filepicker, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND); - picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Wii NAND Root:")), wxGBPosition(3, 0), + picker_sizer->Add(m_dump_path_dirpicker, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND); + picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("SD Card Path:")), wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - picker_sizer->Add(m_nand_root_dirpicker, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND); - picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Dump Path:")), wxGBPosition(4, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - picker_sizer->Add(m_dump_path_dirpicker, wxGBPosition(4, 1), wxDefaultSpan, wxEXPAND); - picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("SD Card Path:")), wxGBPosition(5, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - picker_sizer->Add(m_wii_sdcard_filepicker, wxGBPosition(5, 1), wxDefaultSpan, wxEXPAND); + picker_sizer->Add(m_wii_sdcard_filepicker, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND); picker_sizer->AddGrowableCol(1); // Populate the Paths page @@ -116,8 +102,6 @@ void PathConfigPane::LoadGUIValues() m_recursive_iso_paths_checkbox->SetValue(SConfig::GetInstance().m_RecursiveISOFolder); m_default_iso_filepicker->SetPath(StrToWxStr(startup_params.m_strDefaultISO)); - m_dvd_root_dirpicker->SetPath(StrToWxStr(startup_params.m_strDVDRoot)); - m_apploader_path_filepicker->SetPath(StrToWxStr(startup_params.m_strApploader)); m_nand_root_dirpicker->SetPath(StrToWxStr(SConfig::GetInstance().m_NANDPath)); m_dump_path_dirpicker->SetPath(StrToWxStr(SConfig::GetInstance().m_DumpPath)); m_wii_sdcard_filepicker->SetPath(StrToWxStr(SConfig::GetInstance().m_strWiiSDCardPath)); @@ -136,9 +120,6 @@ void PathConfigPane::BindEvents() m_remove_iso_path_button->Bind(wxEVT_BUTTON, &PathConfigPane::OnRemoveISOPath, this); m_default_iso_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnDefaultISOChanged, this); - m_dvd_root_dirpicker->Bind(wxEVT_DIRPICKER_CHANGED, &PathConfigPane::OnDVDRootChanged, this); - m_apploader_path_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, - &PathConfigPane::OnApploaderPathChanged, this); m_nand_root_dirpicker->Bind(wxEVT_DIRPICKER_CHANGED, &PathConfigPane::OnNANDRootChanged, this); m_dump_path_dirpicker->Bind(wxEVT_DIRPICKER_CHANGED, &PathConfigPane::OnDumpPathChanged, this); m_wii_sdcard_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnSdCardPathChanged, @@ -206,16 +187,6 @@ void PathConfigPane::OnDefaultISOChanged(wxCommandEvent& event) SConfig::GetInstance().m_strDefaultISO = WxStrToStr(m_default_iso_filepicker->GetPath()); } -void PathConfigPane::OnDVDRootChanged(wxCommandEvent& event) -{ - SConfig::GetInstance().m_strDVDRoot = WxStrToStr(m_dvd_root_dirpicker->GetPath()); -} - -void PathConfigPane::OnApploaderPathChanged(wxCommandEvent& event) -{ - SConfig::GetInstance().m_strApploader = WxStrToStr(m_apploader_path_filepicker->GetPath()); -} - void PathConfigPane::OnSdCardPathChanged(wxCommandEvent& event) { std::string sd_card_path = WxStrToStr(m_wii_sdcard_filepicker->GetPath()); diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.h b/Source/Core/DolphinWX/Config/PathConfigPane.h index 484c6d937c..ae708c116c 100644 --- a/Source/Core/DolphinWX/Config/PathConfigPane.h +++ b/Source/Core/DolphinWX/Config/PathConfigPane.h @@ -29,8 +29,6 @@ private: void OnAddISOPath(wxCommandEvent&); void OnRemoveISOPath(wxCommandEvent&); void OnDefaultISOChanged(wxCommandEvent&); - void OnDVDRootChanged(wxCommandEvent&); - void OnApploaderPathChanged(wxCommandEvent&); void OnNANDRootChanged(wxCommandEvent&); void OnDumpPathChanged(wxCommandEvent&); void OnSdCardPathChanged(wxCommandEvent&); @@ -42,10 +40,8 @@ private: wxButton* m_add_iso_path_button; wxButton* m_remove_iso_path_button; - wxDirPickerCtrl* m_dvd_root_dirpicker; wxDirPickerCtrl* m_nand_root_dirpicker; wxFilePickerCtrl* m_default_iso_filepicker; - wxFilePickerCtrl* m_apploader_path_filepicker; wxDirPickerCtrl* m_dump_path_dirpicker; wxFilePickerCtrl* m_wii_sdcard_filepicker; };