Added instance setting overrides.

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.

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 <QObject>
+
+#include <inifile.h>
+
+#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

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 <QObject>
+
+#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

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();
+	}
+}

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();
+}