RMG: switch over to RMG-Core's CoreSettings

This commit is contained in:
Rosalie Wanders committed 2021-10-27 13:58:40 +02:00
1 parent 68290695e3
commit 8112e472ee
14 files changed
+190 -971

No files matched your search

-1
View File
@@ -37,7 +37,6 @@ set(RMG_SOURCES
M64P/Wrapper/Api.cpp
M64P/Wrapper/VidExt.cpp
Utilities/Logger.cpp
Utilities/Settings.cpp
Utilities/Plugins.cpp
Utilities/QtKeyToSdl2Key.cpp
Globals.cpp
-1
View File
@@ -1,7 +1,6 @@
#include <Globals.hpp>
Utilities::Logger g_Logger;
Utilities::Settings g_Settings;
Utilities::Plugins g_Plugins;
M64P::Wrapper::Api g_MupenApi;
UserInterface::Widget::OGLWidget *g_OGLWidget;
-2
View File
@@ -4,12 +4,10 @@
#include "M64P/Wrapper/Api.hpp"
#include "Thread/EmulationThread.hpp"
#include "UserInterface/Widget/OGLWidget.hpp"
#include "Utilities/Settings.hpp"
#include "Utilities/Logger.hpp"
#include "Utilities/Plugins.hpp"
extern Utilities::Logger g_Logger;
extern Utilities::Settings g_Settings;
extern Utilities::Plugins g_Plugins;
extern M64P::Wrapper::Api g_MupenApi;
extern UserInterface::Widget::OGLWidget *g_OGLWidget;
+18 -18
View File
@@ -221,12 +221,12 @@ char *Core::media_loader_get_gb_cart_ram(void *_this, int)
char *Core::media_loader_get_dd_rom(void *_this)
{
QString file = g_Settings.GetStringValue(SettingsID::Core_64DD_RomFile);
std::string file = CoreSettingsGetStringValue(SettingsID::Core_64DD_RomFile);
if (file.isEmpty())
if (file.empty())
return NULL;
return strdup(file.toStdString().c_str());
return strdup(file.c_str());
}
char *Core::media_loader_get_dd_disk(void *_this)
@@ -957,7 +957,7 @@ bool Core::rom_ApplyPluginOverlay(void)
for (int i = 0; i < 4; i++)
{
value = g_Settings.GetStringValue(settingIdArray[i], section);
value = QString::fromStdString(CoreSettingsGetStringValue(settingIdArray[i], section.toStdString()));
if (!value.isEmpty())
{
Plugin_t plugin = {.FileName = value};
@@ -995,7 +995,7 @@ bool Core::rom_HasPluginOverlay(QString file)
for (int i = 0; i < 4; i++)
{
if (!g_Settings.GetStringValue(settingIdArray[i], section).isEmpty())
if (!CoreSettingsGetStringValue(settingIdArray[i], section.toStdString()).empty())
return true;
}
@@ -1023,10 +1023,10 @@ bool Core::rom_ApplyOverlay(void)
return true;
}
info.Settings.disableextramem = g_Settings.GetBoolValue(SettingsID::Game_DisableExtraMem, section);
info.Settings.savetype = g_Settings.GetIntValue(SettingsID::Game_SaveType, section);
info.Settings.countperop = g_Settings.GetIntValue(SettingsID::Game_CountPerOp, section);
info.Settings.sidmaduration = g_Settings.GetIntValue(SettingsID::Game_SiDmaDuration, section);
info.Settings.disableextramem = CoreSettingsGetBoolValue(SettingsID::Game_DisableExtraMem, section.toStdString());
info.Settings.savetype = CoreSettingsGetIntValue(SettingsID::Game_SaveType, section.toStdString());
info.Settings.countperop = CoreSettingsGetIntValue(SettingsID::Game_CountPerOp, section.toStdString());
info.Settings.sidmaduration = CoreSettingsGetIntValue(SettingsID::Game_SiDmaDuration, section.toStdString());
ret2 = M64P::Core.DoCommand(M64CMD_ROM_SET_SETTINGS, sizeof(info.Settings), &info.Settings);
if (ret2 != M64ERR_SUCCESS)
@@ -1047,12 +1047,12 @@ bool Core::core_ApplyOverlay(void)
// copy settings from g_Settings to Core section
g_MupenApi.Config.SetOption("Core", "RandomizeInterrupt",
g_Settings.GetBoolValue(SettingsID::Core_RandomizeInterrupt));
g_MupenApi.Config.SetOption("Core", "R4300Emulator", g_Settings.GetIntValue(SettingsID::Core_CPU_Emulator));
g_MupenApi.Config.SetOption("Core", "DisableExtraMem", g_Settings.GetBoolValue(SettingsID::Core_DisableExtraMem));
g_MupenApi.Config.SetOption("Core", "EnableDebugger", g_Settings.GetBoolValue(SettingsID::Core_EnableDebugger));
g_MupenApi.Config.SetOption("Core", "CountPerOp", g_Settings.GetIntValue(SettingsID::Core_CountPerOp));
g_MupenApi.Config.SetOption("Core", "SiDmaDuration", g_Settings.GetIntValue(SettingsID::Core_SiDmaDuration));
CoreSettingsGetBoolValue(SettingsID::Core_RandomizeInterrupt));
g_MupenApi.Config.SetOption("Core", "R4300Emulator", CoreSettingsGetIntValue(SettingsID::Core_CPU_Emulator));
g_MupenApi.Config.SetOption("Core", "DisableExtraMem", CoreSettingsGetBoolValue(SettingsID::Core_DisableExtraMem));
g_MupenApi.Config.SetOption("Core", "EnableDebugger", CoreSettingsGetBoolValue(SettingsID::Core_EnableDebugger));
g_MupenApi.Config.SetOption("Core", "CountPerOp", CoreSettingsGetIntValue(SettingsID::Core_CountPerOp));
g_MupenApi.Config.SetOption("Core", "SiDmaDuration", CoreSettingsGetIntValue(SettingsID::Core_SiDmaDuration));
ret = this->GetRomInfo(&info);
if (!ret)
@@ -1064,14 +1064,14 @@ bool Core::core_ApplyOverlay(void)
if (!ret)
return true;
ret = g_Settings.GetBoolValue(SettingsID::Game_OverrideCoreSettings, section);
ret = CoreSettingsGetBoolValue(SettingsID::Game_OverrideCoreSettings, section.toStdString());
if (!ret)
return true;
g_MupenApi.Config.SetOption("Core", "RandomizeInterrupt",
g_Settings.GetBoolValue(SettingsID::Game_RandomizeInterrupt, section));
CoreSettingsGetBoolValue(SettingsID::Game_RandomizeInterrupt, section.toStdString()));
g_MupenApi.Config.SetOption("Core", "R4300Emulator",
g_Settings.GetIntValue(SettingsID::Game_CPU_Emulator, section));
CoreSettingsGetIntValue(SettingsID::Game_CPU_Emulator, section.toStdString()));
return true;
}
@@ -8,7 +8,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "SettingsDialog.hpp"
#include "Utilities/SettingsID.hpp"
#include "RMG-Core/Settings/Settings.hpp"
#include "Globals.hpp"
#include <QFileDialog>
@@ -40,8 +40,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent, Qt::WindowSyst
this->reloadSettings(i);
}
int width = g_Settings.GetIntValue(SettingsID::GUI_SettingsDialogWidth);
int height = g_Settings.GetIntValue(SettingsID::GUI_SettingsDialogHeight);
int width = CoreSettingsGetIntValue(SettingsID::GUI_SettingsDialogWidth);
int height = CoreSettingsGetIntValue(SettingsID::GUI_SettingsDialogHeight);
if (width != 0 && height != 0)
{
@@ -53,8 +53,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent, Qt::WindowSyst
SettingsDialog::~SettingsDialog(void)
{
g_Settings.SetValue(SettingsID::GUI_SettingsDialogWidth, this->size().width());
g_Settings.SetValue(SettingsID::GUI_SettingsDialogHeight, this->size().height());
CoreSettingsSetValue(SettingsID::GUI_SettingsDialogWidth, this->size().width());
CoreSettingsSetValue(SettingsID::GUI_SettingsDialogHeight, this->size().height());
CoreSettingsSave();
}
int SettingsDialog::currentIndex(void)
@@ -146,13 +147,13 @@ void SettingsDialog::loadCoreSettings(void)
bool debugger = false;
bool overrideGameSettings = false;
disableExtraMem = g_Settings.GetBoolValue(SettingsID::Core_DisableExtraMem);
counterFactor = g_Settings.GetIntValue(SettingsID::Core_CountPerOp);
cpuEmulator = g_Settings.GetIntValue(SettingsID::Core_CPU_Emulator);
siDmaDuration = g_Settings.GetIntValue(SettingsID::Core_SiDmaDuration);
randomizeInterrupt = g_Settings.GetBoolValue(SettingsID::Core_RandomizeInterrupt);
debugger = g_Settings.GetBoolValue(SettingsID::Core_EnableDebugger);
overrideGameSettings = g_Settings.GetBoolValue(SettingsID::Core_OverrideGameSpecificSettings);
disableExtraMem = CoreSettingsGetBoolValue(SettingsID::Core_DisableExtraMem);
counterFactor = CoreSettingsGetIntValue(SettingsID::Core_CountPerOp);
cpuEmulator = CoreSettingsGetIntValue(SettingsID::Core_CPU_Emulator);
siDmaDuration = CoreSettingsGetIntValue(SettingsID::Core_SiDmaDuration);
randomizeInterrupt = CoreSettingsGetBoolValue(SettingsID::Core_RandomizeInterrupt);
debugger = CoreSettingsGetBoolValue(SettingsID::Core_EnableDebugger);
overrideGameSettings = CoreSettingsGetBoolValue(SettingsID::Core_OverrideGameSpecificSettings);
this->coreCpuEmulatorComboBox->setCurrentIndex(cpuEmulator);
this->coreRandomizeTimingCheckBox->setChecked(randomizeInterrupt);
@@ -186,9 +187,9 @@ void SettingsDialog::loadGameCoreSettings(void)
bool overrideEnabled, randomizeInterrupt;
int cpuEmulator = 0;
overrideEnabled = g_Settings.GetBoolValue(SettingsID::Game_OverrideCoreSettings, this->gameSection);
cpuEmulator = g_Settings.GetIntValue(SettingsID::Game_CPU_Emulator, this->gameSection);
randomizeInterrupt = g_Settings.GetBoolValue(SettingsID::Game_RandomizeInterrupt, this->gameSection);
overrideEnabled = CoreSettingsGetBoolValue(SettingsID::Game_OverrideCoreSettings, this->gameSection.toStdString());
cpuEmulator = CoreSettingsGetIntValue(SettingsID::Game_CPU_Emulator, this->gameSection.toStdString());
randomizeInterrupt = CoreSettingsGetBoolValue(SettingsID::Game_RandomizeInterrupt, this->gameSection.toStdString());
gameOverrideCoreSettingsGroupBox->setChecked(overrideEnabled);
gameCoreCpuEmulatorComboBox->setCurrentIndex(cpuEmulator);
@@ -213,7 +214,8 @@ void SettingsDialog::loadGamePluginSettings(void)
{
comboBox = comboBoxArray[(int)p.Type];
comboBox->addItem(p.Name, p.FileName);
if (g_Settings.GetStringValue(settingsId[(int)p.Type], this->gameSection) == p.FileName)
if (CoreSettingsGetStringValue(settingsId[(int)p.Type], this->gameSection.toStdString()) == p.FileName.toStdString())
{
comboBox->setCurrentText(p.Name);
}
@@ -229,17 +231,17 @@ void SettingsDialog::loadPluginSettings(void)
PluginType type;
QComboBox *comboBox;
QString pluginFileName;
std::string pluginFileName;
int index = 0;
for (const auto &p : this->pluginList)
{
comboBox = comboBoxArray[(int)p.Type];
pluginFileName = g_Settings.GetStringValue(settingsIdArray[(int)p.Type]);
pluginFileName = CoreSettingsGetStringValue(settingsIdArray[(int)p.Type]);
comboBox->addItem(p.Name, p.FileName);
if (pluginFileName == p.FileName)
if (pluginFileName == p.FileName.toStdString())
{
comboBox->setCurrentText(p.Name);
}
@@ -249,30 +251,30 @@ void SettingsDialog::loadPluginSettings(void)
void SettingsDialog::loadDirectorySettings(void)
{
// these need to be static, otherwise Qt will segfault
static QString screenshotDir;
static QString saveStateDir;
static QString saveSramDir;
static QString sharedDataDir;
static std::string screenshotDir;
static std::string saveStateDir;
static std::string saveSramDir;
static std::string sharedDataDir;
static bool overrideUserDirs = false;
static QString userDataDir;
static QString userCacheDir;
static std::string userDataDir;
static std::string userCacheDir;
screenshotDir = g_Settings.GetStringValue(SettingsID::Core_ScreenshotPath);
saveStateDir = g_Settings.GetStringValue(SettingsID::Core_SaveStatePath);
saveSramDir = g_Settings.GetStringValue(SettingsID::Core_SaveSRAMPath);
sharedDataDir = g_Settings.GetStringValue(SettingsID::Core_SharedDataPath);
screenshotDir = CoreSettingsGetStringValue(SettingsID::Core_ScreenshotPath);
saveStateDir = CoreSettingsGetStringValue(SettingsID::Core_SaveStatePath);
saveSramDir = CoreSettingsGetStringValue(SettingsID::Core_SaveSRAMPath);
sharedDataDir = CoreSettingsGetStringValue(SettingsID::Core_SharedDataPath);
overrideUserDirs = g_Settings.GetBoolValue(SettingsID::Core_OverrideUserDirs);
userDataDir = g_Settings.GetStringValue(SettingsID::Core_UserDataDirOverride);
userCacheDir = g_Settings.GetStringValue(SettingsID::Core_UserCacheDirOverride);
overrideUserDirs = CoreSettingsGetBoolValue(SettingsID::Core_OverrideUserDirs);
userDataDir = CoreSettingsGetStringValue(SettingsID::Core_UserDataDirOverride);
userCacheDir = CoreSettingsGetStringValue(SettingsID::Core_UserCacheDirOverride);
this->screenshotDirLineEdit->setText(screenshotDir);
this->saveStateDirLineEdit->setText(saveStateDir);
this->saveSramDirLineEdit->setText(saveSramDir);
this->sharedDataDirLineEdit->setText(sharedDataDir);
this->screenshotDirLineEdit->setText(QString::fromStdString(screenshotDir));
this->saveStateDirLineEdit->setText(QString::fromStdString(saveStateDir));
this->saveSramDirLineEdit->setText(QString::fromStdString(saveSramDir));
this->sharedDataDirLineEdit->setText(QString::fromStdString(sharedDataDir));
this->overrideUserDirsGroupBox->setChecked(overrideUserDirs);
this->userDataDirLineEdit->setText(userDataDir);
this->userCacheDirLineEdit->setText(userCacheDir);
this->userDataDirLineEdit->setText(QString::fromStdString(userDataDir));
this->userCacheDirLineEdit->setText(QString::fromStdString(userCacheDir));
}
void SettingsDialog::loadHotkeySettings(void)
@@ -282,11 +284,11 @@ void SettingsDialog::loadHotkeySettings(void)
void SettingsDialog::loadInterfaceSettings(void)
{
this->manualResizingCheckBox->setChecked(g_Settings.GetBoolValue(SettingsID::GUI_AllowManualResizing));
this->hideCursorCheckBox->setChecked(g_Settings.GetBoolValue(SettingsID::GUI_HideCursorInEmulation));
this->statusBarMessageDurationSpinBox->setValue(g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration));
this->searchSubDirectoriesCheckbox->setChecked(g_Settings.GetBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearchLimitSpinBox->setValue(g_Settings.GetIntValue(SettingsID::RomBrowser_MaxItems));
this->manualResizingCheckBox->setChecked(CoreSettingsGetBoolValue(SettingsID::GUI_AllowManualResizing));
this->hideCursorCheckBox->setChecked(CoreSettingsGetBoolValue(SettingsID::GUI_HideCursorInEmulation));
this->statusBarMessageDurationSpinBox->setValue(CoreSettingsGetIntValue(SettingsID::GUI_StatusbarMessageDuration));
this->searchSubDirectoriesCheckbox->setChecked(CoreSettingsGetBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearchLimitSpinBox->setValue(CoreSettingsGetIntValue(SettingsID::RomBrowser_MaxItems));
}
void SettingsDialog::loadDefaultCoreSettings(void)
@@ -299,13 +301,13 @@ void SettingsDialog::loadDefaultCoreSettings(void)
bool debugger = false;
bool overrideGameSettings;
disableExtraMem = g_Settings.GetDefaultBoolValue(SettingsID::Core_DisableExtraMem);
counterFactor = g_Settings.GetDefaultIntValue(SettingsID::Core_CountPerOp);
cpuEmulator = g_Settings.GetDefaultIntValue(SettingsID::Core_CPU_Emulator);
siDmaDuration = g_Settings.GetDefaultIntValue(SettingsID::Core_SiDmaDuration);
randomizeInterrupt = g_Settings.GetDefaultBoolValue(SettingsID::Core_RandomizeInterrupt);
debugger = g_Settings.GetDefaultBoolValue(SettingsID::Core_EnableDebugger);
overrideGameSettings = g_Settings.GetDefaultBoolValue(SettingsID::Core_OverrideGameSpecificSettings);
disableExtraMem = CoreSettingsGetDefaultBoolValue(SettingsID::Core_DisableExtraMem);
counterFactor = CoreSettingsGetDefaultIntValue(SettingsID::Core_CountPerOp);
cpuEmulator = CoreSettingsGetDefaultIntValue(SettingsID::Core_CPU_Emulator);
siDmaDuration = CoreSettingsGetDefaultIntValue(SettingsID::Core_SiDmaDuration);
randomizeInterrupt = CoreSettingsGetDefaultBoolValue(SettingsID::Core_RandomizeInterrupt);
debugger = CoreSettingsGetDefaultBoolValue(SettingsID::Core_EnableDebugger);
overrideGameSettings = CoreSettingsGetDefaultBoolValue(SettingsID::Core_OverrideGameSpecificSettings);
this->coreCpuEmulatorComboBox->setCurrentIndex(cpuEmulator);
this->coreRandomizeTimingCheckBox->setChecked(randomizeInterrupt);
@@ -339,9 +341,9 @@ void SettingsDialog::loadDefaultGameCoreSettings(void)
bool overrideEnabled, randomizeInterrupt;
int cpuEmulator = 0;
overrideEnabled = g_Settings.GetDefaultBoolValue(SettingsID::Game_OverrideCoreSettings);
cpuEmulator = g_Settings.GetDefaultIntValue(SettingsID::Game_CPU_Emulator);
randomizeInterrupt = g_Settings.GetDefaultBoolValue(SettingsID::Game_RandomizeInterrupt);
overrideEnabled = CoreSettingsGetDefaultBoolValue(SettingsID::Game_OverrideCoreSettings);
cpuEmulator = CoreSettingsGetDefaultIntValue(SettingsID::Game_CPU_Emulator);
randomizeInterrupt = CoreSettingsGetDefaultBoolValue(SettingsID::Game_RandomizeInterrupt);
gameOverrideCoreSettingsGroupBox->setChecked(overrideEnabled);
gameCoreCpuEmulatorComboBox->setCurrentIndex(cpuEmulator);
@@ -361,13 +363,13 @@ void SettingsDialog::loadDefaultGamePluginSettings(void)
void SettingsDialog::loadDefaultDirectorySettings(void)
{
this->screenshotDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_ScreenshotPath));
this->saveStateDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_SaveStatePath));
this->saveSramDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_SaveSRAMPath));
this->sharedDataDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_SharedDataPath));
this->overrideUserDirsGroupBox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::Core_OverrideUserDirs));
this->userDataDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_UserDataDirOverride));
this->userCacheDirLineEdit->setText(g_Settings.GetDefaultStringValue(SettingsID::Core_UserCacheDirOverride));
this->screenshotDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_ScreenshotPath)));
this->saveStateDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_SaveStatePath)));
this->saveSramDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_SaveSRAMPath)));
this->sharedDataDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_SharedDataPath)));
this->overrideUserDirsGroupBox->setChecked(CoreSettingsGetDefaultBoolValue(SettingsID::Core_OverrideUserDirs));
this->userDataDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_UserDataDirOverride)));
this->userCacheDirLineEdit->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(SettingsID::Core_UserCacheDirOverride)));
}
void SettingsDialog::loadDefaultHotkeySettings(void)
@@ -377,11 +379,11 @@ void SettingsDialog::loadDefaultHotkeySettings(void)
void SettingsDialog::loadDefaultInterfaceSettings(void)
{
this->manualResizingCheckBox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::GUI_AllowManualResizing));
this->hideCursorCheckBox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::GUI_HideCursorInEmulation));
this->statusBarMessageDurationSpinBox->setValue(g_Settings.GetDefaultIntValue(SettingsID::GUI_StatusbarMessageDuration));
this->searchSubDirectoriesCheckbox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearchLimitSpinBox->setValue(g_Settings.GetDefaultIntValue(SettingsID::RomBrowser_MaxItems));
this->manualResizingCheckBox->setChecked(CoreSettingsGetDefaultBoolValue(SettingsID::GUI_AllowManualResizing));
this->hideCursorCheckBox->setChecked(CoreSettingsGetDefaultBoolValue(SettingsID::GUI_HideCursorInEmulation));
this->statusBarMessageDurationSpinBox->setValue(CoreSettingsGetDefaultIntValue(SettingsID::GUI_StatusbarMessageDuration));
this->searchSubDirectoriesCheckbox->setChecked(CoreSettingsGetDefaultBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearchLimitSpinBox->setValue(CoreSettingsGetDefaultIntValue(SettingsID::RomBrowser_MaxItems));
}
void SettingsDialog::saveSettings(void)
@@ -411,10 +413,10 @@ void SettingsDialog::saveCoreSettings(void)
bool debugger = this->coreDebuggerCheckBox->isChecked();
bool overrideGameSettings = this->coreOverrideGameSettingsGroup->isChecked();
g_Settings.SetValue(SettingsID::Core_CPU_Emulator, cpuEmulator);
g_Settings.SetValue(SettingsID::Core_RandomizeInterrupt, randomizeInterrupt);
g_Settings.SetValue(SettingsID::Core_EnableDebugger, debugger);
g_Settings.SetValue(SettingsID::Core_OverrideGameSpecificSettings, overrideGameSettings);
CoreSettingsSetValue(SettingsID::Core_CPU_Emulator, cpuEmulator);
CoreSettingsSetValue(SettingsID::Core_RandomizeInterrupt, randomizeInterrupt);
CoreSettingsSetValue(SettingsID::Core_EnableDebugger, debugger);
CoreSettingsSetValue(SettingsID::Core_OverrideGameSpecificSettings, overrideGameSettings);
if (!overrideGameSettings)
{
@@ -423,9 +425,9 @@ void SettingsDialog::saveCoreSettings(void)
siDmaDuration = -1;
}
g_Settings.SetValue(SettingsID::Core_DisableExtraMem, disableExtraMem);
g_Settings.SetValue(SettingsID::Core_CountPerOp, counterFactor);
g_Settings.SetValue(SettingsID::Core_SiDmaDuration, siDmaDuration);
CoreSettingsSetValue(SettingsID::Core_DisableExtraMem, disableExtraMem);
CoreSettingsSetValue(SettingsID::Core_CountPerOp, counterFactor);
CoreSettingsSetValue(SettingsID::Core_SiDmaDuration, siDmaDuration);
}
void SettingsDialog::saveGameSettings(void)
@@ -437,19 +439,19 @@ void SettingsDialog::saveGameSettings(void)
if (this->defaultGameInfo.Settings.disableextramem != (unsigned char)disableExtraMem)
{
g_Settings.SetValue(SettingsID::Game_DisableExtraMem, this->gameSection, disableExtraMem);
CoreSettingsSetValue(SettingsID::Game_DisableExtraMem, this->gameSection.toStdString(), disableExtraMem);
}
if (this->defaultGameInfo.Settings.savetype != saveType)
{
g_Settings.SetValue(SettingsID::Game_SaveType, this->gameSection, saveType);
CoreSettingsSetValue(SettingsID::Game_SaveType, this->gameSection.toStdString(), saveType);
}
if (this->defaultGameInfo.Settings.countperop != countPerOp)
{
g_Settings.SetValue(SettingsID::Game_CountPerOp, this->gameSection, countPerOp);
CoreSettingsSetValue(SettingsID::Game_CountPerOp, this->gameSection.toStdString(), countPerOp);
}
if (this->defaultGameInfo.Settings.sidmaduration != siDmaDuration)
{
g_Settings.SetValue(SettingsID::Game_SiDmaDuration, this->gameSection, siDmaDuration);
CoreSettingsSetValue(SettingsID::Game_SiDmaDuration, this->gameSection.toStdString(), siDmaDuration);
}
}
@@ -463,16 +465,16 @@ void SettingsDialog::saveGameCoreSettings(void)
cpuEmulator = gameCoreCpuEmulatorComboBox->currentIndex();
randomizeInterrupt = gameRandomizeTimingCheckBox->isChecked();
defaultOverrideEnabled = g_Settings.GetDefaultBoolValue(SettingsID::Game_OverrideCoreSettings);
defaultRandomizeInterrupt = g_Settings.GetDefaultBoolValue(SettingsID::Game_RandomizeInterrupt);
defaultCpuEmulator = g_Settings.GetDefaultIntValue(SettingsID::Game_CPU_Emulator);
defaultOverrideEnabled = CoreSettingsGetDefaultBoolValue(SettingsID::Game_OverrideCoreSettings);
defaultRandomizeInterrupt = CoreSettingsGetDefaultBoolValue(SettingsID::Game_RandomizeInterrupt);
defaultCpuEmulator = CoreSettingsGetDefaultIntValue(SettingsID::Game_CPU_Emulator);
if (defaultOverrideEnabled != overrideEnabled)
g_Settings.SetValue(SettingsID::Game_OverrideCoreSettings, this->gameSection, overrideEnabled);
CoreSettingsSetValue(SettingsID::Game_OverrideCoreSettings, this->gameSection.toStdString(), overrideEnabled);
if (defaultCpuEmulator != cpuEmulator)
g_Settings.SetValue(SettingsID::Game_CPU_Emulator, this->gameSection, cpuEmulator);
CoreSettingsSetValue(SettingsID::Game_CPU_Emulator, this->gameSection.toStdString(), cpuEmulator);
if (defaultRandomizeInterrupt != randomizeInterrupt)
g_Settings.SetValue(SettingsID::Game_RandomizeInterrupt, this->gameSection, randomizeInterrupt);
CoreSettingsSetValue(SettingsID::Game_RandomizeInterrupt, this->gameSection.toStdString(), randomizeInterrupt);
}
void SettingsDialog::saveGamePluginSettings(void)
@@ -489,9 +491,9 @@ void SettingsDialog::saveGamePluginSettings(void)
comboBox = comboBoxArray[i];
id = settingsIdArray[i];
if (comboBox->currentIndex() != 0)
if (comboBox->currentIndex() != 0 )
{
g_Settings.SetValue(id, this->gameSection, comboBox->currentData().toString());
CoreSettingsSetValue(id, this->gameSection.toStdString(), comboBox->currentData().toString().toStdString());
}
}
}
@@ -515,14 +517,14 @@ void SettingsDialog::savePluginSettings(void)
void SettingsDialog::saveDirectorySettings(void)
{
g_Settings.SetValue(SettingsID::Core_ScreenshotPath, this->screenshotDirLineEdit->text());
g_Settings.SetValue(SettingsID::Core_SaveStatePath, this->saveStateDirLineEdit->text());
g_Settings.SetValue(SettingsID::Core_SaveSRAMPath, this->saveSramDirLineEdit->text());
g_Settings.SetValue(SettingsID::Core_SharedDataPath, this->sharedDataDirLineEdit->text());
CoreSettingsSetValue(SettingsID::Core_ScreenshotPath, this->screenshotDirLineEdit->text().toStdString());
CoreSettingsSetValue(SettingsID::Core_SaveStatePath, this->saveStateDirLineEdit->text().toStdString());
CoreSettingsSetValue(SettingsID::Core_SaveSRAMPath, this->saveSramDirLineEdit->text().toStdString());
CoreSettingsSetValue(SettingsID::Core_SharedDataPath, this->sharedDataDirLineEdit->text().toStdString());
g_Settings.SetValue(SettingsID::Core_OverrideUserDirs, this->overrideUserDirsGroupBox->isChecked());
g_Settings.SetValue(SettingsID::Core_UserDataDirOverride, this->userDataDirLineEdit->text());
g_Settings.SetValue(SettingsID::Core_UserCacheDirOverride, this->userCacheDirLineEdit->text());
CoreSettingsSetValue(SettingsID::Core_OverrideUserDirs, this->overrideUserDirsGroupBox->isChecked());
CoreSettingsSetValue(SettingsID::Core_UserDataDirOverride, this->userDataDirLineEdit->text().toStdString());
CoreSettingsSetValue(SettingsID::Core_UserCacheDirOverride, this->userCacheDirLineEdit->text().toStdString());
}
void SettingsDialog::saveHotkeySettings(void)
@@ -532,11 +534,11 @@ void SettingsDialog::saveHotkeySettings(void)
void SettingsDialog::saveInterfaceSettings(void)
{
g_Settings.SetValue(SettingsID::GUI_AllowManualResizing, this->manualResizingCheckBox->isChecked());
g_Settings.SetValue(SettingsID::GUI_HideCursorInEmulation, this->hideCursorCheckBox->isChecked());
g_Settings.SetValue(SettingsID::GUI_StatusbarMessageDuration, this->statusBarMessageDurationSpinBox->value());
g_Settings.SetValue(SettingsID::RomBrowser_Recursive, this->searchSubDirectoriesCheckbox->isChecked());
g_Settings.SetValue(SettingsID::RomBrowser_MaxItems, this->romSearchLimitSpinBox->value());
CoreSettingsSetValue(SettingsID::GUI_AllowManualResizing, this->manualResizingCheckBox->isChecked());
CoreSettingsSetValue(SettingsID::GUI_HideCursorInEmulation, this->hideCursorCheckBox->isChecked());
CoreSettingsSetValue(SettingsID::GUI_StatusbarMessageDuration, this->statusBarMessageDurationSpinBox->value());
CoreSettingsSetValue(SettingsID::RomBrowser_Recursive, this->searchSubDirectoriesCheckbox->isChecked());
CoreSettingsSetValue(SettingsID::RomBrowser_MaxItems, this->romSearchLimitSpinBox->value());
}
void SettingsDialog::commonHotkeySettings(int action)
@@ -575,13 +577,13 @@ void SettingsDialog::commonHotkeySettings(int action)
{
default:
case 0:
keybinding.button->setText(g_Settings.GetStringValue(keybinding.settingId));
keybinding.button->setText(QString::fromStdString(CoreSettingsGetStringValue(keybinding.settingId)));
break;
case 1:
keybinding.button->setText(g_Settings.GetDefaultStringValue(keybinding.settingId));
keybinding.button->setText(QString::fromStdString(CoreSettingsGetDefaultStringValue(keybinding.settingId)));
break;
case 2:
g_Settings.SetValue(keybinding.settingId, keybinding.button->text());
CoreSettingsSetValue(keybinding.settingId, keybinding.button->text().toStdString());
break;
}
}
@@ -19,6 +19,7 @@
// needed for KeyBindButton in ui_SettingsDialog
#include "UserInterface/Widget/KeyBindButton.hpp"
#include "M64P/Wrapper/Types.hpp"
using namespace UserInterface::Widget;
#include "ui_SettingsDialog.h"
+57 -39
View File
@@ -8,10 +8,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "MainWindow.hpp"
#include "../Utilities/QtKeyToSdl2Key.hpp"
#include "Config.hpp"
#include "Globals.hpp"
#include "RMG-Core/Settings/Settings.hpp"
#include "UserInterface/EventFilter.hpp"
#include "Utilities/QtKeyToSdl2Key.hpp"
#include "Globals.hpp"
#include "Config.hpp"
#include <RMG-Core/Core.hpp>
#include <QCoreApplication>
#include <QDesktopServices>
@@ -44,17 +48,29 @@ bool MainWindow::Init(void)
return false;
}
if (!CoreInit())
{
this->ui_MessageBox("Error", "CoreInit() Failed", QString::fromStdString(CoreGetError()));
return false;
}
if (!g_MupenApi.Init(MUPEN_CORE_FILE))
{
this->ui_MessageBox("Error", "Api::Init Failed", g_MupenApi.GetLastError());
return false;
}
g_Settings.LoadDefaults();
if (!CoreSettingsSetupDefaults())
{
this->ui_MessageBox("Error", "CoreSettingsSetupDefaults() Failed", QString::fromStdString(CoreGetError()));
return false;
}
QString dataDir = g_Settings.GetStringValue(SettingsID::Core_UserDataDirOverride);
QString cacheDir = g_Settings.GetStringValue(SettingsID::Core_UserCacheDirOverride);
if (g_Settings.GetBoolValue(SettingsID::Core_OverrideUserDirs))
g_Plugins.LoadSettings();
QString dataDir = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::Core_UserDataDirOverride));
QString cacheDir = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::Core_UserCacheDirOverride));
if (CoreSettingsGetBoolValue(SettingsID::Core_OverrideUserDirs))
{
g_MupenApi.Config.OverrideUserPaths(dataDir, cacheDir);
}
@@ -69,7 +85,7 @@ bool MainWindow::Init(void)
};
for (const SettingsID settingId : directorySettings)
{
QString directory = g_Settings.GetStringValue(settingId);
QString directory = QString::fromStdString(CoreSettingsGetStringValue(settingId));
if (!QDir().exists(directory))
{
if (!QDir().mkdir(directory))
@@ -114,8 +130,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
QCoreApplication::processEvents();
}
g_Settings.SetValue(SettingsID::RomBrowser_Geometry,
QString(this->saveGeometry().toBase64().toStdString().c_str()));
QString geometryStr = QString(this->saveGeometry().toBase64().toStdString().c_str());
CoreSettingsSetValue(SettingsID::RomBrowser_Geometry, geometryStr.toStdString());
CoreSettingsSave();
QMainWindow::closeEvent(event);
}
@@ -131,7 +149,7 @@ void MainWindow::ui_Init(void)
this->ui_StatusBar_Label = new QLabel(this);
QString dir;
dir = g_Settings.GetStringValue(SettingsID::RomBrowser_Directory);
dir = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::RomBrowser_Directory));
this->ui_Widget_RomBrowser->SetDirectory(dir);
this->ui_Widget_RomBrowser->RefreshRomList();
@@ -162,7 +180,7 @@ void MainWindow::ui_Setup(void)
this->setCentralWidget(this->ui_Widgets);
QString geometry;
geometry = g_Settings.GetStringValue(SettingsID::RomBrowser_Geometry);
geometry = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::RomBrowser_Geometry));
if (!geometry.isEmpty())
{
@@ -175,7 +193,7 @@ void MainWindow::ui_Setup(void)
this->statusBar()->setHidden(false);
this->statusBar()->addPermanentWidget(this->ui_StatusBar_Label, 1);
this->ui_TimerTimeout = g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration);
this->ui_TimerTimeout = CoreSettingsGetIntValue(SettingsID::GUI_StatusbarMessageDuration);
this->ui_Widgets->addWidget(this->ui_Widget_RomBrowser);
this->ui_Widgets->addWidget(this->ui_Widget_OpenGL->GetWidget());
@@ -244,7 +262,7 @@ void MainWindow::ui_InEmulation(bool inEmulation, bool isPaused)
}
// update timer timeout
this->ui_TimerTimeout = g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration);
this->ui_TimerTimeout = CoreSettingsGetIntValue(SettingsID::GUI_StatusbarMessageDuration);
}
void MainWindow::ui_SaveGeometry(void)
@@ -355,7 +373,7 @@ void MainWindow::menuBar_Setup(bool inEmulation, bool isPaused)
QActionGroup *slotActionGroup = new QActionGroup(this);
QList<QAction *> slotActions;
QAction *slotAction;
int currentSaveslot = g_MupenApi.Core.GetSaveSlot();
int currentSaveslot = CoreGetSaveSlot();
for (int i = 0; i < 10; i++)
{
slotActions.append(new QAction(this));
@@ -453,8 +471,8 @@ void MainWindow::emulationThread_Launch(QString cartRom, QString diskRom)
this->ui_Widget_RomBrowser->StopRefreshRomList();
}
this->ui_AllowManualResizing = g_Settings.GetBoolValue(SettingsID::GUI_AllowManualResizing);
this->ui_HideCursorInEmulation = g_Settings.GetBoolValue(SettingsID::GUI_HideCursorInEmulation);
this->ui_AllowManualResizing = CoreSettingsGetBoolValue(SettingsID::GUI_AllowManualResizing);
this->ui_HideCursorInEmulation = CoreSettingsGetBoolValue(SettingsID::GUI_HideCursorInEmulation);
this->ui_Widget_OpenGL->SetAllowResizing(this->ui_AllowManualResizing);
this->ui_Widget_OpenGL->SetHideCursor(this->ui_HideCursorInEmulation);
@@ -511,74 +529,74 @@ void MainWindow::ui_Actions_Init(void)
void MainWindow::ui_Actions_Setup(bool inEmulation, bool isPaused)
{
QString keyBinding;
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_OpenROM);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_OpenROM));
this->action_File_OpenRom->setText("Open ROM");
this->action_File_OpenRom->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_OpenCombo);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_OpenCombo));
this->action_File_OpenCombo->setText("Open Combo");
this->action_File_OpenCombo->setShortcut(QKeySequence(keyBinding));
this->action_File_RomInfo->setText("ROM Info....");
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_StartEmulation);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_StartEmulation));
this->action_File_StartEmulation->setText("Start Emulation");
this->action_File_StartEmulation->setShortcut(QKeySequence(keyBinding));
this->action_File_StartEmulation->setEnabled(!inEmulation);
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_EndEmulation);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_EndEmulation));
this->action_File_EndEmulation->setText("End Emulation");
this->action_File_EndEmulation->setShortcut(QKeySequence(keyBinding));
this->action_File_EndEmulation->setEnabled(inEmulation);
this->action_File_Language->setText("Language");
this->action_File_ChooseDirectory->setText("Choose ROM Directory...");
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_RefreshROMList);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_RefreshROMList));
this->action_File_RefreshRomList->setText("Refresh ROM List");
this->action_File_RefreshRomList->setShortcut(QKeySequence(keyBinding));
this->action_File_RecentRom->setText("Recent ROM");
this->action_File_RecentRomDirectories->setText("Recent ROM Directories");
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Exit);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Exit));
this->action_File_Exit->setText("Exit");
this->action_File_Exit->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_SoftReset);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_SoftReset));
this->action_System_SoftReset->setText("Soft Reset");
this->action_System_SoftReset->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_HardReset);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_HardReset));
this->action_System_HardReset->setText("Hard Reset");
this->action_System_HardReset->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Resume);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Resume));
this->action_System_Pause->setText(isPaused ? "Resume" : "Pause");
this->action_System_Pause->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_GenerateBitmap);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_GenerateBitmap));
this->action_System_GenerateBitmap->setText("Generate Bitmap");
this->action_System_GenerateBitmap->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_LimitFPS);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_LimitFPS));
this->action_System_LimitFPS->setText("Limit FPS");
this->action_System_LimitFPS->setShortcut(QKeySequence(keyBinding));
this->action_System_LimitFPS->setCheckable(true);
this->action_System_LimitFPS->setChecked(g_MupenApi.Core.GetSpeedLimiterState());
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_SwapDisk);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_SwapDisk));
this->action_System_SwapDisk->setText("Swap Disk");
this->action_System_SwapDisk->setShortcut(QKeySequence(keyBinding));
this->action_System_SwapDisk->setEnabled(false);
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_SaveState);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_SaveState));
this->action_System_SaveState->setText("Save State");
this->action_System_SaveState->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_SaveAs);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_SaveAs));
this->action_System_SaveAs->setText("Save As...");
this->action_System_SaveAs->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_LoadState);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_LoadState));
this->action_System_LoadState->setText("Load State");
this->action_System_LoadState->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Load);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Load));
this->action_System_Load->setText("Load...");
this->action_System_Load->setShortcut(QKeySequence(keyBinding));
this->menu_System_CurrentSaveState->setTitle("Current Save State");
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Cheats);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Cheats));
this->action_System_Cheats->setText("Cheats...");
this->action_System_Cheats->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_GSButton);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_GSButton));
this->action_System_GSButton->setText("GS Button");
this->action_System_GSButton->setShortcut(QKeySequence(keyBinding));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Fullscreen);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Fullscreen));
this->action_Options_FullScreen->setText("Fullscreen");
this->action_Options_FullScreen->setEnabled(inEmulation);
this->action_Options_FullScreen->setShortcut(QKeySequence(keyBinding));
@@ -590,7 +608,7 @@ void MainWindow::ui_Actions_Setup(bool inEmulation, bool isPaused)
this->action_Options_ConfigRsp->setEnabled(g_MupenApi.Core.HasPluginConfig(M64P::Wrapper::PluginType::Rsp));
this->action_Options_ConfigControl->setText("Input Settings");
this->action_Options_ConfigControl->setEnabled(g_MupenApi.Core.HasPluginConfig(M64P::Wrapper::PluginType::Input));
keyBinding = g_Settings.GetStringValue(SettingsID::KeyBinding_Settings);
keyBinding = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::KeyBinding_Settings));
this->action_Options_Settings->setText("Settings");
this->action_Options_Settings->setShortcut(QKeySequence(keyBinding));
@@ -884,7 +902,7 @@ void MainWindow::on_Action_File_ChooseDirectory(void)
if (ret)
{
dir = dialog.selectedFiles().first();
g_Settings.SetValue(SettingsID::RomBrowser_Directory, dir);
CoreSettingsSetValue(SettingsID::RomBrowser_Directory, dir.toStdString());
this->ui_Widget_RomBrowser->SetDirectory(dir);
this->ui_Widget_RomBrowser->RefreshRomList();
}
@@ -1036,7 +1054,7 @@ void MainWindow::on_Action_System_Load(void)
void MainWindow::on_Action_System_CurrentSaveState(int slot)
{
if (!g_MupenApi.Core.SetSaveSlot(slot))
if (!CoreSetSaveSlot(slot))
{
this->ui_MessageBox("Error", "Api::Core::SetSaveSlot Failed", g_MupenApi.Core.GetLastError());
}
@@ -165,13 +165,13 @@ void RomBrowserWidget::model_Setup(void)
this->romSearcher_Launch(this->directory);
this->model_Columns = g_Settings.GetIntListValue(SettingsID::RomBrowser_Columns);
this->model_Columns = CoreSettingsGetIntListValue(SettingsID::RomBrowser_Columns);
// sanitize list
for (int column : this->model_Columns)
{
if (column >= (int)ColumnID::Invalid || column < 0)
{
this->model_Columns.removeOne(column);
this->model_Columns.erase(this->model_Columns.begin() + column);
}
}
@@ -232,8 +232,8 @@ void RomBrowserWidget::romSearcher_Launch(QString directory)
return;
}
this->romSearcher_Thread->SetMaximumFiles(g_Settings.GetIntValue(SettingsID::RomBrowser_MaxItems));
this->romSearcher_Thread->SetRecursive(g_Settings.GetBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearcher_Thread->SetMaximumFiles(CoreSettingsGetIntValue(SettingsID::RomBrowser_MaxItems));
this->romSearcher_Thread->SetRecursive(CoreSettingsGetBoolValue(SettingsID::RomBrowser_Recursive));
this->romSearcher_Thread->SetDirectory(directory);
this->romSearcher_Thread->start();
}
@@ -243,7 +243,7 @@ void RomBrowserWidget::column_SetSize(void)
int index = 0;
int columnCount = (this->model_Model->columnCount() - 1);
QList<int> sizes = g_Settings.GetIntListValue(SettingsID::RomBrowser_ColumnSizes);
std::vector<int> sizes = CoreSettingsGetIntListValue(SettingsID::RomBrowser_ColumnSizes);
for (int id : this->model_Columns)
{
@@ -266,7 +266,7 @@ void RomBrowserWidget::column_SetSize(void)
int RomBrowserWidget::column_GetSizeSettingIndex(int column)
{
QList<int> sizes = g_Settings.GetIntListValue(SettingsID::RomBrowser_ColumnSizes);
std::vector<int> sizes = CoreSettingsGetIntListValue(SettingsID::RomBrowser_ColumnSizes);
for (int id : this->model_Columns)
{
@@ -323,7 +323,7 @@ void RomBrowserWidget::customContextMenuRequested(QPoint position)
void RomBrowserWidget::on_columnResized(int column, int oldWidth, int newWidth)
{
QList<int> sizes = g_Settings.GetIntListValue(SettingsID::RomBrowser_ColumnSizes);
std::vector<int> sizes = CoreSettingsGetIntListValue(SettingsID::RomBrowser_ColumnSizes);
int sizeIndex = this->column_GetSizeSettingIndex(column);
@@ -336,7 +336,7 @@ void RomBrowserWidget::on_columnResized(int column, int oldWidth, int newWidth)
sizes[sizeIndex] = newWidth;
g_Settings.SetValue(SettingsID::RomBrowser_ColumnSizes, sizes);
CoreSettingsSetValue(SettingsID::RomBrowser_ColumnSizes, sizes);
}
void RomBrowserWidget::on_Action_PlayGame(void)
@@ -63,7 +63,7 @@ class RomBrowserWidget : public QTableView
void contextMenu_Actions_Connect(void);
QStandardItemModel *model_Model;
QList<int> model_Columns;
std::vector<int> model_Columns;
void model_Init(void);
void model_Setup(void);
+3 -3
View File
@@ -9,7 +9,7 @@
*/
#include "Plugins.hpp"
#include "../Globals.hpp"
#include "Utilities/SettingsID.hpp"
#include <QDir>
@@ -31,7 +31,7 @@ void Plugins::LoadSettings()
for (const Plugin_t &p : this->GetAvailablePlugins())
{
settingsID = this->pluginTypeToSettingsId(p.Type);
settingValue = g_Settings.GetStringValue(settingsID);
settingValue = QString::fromStdString(CoreSettingsGetStringValue(settingsID));
if (settingValue == p.FileName || settingValue.isEmpty())
{
this->ChangePlugin(p);
@@ -60,7 +60,7 @@ bool Plugins::ChangePlugin(Plugin_t plugin)
if (ret)
{
settingsID = this->pluginTypeToSettingsId(plugin.Type);
g_Settings.SetValue(settingsID, plugin.FileName);
CoreSettingsSetValue(settingsID, plugin.FileName.toStdString());
}
return ret;
+1 -1
View File
@@ -11,7 +11,7 @@
#define PLUGINS_HPP
#include "M64P/Wrapper/Types.hpp"
#include "SettingsID.hpp"
#include <RMG-Core/Core.hpp>
#include <QList>
-594
View File
@@ -1,594 +0,0 @@
/*
* Rosalie's Mupen GUI - https://github.com/Rosalie241/RMG
* Copyright (C) 2020 Rosalie Wanders <rosalie@mailbox.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "Settings.hpp"
#include "../Globals.hpp"
#include "UserInterface/Widget/ColumnID.hpp"
#include "Utilities/SettingsID.hpp"
#include <QVariant>
using namespace Utilities;
Settings::Settings()
{
}
Settings::~Settings()
{
}
void Settings::LoadDefaults()
{
Setting_t setting;
for (int i = 0; i < (int)SettingsID::Invalid; i++)
{
setting = this->getSetting((SettingsID)i);
if (setting.Section.isEmpty())
continue;
switch (setting.Default.type())
{
case QVariant::Type::String:
if (setting.ForceUseSet && this->GetStringValue((SettingsID)i).isEmpty())
this->SetValue((SettingsID)i, setting.Default.toString());
else
g_MupenApi.Config.SetDefaultOption(setting.Section, setting.Key, setting.Default.toString(),
setting.Help);
break;
case QVariant::Type::Int:
g_MupenApi.Config.SetDefaultOption(setting.Section, setting.Key, setting.Default.toInt(), setting.Help);
break;
case QVariant::Type::List: {
QString str = "";
for (QVariant &v : setting.Default.toList())
{
// TODO, support other QList<T>s aswell
str += QString::number(v.toInt()) + ";";
}
g_MupenApi.Config.SetDefaultOption(setting.Section, setting.Key, str, setting.Help);
break;
}
default:
case QVariant::Type::Bool:
g_MupenApi.Config.SetDefaultOption(setting.Section, setting.Key, setting.Default.toBool(), setting.Help);
break;
}
}
g_Plugins.LoadSettings();
g_MupenApi.Config.Save();
}
int Settings::GetDefaultIntValue(SettingsID id)
{
return this->getDefaultIntValue(this->getSetting(id));
}
bool Settings::GetDefaultBoolValue(SettingsID id)
{
return this->getDefaultBoolValue(this->getSetting(id));
}
float Settings::GetDefaultFloatValue(SettingsID id)
{
return this->getDefaultFloatValue(this->getSetting(id));
}
QString Settings::GetDefaultStringValue(SettingsID id)
{
return this->getDefaultStringValue(this->getSetting(id));
}
QList<int> Settings::GetDefaultIntListValue(SettingsID id)
{
return this->getDefaultIntListValue(this->getSetting(id));
}
int Settings::GetDefaultIntValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getDefaultIntValue(s);
}
bool Settings::GetDefaultBoolValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getDefaultBoolValue(s);
}
float Settings::GetDefaultFloatValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getDefaultFloatValue(s);
}
QString Settings::GetDefaultStringValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getDefaultStringValue(s);
}
QList<int> Settings::GetDefaultIntListValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getDefaultIntListValue(s);
}
int Settings::GetIntValue(SettingsID id)
{
return this->getIntValue(this->getSetting(id));
}
bool Settings::GetBoolValue(SettingsID id)
{
return this->getBoolValue(this->getSetting(id));
}
float Settings::GetFloatValue(SettingsID id)
{
return this->getFloatValue(this->getSetting(id));
}
QString Settings::GetStringValue(SettingsID id)
{
return this->getStringValue(this->getSetting(id));
}
QList<int> Settings::GetIntListValue(SettingsID id)
{
return this->getIntListValue(this->getSetting(id));
}
int Settings::GetIntValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getIntValue(s);
}
bool Settings::GetBoolValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getBoolValue(s);
}
float Settings::GetFloatValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getFloatValue(s);
}
QString Settings::GetStringValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getStringValue(s);
}
QList<int> Settings::GetIntListValue(SettingsID id, QString section)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->getIntListValue(s);
}
bool Settings::SetValue(SettingsID id, int value)
{
return this->setValue(this->getSetting(id), value);
}
bool Settings::SetValue(SettingsID id, bool value)
{
return this->setValue(this->getSetting(id), value);
}
bool Settings::SetValue(SettingsID id, float value)
{
return this->setValue(this->getSetting(id), value);
}
bool Settings::SetValue(SettingsID id, QString value)
{
return this->setValue(this->getSetting(id), value);
}
bool Settings::SetValue(SettingsID id, QList<int> value)
{
return this->setValue(this->getSetting(id), value);
}
bool Settings::SetValue(SettingsID id, QString section, int value)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->setValue(s, value);
}
bool Settings::SetValue(SettingsID id, QString section, bool value)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->setValue(s, value);
}
bool Settings::SetValue(SettingsID id, QString section, float value)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->setValue(s, value);
}
bool Settings::SetValue(SettingsID id, QString section, QString value)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->setValue(s, value);
}
bool Settings::SetValue(SettingsID id, QString section, QList<int> value)
{
Setting_t s = this->getSetting(id);
s.Section = section;
return this->setValue(s, value);
}
#define GUI_SECTION "Rosalie's Mupen GUI"
#define CORE_SECTION GUI_SECTION " Core"
#define OVERLAY_SECTION CORE_SECTION " Overlay"
#define KEYBIND_SECTION GUI_SECTION " KeyBindings"
#define ROMBROWSER_SECTION GUI_SECTION " RomBrowser"
#define M64P_SECTION "Core"
Setting_t Settings::getSetting(SettingsID id)
{
Setting_t setting = {"", "", "", "", false};
switch (id)
{
default:
break;
case SettingsID::GUI_SettingsDialogWidth:
setting = {GUI_SECTION, "SettingsDialogWidth", 0, "", false};
break;
case SettingsID::GUI_SettingsDialogHeight:
setting = {GUI_SECTION, "SettingsDialogHeight", 0, "", false};
break;
case SettingsID::GUI_AllowManualResizing:
setting = {GUI_SECTION, "AllowManualResizing", true, "", false};
break;
case SettingsID::GUI_HideCursorInEmulation:
setting = {GUI_SECTION, "HideCursorInEmulation", false, "", false};
break;
case SettingsID::GUI_StatusbarMessageDuration:
setting = {GUI_SECTION, "StatusbarMessageDuration", 3, "", false};
break;
/*
case SettingsID::GUI_PauseEmulationOnFocusLoss:
setting = {GUI_SECTION, "PauseEmulationOnFocusLoss", true, "", false};
break;
case SettingsID::GUI_ResumeEmulationOnFocus:
setting = {GUI_SECTION, "ResumeEmulationOnFocus", true, "", false};
break;
*/
case SettingsID::Core_GFX_Plugin:
setting = {CORE_SECTION, "GFX_Plugin", "", "", false};
break;
case SettingsID::Core_AUDIO_Plugin:
setting = {CORE_SECTION, "AUDIO_Plugin", "", "", false};
break;
case SettingsID::Core_INPUT_Plugin:
setting = {CORE_SECTION, "INPUT_Plugin", "", "", false};
break;
case SettingsID::Core_RSP_Plugin:
setting = {CORE_SECTION, "RSP_Plugin", "", "", false};
break;
case SettingsID::Core_OverrideUserDirs:
setting = {CORE_SECTION, "OverrideUserDirectories", true, "", false};
break;
case SettingsID::Core_UserDataDirOverride:
setting = {CORE_SECTION, "UserDataDirectory", "Data", "", false};
break;
case SettingsID::Core_UserCacheDirOverride:
setting = {CORE_SECTION, "UserCacheDirectory", "Cache", "", false};
break;
case SettingsID::Core_OverrideGameSpecificSettings:
setting = {CORE_SECTION, "OverrideGameSpecificSettings", false, "", false};
break;
case SettingsID::Core_RandomizeInterrupt:
setting = {OVERLAY_SECTION, "RandomizeInterrupt", true, "", false};
break;
case SettingsID::Core_CPU_Emulator:
setting = {OVERLAY_SECTION, "CPU_Emulator", 2, "", false};
break;
case SettingsID::Core_DisableExtraMem:
setting = {OVERLAY_SECTION, "DisableExtraMem", false, "", false};
break;
case SettingsID::Core_EnableDebugger:
setting = {OVERLAY_SECTION, "EnableDebugger", false, "", false};
break;
case SettingsID::Core_CountPerOp:
setting = {OVERLAY_SECTION, "CountPerOp", 0, "", false};
break;
case SettingsID::Core_SiDmaDuration:
setting = {OVERLAY_SECTION, "SiDmaDuration", -1, "", false};
break;
case SettingsID::Core_ScreenshotPath:
setting = {M64P_SECTION, "ScreenshotPath", "Screenshots", "", true};
break;
case SettingsID::Core_SaveStatePath:
setting = {M64P_SECTION, "SaveStatePath", "Save/State", "", true};
break;
case SettingsID::Core_SaveSRAMPath:
setting = {M64P_SECTION, "SaveSRAMPath", "Save/Game", "", true};
break;
case SettingsID::Core_SharedDataPath:
setting = {M64P_SECTION, "SharedDataPath", "Data", "", true};
break;
case SettingsID::Core_64DD_RomFile:
setting = {CORE_SECTION, "64DD_RomFile", "", "", false};
break;
case SettingsID::Game_DisableExtraMem:
setting = {"", "DisableExtraMem", false, "", false};
break;
case SettingsID::Game_SaveType:
setting = {"", "SaveType", 0, "", false};
break;
case SettingsID::Game_CountPerOp:
setting = {"", "CountPerOp", 2, "", false};
break;
case SettingsID::Game_SiDmaDuration:
setting = {"", "SiDmaDuration", 2304, "", false};
break;
case SettingsID::Game_OverrideCoreSettings:
setting = {"", "OverrideCoreSettings", false, "", false};
break;
case SettingsID::Game_CPU_Emulator:
setting = {"", "CPU_Emulator", 2, "", false};
break;
case SettingsID::Game_RandomizeInterrupt:
setting = {"", "RandomizeInterrupt", true, "", false};
break;
case SettingsID::Game_GFX_Plugin:
setting = {"", "GFX_Plugin", "", "", false};
break;
case SettingsID::Game_AUDIO_Plugin:
setting = {"", "AUDIO_Plugin", "", "", false};
break;
case SettingsID::Game_INPUT_Plugin:
setting = {"", "INPUT_Plugin", "", "", false};
break;
case SettingsID::Game_RSP_Plugin:
setting = {"", "RSP_Plugin", "", "", false};
break;
case SettingsID::KeyBinding_OpenROM:
setting = {KEYBIND_SECTION, "OpenROM", "Ctrl+O", "", false};
break;
case SettingsID::KeyBinding_OpenCombo:
setting = {KEYBIND_SECTION, "OpenCombo", "Ctrl+Shift+O", "", false};
break;
case SettingsID::KeyBinding_StartEmulation:
setting = {KEYBIND_SECTION, "StartEmulation", "F11", "", false};
break;
case SettingsID::KeyBinding_EndEmulation:
setting = {KEYBIND_SECTION, "EndEmulation", "F12", "", false};
break;
case SettingsID::KeyBinding_RefreshROMList:
setting = {KEYBIND_SECTION, "RefreshROMList", "F5", "", false};
break;
case SettingsID::KeyBinding_Exit:
setting = {KEYBIND_SECTION, "Exit", "Alt+F4", "", false};
break;
case SettingsID::KeyBinding_SoftReset:
setting = {KEYBIND_SECTION, "SoftReset", "F1", "", false};
break;
case SettingsID::KeyBinding_HardReset:
setting = {KEYBIND_SECTION, "HardReset", "Shift+F1", "", false};
break;
case SettingsID::KeyBinding_Resume:
setting = {KEYBIND_SECTION, "Resume", "F2", "", false};
break;
case SettingsID::KeyBinding_GenerateBitmap:
setting = {KEYBIND_SECTION, "GenerateBitmap", "F3", "", false};
break;
case SettingsID::KeyBinding_LimitFPS:
setting = {KEYBIND_SECTION, "LimitFPS", "F4", "", false};
break;
case SettingsID::KeyBinding_SwapDisk:
setting = {KEYBIND_SECTION, "SwapDisk", "Ctrl+D", "", false};
break;
case SettingsID::KeyBinding_SaveState:
setting = {KEYBIND_SECTION, "SaveState", "F5", "", false};
break;
case SettingsID::KeyBinding_SaveAs:
setting = {KEYBIND_SECTION, "SaveAs", "Ctrl+S", "", false};
break;
case SettingsID::KeyBinding_LoadState:
setting = {KEYBIND_SECTION, "LoadState", "F7", "", false};
break;
case SettingsID::KeyBinding_Load:
setting = {KEYBIND_SECTION, "Load", "Ctrl+L", "", false};
break;
case SettingsID::KeyBinding_Cheats:
setting = {KEYBIND_SECTION, "Cheats", "Ctrl+C", "", false};
break;
case SettingsID::KeyBinding_GSButton:
setting = {KEYBIND_SECTION, "GSButton", "F9", "", false};
break;
case SettingsID::KeyBinding_Fullscreen:
setting = {KEYBIND_SECTION, "Fullscreen", "Alt+Return", "", false};
break;
case SettingsID::KeyBinding_Settings:
setting = {KEYBIND_SECTION, "Settings", "Ctrl+T", "", false};
break;
case SettingsID::RomBrowser_Directory:
setting = {ROMBROWSER_SECTION, "Directory", "", "", false};
break;
case SettingsID::RomBrowser_Geometry:
setting = {ROMBROWSER_SECTION, "Geometry", "", "", false};
break;
case SettingsID::RomBrowser_Recursive:
setting = {ROMBROWSER_SECTION, "Recursive", true, "", false};
break;
case SettingsID::RomBrowser_MaxItems:
setting = {ROMBROWSER_SECTION, "MaxItems", 50, "", false};
break;
case SettingsID::RomBrowser_Columns:
setting = {ROMBROWSER_SECTION, "Columns", QVariant({(int)ColumnID::GoodName, (int)ColumnID::InternalName, (int)ColumnID::MD5}), "", false};
break;
case SettingsID::RomBrowser_ColumnSizes:
setting = {ROMBROWSER_SECTION, "ColumnSizes", QVariant({(int)ColumnID::GoodName, 250, (int)ColumnID::InternalName, 100, (int)ColumnID::MD5, 100}), "", false};
break;
}
return setting;
}
int Settings::getDefaultIntValue(Setting_t s)
{
return s.Default.toInt();
}
bool Settings::getDefaultBoolValue(Setting_t s)
{
return s.Default.toBool();
}
float Settings::getDefaultFloatValue(Setting_t s)
{
return s.Default.toFloat();
}
QString Settings::getDefaultStringValue(Setting_t s)
{
return s.Default.toString();
}
QList<int> Settings::getDefaultIntListValue(Setting_t s)
{
QList<int> value;
for (const QVariant& var : s.Default.toList())
{
value.append(var.toInt());
}
return value;
}
int Settings::getIntValue(Setting_t s)
{
int value = s.Default.toInt();
if (!s.Section.isEmpty() && g_MupenApi.Config.SectionExists(s.Section))
g_MupenApi.Config.GetOption(s.Section, s.Key, &value);
return value;
}
bool Settings::getBoolValue(Setting_t s)
{
bool value = s.Default.toBool();
if (!s.Section.isEmpty() && g_MupenApi.Config.SectionExists(s.Section))
g_MupenApi.Config.GetOption(s.Section, s.Key, &value);
return value;
}
float Settings::getFloatValue(Setting_t s)
{
float value = s.Default.toFloat();
if (!s.Section.isEmpty() && g_MupenApi.Config.SectionExists(s.Section))
g_MupenApi.Config.GetOption(s.Section, s.Key, &value);
return value;
}
QString Settings::getStringValue(Setting_t s)
{
QString value = s.Default.toString();
if (!s.Section.isEmpty() && g_MupenApi.Config.SectionExists(s.Section))
g_MupenApi.Config.GetOption(s.Section, s.Key, &value);
return value;
}
QList<int> Settings::getIntListValue(Setting_t s)
{
QList<int> value;
if (!s.Section.isEmpty() && g_MupenApi.Config.SectionExists(s.Section))
{
QString strValue = this->getStringValue(s);
for (const QString& str : strValue.split(";"))
{
if (str.isEmpty())
{
continue;
}
value.append(str.toInt());
}
}
if (value.isEmpty())
{
value = this->getDefaultIntListValue(s);
}
return value;
}
bool Settings::setValue(Setting_t s, int value)
{
bool ret = false;
ret = g_MupenApi.Config.SetOption(s.Section, s.Key, value);
return ret;
}
bool Settings::setValue(Setting_t s, bool value)
{
bool ret = false;
ret = g_MupenApi.Config.SetOption(s.Section, s.Key, value);
return ret;
}
bool Settings::setValue(Setting_t s, float value)
{
bool ret = false;
ret = g_MupenApi.Config.SetOption(s.Section, s.Key, value);
return ret;
}
bool Settings::setValue(Setting_t s, QString value)
{
bool ret = false;
ret = g_MupenApi.Config.SetOption(s.Section, s.Key, value);
return ret;
}
bool Settings::setValue(Setting_t s, QList<int> value)
{
QString str;
for (const int& val : value)
{
str += QString::number(val) + ";";
}
return this->setValue(s, str);
}
-85
View File
@@ -1,85 +0,0 @@
/*
* Rosalie's Mupen GUI - https://github.com/Rosalie241/RMG
* Copyright (C) 2020 Rosalie Wanders <rosalie@mailbox.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef SETTINGS_HPP
#define SETTINGS_HPP
#include "Utilities/SettingsID.hpp"
#include <QString>
namespace Utilities
{
class Settings
{
public:
Settings();
~Settings();
void LoadDefaults(void);
int GetDefaultIntValue(SettingsID);
bool GetDefaultBoolValue(SettingsID);
float GetDefaultFloatValue(SettingsID);
QString GetDefaultStringValue(SettingsID);
QList<int> GetDefaultIntListValue(SettingsID);
int GetDefaultIntValue(SettingsID, QString);
bool GetDefaultBoolValue(SettingsID, QString);
float GetDefaultFloatValue(SettingsID, QString);
QString GetDefaultStringValue(SettingsID, QString);
QList<int> GetDefaultIntListValue(SettingsID, QString);
int GetIntValue(SettingsID);
bool GetBoolValue(SettingsID);
float GetFloatValue(SettingsID);
QString GetStringValue(SettingsID);
QList<int> GetIntListValue(SettingsID);
int GetIntValue(SettingsID, QString);
bool GetBoolValue(SettingsID, QString);
float GetFloatValue(SettingsID, QString);
QString GetStringValue(SettingsID, QString);
QList<int> GetIntListValue(SettingsID, QString);
bool SetValue(SettingsID, int);
bool SetValue(SettingsID, bool);
bool SetValue(SettingsID, float);
bool SetValue(SettingsID, QString);
bool SetValue(SettingsID, QList<int>);
bool SetValue(SettingsID, QString, int);
bool SetValue(SettingsID, QString, bool);
bool SetValue(SettingsID, QString, float);
bool SetValue(SettingsID, QString, QString);
bool SetValue(SettingsID, QString, QList<int>);
private:
Setting_t getSetting(SettingsID);
int getDefaultIntValue(Setting_t);
bool getDefaultBoolValue(Setting_t);
float getDefaultFloatValue(Setting_t);
QString getDefaultStringValue(Setting_t);
QList<int> getDefaultIntListValue(Setting_t);
int getIntValue(Setting_t);
bool getBoolValue(Setting_t);
float getFloatValue(Setting_t);
QString getStringValue(Setting_t);
QList<int> getIntListValue(Setting_t);
bool setValue(Setting_t, int);
bool setValue(Setting_t, bool);
bool setValue(Setting_t, float);
bool setValue(Setting_t, QString);
bool setValue(Setting_t, QList<int>);
};
} // namespace Utilities
#endif // SETTINGS_HPP
-119
View File
@@ -1,119 +0,0 @@
/*
* Rosalie's Mupen GUI - https://github.com/Rosalie241/RMG
* Copyright (C) 2020 Rosalie Wanders <rosalie@mailbox.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef SETTINGSTYPES_HPP
#define SETTINGSTYPES_HPP
#include "Config.hpp"
#include <QString>
#include <QVariant>
typedef struct
{
QString Section;
QString Key;
QVariant Default;
QString Help;
bool ForceUseSet;
} Setting_t;
enum class SettingsID
{
// GUI Settings
GUI_SettingsDialogWidth = 0,
GUI_SettingsDialogHeight,
GUI_AllowManualResizing,
GUI_HideCursorInEmulation,
GUI_StatusbarMessageDuration,
/*
GUI_PauseEmulationOnFocusLoss,
GUI_ResumeEmulationOnFocus,
*/
// Core Plugin Settings
Core_GFX_Plugin,
Core_AUDIO_Plugin,
Core_INPUT_Plugin,
Core_RSP_Plugin,
// Core User Directory Settings
Core_OverrideUserDirs,
Core_UserDataDirOverride,
Core_UserCacheDirOverride,
// Core 64DD ROM Settings
Core_64DD_RomFile,
// (mupen64plus) Core Settings
Core_OverrideGameSpecificSettings,
Core_RandomizeInterrupt,
Core_CPU_Emulator,
Core_DisableExtraMem,
Core_EnableDebugger,
Core_CountPerOp,
Core_SiDmaDuration,
// (mupen64plus) Core Directory Settings
Core_ScreenshotPath,
Core_SaveStatePath,
Core_SaveSRAMPath,
Core_SharedDataPath,
// Game Specific Settings
Game_DisableExtraMem,
Game_SaveType,
Game_CountPerOp,
Game_SiDmaDuration,
// Game Core Override Settings
Game_OverrideCoreSettings,
Game_CPU_Emulator,
Game_RandomizeInterrupt,
// Game Plugin Settings
Game_GFX_Plugin,
Game_AUDIO_Plugin,
Game_INPUT_Plugin,
Game_RSP_Plugin,
// GUI KeyBindings
KeyBinding_OpenROM,
KeyBinding_OpenCombo,
KeyBinding_StartEmulation,
KeyBinding_EndEmulation,
KeyBinding_RefreshROMList,
KeyBinding_Exit,
KeyBinding_SoftReset,
KeyBinding_HardReset,
KeyBinding_Resume,
KeyBinding_GenerateBitmap,
KeyBinding_LimitFPS,
KeyBinding_SwapDisk,
KeyBinding_SaveState,
KeyBinding_SaveAs,
KeyBinding_LoadState,
KeyBinding_Load,
KeyBinding_Cheats,
KeyBinding_GSButton,
KeyBinding_Fullscreen,
KeyBinding_Settings,
// RomBrowser Settings
RomBrowser_Directory,
RomBrowser_Geometry,
RomBrowser_Recursive,
RomBrowser_MaxItems,
RomBrowser_Columns,
RomBrowser_ColumnSizes,
Invalid
};
#endif // SETTINGSTYPES_HPP