Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Code Issues Projects Releases Activity

Replace on version struct with QVersionNumber

Browse Source
This commit is contained in:
Elias 2019-01-31 18:14:11 +01:00
parent 70fe34812e
commit dc4aad776f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ScreenPlay/src/settings.cpp
View File

@ -4,6 +4,7 @@
Settings::Settings(ProfileListModel* plm, MonitorListModel* mlm, InstalledListModel* ilm, SDKConnector* sdkc, QGuiApplication* app, QObject* parent) Settings::Settings(ProfileListModel* plm, MonitorListModel* mlm, InstalledListModel* ilm, SDKConnector* sdkc, QGuiApplication* app, QObject* parent)
: QObject(parent) : QObject(parent)
, m_version(QVersionNumber(0, 0, 1))
, m_qSettings(QSettings(QSettings::NativeFormat, QSettings::Scope::UserScope, app->organizationName(), app->applicationName())) , m_qSettings(QSettings(QSettings::NativeFormat, QSettings::Scope::UserScope, app->organizationName(), app->applicationName()))
{ {
@ -71,16 +72,18 @@ Settings::Settings(ProfileListModel* plm, MonitorListModel* mlm, InstalledListMo
} }
configObj = configJsonDocument.object(); configObj = configJsonDocument.object();
QString tmp(configObj.value("version").toVariant().toString()); QString tmp(configObj.value("version").toVariant().toString());
int major, minor, patch; int major, minor, patch;
major = QString(tmp.at(0)).toInt(); major = QString(tmp.at(0)).toInt();
minor = QString(tmp.at(2)).toInt(); minor = QString(tmp.at(2)).toInt();
patch = QString(tmp.at(4)).toInt(); patch = QString(tmp.at(4)).toInt();
QVersionNumber fileVersion(major, minor, patch);
//Checks if the settings file has the same version as ScreeenPlay //Checks if the settings file has the same version as ScreeenPlay
if (!(major == m_version.major && minor == m_version.minor && patch == m_version.patch)) { if (fileVersion != m_version) {
// TODO(Kelteseth): Display error message // TODO(Kelteseth): Display error message
qWarning("Version missmatch"); qWarning() << "Version missmatch fileVersion: " << fileVersion.toString() << "m_version: " << m_version.toString();
return; return;
} }
@ -265,7 +268,7 @@ void Settings::saveWallpaper(int monitorIndex, QUrl absoluteStoragePath, QString
{ {
} }
void Settings::setqSetting(const QString &key, const QString &value) void Settings::setqSetting(const QString& key, const QString& value)
{ {
m_qSettings.setValue(key, value); m_qSettings.setValue(key, value);
m_qSettings.sync(); m_qSettings.sync();

13
ScreenPlay/src/settings.h
View File

@ -22,6 +22,7 @@
#include <QVariant> #include <QVariant>
#include <QVector> #include <QVector>
#include <QtGlobal> #include <QtGlobal>
#include <QVersionNumber>
#include "installedlistmodel.h" #include "installedlistmodel.h"
#include "monitorlistmodel.h" #include "monitorlistmodel.h"
@ -52,7 +53,7 @@ public:
explicit Settings(ProfileListModel* plm, MonitorListModel* mlm, InstalledListModel* ilm, SDKConnector* sdkc, QGuiApplication* app, QObject* parent = nullptr); explicit Settings(ProfileListModel* plm, MonitorListModel* mlm, InstalledListModel* ilm, SDKConnector* sdkc, QGuiApplication* app, QObject* parent = nullptr);
~Settings(); ~Settings();
Q_PROPERTY(Version version READ version) Q_PROPERTY(QVersionNumber version READ version)
Q_PROPERTY(bool hasWorkshopBannerSeen READ hasWorkshopBannerSeen WRITE setHasWorkshopBannerSeen NOTIFY hasWorkshopBannerSeenChanged) Q_PROPERTY(bool hasWorkshopBannerSeen READ hasWorkshopBannerSeen WRITE setHasWorkshopBannerSeen NOTIFY hasWorkshopBannerSeenChanged)
Q_PROPERTY(bool autostart READ autostart WRITE setAutostart NOTIFY autostartChanged) Q_PROPERTY(bool autostart READ autostart WRITE setAutostart NOTIFY autostartChanged)
Q_PROPERTY(bool highPriorityStart READ highPriorityStart WRITE setHighPriorityStart NOTIFY highPriorityStartChanged) Q_PROPERTY(bool highPriorityStart READ highPriorityStart WRITE setHighPriorityStart NOTIFY highPriorityStartChanged)
@ -73,13 +74,7 @@ public:
}; };
Q_ENUM(LocalCopyResult) Q_ENUM(LocalCopyResult)
struct Version { QVersionNumber version() const
int major = 0;
int minor = 0;
int patch = 1;
};
Version version() const
{ {
return m_version; return m_version;
} }
@ -299,7 +294,7 @@ public slots:
private: private:
void createDefaultConfig(); void createDefaultConfig();
Version m_version; QVersionNumber m_version;
QSettings m_qSettings; QSettings m_qSettings;
QTranslator m_translator; QTranslator m_translator;
ProfileListModel* m_plm; ProfileListModel* m_plm;