752546e · unity8 · git.iko.soy

CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -74,6 +74,7 @@ find_package(Qt5Svg 5.6 REQUIRED)

74find_package(Qt5Network 5.6 REQUIRED)

75find_package(Qt5Xml 5.6 REQUIRED)

76

77+pkg_check_modules(DEVICEINFO REQUIRED deviceinfo)

77pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)

78pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)

78pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

79pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

79pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

80pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

debian/control+1−1

@@ -15,7 +15,6 @@ Build-Depends: cmake,

15 gdb,

16 graphviz,

17 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),

18− libandroid-properties-dev,

19 libconnectivity-qt1-dev (>= 0.7.1),

18 libconnectivity-qt1-dev (>= 0.7.1),

20 libevdev-dev,

19 libevdev-dev,

21 libgeonames-dev (>= 0.2),

20 libgeonames-dev (>= 0.2),

@@ -74,6 +73,7 @@ Build-Depends: cmake,

74 qtdeclarative5-ubuntu-settings-components (>= 0.11),

73 qtdeclarative5-ubuntu-settings-components (>= 0.11),

75 ttf-ubuntu-font-family,

74 ttf-ubuntu-font-family,

76 xvfb,

75 xvfb,

76+ libdeviceinfo-dev,

77Standards-Version: 3.9.4

78Homepage: http://launchpad.net/unity

79# If you aren't a member of ~unity-team but need to upload

plugins/Utils/CMakeLists.txt+4−2

@@ -7,6 +7,7 @@ include_directories(

7 SYSTEM

8 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

9 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

10+ ${DEVICEINFO_INCLUDE_DIRS}

10)

11)

11

12

