Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Editor Settings refactoring #648

Merged
merged 3 commits into from
Dec 30, 2023
Merged

Editor Settings refactoring #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eb7f74
Editor Settings refactoring
eprikazchikov Dec 29, 2023
8ff04eb
1
eprikazchikov Dec 29, 2023
707974a
1
eprikazchikov Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions builder/builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <log.h>
#include <editor/projectmanager.h>
#include <editor/pluginmanager.h>
#include <editor/settingsmanager.h>
#include <editor/editorsettings.h>
#include <editor/assetmanager.h>

#include <quazip.h>
Expand All @@ -21,7 +21,7 @@ Builder::Builder() {

void Builder::setPlatform(const QString &platform) {
ProjectManager *project = ProjectManager::instance();
SettingsManager::instance()->loadSettings();
EditorSettings::instance()->loadSettings();
if(platform.isEmpty()) {
for(QString &it : project->platforms()) {
m_Stack.push(it);
Expand Down
18 changes: 9 additions & 9 deletions engine/includes/editor/settingsmanager.h → engine/includes/editor/editorsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef SETTINGSMANAGER_H
#define SETTINGSMANAGER_H
#ifndef EDITORSETTINGS_H
#define EDITORSETTINGS_H

#include <QObject>
#include <QLocale>
Expand All @@ -8,11 +8,11 @@

class QTranslator;

class ENGINE_EXPORT SettingsManager : public QObject {
class ENGINE_EXPORT EditorSettings : public QObject {
Q_OBJECT

public:
static SettingsManager *instance();
static EditorSettings *instance();

static void destroy();

Expand All @@ -34,13 +34,13 @@ public slots:
bool eventFilter(QObject *obj, QEvent *event);

private:
SettingsManager();
EditorSettings();

static SettingsManager *m_pInstance;
static EditorSettings *m_pInstance;

QTranslator *m_Translator;
QLocale m_Locale;
QTranslator *m_translator;
QLocale m_locale;

};

#endif // SETTINGSMANAGER_H
#endif // EDITORSETTINGS_H
55 changes: 33 additions & 22 deletions engine/src/editor/settingsmanager.cpp → engine/src/editor/editorsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,65 @@
#include "settingsmanager.h"
#include "editorsettings.h"

#include <QVariant>

#include <QSettings>
#include <QFileInfo>
#include <QDebug>
#include <QColor>
#include <QCoreApplication>
#include <QTranslator>
#include <QDebug>

#include <QEvent>

#define SETTINGS ".Settings"

SettingsManager *SettingsManager::m_pInstance = nullptr;
EditorSettings *EditorSettings::m_pInstance = nullptr;

EditorSettings::EditorSettings() :
m_translator(new QTranslator()) {

SettingsManager::SettingsManager() :
m_Translator(new QTranslator()) {
installEventFilter(this);

connect(this, &EditorSettings::updated, this, &EditorSettings::saveSettings);
}

SettingsManager *SettingsManager::instance() {
EditorSettings *EditorSettings::instance() {
if(!m_pInstance) {
m_pInstance = new SettingsManager;
m_pInstance = new EditorSettings;
}
return m_pInstance;
}

void SettingsManager::destroy() {
void EditorSettings::destroy() {
delete m_pInstance;
m_pInstance = nullptr;
}

void SettingsManager::registerProperty(const char *name, const QVariant &value) {
void EditorSettings::registerProperty(const char *name, const QVariant &value) {
int32_t index = dynamicPropertyNames().indexOf(name);
if(index == -1) {
blockSignals(true);
setProperty(name, value);
blockSignals(false);
}
}

QVariant SettingsManager::value(const char *name, const QVariant &defaultValue) {
QVariant EditorSettings::value(const char *name, const QVariant &defaultValue) {
QVariant result = property(name);
if(!result.isValid()) {
result = defaultValue;
}
return result;
}

void SettingsManager::setValue(const char *name, const QVariant &value) {
QVariant current = SettingsManager::value(name);
void EditorSettings::setValue(const char *name, const QVariant &value) {
QVariant current = EditorSettings::value(name);
if(current != value) {
setProperty(name, value);
}
}

void SettingsManager::loadSettings() {
void EditorSettings::loadSettings() {
QSettings settings(COMPANY_NAME, EDITOR_NAME);
QVariantMap data = settings.value(SETTINGS).toMap();

Expand All @@ -71,6 +76,7 @@ void SettingsManager::loadSettings() {
}
} else if(userType == QMetaType::type("QLocale")) {
QLocale locale(data[it].toString());

setLanguage(locale);
setProperty(it, locale);
} else if(userType == QMetaType::Bool) {
Expand All @@ -85,10 +91,9 @@ void SettingsManager::loadSettings() {
}

blockSignals(false);
emit updated();
}

void SettingsManager::saveSettings() {
void EditorSettings::saveSettings() {
QVariantMap data;

for(QByteArray &it : dynamicPropertyNames()) {
Expand All @@ -101,6 +106,12 @@ void SettingsManager::saveSettings() {
} else if(userType == QMetaType::type("QLocale")) {
setLanguage(value.value<QLocale>());
data[it] = value.value<QLocale>().name();
} else if(userType == QMetaType::Bool) {
data[it] = value.toBool();
} else if(userType == QMetaType::Int) {
data[it] = value.toInt();
} else if(userType == QMetaType::Float) {
data[it] = value.toFloat();
} else {
data[it] = value.toString();
}
Expand All @@ -110,7 +121,7 @@ void SettingsManager::saveSettings() {
settings.setValue(SETTINGS, data);
}

bool SettingsManager::eventFilter(QObject *obj, QEvent *event) {
bool EditorSettings::eventFilter(QObject *obj, QEvent *event) {
if(event->type() == QEvent::DynamicPropertyChange) {
emit updated();
return true;
Expand All @@ -119,11 +130,11 @@ bool SettingsManager::eventFilter(QObject *obj, QEvent *event) {
}
}

void SettingsManager::setLanguage(const QLocale &locale) {
if(m_Translator && m_Locale != locale) {
m_Locale = locale;
QCoreApplication::removeTranslator(m_Translator);
m_Translator->load(locale, QString(), QString(), ":/Translations");
QCoreApplication::installTranslator(m_Translator);
void EditorSettings::setLanguage(const QLocale &locale) {
if(m_translator && m_locale != locale) {
m_locale = locale;
QCoreApplication::removeTranslator(m_translator);
m_translator->load(locale, QString(), QString(), ":/Translations");
QCoreApplication::installTranslator(m_translator);
}
}
41 changes: 11 additions & 30 deletions engine/src/editor/viewport/viewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@
#include <pipelinetask.h>
#include <gizmos.h>

#include <settingsmanager.h>
#include <editorsettings.h>

namespace {
const char *postSettings("Graphics/");
const char *outlineWidth("General/Colors/Outline_Width");
const char *outlineColor("General/Colors/Outline_Color");
const char *gridColor("General/Colors/Grid_Color");
const char *outlineWidth("Viewport/Outline/Width");
const char *outlineColor("Viewport/Outline/Color");
const char *gridColor("Viewport/Grid/Color");
}

class Outline : public PipelineTask {
Expand Down Expand Up @@ -64,18 +63,18 @@ class Outline : public PipelineTask {

setName("Outline");

SettingsManager::instance()->registerProperty(outlineWidth, 1.0f);
SettingsManager::instance()->registerProperty(outlineColor, QColor(255, 128, 0, 255));
EditorSettings::instance()->registerProperty(outlineWidth, 1.0f);
EditorSettings::instance()->registerProperty(outlineColor, QColor(255, 128, 0, 255));

m_inputs.push_back("In");

m_outputs.push_back(make_pair("Result", nullptr));
}

void loadSettings() {
QColor color = SettingsManager::instance()->property(qPrintable(outlineColor)).value<QColor>();
QColor color = EditorSettings::instance()->property(qPrintable(outlineColor)).value<QColor>();
m_color = Vector4(color.redF(), color.greenF(), color.blueF(), color.alphaF());
m_width = SettingsManager::instance()->property(qPrintable(outlineWidth)).toFloat();
m_width = EditorSettings::instance()->property(qPrintable(outlineWidth)).toFloat();

if(m_combineMaterial) {
m_combineMaterial->setFloat("width", &m_width);
Expand Down Expand Up @@ -162,7 +161,7 @@ class GridRender : public PipelineTask {
m_grid = m->createInstance();
}

SettingsManager::instance()->registerProperty(gridColor, QColor(102, 102, 102, 102));
EditorSettings::instance()->registerProperty(gridColor, QColor(102, 102, 102, 102));

m_inputs.push_back("In");
m_inputs.push_back("depthMap");
Expand All @@ -175,7 +174,7 @@ class GridRender : public PipelineTask {
}

void loadSettings() {
QColor color = SettingsManager::instance()->property(gridColor).value<QColor>();
QColor color = EditorSettings::instance()->property(gridColor).value<QColor>();
m_gridColor = Vector4(color.redF(), color.greenF(), color.blueF(), color.alphaF());
}

Expand Down Expand Up @@ -471,7 +470,7 @@ Viewport::Viewport(QWidget *parent) :

setMouseTracking(true);

QObject::connect(SettingsManager::instance(), &SettingsManager::updated, this, &Viewport::onApplySettings);
QObject::connect(EditorSettings::instance(), &EditorSettings::updated, this, &Viewport::onApplySettings);
}

void Viewport::init() {
Expand Down Expand Up @@ -517,12 +516,6 @@ void Viewport::init() {
pipelineContext->insertRenderTask(m_outlinePass, lastLayer);
pipelineContext->insertRenderTask(m_gizmoRender, lastLayer);

for(auto it : pipelineContext->renderTasks()) {
if(!it->name().empty()) {
SettingsManager::instance()->registerProperty(qPrintable(QString(postSettings) + it->name().c_str()), it->isEnabled());
}
}

Handles::init();
}

Expand Down Expand Up @@ -565,17 +558,6 @@ void Viewport::onCursorUnset() {
}

void Viewport::onApplySettings() {
if(m_renderSystem) {
PipelineContext *pipelineContext = m_renderSystem->pipelineContext();
if(pipelineContext) {
for(auto it : pipelineContext->renderTasks()) {
if(!it->name().empty()) {
bool value = SettingsManager::instance()->property(qPrintable(QString(postSettings) + it->name().c_str())).toBool();
it->setEnabled(value);
}
}
}
}
if(m_outlinePass) {
m_outlinePass->loadSettings();
}
Expand Down Expand Up @@ -769,7 +751,6 @@ void Viewport::onPostEffectChanged(bool checked) {
for(auto &it : m_renderSystem->pipelineContext()->renderTasks()) {
if(action->data().toString().toStdString() == it->name()) {
it->setEnabled(checked);
SettingsManager::instance()->setProperty(qPrintable(QString(postSettings) + it->name().c_str()), checked);
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions modules/editor/qbstools/converter/qbsbuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <config.h>

#include <editor/projectmanager.h>
#include <editor/settingsmanager.h>
#include <editor/editorsettings.h>
#include <editor/pluginmanager.h>

namespace {
Expand Down Expand Up @@ -50,7 +50,7 @@ QbsBuilder::QbsBuilder() :

m_settings << "--settings-dir" << QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/..";

SettingsManager *settings = SettingsManager::instance();
EditorSettings *settings = EditorSettings::instance();
settings->registerProperty(gAndroidJava, QVariant::fromValue(QFileInfo("/")));
settings->registerProperty(gAndroidSdk, QVariant::fromValue(QFileInfo("/")));
settings->registerProperty(gAndroidNdk, QVariant::fromValue(QFileInfo("/")));
Expand Down Expand Up @@ -80,7 +80,7 @@ bool QbsBuilder::buildProject() {
aInfo() << gLabel << "Build started.";

ProjectManager *mgr = ProjectManager::instance();
m_qbsPath = SettingsManager::instance()->value(gQBSPath).value<QFileInfo>();
m_qbsPath = EditorSettings::instance()->value(gQBSPath).value<QFileInfo>();
if(m_qbsPath.absoluteFilePath().isEmpty()) {
QString suffix;
#if defined(Q_OS_WIN)
Expand Down Expand Up @@ -150,7 +150,7 @@ bool QbsBuilder::buildProject() {
}

void QbsBuilder::builderInit() {
SettingsManager *settings = SettingsManager::instance();
EditorSettings *settings = EditorSettings::instance();
if(!checkProfiles()) {
{
QProcess qbs(this);
Expand Down Expand Up @@ -250,21 +250,21 @@ QString QbsBuilder::getProfile(const QString &platform) const {
QString profile;
if(platform == "desktop") {
#if defined(Q_OS_WIN)
SettingsManager *settings = SettingsManager::instance();
EditorSettings *settings = EditorSettings::instance();
profile = settings->property(gQBSProfile).toString();
if(profile.isEmpty()) {
profile = "MSVC2015-amd64";
settings->setProperty(gQBSProfile, profile);
}
#elif defined(Q_OS_MAC)
SettingsManager *settings = SettingsManager::instance();
EditorSettings *settings = EditorSettings::instance();
profile = settings->property(gQBSProfile).toString();
if(profile.isEmpty()) {
profile = "xcode-macosx-x86_64";
settings->setProperty(gQBSProfile, profile);
}
#elif defined(Q_OS_UNIX)
SettingsManager *settings = SettingsManager::instance();
EditorSettings *settings = EditorSettings::instance();
profile = settings->property(gQBSProfile).toString();
if(profile.isEmpty()) {
profile = "clang";
Expand Down
Loading
Loading