piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use new config system for Discord Rich Presence option

Browse Source 
This doesn't feel like a mirror change to me.
This commit is contained in:
Sleepy Flower Girl
2018-06-06 00:16:42 -04:00
parent f25d833dbd
commit 57bd13a0ce
9 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinQt2/Settings/GeneralPane.cpp
View File

@ -24,6 +24,9 @@
#include "Core/PowerPC/PowerPC.h"
#include "DolphinQt2/Settings.h"
#include "UICommon/AutoUpdate.h"
#ifdef USE_DISCORD_PRESENCE
#include "UICommon/DiscordPresence.h"
#endif
constexpr int AUTO_UPDATE_DISABLE_INDEX = 0;
constexpr int AUTO_UPDATE_STABLE_INDEX = 1;
@ -127,7 +130,7 @@ void GeneralPane::CreateBasic()
basic_group_layout->addWidget(m_checkbox_cheats);
#ifdef USE_DISCORD_PRESENCE
m_checkbox_discord_presence = new QCheckBox(tr("Show Activity in Your Discord Status"));
m_checkbox_discord_presence = new QCheckBox(tr("Show Current Game on Discord"));
basic_group_layout->addWidget(m_checkbox_discord_presence);
#endif
@ -224,7 +227,7 @@ void GeneralPane::LoadConfig()
m_checkbox_dualcore->setChecked(SConfig::GetInstance().bCPUThread);
m_checkbox_cheats->setChecked(Settings::Instance().GetCheatsEnabled());
#ifdef USE_DISCORD_PRESENCE
m_checkbox_discord_presence->setChecked(SConfig::GetInstance().bUseDiscordPresence);
m_checkbox_discord_presence->setChecked(Config::Get(MAIN_USE_DISCORD_PRESENCE));
#endif
int selection = qRound(SConfig::GetInstance().m_EmulationSpeed * 10);
if (selection < m_combobox_speedlimit->count())
@ -272,7 +275,7 @@ void GeneralPane::OnSaveConfig()
}
#ifdef USE_DISCORD_PRESENCE
Settings::Instance().SetDiscordPresenceEnabled(m_checkbox_discord_presence->isChecked());
Discord::SetDiscordPresenceEnabled(m_checkbox_discord_presence->isChecked());
#endif
#if defined(USE_ANALYTICS) && USE_ANALYTICS