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 #5755 from ligfx/qtglobalorganizationname 

DolphinQt2: set QSettings parameters globally
This commit is contained in:
Leo Lam 2017-07-09 16:25:31 +02:00 committed by GitHub
parent e6c1b04b69 234ab6f759
commit a621a1bc2f
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,9 @@ int main(int argc, char* argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setOrganizationName(QStringLiteral("Dolphin Emulator"));
QCoreApplication::setOrganizationDomain(QStringLiteral("dolphin-emu.org"));
QCoreApplication::setApplicationName(QStringLiteral("dolphin"));
QApplication app(argc, argv);

19
Source/Core/DolphinQt2/Settings.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <QDir>
#include <QSettings>
#include <QSize>
#include "AudioCommon/AudioCommon.h"
@ -13,15 +14,7 @@
#include "DolphinQt2/Settings.h"
#include "InputCommon/InputConfig.h"
Settings::Settings()
:
#ifdef Q_OS_MAC
m_native_settings(QStringLiteral("dolphin-emu.org"), QStringLiteral("dolphin"))
#else
m_native_settings(QStringLiteral("Dolphin Emulator"), QStringLiteral("Dolphin"))
#endif
{
}
Settings::Settings() = default;
Settings& Settings::Instance()
{
@ -81,22 +74,22 @@ void Settings::RemovePath(const QString& qpath)
bool Settings::GetPreferredView() const
{
return m_native_settings.value(QStringLiteral("PreferredView"), true).toBool();
return QSettings().value(QStringLiteral("PreferredView"), true).toBool();
}
void Settings::SetPreferredView(bool table)
{
m_native_settings.setValue(QStringLiteral("PreferredView"), table);
QSettings().setValue(QStringLiteral("PreferredView"), table);
}
int Settings::GetStateSlot() const
{
return m_native_settings.value(QStringLiteral("Emulation/StateSlot"), 1).toInt();
return QSettings().value(QStringLiteral("Emulation/StateSlot"), 1).toInt();
}
void Settings::SetStateSlot(int slot)
{
m_native_settings.setValue(QStringLiteral("Emulation/StateSlot"), slot);
QSettings().setValue(QStringLiteral("Emulation/StateSlot"), slot);
}
void Settings::SetHideCursor(bool hide_cursor)

3
Source/Core/DolphinQt2/Settings.h
View File

@ -4,7 +4,7 @@
#pragma once
#include <QSettings>
#include <QObject>
#include <QVector>
#include "Common/NonCopyable.h"
@ -64,5 +64,4 @@ signals:
private:
Settings();
QSettings m_native_settings;
};