12set(QMLPLUGIN_SRC

13set(QMLPLUGIN_SRC

@@ -30,7 +31,7 @@ set(QMLPLUGIN_SRC

30 windowstatestorage.cpp

31 windowstatestorage.cpp

31 timezoneFormatter.cpp

32 timezoneFormatter.cpp

32 inputeventgenerator.cpp

33 inputeventgenerator.cpp

33− deviceconfigparser.cpp

34+ deviceconfig.cpp

34 globalfunctions.cpp

35 globalfunctions.cpp

35 URLDispatcher.cpp

36 URLDispatcher.cpp

36 tabfocusfence.cpp

37 tabfocusfence.cpp

@@ -45,7 +46,8 @@ add_library(Utils-qml SHARED

45

46

46target_link_libraries(Utils-qml

47target_link_libraries(Utils-qml

47 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent

48 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent

49+ ${DEVICEINFO_LDFLAGS}

48− )

50+)

49

51

50# Because this is an internal support library, we want

52# Because this is an internal support library, we want

51# to expose all symbols in it. Consider changing this

53# to expose all symbols in it. Consider changing this

plugins/Utils/deviceconfig.cppnew file+113

@@ -0,0 +1,113 @@

1+/*

3+ * 2019 UBports foundation.

4+ *

5+ * This program is free software; you can redistribute it and/or modify

6+ * it under the terms of the GNU Lesser General Public License as published by

7+ * the Free Software Foundation; version 3.

8+ *

9+ * This program is distributed in the hope that it will be useful,

10+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

11+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12+ * GNU Lesser General Public License for more details.

13+ *

14+ * You should have received a copy of the GNU Lesser General Public License

15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

16+ */

17+

18+#include "deviceconfig.h"

19+

20+#include <deviceinfo.h>

21+#include <QDebug>

22+

23+DeviceConfig::DeviceConfig(QObject *parent):

24+ QObject(parent),

25+ m_info(std::make_shared<DeviceInfo>())

26+{

27+}

28+

29+QString DeviceConfig::name() const

30+{

31+ return QString::fromStdString(m_info->name());

32+}

33+

34+Qt::ScreenOrientation DeviceConfig::primaryOrientation() const

35+{

36+ return stringToOrientation(m_info->primaryOrientation(), Qt::PrimaryOrientation);

37+}

38+

39+Qt::ScreenOrientations DeviceConfig::supportedOrientations() const

40+{

41+ auto values = m_info->supportedOrientations();

42+ if (values.empty()) {

43+ return Qt::PortraitOrientation

44+ | Qt::InvertedPortraitOrientation

45+ | Qt::LandscapeOrientation

46+ | Qt::InvertedLandscapeOrientation;

47+ }

48+

49+ Qt::ScreenOrientations ret = Qt::PrimaryOrientation;

50+ for (auto orientationString : values) {

51+ ret |= stringToOrientation(orientationString, Qt::PrimaryOrientation);

52+ }

53+ return ret;

54+}

55+

56+Qt::ScreenOrientation DeviceConfig::landscapeOrientation() const

57+{

58+ return stringToOrientation(m_info->landscapeOrientation(), Qt::LandscapeOrientation);

59+}

60+

61+Qt::ScreenOrientation DeviceConfig::invertedLandscapeOrientation() const

62+{

63+ return stringToOrientation(m_info->invertedLandscapeOrientation(), Qt::InvertedLandscapeOrientation);

64+}

65+

66+Qt::ScreenOrientation DeviceConfig::portraitOrientation() const

67+{

68+ return stringToOrientation(m_info->portraitOrientation(), Qt::PortraitOrientation);

69+}

70+

71+Qt::ScreenOrientation DeviceConfig::invertedPortraitOrientation() const

72+{

73+ return stringToOrientation(m_info->invertedPortraitOrientation(), Qt::InvertedPortraitOrientation);

74+}

75+

76+QString DeviceConfig::category() const

77+{

78+ QStringList supportedValues = {"phone", "tablet", "desktop"};

79+ QString value = QString::fromStdString(DeviceInfo::deviceTypeToString(m_info->deviceType()));

80+ if (!supportedValues.contains(value)) {

81+ qWarning().nospace().noquote() << "Unknown option \"" << value

82+ << ". Supported options are: " << supportedValues.join(", ") << ".";

83+ return "phone";

84+ }

85+ return value;

86+}

87+

88+Qt::ScreenOrientation DeviceConfig::stringToOrientation(const std::string &orientationString, Qt::ScreenOrientation defaultValue) const

89+{

90+ if (orientationString == "Landscape") {

91+ return Qt::LandscapeOrientation;

92+ }

93+ if (orientationString == "InvertedLandscape") {

94+ return Qt::InvertedLandscapeOrientation;

95+ }

96+ if (orientationString == "Portrait") {

97+ return Qt::PortraitOrientation;

98+ }

99+ if (orientationString == "InvertedPortrait") {

100+ return Qt::InvertedPortraitOrientation;

101+ }

102+ if (!orientationString.empty()) {

103+ // Some option we don't know. Give some hint on what went wrong.

104+ qWarning().nospace().noquote() << "Unknown option \"" << QString::fromStdString(orientationString)

105+ << ". Supported options are: Landscape, InvertedLandscape, Portrait and InvertedPortrait.";

106+ }

107+ return defaultValue;

108+}

109+

110+bool DeviceConfig::supportsMultiColorLed() const

111+{

112+ return m_info->contains("supportsMultiColorLed");

113+}

plugins/Utils/deviceconfigparser.h → plugins/Utils/deviceconfig.hrenamed+9−16

@@ -14,16 +14,16 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

16

17−#ifndef DEVICECONFIGPARSER_H

17+#pragma once

18−#define DEVICECONFIGPARSER_H

19

18

20#include <QObject>

19#include <QObject>

21−#include <QSettings>

20+#include <memory>

22

21

23−class DeviceConfigParser: public QObject

22+class DeviceInfo;

23+class DeviceConfig: public QObject

24{

25 Q_OBJECT

26− Q_PROPERTY(QString name READ name WRITE setName NOTIFY changed)

26+ Q_PROPERTY(QString name READ name NOTIFY changed)

27

28 // NOTE: When changing this properties, also update the examples in docs and data

29 Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY changed)

@@ -33,13 +33,12 @@ class DeviceConfigParser: public QObject

33 Q_PROPERTY(Qt::ScreenOrientation portraitOrientation READ portraitOrientation NOTIFY changed)

34 Q_PROPERTY(Qt::ScreenOrientation invertedPortraitOrientation READ invertedPortraitOrientation NOTIFY changed)

35 Q_PROPERTY(QString category READ category NOTIFY changed)

36− Q_PROPERTY(bool supportsMultiColorLed READ supportsMultiColorLed NOTIFY changed)

36+ Q_PROPERTY(bool supportsMultiColorLed READ supportsMultiColorLed)

37

38public:

39− DeviceConfigParser(QObject *parent = nullptr);

39+ DeviceConfig(QObject *parent = nullptr);

40

41 QString name() const;

42− void setName(const QString &name);

43

42

44 Qt::ScreenOrientation primaryOrientation() const;

43 Qt::ScreenOrientation primaryOrientation() const;

45 Qt::ScreenOrientations supportedOrientations() const;

44 Qt::ScreenOrientations supportedOrientations() const;

@@ -54,13 +53,7 @@ Q_SIGNALS:

54 void changed();

53 void changed();

55

54

56private:

55private:

57− QString m_name;

56+ std::shared_ptr<DeviceInfo> m_info;

58− QSettings *m_config;

59

57

60− QStringList readOrientationsFromConfig(const QString &key) const;

61− QString readOrientationFromConfig(const QString &key) const;

62− Qt::ScreenOrientation stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const;

58+ Qt::ScreenOrientation stringToOrientation(const std::string &orientationString, Qt::ScreenOrientation defaultValue) const;

63− bool readBoolFromConfig(const QString &key, bool defaultValue) const;

64};

59};

65−

66−#endif

plugins/Utils/deviceconfigparser.cppdeleted−176

@@ -1,176 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "deviceconfigparser.h"

18−

19−#include <QSettings>

20−#include <QFileInfo>

21−#include <QDebug>

22−#include <QStandardPaths>

23−

24−DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)

25−{

26− // Local files have highest priority

27− QString path;

28− Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {

29− if (QFileInfo::exists(standardPath + "/devices.conf")) {

30− path = standardPath + "/devices.conf";

31− break;

32− }

33− }

34−

35− // Check if there is an override in the device tarball (/system/etc/)

36− if (path.isEmpty() && QFileInfo::exists("/system/etc/ubuntu/devices.conf")) {

37− path = "/system/etc/ubuntu/devices.conf";

38− }

39−

40− // No higher priority files found. Use standard of /etc/

41− if (path.isEmpty()) {

42− path = "/etc/ubuntu/devices.conf";

43− }

44−

45− qDebug() << "Using" << path << "as device configuration file";

46− m_config = new QSettings(path, QSettings::IniFormat, this);

47−}

48−

49−QString DeviceConfigParser::name() const

50−{

51− return m_name;

52−}

53−

54−void DeviceConfigParser::setName(const QString &name)

55−{

56− if (m_name == name) {

57− return;

58− }

59− m_name = name;

60− Q_EMIT changed();

61−}

62−

63−Qt::ScreenOrientation DeviceConfigParser::primaryOrientation() const

64−{

65− return stringToOrientation(readOrientationFromConfig("PrimaryOrientation"), Qt::PrimaryOrientation);

66−}

67−

68−Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const

69−{

70− QStringList values = readOrientationsFromConfig("SupportedOrientations");

71− if (values.isEmpty()) {

72− return Qt::PortraitOrientation

73− | Qt::InvertedPortraitOrientation

74− | Qt::LandscapeOrientation

75− | Qt::InvertedLandscapeOrientation;

76− }

77−

78− Qt::ScreenOrientations ret = Qt::PrimaryOrientation;

79− Q_FOREACH(const QString &orientationString, values) {

80− ret |= stringToOrientation(orientationString, Qt::PrimaryOrientation);

81− }

82− return ret;

83−}

84−

85−Qt::ScreenOrientation DeviceConfigParser::landscapeOrientation() const

86−{

87− return stringToOrientation(readOrientationFromConfig("LandscapeOrientation"), Qt::LandscapeOrientation);

88−}

89−

90−Qt::ScreenOrientation DeviceConfigParser::invertedLandscapeOrientation() const

91−{

92− return stringToOrientation(readOrientationFromConfig("InvertedLandscapeOrientation"), Qt::InvertedLandscapeOrientation);

93−}

94−

95−Qt::ScreenOrientation DeviceConfigParser::portraitOrientation() const

96−{

97− return stringToOrientation(readOrientationFromConfig("PortraitOrientation"), Qt::PortraitOrientation);

98−}

99−

100−Qt::ScreenOrientation DeviceConfigParser::invertedPortraitOrientation() const

101−{

102− return stringToOrientation(readOrientationFromConfig("InvertedPortraitOrientation"), Qt::InvertedPortraitOrientation);

103−}

104−

105−QString DeviceConfigParser::category() const

106−{

107− QStringList supportedValues = {"phone", "tablet", "desktop"};

108− m_config->beginGroup(m_name);

109− QString value = m_config->value("Category", "phone").toString();

110− if (!supportedValues.contains(value)) {

111− qWarning().nospace().noquote() << "Unknown option \"" << value << "\" in " << m_config->fileName()

112− << ". Supported options are: " << supportedValues.join(", ") << ".";

113− return "phone";

114− }

115− m_config->endGroup();

116− return value;

117−}

118−

119−bool DeviceConfigParser::supportsMultiColorLed() const

120−{

121− return readBoolFromConfig("SupportsMultiColorLed", true);

122−}

123−

124−bool DeviceConfigParser::readBoolFromConfig(const QString &key, bool defaultValue) const

125−{

126− m_config->beginGroup(m_name);

127−

128− bool ret = defaultValue;

129− if (m_config->contains(key)) {

130− ret = m_config->value(key).toBool();

131− }

132−

133− m_config->endGroup();

134− return ret;

135−}

136−

137−QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const

138−{

139− m_config->beginGroup(m_name);

140−

141− QStringList ret;

142− if (m_config->contains(key)) {

143− ret = m_config->value(key).toStringList();

144− }

145−

146− m_config->endGroup();

147− return ret;

148−}

149−

150−QString DeviceConfigParser::readOrientationFromConfig(const QString &key) const

151−{

152− QStringList ret = readOrientationsFromConfig(key);

153− return ret.count() > 0 ? ret.first() : QString();

154−}

155−

156−Qt::ScreenOrientation DeviceConfigParser::stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const

157−{

158− if (orientationString == "Landscape") {

159− return Qt::LandscapeOrientation;

160− }

161− if (orientationString == "InvertedLandscape") {

162− return Qt::InvertedLandscapeOrientation;

163− }

164− if (orientationString == "Portrait") {

165− return Qt::PortraitOrientation;

166− }

167− if (orientationString == "InvertedPortrait") {

168− return Qt::InvertedPortraitOrientation;

169− }

170− if (!orientationString.isEmpty()) {

171− // Some option we don't know. Give some hint on what went wrong.

172− qWarning().nospace().noquote() << "Unknown option \"" << orientationString << "\" in " << m_config->fileName()

173− << ". Supported options are: Landscape, InvertedLandscape, Portrait and InvertedPortrait.";

174− }

175− return defaultValue;

176−}

plugins/Utils/plugin.cpp+2−2

@@ -36,7 +36,7 @@

36#include "timezoneFormatter.h"

37#include "applicationsfiltermodel.h"

38#include "inputeventgenerator.h"

39−#include "deviceconfigparser.h"

39+#include "deviceconfig.h"

40#include "globalfunctions.h"

41#include "URLDispatcher.h"

42#include "appdrawerproxymodel.h"

@@ -83,7 +83,7 @@ void UtilsPlugin::registerTypes(const char *uri)

83 qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");

84 qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");

85 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");

86− qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");

86+ qmlRegisterType<DeviceConfig>(uri, 0, 1, "DeviceConfig");

87 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);

