diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index 769c032f2..602b3e275 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -118,7 +118,6 @@ - diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index fa3495ba0..49b2ec0da 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -234,9 +234,6 @@ Source Files\User Interface Source\Debugger Source - - Source Files\User Interface Source\Settings Source - @@ -499,6 +496,9 @@ Resource Files + + Resource Files + diff --git a/Source/Project64/UserInterface/Settings/SettingsPage.h b/Source/Project64/UserInterface/Settings/SettingsPage.h index d5833fa46..ebed27293 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage.h @@ -592,4 +592,4 @@ public: #include "SettingsPage-KeyboardShortcuts.h" #include "SettingsPage-Options.h" #include "SettingsPage-Plugin.h" -#include "SettingsPage-DiskDrive.h" +//#include "SettingsPage-DiskDrive.h" diff --git a/Source/Project64/UserInterface/SettingsConfig.cpp b/Source/Project64/UserInterface/SettingsConfig.cpp index 7f66b8d1e..963d652cc 100644 --- a/Source/Project64/UserInterface/SettingsConfig.cpp +++ b/Source/Project64/UserInterface/SettingsConfig.cpp @@ -131,14 +131,14 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /* m_GeneralOptionsPage = new CGeneralOptionsPage(this, this->m_hWnd, rcSettingInfo); m_AdvancedPage = new CAdvancedOptionsPage(this->m_hWnd, rcSettingInfo); m_DefaultsPage = new CDefaultsOptionsPage(this->m_hWnd, rcSettingInfo); - m_DiskDrivePage = new CDiskDrivePage(this->m_hWnd, rcSettingInfo); + //m_DiskDrivePage = new CDiskDrivePage(this->m_hWnd, rcSettingInfo); SettingsSection = new CConfigSettingSection(wGS(TAB_OPTIONS).c_str()); SettingsSection->AddPage(m_GeneralOptionsPage); SettingsSection->AddPage(m_AdvancedPage); SettingsSection->AddPage(m_DefaultsPage); SettingsSection->AddPage(new COptionsDirectoriesPage(this->m_hWnd, rcSettingInfo)); - SettingsSection->AddPage(m_DiskDrivePage); + //SettingsSection->AddPage(m_DiskDrivePage); m_Sections.push_back(SettingsSection); SettingsSection = new CConfigSettingSection(wGS(TAB_ROMSELECTION).c_str()); diff --git a/Source/Project64/UserInterface/SettingsConfig.h b/Source/Project64/UserInterface/SettingsConfig.h index fff9e5adb..b73d82838 100644 --- a/Source/Project64/UserInterface/SettingsConfig.h +++ b/Source/Project64/UserInterface/SettingsConfig.h @@ -42,7 +42,7 @@ private: CTreeViewCtrl m_PagesTreeList; SETTING_SECTIONS m_Sections; - CSettingsPage * m_CurrentPage, *m_GeneralOptionsPage, *m_AdvancedPage, *m_DefaultsPage, *m_DiskDrivePage; + CSettingsPage * m_CurrentPage, *m_GeneralOptionsPage, *m_AdvancedPage, *m_DefaultsPage/*, *m_DiskDrivePage*/; bool m_GameConfig; bool m_bTVNSelChangedSupported; };