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

Merge pull request #1645 from LuigiBlood/ddrevamp_fix 

[Disk] Undo changes to compile 64DD Settings Page
This commit is contained in:
zilmar 2019-08-21 17:32:45 +09:30 committed by GitHub
parent 3079edfd95 01ae9450fc
commit 23770d82e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64/Project64.vcxproj
View File

@ -118,6 +118,7 @@
<ClCompile Include="UserInterface\Settings\SettingsPage-AdvancedOptions.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-AdvancedOptions.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Defaults.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Defaults.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Directories.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Directories.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-DiskDrive.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Game-General.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Game-General.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Game-Plugin.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Game-Plugin.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Game-Recompiler.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Game-Recompiler.cpp" />

3
Source/Project64/Project64.vcxproj.filters
View File

@ -234,6 +234,9 @@
<ClCompile Include="UserInterface\Debugger\Debugger-ExceptionBreakpoints.cpp"> <ClCompile Include="UserInterface\Debugger\Debugger-ExceptionBreakpoints.cpp">
<Filter>Source Files\User Interface Source\Debugger Source</Filter> <Filter>Source Files\User Interface Source\Debugger Source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\Settings\SettingsPage-DiskDrive.cpp">
<Filter>Source Files\User Interface Source\Settings Source</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="UserInterface\resource.h"> <ClInclude Include="UserInterface\resource.h">

2
Source/Project64/UserInterface/Settings/SettingsPage.h
View File

@ -592,4 +592,4 @@ public:
#include "SettingsPage-KeyboardShortcuts.h" #include "SettingsPage-KeyboardShortcuts.h"
#include "SettingsPage-Options.h" #include "SettingsPage-Options.h"
#include "SettingsPage-Plugin.h" #include "SettingsPage-Plugin.h"
//#include "SettingsPage-DiskDrive.h" #include "SettingsPage-DiskDrive.h"

4
Source/Project64/UserInterface/SettingsConfig.cpp
View File

@ -131,14 +131,14 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
m_GeneralOptionsPage = new CGeneralOptionsPage(this, this->m_hWnd, rcSettingInfo); m_GeneralOptionsPage = new CGeneralOptionsPage(this, this->m_hWnd, rcSettingInfo);
m_AdvancedPage = new CAdvancedOptionsPage(this->m_hWnd, rcSettingInfo); m_AdvancedPage = new CAdvancedOptionsPage(this->m_hWnd, rcSettingInfo);
m_DefaultsPage = new CDefaultsOptionsPage(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 = new CConfigSettingSection(wGS(TAB_OPTIONS).c_str());
SettingsSection->AddPage(m_GeneralOptionsPage); SettingsSection->AddPage(m_GeneralOptionsPage);
SettingsSection->AddPage(m_AdvancedPage); SettingsSection->AddPage(m_AdvancedPage);
SettingsSection->AddPage(m_DefaultsPage); SettingsSection->AddPage(m_DefaultsPage);
SettingsSection->AddPage(new COptionsDirectoriesPage(this->m_hWnd, rcSettingInfo)); SettingsSection->AddPage(new COptionsDirectoriesPage(this->m_hWnd, rcSettingInfo));
//SettingsSection->AddPage(m_DiskDrivePage); SettingsSection->AddPage(m_DiskDrivePage);
m_Sections.push_back(SettingsSection); m_Sections.push_back(SettingsSection);
SettingsSection = new CConfigSettingSection(wGS(TAB_ROMSELECTION).c_str()); SettingsSection = new CConfigSettingSection(wGS(TAB_ROMSELECTION).c_str());

2
Source/Project64/UserInterface/SettingsConfig.h
View File

@ -42,7 +42,7 @@ private:
CTreeViewCtrl m_PagesTreeList; CTreeViewCtrl m_PagesTreeList;
SETTING_SECTIONS m_Sections; 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_GameConfig;
bool m_bTVNSelChangedSupported; bool m_bTVNSelChangedSupported;
}; };