88 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");

89 qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");

qml/DeviceConfiguration.qml+26−15

@@ -20,11 +20,13 @@ import Utils 0.1

20QtObject {

21 id: root

22

23+ // This allows to override device name, used for convergence

24+ // to set screens to desktop "mode"

25+ property var overrideName: false

26+

23 readonly property int useNativeOrientation: -1

27 readonly property int useNativeOrientation: -1

24

28

25− // The only writable property in the API

26− // all other properties are set according to the device name

27− property alias name: priv.state

29+ readonly property alias name: priv.name;

28

30

29 readonly property alias primaryOrientation: priv.primaryOrientation

31 readonly property alias primaryOrientation: priv.primaryOrientation

30 readonly property alias supportedOrientations: priv.supportedOrientations

32 readonly property alias supportedOrientations: priv.supportedOrientations

@@ -35,26 +37,29 @@ QtObject {

35

37

36 readonly property alias category: priv.category

38 readonly property alias category: priv.category

37

39

38− readonly property alias supportsMultiColorLed: priv.supportsMultiColorLed

40+ readonly property var deviceConfig: DeviceConfig {}

39

41

40− readonly property var deviceConfigParser: DeviceConfigParser {

42+ readonly property var binding: Binding {

41− name: root.name

43+ target: priv

44+ property: "state"

45+ value: root.overrideName ? overrideName : deviceConfig.name

42 }

46 }

43

47

44 readonly property var priv: StateGroup {

48 readonly property var priv: StateGroup {

45 id: priv

49 id: priv

46

50

47− property int primaryOrientation: deviceConfigParser.primaryOrientation == Qt.PrimaryOrientation ?

51+ property int primaryOrientation: deviceConfig.primaryOrientation == Qt.PrimaryOrientation ?

48− root.useNativeOrientation : deviceConfigParser.primaryOrientation

52+ root.useNativeOrientation : deviceConfig.primaryOrientation

49

53

50− property int supportedOrientations: deviceConfigParser.supportedOrientations

54+ property int supportedOrientations: deviceConfig.supportedOrientations

51

55

52− property int landscapeOrientation: deviceConfigParser.landscapeOrientation

56+ property int landscapeOrientation: deviceConfig.landscapeOrientation

53− property int invertedLandscapeOrientation: deviceConfigParser.invertedLandscapeOrientation

57+ property int invertedLandscapeOrientation: deviceConfig.invertedLandscapeOrientation

54− property int portraitOrientation: deviceConfigParser.portraitOrientation

58+ property int portraitOrientation: deviceConfig.portraitOrientation

55− property int invertedPortraitOrientation: deviceConfigParser.invertedPortraitOrientation

59+ property int invertedPortraitOrientation: deviceConfig.invertedPortraitOrientation

56− property string category: deviceConfigParser.category

60+ property string category: deviceConfig.category

61+ property string name: deviceConfig.name

57− property bool supportsMultiColorLed: deviceConfigParser.supportsMultiColorLed

62+ property bool supportsMultiColorLed: deviceConfig.supportsMultiColorLed

58

63

59 states: [

64 states: [

60 State {

65 State {

@@ -70,6 +75,7 @@ QtObject {

70 portraitOrientation: Qt.PortraitOrientation

75 portraitOrientation: Qt.PortraitOrientation

71 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

76 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

72 category: "phone"

77 category: "phone"

78+ name: "mako"

73 }

79 }

74 },

80 },

75 State {

81 State {

@@ -85,6 +91,7 @@ QtObject {

85 portraitOrientation: Qt.PortraitOrientation

91 portraitOrientation: Qt.PortraitOrientation

86 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

92 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

87 category: "phone"

93 category: "phone"

94+ name: "krillin"

88 }

95 }

89 },

96 },

90 State {

97 State {

@@ -102,6 +109,7 @@ QtObject {

102 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

109 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

103 supportsMultiColorLed: false

110 supportsMultiColorLed: false

104 category: "phone"

111 category: "phone"

112+ name: "arale"

105 }

113 }

106 },

114 },

107 State {

115 State {

@@ -118,6 +126,7 @@ QtObject {

118 portraitOrientation: Qt.PortraitOrientation

126 portraitOrientation: Qt.PortraitOrientation

119 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

127 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

120 category: "tablet"

128 category: "tablet"

129+ name: "manta"

121 }

130 }

122 },

131 },

123 State {

132 State {

@@ -134,6 +143,7 @@ QtObject {

134 portraitOrientation: Qt.PortraitOrientation

143 portraitOrientation: Qt.PortraitOrientation

135 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

144 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

136 category: "tablet"

145 category: "tablet"

146+ name: "flo"

137 }

147 }

138 },

148 },

139 State {

149 State {

@@ -147,6 +157,7 @@ QtObject {

147 portraitOrientation: Qt.PortraitOrientation

157 portraitOrientation: Qt.PortraitOrientation

148 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

158 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

149 category: "desktop"

159 category: "desktop"

160+ name: "desktop"

150 }

161 }

151 },

162 },

