c250d36 · 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+2−4

@@ -3,7 +3,6 @@ Section: x11

3Priority: optional

4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>

5Build-Depends:

6− android-headers,

7 cmake,

6 cmake,

8 cmake-extras,

7 cmake-extras,

9 dbus-test-runner,

8 dbus-test-runner,

@@ -14,8 +13,8 @@ Build-Depends:

14 gdb,

13 gdb,

15 graphviz,

14 graphviz,

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

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

17− libandroid-properties-dev,

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

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

17+ libdeviceinfo-dev,

19 libevdev-dev,

18 libevdev-dev,

20 libgeonames-dev (>= 0.2),

19 libgeonames-dev (>= 0.2),

21 libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],

20 libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],

@@ -24,7 +23,6 @@ Build-Depends:

24 libglib2.0-dev,

23 libglib2.0-dev,

25 libgnome-desktop-3-dev,

24 libgnome-desktop-3-dev,

26 libgsettings-qt-dev,

25 libgsettings-qt-dev,

27− libhardware-dev,

28 liblightdm-qt5-3-dev,

26 liblightdm-qt5-3-dev,

29 libpam0g-dev,

27 libpam0g-dev,

30 libpulse-dev,

28 libpulse-dev,

@@ -115,6 +113,7 @@ Depends:

115 libglib2.0-bin,

113 libglib2.0-bin,

116 qmenumodel-qml (>= 0.2.11),

114 qmenumodel-qml (>= 0.2.11),

117 qml-module-biometryd,

115 qml-module-biometryd,

116+ qml-module-hfd,

118 qml-module-qt-labs-folderlistmodel,

117 qml-module-qt-labs-folderlistmodel,

119 qml-module-qt-labs-settings,

118 qml-module-qt-labs-settings,

120 qml-module-qtqml-statemachine,

119 qml-module-qtqml-statemachine,

@@ -233,7 +232,6 @@ Pre-Depends:

233Depends:

232Depends:

234 accountsservice-ubuntu-schemas (>= 0.0.7),

233 accountsservice-ubuntu-schemas (>= 0.0.7),

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

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

236− libhardware2,

237 qml-module-qtmultimedia,

235 qml-module-qtmultimedia,

238 qtdeclarative5-gsettings1.0,

236 qtdeclarative5-gsettings1.0,

239 unity8-schemas,

237 unity8-schemas,

debian/rules+7

@@ -8,6 +8,11 @@ include /usr/share/dpkg/default.mk

8export DPKG_GENSYMBOLS_CHECK_LEVEL=4

9export NO_PNG_PKG_MANGLE=1

10

11+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

12+

13+# Skip tests on the archs they are known to be flaky with current configuration

14+testskip_architectures := arm64

15+

11%:

16%:

12 dh $@ --parallel --fail-missing --with python3

17 dh $@ --parallel --fail-missing --with python3

13

18

@@ -21,10 +26,12 @@ override_dh_auto_build:

21 dh_auto_build -- -O all doc

26 dh_auto_build -- -O all doc

22

27

23override_dh_auto_test:

28override_dh_auto_test:

29+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))

24 # Run the entire test battery

30 # Run the entire test battery

25 # Parallel tests have a risk of starting xvfb on the same DISPLAY multiple times,

31 # Parallel tests have a risk of starting xvfb on the same DISPLAY multiple times,

26 # causing the whole battery to fail.

32 # causing the whole battery to fail.

27 dh_auto_test --no-parallel -- -O -k xvfballtests || true

33 dh_auto_test --no-parallel -- -O -k xvfballtests || true

34+endif

28

35

29override_dh_install:

36override_dh_install:

30 # install autopilot tests

37 # install autopilot tests

debian/unity8-private.install−1

@@ -4,7 +4,6 @@ usr/lib/*/unity8/qml/Cursor

4usr/lib/*/unity8/qml/GlobalShortcut

5usr/lib/*/unity8/qml/Greeter

6usr/lib/*/unity8/qml/LightDM

