[nemo-qml-plugin-systemsettings] Read vendor data info. Contributes t…

…o JB#35322
sailfishos · May 26, 2016 · 35740e4 · 35740e4
1 parent 88e161d
commit 35740e4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/aboutsettings.cpp b/src/aboutsettings.cpp
@@ -42,6 +42,7 @@
 #include <QMap>
 #include <QTextStream>
 #include <QVariant>
+#include <QSettings>
 
 #include <mntent.h>
 
@@ -186,6 +187,10 @@ AboutSettings::AboutSettings(QObject *parent)
 :   QObject(parent), m_sysinfo(new QStorageInfo(this)), m_netinfo(new QNetworkInfo(this)),
     m_devinfo(new QDeviceInfo(this))
 {
+    QSettings settings(QStringLiteral("/mnt/vendor_data/vendor-data.ini"), QSettings::IniFormat);
+    m_vendorName = settings.value(QStringLiteral("Name")).toString();
+    m_vendorVersion = settings.value(QStringLiteral("Version")).toString();
+
     refreshStorageModels();
 }
 
@@ -265,6 +270,16 @@ QString AboutSettings::adaptationVersion() const
     return m_hardwareRelease["VERSION_ID"];
 }
 
+QString AboutSettings::vendorName() const
+{
+    return m_vendorName;
+}
+
+QString AboutSettings::vendorVersion() const
+{
+    return m_vendorVersion;
+}
+
 void AboutSettings::refreshStorageModels()
 {
     // Optional mountpoints that we want to report disk usage for

diff --git a/src/aboutsettings.h b/src/aboutsettings.h
@@ -49,6 +49,8 @@ class AboutSettings: public QObject
     Q_PROPERTY(QString softwareVersion READ softwareVersion CONSTANT)
     Q_PROPERTY(QString softwareVersionId READ softwareVersionId CONSTANT)
     Q_PROPERTY(QString adaptationVersion READ adaptationVersion CONSTANT)
+    Q_PROPERTY(QString vendorName READ vendorName CONSTANT)
+    Q_PROPERTY(QString vendorVersion READ vendorVersion CONSTANT)
 
     Q_PROPERTY(QVariant internalStorageUsageModel READ diskUsageModel NOTIFY storageChanged)
     Q_PROPERTY(QVariant externalStorageUsageModel READ externalStorageUsageModel NOTIFY storageChanged)
@@ -81,6 +83,9 @@ class AboutSettings: public QObject
     QString softwareVersionId() const;
     QString adaptationVersion() const;
 
+    QString vendorName() const;
+    QString vendorVersion() const;
+
 signals:
     void storageChanged();
 
@@ -93,6 +98,9 @@ class AboutSettings: public QObject
     QVariantList m_externalStorage;
     mutable QMap<QString, QString> m_osRelease;
     mutable QMap<QString, QString> m_hardwareRelease;
+
+    QString m_vendorName;
+    QString m_vendorVersion;
 };
 
 #endif