152 State {

163 State {

qml/DisabledScreenNotice.qml+1−1

@@ -27,10 +27,10 @@ Item {

27 // For testing

28 property var screen: Screen

29 property var orientationLock: OrientationLock

30+ property alias overrideDeviceName: deviceConfiguration.overrideName

30

31

31 DeviceConfiguration {

32 DeviceConfiguration {

32 id: deviceConfiguration

33 id: deviceConfiguration

33− name: applicationArguments.deviceName

34 }

35

36 Item {

qml/OrientedShell.qml+4−1

@@ -33,10 +33,13 @@ Item {

33 implicitHeight: units.gu(71)

34

35 onWidthChanged: calculateUsageMode();

36+ property var overrideDeviceName: screens.count > 1 ? "desktop" : false

36

37

37 DeviceConfiguration {

38 DeviceConfiguration {

38 id: deviceConfiguration

39 id: deviceConfiguration

39− name: applicationArguments.deviceName

40+

41+ // Override for convergence to set scale etc for second monitor

42+ overrideName: root.overrideDeviceName

40 }

43 }

41

44

42 property alias orientations: d.orientations

45 property alias orientations: d.orientations

src/ApplicationArguments.h−13

@@ -26,27 +26,14 @@

26class ApplicationArguments : public QObject

27{

28 Q_OBJECT

29− Q_PROPERTY(QString deviceName READ deviceName NOTIFY deviceNameChanged)

30 Q_PROPERTY(QString mode READ mode CONSTANT)

29 Q_PROPERTY(QString mode READ mode CONSTANT)

31public:

30public:

32 ApplicationArguments(QObject *parent = nullptr);

31 ApplicationArguments(QObject *parent = nullptr);

33

32

34− void setDeviceName(const QString &deviceName) {

35− if (deviceName != m_deviceName) {

36− m_deviceName = deviceName;

37− Q_EMIT deviceNameChanged(m_deviceName);

38− }

39− }

40− QString deviceName() const { return m_deviceName; }

41−

42 void setMode(const QString &mode) { m_mode = mode; }

33 void setMode(const QString &mode) { m_mode = mode; }

43 QString mode() const { return m_mode; }

34 QString mode() const { return m_mode; }

44

35

45−Q_SIGNALS:

46− void deviceNameChanged(const QString&);

47−

48private:

36private:

49− QString m_deviceName;

50 QString m_mode;

37 QString m_mode;

51};

38};

52

39

src/CMakeLists.txt+1−5

@@ -42,15 +42,11 @@ if (ENABLE_TOUCH_EMULATION)

42 set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)

43endif()

44

45−pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

46add_executable(${SHELL_APP} ${SOURCE_FILES})

45add_executable(${SHELL_APP} ${SOURCE_FILES})

47

46

48−if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")

49− set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})

50−endif()

51target_link_libraries(${SHELL_APP}

47target_link_libraries(${SHELL_APP}

52 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test

48 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test

53− ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}

49+ ${GSETTINGS_QT_LDFLAGS}

54 UbuntuGestures connectivity-qt1 unity8-private

50 UbuntuGestures connectivity-qt1 unity8-private

55 )

51 )

56

52

src/ShellApplication.cpp−15

@@ -25,9 +25,6 @@

25

26#include <libintl.h>

27

28−// libandroid-properties

29−#include <hybris/properties/properties.h>

30−

31// local

28// local

32#include <paths.h>

29#include <paths.h>

33#include "CachingNetworkManagerFactory.h"

30#include "CachingNetworkManagerFactory.h"

@@ -47,15 +44,6 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

47

44

48 UnityCommandLineParser parser(*this);

45 UnityCommandLineParser parser(*this);

49

46

50− if (!parser.deviceName().isEmpty()) {

51− m_deviceName = parser.deviceName();

52− } else {

53− char buffer[200];

54− property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);

55− m_deviceName = QString(buffer);

56− }