7−usr/lib/*/unity8/qml/Lights

8usr/lib/*/unity8/qml/Powerd

7usr/lib/*/unity8/qml/Powerd

9usr/lib/*/unity8/qml/ScreenshotDirectory

8usr/lib/*/unity8/qml/ScreenshotDirectory

10usr/lib/*/unity8/qml/SessionBroadcast

9usr/lib/*/unity8/qml/SessionBroadcast

plugins/CMakeLists.txt−1

@@ -16,7 +16,6 @@ add_subdirectory(Cursor)

16add_subdirectory(GlobalShortcut)

17add_subdirectory(Greeter)

18add_subdirectory(LightDM)

19−add_subdirectory(Lights)

20add_subdirectory(Powerd)

19add_subdirectory(Powerd)

21add_subdirectory(ScreenshotDirectory)

20add_subdirectory(ScreenshotDirectory)

22add_subdirectory(SessionBroadcast)

21add_subdirectory(SessionBroadcast)

plugins/Lights/CMakeLists.txtdeleted−19

@@ -1,19 +0,0 @@

1−pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

2−pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3−

4−include_directories(

5− SYSTEM

6− ${ANDROID_HEADERS_INCLUDE_DIRS}

7−)

8−

9−add_library(Lights-qml MODULE

10− plugin.cpp

11− Lights.cpp

12− )

13−

14−target_link_libraries(Lights-qml

15− Qt5::Qml Qt5::Gui

16− ${ANDROID_HARDWARE_LIBRARIES}

17− )

18−

19−add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

plugins/Lights/Lights.cppdeleted−166

@@ -1,166 +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 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 General Public License for more details.

12− *

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

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

15− *

16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

17− */

18−

19−#include "Lights.h"

20−#include <QtCore/QDebug>

21−

22−extern "C" {

23−#include "android-hardware.h"

24−#include <string.h>

25−}

26−

27−Lights::Lights(QObject* parent)

28− : QObject(parent),

29− m_lightDevice(0),

30− m_color("blue"),

31− m_state(Lights::Off),

32− m_onMs(1000),

33− m_offMs(3000)

34−{

35−}

36−

37−Lights::~Lights()

38−{

39− if (m_lightDevice) {

40− hw_device_t* device = (hw_device_t*) m_lightDevice;

41− device->close(device);

42− }

43−}

44−

45−void Lights::setState(Lights::State newState)

46−{

47− if (!init()) {

48− qWarning() << "No lights device";

49− return;

50− }

51−

52− if (m_state != newState) {

53− if (newState == Lights::On) {

54− turnOn();

55− } else {

56− turnOff();

57− }

58−

59− m_state = newState;

60− Q_EMIT stateChanged(m_state);

61− }

62−}

63−

64−Lights::State Lights::state() const

65−{

66− return m_state;

67−}

68−

69−void Lights::setColor(const QColor &color)

70−{

71− if (m_color != color) {

72− m_color = color;

73− Q_EMIT colorChanged(m_color);

74− // FIXME: update the color if the light is already on

75− }

76−}

77−

78−QColor Lights::color() const

79−{

80− return m_color;

81−}

82−

83−int Lights::onMillisec() const

84−{

85− return m_onMs;

86−}

87−

88−void Lights::setOnMillisec(int onMs)

89−{

90− if (m_onMs != onMs) {

91− m_onMs = onMs;

92− Q_EMIT onMillisecChanged(m_onMs);

93− // FIXME: update the property if the light is already on

94− }

95−}

96−

97−int Lights::offMillisec() const

98−{

99− return m_offMs;

100−}

101−

102−void Lights::setOffMillisec(int offMs)

103−{

104− if (m_offMs != offMs) {

105− m_offMs = offMs;

106− Q_EMIT offMillisecChanged(m_offMs);

107− // FIXME: update the property if the light is already on

108− }

109−}

110−

111−bool Lights::init()

