summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/settings.cpp44
-rw-r--r--src/settings.h36
-rw-r--r--src/settingsdialog.cpp26
-rw-r--r--src/settingsdialog.h4
-rw-r--r--src/settingsdialoggeneral.cpp24
-rw-r--r--src/settingsdialognexus.cpp11
-rw-r--r--src/settingsdialognexus.h1
7 files changed, 9 insertions, 137 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index dc07e107..e7a853a2 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -18,58 +18,16 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "settings.h"
-
-#include "pluginsetting.h"
#include "serverinfo.h"
-#include "versioninfo.h"
#include "appconfig.h"
-#include "organizercore.h"
#include <utility.h>
-#include <iplugin.h>
#include <iplugingame.h>
-#include <questionboxmemory.h>
#include <usvfsparameters.h>
-#include <QCheckBox>
-#include <QCoreApplication>
-#include <QComboBox>
-#include <QDate>
-#include <QDialog>
-#include <QDir>
-#include <QDirIterator>
-#include <QFileInfo>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QListWidgetItem>
-#include <QLocale>
-#include <QMessageBox>
-#include <QApplication>
-#include <QRegExp>
-#include <QDir>
-#include <QStringList>
-#include <QVariantMap>
-#include <QLabel>
-#include <QPushButton>
-#include <QPalette>
-
-#include <Qt> // for Qt::UserRole, etc
-
-#include <Windows.h> // For ShellExecuteW, HINSTANCE, etc
-#include <wincred.h> // For storage
-
-#include <algorithm> // for sort
-#include <memory>
-#include <stdexcept> // for runtime_error
-#include <string>
-#include <utility> // for pair, make_pair
-
-
using namespace MOBase;
-
Settings *Settings::s_Instance = nullptr;
-
Settings::Settings(const QSettings &settingsSource)
: m_Settings(settingsSource.fileName(), settingsSource.format())
{
@@ -80,13 +38,11 @@ Settings::Settings(const QSettings &settingsSource)
}
}
-
Settings::~Settings()
{
s_Instance = nullptr;
}
-
Settings &Settings::instance()
{
if (s_Instance == nullptr) {
diff --git a/src/settings.h b/src/settings.h
index 899baaa3..b20e78d0 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -23,17 +23,6 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "loadmechanism.h"
#include <log.h>
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QSet>
-#include <QSettings>
-#include <QString>
-#include <QVariant>
-#include <QColor>
-#include <map>
-#include <vector>
-
namespace MOBase {
class IPlugin;
class IPluginGame;
@@ -376,6 +365,8 @@ public:
*/
bool colorSeparatorScrollbar() const;
+ static QColor getIdealTextColor(const QColor& rBackgroundColor);
+
// temp
QSettings& settingsRef() { return m_Settings; }
MOBase::IPluginGame const *gamePlugin() { return m_GamePlugin; }
@@ -386,37 +377,24 @@ public:
const LoadMechanism& loadMechanism() const { return m_LoadMechanism; }
public slots:
-
void managedGameChanged(MOBase::IPluginGame const *gamePlugin);
-public:
- static QColor getIdealTextColor(const QColor& rBackgroundColor);
-private:
-
- static bool obfuscate(const QString key, const QString data);
- static QString deObfuscate(const QString key);
-
- void readPluginBlacklist();
- QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
-
-private slots:
signals:
-
void languageChanged(const QString &newLanguage);
void styleChanged(const QString &newStyle);
private:
-
static Settings *s_Instance;
-
MOBase::IPluginGame const *m_GamePlugin;
-
QSettings m_Settings;
-
LoadMechanism m_LoadMechanism;
-
std::vector<MOBase::IPlugin*> m_Plugins;
+ static bool obfuscate(const QString key, const QString data);
+ static QString deObfuscate(const QString key);
+
+ void readPluginBlacklist();
+ QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
};
#endif // SETTINGS_H
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 8c5b2678..e008086a 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -18,17 +18,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "settingsdialog.h"
-
#include "ui_settingsdialog.h"
-#include "categoriesdialog.h"
-#include "helper.h"
-#include "noeditdelegate.h"
-#include "iplugingame.h"
-#include "settings.h"
-#include "instancemanager.h"
-#include "nexusinterface.h"
-#include "plugincontainer.h"
-
#include "settingsdialogdiagnostics.h"
#include "settingsdialoggeneral.h"
#include "settingsdialognexus.h"
@@ -37,22 +27,6 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "settingsdialogsteam.h"
#include "settingsdialogworkarounds.h"
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-
-#include <QDirIterator>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QShortcut>
-#include <QColorDialog>
-#include <QInputDialog>
-#include <QJsonDocument>
-#include <QDesktopServices>
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-
using namespace MOBase;
SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings* settings, QWidget *parent)
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index f2367315..03bba7cf 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -21,15 +21,13 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#define SETTINGSDIALOG_H
#include "tutorabledialog.h"
-#include "nxmaccessmanager.h"
-#include <iplugin.h>
-#include <QListWidgetItem>
class PluginContainer;
class Settings;
class SettingsDialog;
namespace Ui { class SettingsDialog; }
+
class SettingsTab
{
public:
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index cd98dfdc..324dc4f4 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -33,28 +33,6 @@ GeneralSettingsTab::GeneralSettingsTab(Settings *m_parent, SettingsDialog &m_dia
ui->styleBox->setCurrentIndex(currentID);
}
}
- /* verision using palette only works with fusion theme for some stupid reason...
- m_overwritingBtn->setAutoFillBackground(true);
- m_overwrittenBtn->setAutoFillBackground(true);
- m_containsBtn->setAutoFillBackground(true);
- m_containedBtn->setAutoFillBackground(true);
- m_overwritingBtn->setPalette(QPalette(m_parent->modlistOverwritingLooseColor()));
- m_overwrittenBtn->setPalette(QPalette(m_parent->modlistOverwrittenLooseColor()));
- m_containsBtn->setPalette(QPalette(m_parent->modlistContainsPluginColor()));
- m_containedBtn->setPalette(QPalette(m_parent->pluginListContainedColor()));
- QPalette palette1 = m_overwritingBtn->palette();
- QPalette palette2 = m_overwrittenBtn->palette();
- QPalette palette3 = m_containsBtn->palette();
- QPalette palette4 = m_containedBtn->palette();
- palette1.setColor(QPalette::Background, m_parent->modlistOverwritingLooseColor());
- palette2.setColor(QPalette::Background, m_parent->modlistOverwrittenLooseColor());
- palette3.setColor(QPalette::Background, m_parent->modlistContainsPluginColor());
- palette4.setColor(QPalette::Background, m_parent->pluginListContainedColor());
- m_overwritingBtn->setPalette(palette1);
- m_overwrittenBtn->setPalette(palette2);
- m_containsBtn->setPalette(palette3);
- m_containedBtn->setPalette(palette4);
- */
//version with stylesheet
setButtonColor(ui->overwritingBtn, m_parent->modlistOverwritingLooseColor());
@@ -137,12 +115,10 @@ void GeneralSettingsTab::addLanguages()
}
}
languages.push_back(std::make_pair(QString("%1").arg(languageString), exp.cap(1)));
- //languageBox->addItem(QString("%1").arg(languageString), exp.cap(1));
}
}
if (!ui->languageBox->findText("English")) {
languages.push_back(std::make_pair(QString("English"), QString("en_US")));
- //languageBox->addItem("English", "en_US");
}
std::sort(languages.begin(), languages.end());
for (const auto &lang : languages) {
diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
index 7d4414fd..575f54d0 100644
--- a/src/settingsdialognexus.cpp
+++ b/src/settingsdialognexus.cpp
@@ -114,17 +114,6 @@ NexusSettingsTab::NexusSettingsTab(Settings *parent, SettingsDialog &dialog)
void NexusSettingsTab::update()
{
- /*
- if (m_loginCheckBox->isChecked()) {
- m_Settings.setValue("Settings/nexus_login", true);
- m_Settings.setValue("Settings/nexus_username", m_usernameEdit->text());
- m_Settings.setValue("Settings/nexus_password", obfuscate(m_passwordEdit->text()));
- } else {
- m_Settings.setValue("Settings/nexus_login", false);
- m_Settings.remove("Settings/nexus_username");
- m_Settings.remove("Settings/nexus_password");
- }
- */
m_Settings.setValue("Settings/offline_mode", ui->offlineBox->isChecked());
m_Settings.setValue("Settings/use_proxy", ui->proxyBox->isChecked());
m_Settings.setValue("Settings/endorsement_integration", ui->endorsementBox->isChecked());
diff --git a/src/settingsdialognexus.h b/src/settingsdialognexus.h
index 5c01f61f..cca2e1b5 100644
--- a/src/settingsdialognexus.h
+++ b/src/settingsdialognexus.h
@@ -3,6 +3,7 @@
#include "settings.h"
#include "settingsdialog.h"
+#include "nxmaccessmanager.h"
class NexusSettingsTab : public SettingsTab
{
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 05:21:21 +0000