57− m_qmlArgs.setDeviceName(m_deviceName);

58−

59 m_qmlArgs.setMode(parser.mode());

47 m_qmlArgs.setMode(parser.mode());

60

48

61 // The testability driver is only loaded by QApplication but not by QGuiApplication.

49 // The testability driver is only loaded by QApplication but not by QGuiApplication.

@@ -110,7 +98,6 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

110 // (eg cloned desktop, several desktops, etc)

98 // (eg cloned desktop, several desktops, etc)

111 if (isMirServer && screens().count() == 2) {

99 if (isMirServer && screens().count() == 2) {

112 m_shellView->setScreen(screens().at(1));

100 m_shellView->setScreen(screens().at(1));

113− m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

114

101

115 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

102 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

116 m_secondaryWindow->setScreen(screens().at(0));

103 m_secondaryWindow->setScreen(screens().at(0));

@@ -182,7 +169,6 @@ void ShellApplication::onScreenAdded(QScreen * /*screen*/)

182 // (eg cloned desktop, several desktops, etc)

169 // (eg cloned desktop, several desktops, etc)

183 if (screens().count() == 2) {

170 if (screens().count() == 2) {

184 m_shellView->setScreen(screens().at(1));

171 m_shellView->setScreen(screens().at(1));

185− m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

186 // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again

172 // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again

187 // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/

173 // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/

188 m_shellView->setVisible(true);

174 m_shellView->setVisible(true);

@@ -214,7 +200,6 @@ void ShellApplication::onScreenRemoved(QScreen *screen)

214 delete m_secondaryWindow;

200 delete m_secondaryWindow;

215 m_secondaryWindow = nullptr;

201 m_secondaryWindow = nullptr;

216 m_shellView->setScreen(allScreens.first());

202 m_shellView->setScreen(allScreens.first());

217− m_qmlArgs.setDeviceName(m_deviceName);

218 // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

203 // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

219 // its backing QPlatformWindow recreated). So lets refocus it.

204 // its backing QPlatformWindow recreated). So lets refocus it.

220 m_shellView->requestActivate();

205 m_shellView->requestActivate();

src/ShellApplication.h−1

@@ -46,7 +46,6 @@ private Q_SLOTS:

46

47private:

48 void setupQmlEngine(bool isMirServer);

49− QString m_deviceName;

50 ApplicationArguments m_qmlArgs;

49 ApplicationArguments m_qmlArgs;

51 ShellView *m_shellView{nullptr};

50 ShellView *m_shellView{nullptr};

52 SecondaryWindow *m_secondaryWindow{nullptr};

51 SecondaryWindow *m_secondaryWindow{nullptr};

src/UnityCommandLineParser.cpp−5

@@ -51,10 +51,6 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

51 QStringLiteral("DISCOURAGED: Please set QT_LOAD_TESTABILITY instead.\nLoad the testability driver"));

52 parser.addOption(testabilityOption);

53

54− QCommandLineOption devicenameOption(QStringList() << QStringLiteral("devicename"),

55− QStringLiteral("Specify the device name instead of letting Unity 8 find it out"), QStringLiteral("devicename"), QLatin1String(""));

56− parser.addOption(devicenameOption);

57−

58 QCommandLineOption modeOption(QStringLiteral("mode"),

54 QCommandLineOption modeOption(QStringLiteral("mode"),

59 QStringLiteral("Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]"),

55 QStringLiteral("Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]"),

60 QStringLiteral("mode"), QStringLiteral("full-greeter"));

56 QStringLiteral("mode"), QStringLiteral("full-greeter"));

@@ -83,7 +79,6 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

83 #endif

79 #endif

84

80

85 m_hasFullscreen = parser.isSet(fullscreenOption);

81 m_hasFullscreen = parser.isSet(fullscreenOption);

86− m_deviceName = parser.value(devicenameOption);

87 resolveMode(parser, modeOption);

82 resolveMode(parser, modeOption);

88}

83}

89

84

src/UnityCommandLineParser.h−2

@@ -34,7 +34,6 @@ public:

34 #endif

35

36 bool hasFullscreen() const { return m_hasFullscreen; }

37− QString deviceName() const { return m_deviceName; }

38 QString mode() const { return m_mode; }

37 QString mode() const { return m_mode; }

39private:

38private:

40

39

@@ -53,7 +52,6 @@ private:

53 #endif

52 #endif

54

53

55 bool m_hasFullscreen;

54 bool m_hasFullscreen;

56− QString m_deviceName;

57 QString m_mode;

55 QString m_mode;

58};

