@@ -1,6 +1,5 @@
11#include "deviceconfigparser.h"
22
3−#include <QSettings>
43#include <QSettings>
54
65DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
@@ -24,12 +23,12 @@ void DeviceConfigParser::setName(const QString &name)
2423
2524Qt::ScreenOrientation DeviceConfigParser::primaryOrientation() const
2625{
27− return stringToOrientation(readOrientationStringFromConfig("PrimaryOrientation"), Qt::PrimaryOrientation);
26+ return stringToOrientation(readOrientationFromConfig("PrimaryOrientation"), Qt::PrimaryOrientation);
2827}
2928
3029Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const
3130{
32− QString values = readOrientationStringFromConfig("SupportedOrientations");
31+ QStringList values = readOrientationsFromConfig("SupportedOrientations");
3332 if (values.isEmpty()) {
3433 return Qt::PortraitOrientation
3534 | Qt::InvertedPortraitOrientation
@@ -38,7 +37,7 @@ Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const
3837 }
3938
4039 Qt::ScreenOrientations ret = Qt::PrimaryOrientation;
41− Q_FOREACH(const QString &orientationString, values.split(',')) {
40+ Q_FOREACH(const QString &orientationString, values) {
4241 ret |= stringToOrientation(orientationString, Qt::PrimaryOrientation);
4342 }
4443 return ret;
@@ -46,33 +45,39 @@ Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const
4645
4746Qt::ScreenOrientation DeviceConfigParser::landscapeOrientation() const
4847{
49− return stringToOrientation(readOrientationStringFromConfig("LandscapeOrientation"), Qt::LandscapeOrientation);
48+ return stringToOrientation(readOrientationFromConfig("LandscapeOrientation"), Qt::LandscapeOrientation);
5049}
5150
5251Qt::ScreenOrientation DeviceConfigParser::invertedLandscapeOrientation() const
5352{
54− return stringToOrientation(readOrientationStringFromConfig("InvertedLandscapeOrientation"), Qt::InvertedLandscapeOrientation);
53+ return stringToOrientation(readOrientationFromConfig("InvertedLandscapeOrientation"), Qt::InvertedLandscapeOrientation);
5554}
5655
5756Qt::ScreenOrientation DeviceConfigParser::portraitOrientation() const
5857{
59− return stringToOrientation(readOrientationStringFromConfig("PortraitOrientation"), Qt::PortraitOrientation);
58+ return stringToOrientation(readOrientationFromConfig("PortraitOrientation"), Qt::PortraitOrientation);
6059}
6160
6261Qt::ScreenOrientation DeviceConfigParser::invertedPortraitOrientation() const
6362{
64− return stringToOrientation(readOrientationStringFromConfig("InvertedPortraitOrientation"), Qt::InvertedPortraitOrientation);
63+ return stringToOrientation(readOrientationFromConfig("InvertedPortraitOrientation"), Qt::InvertedPortraitOrientation);
6564}
6665
67−QString DeviceConfigParser::readOrientationStringFromConfig(const QString &key) const
66+QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const
6867{
6968 QSettings config("/etc/unity8/devices.conf", QSettings::IniFormat);
7069 config.beginGroup(m_name);
7170
7271 if (config.contains(key)) {
73− return config.value(key).toString();
72+ return config.value(key).toStringList();
7473 }
75− return QString();
74+ return QStringList();
75+}
76+
77+QString DeviceConfigParser::readOrientationFromConfig(const QString &key) const
78+{
79+ QStringList ret = readOrientationsFromConfig(key);
80+ return ret.count() > 0 ? ret.first() : QString();
7681}
7782
7883Qt::ScreenOrientation DeviceConfigParser::stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const