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

Merge pull request #4501 from flibitijibibo/disabletooltips 

DolphinWX: Add 'DisableTooltips' config option (R2)
This commit is contained in:
Mat M 2016-12-20 17:20:24 -05:00 committed by GitHub
parent b5fe0b5b83 7cfead6429
commit cd4449f881
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/ConfigManager.cpp
View File

@ -188,6 +188,7 @@ void SConfig::SaveInterfaceSettings(IniFile& ini)
interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo); interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo);
interface->Set("ThemeName", theme_name); interface->Set("ThemeName", theme_name);
interface->Set("PauseOnFocusLost", m_PauseOnFocusLost); interface->Set("PauseOnFocusLost", m_PauseOnFocusLost);
interface->Set("DisableTooltips", m_DisableTooltips);
} }
void SConfig::SaveDisplaySettings(IniFile& ini) void SConfig::SaveDisplaySettings(IniFile& ini)
@ -491,6 +492,7 @@ void SConfig::LoadInterfaceSettings(IniFile& ini)
interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false); interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false);
interface->Get("ThemeName", &theme_name, DEFAULT_THEME_DIR); interface->Get("ThemeName", &theme_name, DEFAULT_THEME_DIR);
interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false); interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false);
interface->Get("DisableTooltips", &m_DisableTooltips, false);
} }
void SConfig::LoadDisplaySettings(IniFile& ini) void SConfig::LoadDisplaySettings(IniFile& ini)

2
Source/Core/Core/ConfigManager.h
View File

@ -292,6 +292,8 @@ struct SConfig : NonCopyable
bool m_PauseOnFocusLost; bool m_PauseOnFocusLost;
bool m_DisableTooltips;
// DSP settings // DSP settings
bool m_DSPEnableJIT; bool m_DSPEnableJIT;
bool m_DSPCaptureLog; bool m_DSPCaptureLog;

3
Source/Core/DolphinWX/Main.cpp
View File

@ -18,6 +18,7 @@
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/thread.h> #include <wx/thread.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/tooltip.h>
#include <wx/utils.h> #include <wx/utils.h>
#include <wx/window.h> #include <wx/window.h>
@ -110,6 +111,8 @@ bool DolphinApp::OnInit()
DolphinAnalytics::Instance()->ReportDolphinStart("wx"); DolphinAnalytics::Instance()->ReportDolphinStart("wx");
wxToolTip::Enable(!SConfig::GetInstance().m_DisableTooltips);
// Enable the PNG image handler for screenshots // Enable the PNG image handler for screenshots
wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler(new wxPNGHandler);