112−{

113− if (m_lightDevice) {

114− return true;

115− }

116−

117− int err;

118− hw_module_t* module;

119−

120− err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);

121− if (err == 0) {

122− hw_device_t* device;

123− err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

124− if (err == 0) {

125− m_lightDevice = (light_device_t*)device;

126− turnOff();

127− return true;

128− } else {

129− qWarning() << "Failed to access notification lights";

130− }

131− } else {

132− qWarning() << "Failed to initialize lights hardware.";

133− }

134− return false;

135−}

136−

137−void Lights::turnOn()

138−{

139− // pulse

140− light_state_t state;

141− memset(&state, 0, sizeof(light_state_t));

142− state.color = m_color.rgba();

143− state.flashMode = LIGHT_FLASH_TIMED;

144− state.flashOnMS = m_onMs;

145− state.flashOffMS = m_offMs;

146− state.brightnessMode = BRIGHTNESS_MODE_USER;

147−

148− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

149− qWarning() << "Failed to turn the light off";

150− }

151−}

152−

153−void Lights::turnOff()

154−{

155− light_state_t state;

156− memset(&state, 0, sizeof(light_state_t));

157− state.color = 0x00000000;

158− state.flashMode = LIGHT_FLASH_NONE;

159− state.flashOnMS = 0;

160− state.flashOffMS = 0;

161− state.brightnessMode = 0;

162−

163− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

164− qWarning() << "Failed to turn the light off";

165− }

166−}

plugins/Lights/Lights.hdeleted−75

@@ -1,75 +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 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 General Public License for more details.

12− *

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

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

15− *

16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

17− */

18−

19−#ifndef UNITY_LIGHTS_H

20−#define UNITY_LIGHTS_H

21−

22−#include <QtCore/QObject>

23−#include <QtGui/QColor>

24−

25−struct light_device_t;

26−

27−class Lights: public QObject

28−{

29− Q_OBJECT

30− Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)

31− Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

32− Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)

33− Q_PROPERTY(int offMillisec READ offMillisec WRITE setOffMillisec NOTIFY offMillisecChanged)

34−

35−public:

36− enum State {

37− Off,

38− On,

39− };

40− Q_ENUM(State)

41−

42− explicit Lights(QObject *parent = 0);

43− ~Lights();

44−

45− void setState(State newState);

46− State state() const;

47−

48− void setColor(const QColor &color);

49− QColor color() const;

50−

51− int onMillisec() const;

52− void setOnMillisec(int onMs);

53−

54− int offMillisec() const;

55− void setOffMillisec(int offMs);

56−

57−Q_SIGNALS:

58− void stateChanged(State newState);

59− void colorChanged(const QColor &color);

60− void onMillisecChanged(int onMs);

61− void offMillisecChanged(int offMs);

62−

63−private:

64− light_device_t* m_lightDevice;

65− QColor m_color;

66− State m_state;

67− int m_onMs;

68− int m_offMs;

69−

70− bool init();

71− void turnOff();

72− void turnOn();

73−};

74−

75−#endif

plugins/Lights/android-hardware.hdeleted−19

@@ -1,19 +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 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 General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#include <hardware/hardware.h>

19−#include <hardware/lights.h>

plugins/Lights/plugin.cppdeleted−35

@@ -1,35 +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 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 General Public License for more details.

12− *

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

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

15− *

16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

17− */

18−

19−#include "plugin.h"

20−#include "Lights.h"

21−

22−#include <QtQml/qqml.h>

23−

24−static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25−{

26− Q_UNUSED(engine)

27− Q_UNUSED(scriptEngine)

28− return new Lights();

29−}

30−

31−void LightsPlugin::registerTypes(const char *uri)

32−{

33− Q_ASSERT(uri == QLatin1String("Lights"));

34− qmlRegisterSingletonType<Lights>(uri, 0, 1, "Lights", lights_provider);

35−}

plugins/Lights/plugin.hdeleted−34

@@ -1,34 +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 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 General Public License for more details.

12− *

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

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

15− *

16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

17− */

18−

