From bd64cda6726e088ebc860c3fc3ee220ed00121bd Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 25 Feb 2013 16:36:27 -0600 Subject: Added instance setting overrides. --- libsettings/CMakeLists.txt | 4 +++ libsettings/include/inisettingsobject.h | 59 +++++++++++++++++++++++++++++++++ libsettings/include/overridesetting.h | 43 ++++++++++++++++++++++++ libsettings/src/inisettingsobject.cpp | 49 +++++++++++++++++++++++++++ libsettings/src/overridesetting.cpp | 30 +++++++++++++++++ 5 files changed, 185 insertions(+) create mode 100644 libsettings/include/inisettingsobject.h create mode 100644 libsettings/include/overridesetting.h create mode 100644 libsettings/src/inisettingsobject.cpp create mode 100644 libsettings/src/overridesetting.cpp (limited to 'libsettings') diff --git a/libsettings/CMakeLists.txt b/libsettings/CMakeLists.txt index 4040032d..4ec019a5 100644 --- a/libsettings/CMakeLists.txt +++ b/libsettings/CMakeLists.txt @@ -15,15 +15,19 @@ include/libsettings_config.h include/settingsobject.h include/setting.h +include/overridesetting.h include/basicsettingsobject.h +include/inisettingsobject.h ) SET(LIBSETTINGS_SOURCES src/settingsobject.cpp src/setting.cpp +src/overridesetting.cpp src/basicsettingsobject.cpp +src/inisettingsobject.cpp ) # Set the include dir path. diff --git a/libsettings/include/inisettingsobject.h b/libsettings/include/inisettingsobject.h new file mode 100644 index 00000000..6eead951 --- /dev/null +++ b/libsettings/include/inisettingsobject.h @@ -0,0 +1,59 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef INISETTINGSOBJECT_H +#define INISETTINGSOBJECT_H + +#include + +#include + +#include "settingsobject.h" + +#include "libutil_config.h" + +/*! + * \brief A settings object that stores its settings in an INIFile. + */ +class LIBMMCSETTINGS_EXPORT INISettingsObject : public SettingsObject +{ + Q_OBJECT +public: + explicit INISettingsObject(const QString &path, QObject *parent = 0); + + /*! + * \brief Gets the path to the INI file. + * \return The path to the INI file. + */ + virtual QString filePath() const { return m_filePath; } + + /*! + * \brief Sets the path to the INI file and reloads it. + * \param filePath The INI file's new path. + */ + virtual void setFilePath(const QString &filePath); + +protected slots: + virtual void changeSetting(const Setting &setting, QVariant value); + +protected: + virtual QVariant retrieveValue(const Setting &setting); + + INIFile m_ini; + + QString m_filePath; +}; + +#endif // INISETTINGSOBJECT_H diff --git a/libsettings/include/overridesetting.h b/libsettings/include/overridesetting.h new file mode 100644 index 00000000..e7bf2c32 --- /dev/null +++ b/libsettings/include/overridesetting.h @@ -0,0 +1,43 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OVERRIDESETTING_H +#define OVERRIDESETTING_H + +#include + +#include "setting.h" + +#include "libsettings_config.h" + +/*! + * \brief A setting that 'overrides another.' + * This means that the setting's default value will be the value of another setting. + * The other setting can be (and usually is) a part of a different SettingsObject + * than this one. + */ +class LIBMMCSETTINGS_EXPORT OverrideSetting : public Setting +{ + Q_OBJECT +public: + explicit OverrideSetting(const QString &name, Setting *other, QObject *parent = 0); + + virtual QVariant defValue() const; + +protected: + Setting *m_other; +}; + +#endif // OVERRIDESETTING_H diff --git a/libsettings/src/inisettingsobject.cpp b/libsettings/src/inisettingsobject.cpp new file mode 100644 index 00000000..75228865 --- /dev/null +++ b/libsettings/src/inisettingsobject.cpp @@ -0,0 +1,49 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "include/inisettingsobject.h" +#include "include/setting.h" + +INISettingsObject::INISettingsObject(const QString &path, QObject *parent) : + SettingsObject(parent) +{ + m_filePath = path; + m_ini.loadFile(path); +} + +void INISettingsObject::setFilePath(const QString &filePath) +{ + m_filePath = filePath; +} + +void INISettingsObject::changeSetting(const Setting &setting, QVariant value) +{ + if (contains(setting.id())) + { + m_ini.set(setting.configKey(), value); + } +} + +QVariant INISettingsObject::retrieveValue(const Setting &setting) +{ + if (contains(setting.id())) + { + return m_ini.get(setting.configKey(), QVariant()); + } + else + { + return QVariant(); + } +} diff --git a/libsettings/src/overridesetting.cpp b/libsettings/src/overridesetting.cpp new file mode 100644 index 00000000..eafb298f --- /dev/null +++ b/libsettings/src/overridesetting.cpp @@ -0,0 +1,30 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "include/overridesetting.h" + +OverrideSetting::OverrideSetting(const QString &name, Setting *other, QObject *parent) : + Setting(name, QVariant(), parent) +{ + m_other = other; +} + +QVariant OverrideSetting::defValue() const +{ + if (m_other) + return m_other->get(); + else + return QVariant(); +} -- cgit v1.2.3