Permalink
Browse files

Merge pull request #7271 from JosJuice/remove-wx-settings

Remove settings that only were used by DolphinWX
  • Loading branch information...
lioncash committed Jul 16, 2018
2 parents 325f3c6 + c663dc9 commit 5516731a72ef522d09475fe30c057145de5e62aa
Showing with 0 additions and 31 deletions.
  1. +0 −23 Source/Core/Core/ConfigManager.cpp
  2. +0 −8 Source/Core/Core/ConfigManager.h
@@ -141,21 +141,12 @@ void SConfig::SaveInterfaceSettings(IniFile& ini)
interface->Set("UsePanicHandlers", bUsePanicHandlers);
interface->Set("OnScreenDisplayMessages", bOnScreenDisplayMessages);
interface->Set("HideCursor", bHideCursor);
interface->Set("MainWindowPosX", iPosX);
interface->Set("MainWindowPosY", iPosY);
interface->Set("MainWindowWidth", iWidth);
interface->Set("MainWindowHeight", iHeight);
interface->Set("LanguageCode", m_InterfaceLanguage);
interface->Set("ShowToolbar", m_InterfaceToolbar);
interface->Set("ShowStatusbar", m_InterfaceStatusbar);
interface->Set("ShowLogWindow", m_InterfaceLogWindow);
interface->Set("ShowLogConfigWindow", m_InterfaceLogConfigWindow);
interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo);
interface->Set("ShowActiveTitle", m_show_active_title);
interface->Set("UseBuiltinTitleDatabase", m_use_builtin_title_database);
interface->Set("ThemeName", theme_name);
interface->Set("PauseOnFocusLost", m_PauseOnFocusLost);
interface->Set("DisableTooltips", m_DisableTooltips);
interface->Set("DebugModeEnabled", bEnableDebugging);
}
@@ -425,21 +416,12 @@ void SConfig::LoadInterfaceSettings(IniFile& ini)
interface->Get("UsePanicHandlers", &bUsePanicHandlers, true);
interface->Get("OnScreenDisplayMessages", &bOnScreenDisplayMessages, true);
interface->Get("HideCursor", &bHideCursor, false);
interface->Get("MainWindowPosX", &iPosX, INT_MIN);
interface->Get("MainWindowPosY", &iPosY, INT_MIN);
interface->Get("MainWindowWidth", &iWidth, -1);
interface->Get("MainWindowHeight", &iHeight, -1);
interface->Get("LanguageCode", &m_InterfaceLanguage, "");
interface->Get("ShowToolbar", &m_InterfaceToolbar, true);
interface->Get("ShowStatusbar", &m_InterfaceStatusbar, true);
interface->Get("ShowLogWindow", &m_InterfaceLogWindow, false);
interface->Get("ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false);
interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false);
interface->Get("ShowActiveTitle", &m_show_active_title, true);
interface->Get("UseBuiltinTitleDatabase", &m_use_builtin_title_database, true);
interface->Get("ThemeName", &theme_name, DEFAULT_THEME_DIR);
interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false);
interface->Get("DisableTooltips", &m_DisableTooltips, false);
interface->Get("DebugModeEnabled", &bEnableDebugging, false);
}
@@ -792,11 +774,6 @@ void SConfig::LoadDefaults()
bUsePanicHandlers = true;
bOnScreenDisplayMessages = true;
iPosX = INT_MIN;
iPosY = INT_MIN;
iWidth = -1;
iHeight = -1;
m_analytics_id = "";
m_analytics_enabled = false;
m_analytics_permission_asked = false;
@@ -155,8 +155,6 @@ struct SConfig
bool bFullscreen = false, bRenderToMain = false;
bool bDisableScreenSaver = false;
int iPosX, iPosY, iWidth, iHeight;
// Analytics settings.
std::string m_analytics_id;
bool m_analytics_enabled = false;
@@ -239,10 +237,6 @@ struct SConfig
bool m_OCEnable;
float m_OCFactor;
// other interface settings
bool m_InterfaceToolbar;
bool m_InterfaceStatusbar;
bool m_InterfaceLogWindow;
bool m_InterfaceLogConfigWindow;
bool m_InterfaceExtendedFPSInfo;
bool m_show_active_title = false;
bool m_use_builtin_title_database = true;
@@ -293,8 +287,6 @@ struct SConfig
bool m_PauseOnFocusLost;
bool m_DisableTooltips;
// DSP settings
bool m_DSPEnableJIT;
bool m_DSPCaptureLog;

0 comments on commit 5516731

Please sign in to comment.