19−#ifndef LIGHTS_PLUGIN_H

20−#define LIGHTS_PLUGIN_H

21−

22−#include <QtQml/QQmlEngine>

23−#include <QtQml/QQmlExtensionPlugin>

24−

25−class LightsPlugin : public QQmlExtensionPlugin

26−{

27− Q_OBJECT

28− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

29−

30−public:

31− void registerTypes(const char *uri) override;

32−};

33−

34−#endif

plugins/Lights/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Lights

2−plugin Lights-qml

3−typeinfo Lights.qmltypes

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");

po/unity8.pot+15−7

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2020-04-15 12:15-0500\n"

11+"POT-Creation-Date: 2020-05-03 09:34-0500\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -50,16 +50,16 @@ msgstr ""

50msgid "Guest Session"

51msgstr ""

52

53−#: plugins/Unity/Launcher/launcheritem.cpp:49

53+#: plugins/Unity/Launcher/launcheritem.cpp:48

54−#: plugins/Unity/Launcher/launcheritem.cpp:123

54+#: plugins/Unity/Launcher/launcheritem.cpp:122

55msgid "Pin shortcut"

56msgstr ""

57

58−#: plugins/Unity/Launcher/launcheritem.cpp:55

58+#: plugins/Unity/Launcher/launcheritem.cpp:54

59msgid "Quit"

60msgstr ""

61

62−#: plugins/Unity/Launcher/launcheritem.cpp:123

62+#: plugins/Unity/Launcher/launcheritem.cpp:122

63msgid "Unpin shortcut"

64msgstr ""

65

@@ -427,10 +427,18 @@ msgstr ""

427msgid "Select desktop environment"

428msgstr ""

429

430−#: qml/Launcher/Drawer.qml:249

430+#: qml/Launcher/Drawer.qml:250

431msgid "Search…"

432msgstr ""

433

434+#: qml/Launcher/PullToRefreshScopeStyle.qml:56

435+msgid "Pull to refresh…"

436+msgstr ""

437+

438+#: qml/Launcher/PullToRefreshScopeStyle.qml:61

439+msgid "Release to refresh…"

440+msgstr ""

441+

434#: qml/Notifications/NotificationMenuItemFactory.qml:124

442#: qml/Notifications/NotificationMenuItemFactory.qml:124

435msgid "Show password"

443msgid "Show password"

436msgstr ""

444msgstr ""

@@ -688,7 +696,7 @@ msgid "Welcome Back"

688msgstr ""

696msgstr ""

689

697

690#: qml/Wizard/Pages/80-finished.qml:91

698#: qml/Wizard/Pages/80-finished.qml:91

691−msgid "Welcome to Ubuntu"

699+msgid "Welcome to Ubuntu Touch"

692msgstr ""

700msgstr ""

693

701

694#: qml/Wizard/Pages/80-finished.qml:106

702#: qml/Wizard/Pages/80-finished.qml:106

qml/Components/WallpaperResolver.qml → qml/Components/ImageResolver.qmlrenamed

The content is the same.

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/Launcher/LauncherPanel.qml+14−3