56};

59

57

tests/mocks/Utils/CMakeLists.txt+4−2

@@ -9,6 +9,7 @@ include_directories(

9 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

10 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

11 ${GIO_INCLUDE_DIRS}

12+ ${DEVICEINFO_INCLUDE_DIRS}

12)

13)

13

14

14set(QMLPLUGIN_SRC

15set(QMLPLUGIN_SRC

@@ -22,7 +23,7 @@ set(QMLPLUGIN_SRC

22 ${CMAKE_SOURCE_DIR}/plugins/Utils/timezoneFormatter.cpp

23 ${CMAKE_SOURCE_DIR}/plugins/Utils/timezoneFormatter.cpp

23 ${CMAKE_SOURCE_DIR}/plugins/Utils/applicationsfiltermodel.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/Utils/applicationsfiltermodel.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/Utils/inputeventgenerator.cpp

25 ${CMAKE_SOURCE_DIR}/plugins/Utils/inputeventgenerator.cpp

25− ${CMAKE_SOURCE_DIR}/plugins/Utils/deviceconfigparser.cpp

26+ ${CMAKE_SOURCE_DIR}/plugins/Utils/deviceconfig.cpp

26 ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp

28 ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp

28 ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp

@@ -50,7 +51,8 @@ add_library(FakeUtils-qml SHARED

50target_link_libraries(FakeUtils-qml

51target_link_libraries(FakeUtils-qml

51 ${GIO_LDFLAGS}

52 ${GIO_LDFLAGS}

52 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui

53 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui

54+ ${DEVICEINFO_LDFLAGS}

53− )

55+)

54

56

55# Because this is an internal support library, we want

57# Because this is an internal support library, we want

56# to expose all symbols in it. Consider changing this

58# to expose all symbols in it. Consider changing this

tests/mocks/Utils/plugin.cpp+2−2

@@ -38,7 +38,7 @@

38#include <timezoneFormatter.h>

39#include <applicationsfiltermodel.h>

40#include <inputeventgenerator.h>

41−#include <deviceconfigparser.h>

41+#include <deviceconfig.h>

42#include <globalfunctions.h>

43#include <appdrawerproxymodel.h>

44#include <tabfocusfence.h>

@@ -83,7 +83,7 @@ void FakeUtilsPlugin::registerTypes(const char *uri)