@@ -90,16 +90,27 @@ Rectangle {

90 color: UbuntuColors.orange

91 readonly property bool highlighted: root.highlightIndex == -1;

92

93− Icon {

93+ Image {

94 objectName: "dashItem"

95 width: parent.width * .6

96 height: width

97 anchors.centerIn: parent

98− source: "graphics/home.svg"

98+ source: homeIconResolver.background

99− color: "white"

100 rotation: root.rotation

99 rotation: root.rotation

101 }

100 }

102

101

102+ ImageResolver {

103+ id: homeIconResolver

104+ objectName: "homeIconResolver"

105+

106+ readonly property url defaultHomeIcon: "graphics/home.svg"

107+

108+ candidates: [

109+ "file:///custom/graphics/homebutton.svg",

110+ defaultHomeIcon

111+ ]

112+ }

113+

103 AbstractButton {

114 AbstractButton {

104 id: dashItem

115 id: dashItem

105 anchors.fill: parent

116 anchors.fill: parent

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

qml/Panel/Indicators/IndicatorsLight.qml+8−8

@@ -20,7 +20,7 @@

20

21import QtQuick 2.4

22import Powerd 0.1

23−import Lights 0.1

23+import Hfd 0.1

24import QMenuModel 0.1 as QMenuModel

25import Unity.Indicators 0.1 as Indicators

26import Wizard 0.1

@@ -171,9 +171,9 @@ console.log("no support for Multicolor LED. " + indicatorState)

171 }

172

173 // HACK: led is only updated after turn on so first always turn off

174− Lights.state = Lights.Off

174+ Leds.state = Leds.Off

175 if (indicatorState != "INDICATOR_OFF")

176− Lights.state = Lights.On

176+ Leds.state = Leds.On

177 }

178

179 // Existence of unread notifications is determined by checking for a specific icon name in a dbus signal.

@@ -213,23 +213,23 @@ console.log("no support for Multicolor LED. " + indicatorState)

213 }

214 }

215

216− Component.onCompleted: Lights.state = Lights.Off

216+ Component.onCompleted: Leds.state = Lights.Off

217− Component.onDestruction: Lights.state = Lights.Off

217+ Component.onDestruction: Leds.state = Leds.Off

218

219 property var _colorBinding: Binding {

220− target: Lights

220+ target: Leds

221 property: "color"

222 value: root.color

223 }

224

225 property var _onMillisecBinding: Binding {

226− target: Lights

226+ target: Leds

227 property: "onMillisec"

228 value: root.onMillisec

229 }

230

231 property var _offMillisecBinding: Binding {

232− target: Lights

232+ target: Leds

233 property: "offMillisec"

234 value: root.offMillisec

235 }

qml/Shell.qml+1−1

@@ -157,7 +157,7 @@ StyledItem {

157

158 property real edgeSize: units.gu(settings.edgeDragWidth)

159

160− WallpaperResolver {

160+ ImageResolver {

161 id: wallpaperResolver

162 objectName: "wallpaperResolver"

163

qml/Wizard/Pages.qml+8−5

@@ -84,19 +84,22 @@ StyledItem {

84 }

85 }

86

87− function quitWizard() {

87+ function savePassword() {

88− pageStack.currentPage.enabled = false;

89−

90 if (password != "") {

88 if (password != "") {

91− var errorMsg = securityPrivacy.setSecurity("", password, passwordMethod)

89+ var errorMsg = securityPrivacy.setSecurity("", password, passwordMethod);

92 if (errorMsg !== "") {

90 if (errorMsg !== "") {

93 // Ignore (but log) any errors, since we're past where the user set

91 // Ignore (but log) any errors, since we're past where the user set

94 // the method. Worst case, we just leave the user with a swipe

92 // the method. Worst case, we just leave the user with a swipe

95 // security method and they fix it in the system settings.

93 // security method and they fix it in the system settings.

96− console.log("Wizard: Error setting security method:", errorMsg)

94+ console.log("Wizard: Error setting security method:", errorMsg);

97 }

95 }

98 }

96 }

99

97

98+ }

99+

100+ function quitWizard() {

101+ pageStack.currentPage.enabled = false;

102+ savePassword();

100 quit();

103 quit();

101 }

104 }

102

105

qml/Wizard/Pages/79-system-update.qml+1

@@ -116,6 +116,7 @@ LocalComponents.Page {

116 objectName: "installButton"

117 anchors.fill: parent

118 onClicked: {

119+ root.savePassword();

119 System.skipUntilFinishedPage();

120 System.skipUntilFinishedPage();

120 SystemImage.applyUpdate();

121 SystemImage.applyUpdate();

121 }

122 }

qml/Wizard/Pages/80-finished.qml+1−1

@@ -88,7 +88,7 @@ LocalComponents.Page {

88 fontSize: "x-large"

89 font.weight: Font.Light

90 lineHeight: 1.2

91− text: (System.isUpdate) ? i18n.tr("Welcome Back") : i18n.tr("Welcome to Ubuntu")

91+ text: (System.isUpdate) ? i18n.tr("Welcome Back") : i18n.tr("Welcome to Ubuntu Touch")

92 color: whiteColor

93 }

94

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/ShellApplication.cpp−12

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

47

48 UnityCommandLineParser parser(*this);

49

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

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

60

51

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

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

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

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

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

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

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

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

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

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

114

104

115 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

105 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

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

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

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

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

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

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

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

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

174 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

175 // 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. :-/

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

188 m_shellView->setVisible(true);

177 m_shellView->setVisible(true);

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

214 delete m_secondaryWindow;

203 delete m_secondaryWindow;

215 m_secondaryWindow = nullptr;

204 m_secondaryWindow = nullptr;

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

205 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

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

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

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

220 m_shellView->requestActivate();

208 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/CMakeLists.txt+1−1

@@ -35,7 +35,7 @@ add_subdirectory(indicator-service)

35add_subdirectory(liblightdm)

36add_subdirectory(libusermetrics)

37add_subdirectory(LightDMController)

38−add_subdirectory(Lights)

38+add_subdirectory(Hfd)

39add_subdirectory(MeeGo)

40add_subdirectory(Powerd)

41add_subdirectory(QMenuModel)

tests/mocks/Hfd/CMakeLists.txtnew file+8

@@ -0,0 +1,8 @@

1+add_library(MockHfd-qml MODULE

2+ plugin.cpp

3+ Leds.cpp

4+ )

5+

6+qt5_use_modules(MockHfd-qml Qml Gui)

7+

8+add_unity8_mock(Hfd 0.1 Hfd TARGETS MockHfd-qml)

tests/mocks/Lights/Lights.cpp → tests/mocks/Hfd/Leds.cpprenamed+12−12

@@ -14,24 +14,24 @@

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

15 */

16

17−#include "Lights.h"

17+#include "Leds.h"

18

19#include <QDebug>

20

21−Lights::Lights(QObject* parent)

21+Leds::Leds(QObject* parent)

22 : QObject(parent),

23 m_color("blue"),

24− m_state(Lights::Off),

24+ m_state(Leds::Off),

25 m_onMs(1000),

26 m_offMs(3000)

27{

28}

29

30−Lights::~Lights()

30+Leds::~Leds()

31{

32}

33

34−void Lights::setState(Lights::State newState)

34+void Leds::setState(Leds::State newState)

35{

36 if (m_state != newState) {

37 m_state = newState;

@@ -39,12 +39,12 @@ void Lights::setState(Lights::State newState)

39 }

40}

41

42−Lights::State Lights::state() const

42+Leds::State Leds::state() const

43{

44 return m_state;

45}

46

47−void Lights::setColor(const QColor &color)

47+void Leds::setColor(const QColor &color)

48{

49 if (m_color != color) {

50 m_color = color;

@@ -52,17 +52,17 @@ void Lights::setColor(const QColor &color)

52 }

53}

54

55−QColor Lights::color() const

55+QColor Leds::color() const

56{

57 return m_color;

58}

59

60−int Lights::onMillisec() const

60+int Leds::onMillisec() const

61{

62 return m_onMs;

63}

64

65−void Lights::setOnMillisec(int onMs)

65+void Leds::setOnMillisec(int onMs)

66{

67 if (m_onMs != onMs) {

68 m_onMs = onMs;

@@ -70,12 +70,12 @@ void Lights::setOnMillisec(int onMs)

70 }

71}

72

73−int Lights::offMillisec() const

73+int Leds::offMillisec() const

74{

75 return m_offMs;

76}

77

78−void Lights::setOffMillisec(int offMs)

78+void Leds::setOffMillisec(int offMs)

79{

80 if (m_offMs != offMs) {

81 m_offMs = offMs;

tests/mocks/Lights/Lights.h → tests/mocks/Hfd/Leds.hrenamed+4−7

@@ -14,13 +14,12 @@

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

15 */

16

17−#ifndef UNITY_MOCK_LIGHTS_H

17+#pragma once

18−#define UNITY_MOCK_LIGHTS_H

19

18

20#include <QtCore/QObject>

19#include <QtCore/QObject>

21#include <QtGui/QColor>

20#include <QtGui/QColor>

22

21

23−class Lights: public QObject

22+class Leds: public QObject

24{

23{

25 Q_OBJECT

24 Q_OBJECT

26 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)

25 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)

@@ -35,8 +34,8 @@ public:

35 };

34 };

36 Q_ENUM(State)

35 Q_ENUM(State)

37

36

38− explicit Lights(QObject *parent = 0);

37+ explicit Leds(QObject *parent = 0);

39− ~Lights();

38+ ~Leds();

40

39

41 void setState(State newState);

40 void setState(State newState);

42 State state() const;

41 State state() const;

@@ -62,5 +61,3 @@ private:

62 int m_onMs;

61 int m_onMs;

63 int m_offMs;

62 int m_offMs;

64};

63};

65−

66−#endif

tests/mocks/Lights/plugin.cpp → tests/mocks/Hfd/plugin.cpprenamed+5−5

@@ -15,19 +15,19 @@

15 */

16

17#include "plugin.h"

18−#include "Lights.h"

18+#include "Leds.h"

19

20#include <QtQml/qqml.h>

21

22−static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

22+static QObject *leds_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

23{

24 Q_UNUSED(engine)

25 Q_UNUSED(scriptEngine)

26− return new Lights();

26+ return new Leds();

27}

28

29void PowerdPlugin::registerTypes(const char *uri)

30{

31− Q_ASSERT(uri == QLatin1String("Lights"));

31+ Q_ASSERT(uri == QLatin1String("Hfd"));

32− qmlRegisterSingletonType<Lights>(uri, 0, 1, "Lights", lights_provider);

32+ qmlRegisterSingletonType<Leds>(uri, 0, 1, "Leds", leds_provider);

33}

tests/mocks/Lights/plugin.h → tests/mocks/Hfd/plugin.hrenamed+1−4

@@ -14,8 +14,7 @@

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

15 */

16

17−#ifndef MOCK_POWER_PLUGIN_H

17+#pragma once

18−#define MOCK_POWER_PLUGIN_H

19

18

20#include <QtQml/QQmlEngine>

19#include <QtQml/QQmlEngine>

21#include <QtQml/QQmlExtensionPlugin>

20#include <QtQml/QQmlExtensionPlugin>

@@ -28,5 +27,3 @@ class PowerdPlugin : public QQmlExtensionPlugin

28public:

27public:

29 void registerTypes(const char *uri) override;

28 void registerTypes(const char *uri) override;

30};

29};

31−

32−#endif

tests/mocks/Hfd/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Hfd

2+plugin MockHfd-qml

3+typeinfo hfd.qmltypes

tests/mocks/Lights/CMakeLists.txtdeleted−8

@@ -1,8 +0,0 @@

1−add_library(MockLights-qml MODULE

2− plugin.cpp

3− Lights.cpp

4− )

5−

6−target_link_libraries(MockLights-qml Qt5::Qml Qt5::Gui)

7−

8−add_unity8_mock(Lights 0.1 Lights TARGETS MockLights-qml)

tests/mocks/Lights/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Lights

2−plugin MockLights-qml

3−typeinfo Lights.qmltypes

tests/mocks/Utils/CMakeLists.txt+3−1

@@ -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

@@ -48,6 +49,7 @@ add_library(FakeUtils-qml SHARED

48 )

49 )

49

50

50target_link_libraries(FakeUtils-qml

51target_link_libraries(FakeUtils-qml

52+ ${DEVICEINFO_LDFLAGS}

51 ${GIO_LDFLAGS}

53 ${GIO_LDFLAGS}

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

54 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui

53 )

55 )

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)