xenial...d0a583f · unity8

CMakeLists.txt+1

since splitsnapshots

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+204−189

@@ -2,166 +2,170 @@ Source: unity8

2Section: x11

3Priority: optional

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

5−Build-Depends: cmake,

5+Build-Depends:

6+ cmake,

6− cmake-extras,

7+ cmake-extras,

7− dbus-test-runner,

8+ dbus-test-runner,

8− debhelper (>= 9),

9+ debhelper (>= 9),

9− dh-apparmor,

10+ dh-apparmor,

10− doxyqml,

11+ doxyqml,

11−# To allow cross-compiling to work, we also must append :native

12−# to g++ so we don't try to run arm g++

13−# on an x86 CPU for example, when cross-compiling.

14− g++:native,

12+ g++:native,

15− gdb,

13+ gdb,

16− graphviz,

14+ graphviz,

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

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

18− libandroid-properties-dev,

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

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

17+ libdeviceinfo-dev,

20− libevdev-dev,

18+ libevdev-dev,

21− libgeonames-dev (>= 0.2),

19+ libgeonames-dev (>= 0.2),

22− libgnome-desktop-3-dev,

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

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

24− libgl1-mesa-dri,

21+ libgl1-mesa-dri,

25− libgles2-mesa-dev[arm64 armhf],

22+ libgles2-mesa-dev[arm64 armhf],

26− libglib2.0-dev,

23+ libglib2.0-dev,

24+ libgnome-desktop-3-dev,

27− libgsettings-qt-dev,

25+ libgsettings-qt-dev,

28− libhardware-dev,

29− liblightdm-qt5-3-dev,

26+ liblightdm-qt5-3-dev,

30− libpam0g-dev,

27+ libpam0g-dev,

31− libpulse-dev,

28+ libpulse-dev,

32− libqmenumodel-dev (>= 0.2.12),

29+ libqmenumodel-dev (>= 0.2.12),

33− libqtdbusmock1-dev (>= 0.7),

30+ libqt5sql5-sqlite,

34− libqtdbustest1-dev,

35− libqt5svg5-dev,

31+ libqt5svg5-dev,

36− libqt5xmlpatterns5-dev,

32+ libqt5xmlpatterns5-dev,

33+ libqtdbusmock1-dev (>= 0.7),

34+ libqtdbustest1-dev,

37− libsystemsettings-dev,

35+ libsystemsettings-dev,

38− libubuntu-app-launch2-dev,

36+ libubuntu-app-launch2-dev,

39− libubuntu-download-manager-common-dev,

37+ libubuntu-download-manager-common-dev,

40− libubuntugestures5-dev (>= 1.3.2030),

38+ libubuntugestures5-dev (>= 1.3.2030),

41− libubuntugestures5-private-dev (>= 1.3.2030),

39+ libubuntugestures5-private-dev (>= 1.3.2030),

42− libudev-dev,

40+ libudev-dev,

43− libudm-common-dev,

41+ libudm-common-dev,

44− libunity-api-dev (>= 8.7),

42+ libunity-api-dev (>= 8.7),

45− libusermetricsoutput1-dev,

43+ libusermetricsoutput1-dev,

46−# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop

47− libx11-dev[!arm64 !armhf],

44+ libx11-dev[!arm64 !armhf],

48− libxcb1-dev[!arm64 !armhf],

45+ libxcb1-dev[!arm64 !armhf],

49− libxi-dev[!arm64 !armhf],

46+ libxi-dev[!arm64 !armhf],

50−# End of X11 libs

51− pkg-config,

47+ pkg-config,

52− python3-all:any,

48+ python3-all:any,

53− python3-setuptools,

49+ python3-setuptools,

54− qtdbustest-runner,

55− qml-module-qt-labs-folderlistmodel,

50+ qml-module-qt-labs-folderlistmodel,

56− qml-module-qt-labs-settings,

51+ qml-module-qt-labs-settings,

52+ qml-module-qtmultimedia (>= 5.6),

57− qml-module-qtqml-statemachine,

53+ qml-module-qtqml-statemachine,

58− qml-module-qtmultimedia (>= 5.6),

59− qml-module-qtquick-layouts,

54+ qml-module-qtquick-layouts,

60− qml-module-qtquick-xmllistmodel,

55+ qml-module-qtquick-xmllistmodel,

61− qml-module-qtquick2,

56+ qml-module-qtquick2,

62− qml-module-qtsysteminfo,

57+ qml-module-qtsysteminfo,

63− qml-module-qttest,

58+ qml-module-qttest,

64− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

59+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

65− qml-module-ubuntu-layouts,

60+ qml-module-ubuntu-layouts,

61+ qml-module-ubuntu-settings-components,

66− qml-module-ubuntu-test,

62+ qml-module-ubuntu-test,

67− qt5-default,

63+ qt5-default,

68− qtbase5-dev (>= 5.6),

64+ qtbase5-dev (>= 5.6),

69− qtbase5-dev-tools,

65+ qtbase5-dev-tools,

70− qtbase5-private-dev (>= 5.6),

66+ qtbase5-private-dev (>= 5.6),

67+ qtdbustest-runner,

71− qtdeclarative5-dev (>= 5.6),

68+ qtdeclarative5-dev (>= 5.6),

72− qtdeclarative5-dev-tools,

69+ qtdeclarative5-dev-tools,

73− qtdeclarative5-private-dev (>= 5.6),

70+ qtdeclarative5-private-dev (>= 5.6),

74− qtdeclarative5-ubuntu-content1,

71+ qtdeclarative5-ubuntu-content1,

75− qtdeclarative5-ubuntu-settings-components (>= 0.11),

76− ttf-ubuntu-font-family,

72+ ttf-ubuntu-font-family,

77− xvfb,

73+ xvfb,

78− android-headers,

79Standards-Version: 3.9.4

74Standards-Version: 3.9.4

80−Homepage: http://launchpad.net/unity

75+Homepage: https://github.com/ubports/unity8

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

76+Vcs-Git: https://github.com/ubports/unity8

82−# packaging changes, just go ahead. ~unity-team will notice

83−# and sync up the code again.

84−Vcs-Bzr: https://code.launchpad.net/unity8

85−Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk

86XS-Testsuite: autopkgtest

77XS-Testsuite: autopkgtest

87X-Ubuntu-Use-Langpack: yes

78X-Ubuntu-Use-Langpack: yes

88

79

89Package: indicators-client

80Package: indicators-client

90Architecture: any

81Architecture: any

82+Depends:

91−Depends: qmenumodel-qml (>= 0.2.11),

83+ qmenumodel-qml (>= 0.2.11),

92− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

84+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

93− unity8 (= ${binary:Version}),

85+ unity8 (= ${binary:Version}),

94− ${misc:Depends},

86+ ${misc:Depends},

95− ${shlibs:Depends},

87+ ${shlibs:Depends},

96Description: Indicators client test application

88Description: Indicators client test application

97 This package contains the client application for indicators used by autopilot

89 This package contains the client application for indicators used by autopilot

98

90

99Package: unity8-greeter

91Package: unity8-greeter

100Architecture: any

92Architecture: any

93+Depends:

94+ unity-system-compositor,

101−Depends: unity8 (= ${binary:Version}),

95+ unity8 (= ${binary:Version}),

102− unity-system-compositor,

103− ${misc:Depends},

96+ ${misc:Depends},

104− ${shlibs:Depends}

97+ ${shlibs:Depends},

105−Recommends: lightdm

98+Recommends:

99+ lightdm,

100+Provides:

106−Provides: lightdm-greeter

101+ lightdm-greeter,

107Description: The Unity8 Greeter

102Description: The Unity8 Greeter

108 The Unity 8 greeter is the primary login greeter for Ubuntu devices.

103 The Unity 8 greeter is the primary login greeter for Ubuntu devices.

109

104

110Package: unity8

105Package: unity8

111Architecture: any

106Architecture: any

107+Provides:

112−Provides: indicator-renderer,

108+ indicator-renderer,

109+Depends:

113−Depends: dmz-cursor-theme,

110+ dmz-cursor-theme,

114− gsettings-desktop-schemas,

111+ gsettings-desktop-schemas,

115− libcap2-bin,

112+ libcap2-bin,

116− libglib2.0-bin,

113+ libglib2.0-bin,

117− qmenumodel-qml (>= 0.2.11),

114+ qmenumodel-qml (>= 0.2.11),

118− qml-module-biometryd,

115+ qml-module-biometryd,

116+ qml-module-hfd,

119− qml-module-qt-labs-folderlistmodel,

117+ qml-module-qt-labs-folderlistmodel,

120− qml-module-qt-labs-settings,

118+ qml-module-qt-labs-settings,

121− qml-module-qtqml-statemachine,

119+ qml-module-qtqml-statemachine,

122− qml-module-qtquick-xmllistmodel,

120+ qml-module-qtquick-xmllistmodel,

123− qml-module-qtsysteminfo,

121+ qml-module-qtsysteminfo,

124−# qml-module-ubuntu-web,

125− qtdeclarative5-qtmir-plugin (>= 0.4.8),

122+ qtdeclarative5-qtmir-plugin (>= 0.4.8),

126− qtdeclarative5-ubuntu-telephony0.1,

123+ qtdeclarative5-ubuntu-telephony0.1,

127− ubuntu-system-settings (>= 0.4),

124+ ubuntu-system-settings (>= 0.4),

128− unity-launcher-impl-13,

125+ unity-launcher-impl-13,

129− unity8-common (= ${source:Version}),

126+ unity8-common (= ${source:Version}),

130− unity8-private (= ${binary:Version}),

127+ unity8-private (= ${binary:Version}),

131− unity8-private | unity-launcher-impl,

128+ unity8-private | unity-launcher-impl,

132− ${misc:Depends},

129+ ${misc:Depends},

133− ${shlibs:Depends},

130+ ${shlibs:Depends},

131+Recommends:

134−Recommends: indicator-keyboard,

132+ indicator-keyboard,

135− indicator-session,

133+ indicator-session,

136− unity-greeter-session-broadcast,

134+ unity-greeter-session-broadcast,

135+Breaks:

137−Breaks: indicator-network (<< 0.5.1+14.10.20141014),

136+ indicator-network (<< 0.5.1+14.10.20141014),

137+ ubuntu-keyboard (<< 0.100),

138− ubuntu-touch-session (<< 0.107),

138+ ubuntu-touch-session (<< 0.107),

139− unity8-greeter (<< 7.89),

140− unity-scope-tool,

139+ unity-scope-tool,

141− ubuntu-keyboard (<< 0.100),

140+ unity8-greeter (<< 7.89),

141+Replaces:

142−Replaces: ubuntu-touch-session (<< 0.82~),

142+ ubuntu-touch-session (<< 0.82~),

143+ unity-scope-tool,

143− unity8-greeter (<< 7.89),

144+ unity8-greeter (<< 7.89),

144− unity-scope-tool,

145+Conflicts:

145−Conflicts: ubuntu-system-settings-wizard,

146+ ubuntu-system-settings-wizard,

146Description: Unity 8 shell

147Description: Unity 8 shell

147 The Unity 8 shell is the primary user interface for Ubuntu devices.

148 The Unity 8 shell is the primary user interface for Ubuntu devices.

148

149

149Package: unity8-common

150Package: unity8-common

150Architecture: all

151Architecture: all

152+Depends:

151−Depends: qml-module-qtquick-layouts,

153+ qml-module-qtquick-layouts,

152− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

154+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

155+ qml-module-ubuntu-settings-components,

153− qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

156+ qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

154− qtdeclarative5-ubuntu-settings-components (>= 0.11),

155− qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

157+ qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

156− qttranslations5-l10n,

158+ qttranslations5-l10n,

157− ubuntu-thumbnailer-impl-0,

159+ ubuntu-thumbnailer-impl-0,

158− unity-application-impl-27,

160+ unity-application-impl-27,

159− unity-notifications-impl-3,

161+ unity-notifications-impl-3,

160− unity8-tests | unity-application-impl,

161− unity8-schemas,

162+ unity8-schemas,

163+ unity8-tests | unity-application-impl,

162− ${misc:Depends},

164+ ${misc:Depends},

165+Breaks:

163−Breaks: unity8 (<< 7.86),

166+ unity8 (<< 7.86),

167+Replaces:

164−Replaces: unity8 (<< 7.86),

168+ unity8 (<< 7.86),

165Description: Unity 8 shell (common files)

169Description: Unity 8 shell (common files)

166 The Unity 8 shell is the primary user interface for Ubuntu devices.

170 The Unity 8 shell is the primary user interface for Ubuntu devices.

167 .

171 .

@@ -169,46 +173,52 @@ Description: Unity 8 shell (common files)

169

173

170Package: unity8-autopilot

174Package: unity8-autopilot

171Architecture: all

175Architecture: all

176+Depends:

172−Depends: autopilot-qt5 (>= 1.4),

177+ autopilot-qt5 (>= 1.4),

173− gir1.2-glib-2.0,

178+ gir1.2-glib-2.0,

174− gir1.2-notify-0.7,

179+ gir1.2-notify-0.7,

175− libqt5test5,

180+ libqt5test5,

176− libqt5widgets5,

181+ libqt5widgets5,

177− ofono-phonesim,

182+ ofono-phonesim,

178− python3-autopilot,

183+ python3-autopilot,

179− python3-evdev,

184+ python3-evdev,

180− python3-fixtures,

185+ python3-fixtures,

181− python3-gi,

186+ python3-gi,

182− qttestability-autopilot (>= 1.4),

187+ qttestability-autopilot (>= 1.4),

183− ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

188+ ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

184− unity8 (= ${source:Version}),

189+ unity8 (= ${source:Version}),

185− unity8-tests (= ${source:Version}),

190+ unity8-tests (= ${source:Version}),

186− url-dispatcher-tools,

191+ url-dispatcher-tools,

187− xvfb,

192+ xvfb,

188− ${misc:Depends},

193+ ${misc:Depends},

189− ${python3:Depends},

194+ ${python3:Depends},

190Description: Test package for Unity 8 shell

195Description: Test package for Unity 8 shell

191 Autopilot tests for the unity8 package

196 Autopilot tests for the unity8 package

192

197

193Package: unity8-tests

198Package: unity8-tests

194Architecture: any

199Architecture: any

195Multi-Arch: same

200Multi-Arch: same

201+Pre-Depends:

196−Pre-Depends: ${misc:Pre-Depends},

202+ ${misc:Pre-Depends},

203+Depends:

197−Depends: dbus-test-runner,

204+ dbus-test-runner,

198− parallel,

205+ parallel,

199− qtdbustest-runner,

200− qt5-default,

206+ qt5-default,

207+ qtdbustest-runner,

201− qtdeclarative5-dev-tools,

208+ qtdeclarative5-dev-tools,

202− unity8 (= ${source:Version}),

209+ unity8 (= ${source:Version}),

203− xvfb,

210+ xvfb,

204− ${misc:Depends},

211+ ${misc:Depends},

205− ${shlibs:Depends},

212+ ${shlibs:Depends},

213+Provides:

206−Provides: unity-application-impl,

214+ unity-application-impl,

207− unity-application-impl-27,

215+ unity-application-impl-27,

208− unity8-fake-env,

216+ unity8-fake-env,

217+Replaces:

209−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),

218+ unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),

210− unity8-fake-env,

219+ unity8-fake-env,

220+Conflicts:

211−Conflicts: unity8-fake-env,

221+ unity8-fake-env,

212Description: Scripts and mocks for running Unity 8 shell tests

222Description: Scripts and mocks for running Unity 8 shell tests

213 Provides fake implementations of some QML modules used by Unity 8 shell

223 Provides fake implementations of some QML modules used by Unity 8 shell

214 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment

224 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment

@@ -217,30 +227,34 @@ Description: Scripts and mocks for running Unity 8 shell tests

217Package: unity8-private

227Package: unity8-private

218Architecture: any

228Architecture: any

219Multi-Arch: same

229Multi-Arch: same

230+Pre-Depends:

220−Pre-Depends: ${misc:Pre-Depends},

231+ ${misc:Pre-Depends},

232+Depends:

221−Depends: accountsservice-ubuntu-schemas (>= 0.0.7),

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

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

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

223− libhardware2,

224− unity8-schemas,

225− qtdeclarative5-gsettings1.0,

226− qml-module-qtmultimedia,

235+ qml-module-qtmultimedia,

236+ qtdeclarative5-gsettings1.0,

237+ unity8-schemas,

227− ${misc:Depends},

238+ ${misc:Depends},

228− ${shlibs:Depends},

239+ ${shlibs:Depends},

240+Provides:

229−Provides: unity-launcher-impl,

241+ unity-launcher-impl,

230− unity-launcher-impl-13,

242+ unity-launcher-impl-13,

231Description: Unity 8 private libs

243Description: Unity 8 private libs

232 The Unity 8 shell is the primary user interface for Ubuntu devices.

244 The Unity 8 shell is the primary user interface for Ubuntu devices.

233 .

245 .

234 This package contains the private libraries for QML and other components

246 This package contains the private libraries for QML and other components

235 only used by the shell.

247 only used by the shell.

236

248

237−

238Package: unity8-schemas

249Package: unity8-schemas

239Architecture: all

250Architecture: all

240Multi-Arch: foreign

251Multi-Arch: foreign

252+Depends:

241−Depends: ${misc:Depends},

253+ ${misc:Depends},

254+Replaces:

242−Replaces: unity-schemas (>= 7.3.1+14.10.20140915),

255+ unity-schemas (>= 7.3.1+14.10.20140915),

256+Breaks:

243−Breaks: unity-schemas (>= 7.3.1+14.10.20140915),

257+ unity-schemas (>= 7.3.1+14.10.20140915),

244Description: Unity 8 schemas

258Description: Unity 8 schemas

245 The Unity 8 shell is the primary user interface for Ubuntu devices.

259 The Unity 8 shell is the primary user interface for Ubuntu devices.

246 .

260 .

@@ -250,6 +264,7 @@ Package: unity8-doc

250Section: doc

264Section: doc

251Architecture: all

265Architecture: all

252Multi-Arch: foreign

266Multi-Arch: foreign

267+Depends:

253−Depends: ${misc:Depends},

268+ ${misc:Depends},

254Description: Documentation for Unity8

269Description: Documentation for Unity8

255 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)

270 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)

debian/rules+8−1

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

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/tests/control+5−3

@@ -1,9 +1,11 @@

1Tests: qmluitests.sh

2Restrictions: allow-stderr

3−Depends: dpkg-dev,

3+Depends:

4+ dpkg-dev,

4− unity8-tests,

5+ unity8-tests,

5

6

6Tests: autopilot.sh

7Tests: autopilot.sh

7Restrictions: allow-stderr,

8Restrictions: allow-stderr,

8 isolation-machine,

9 isolation-machine,

10+Depends:

9−Depends: unity8-autopilot,

11+ unity8-autopilot,

debian/unity8-greeter.install+1−1

@@ -1,5 +1,5 @@

1−data/unity8-greeter-wrapper usr/bin/

2data/unity8-greeter-init.conf usr/share/upstart/sessions/

1data/unity8-greeter-init.conf usr/share/upstart/sessions/

2+data/unity8-greeter-wrapper usr/bin/

3data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/

4usr/share/lightdm/greeters/unity8-greeter.desktop

5usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf

debian/unity8-private.install+1−2

@@ -4,13 +4,12 @@ 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

10+usr/lib/*/unity8/qml/UInput

11usr/lib/*/unity8/qml/Ubuntu

12usr/lib/*/unity8/qml/Unity

13−usr/lib/*/unity8/qml/UInput

14usr/lib/*/unity8/qml/Utils

13usr/lib/*/unity8/qml/Utils

15usr/lib/*/unity8/qml/WindowManager

14usr/lib/*/unity8/qml/WindowManager

16usr/lib/*/unity8/qml/Wizard

15usr/lib/*/unity8/qml/Wizard

debian/unity8.install+6−6

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

1−var/lib/unity8/version

2−data/unity8-filewatcher.conf usr/share/upstart/sessions/

3−data/unity8.conf usr/share/upstart/sessions/

4data/devices.conf etc/ubuntu/

1data/devices.conf etc/ubuntu/

5data/test.sensors etc/ubuntusensors/

2data/test.sensors etc/ubuntusensors/

3+data/unity8-filewatcher.conf usr/share/upstart/sessions/

4+data/unity8.conf usr/share/upstart/sessions/

6usr/bin/unity8

5usr/bin/unity8

7usr/share/applications/unity8.desktop

6usr/share/applications/unity8.desktop

8usr/share/unity8/ApplicationMenus

7usr/share/unity8/ApplicationMenus

8+usr/share/unity8/DeviceConfiguration.qml

9+usr/share/unity8/DisabledScreenNotice.qml

9usr/share/unity8/Greeter

10usr/share/unity8/Greeter

10usr/share/unity8/Launcher

11usr/share/unity8/Launcher

12+usr/share/unity8/OrientedShell.qml

11usr/share/unity8/Panel

13usr/share/unity8/Panel

12usr/share/unity8/Rotation

14usr/share/unity8/Rotation

13−usr/share/unity8/DeviceConfiguration.qml

14−usr/share/unity8/OrientedShell.qml

15−usr/share/unity8/DisabledScreenNotice.qml

16usr/share/unity8/Shell.qml

15usr/share/unity8/Shell.qml

17usr/share/unity8/Stage

16usr/share/unity8/Stage

18usr/share/unity8/Tutorial

17usr/share/unity8/Tutorial

19usr/share/unity8/Wizard

18usr/share/unity8/Wizard

19+var/lib/unity8/version

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/Unity/Indicators/indicatorsmanager.cpp+19−15

@@ -55,20 +55,22 @@ void IndicatorsManager::load()

55{

56 unload();

57

58− const QStringList xdgLocations = shellDataDirs();

59−

60 m_fsWatcher.reset(new QFileSystemWatcher(this));

58 m_fsWatcher.reset(new QFileSystemWatcher(this));

61

59

62− Q_FOREACH(const QString& xdgLocation, xdgLocations)

60+ for (const auto xdgPath : shellDataDirs()) {

63− {

61+ // For legacy reasons we keep the old unity indicator path

64− const QString indicator_path = QDir::cleanPath(xdgLocation + "/unity/indicators");

62+ const auto unityPath = QDir::cleanPath(xdgPath + "/unity/indicators");

65− QDir indicator_dir(indicator_path);

63+ if (QFile::exists(unityPath)) {

66− if (indicator_dir.exists())

67− {

68 // watch folder for changes.

64 // watch folder for changes.

69− m_fsWatcher->addPath(indicator_path);

65+ m_fsWatcher->addPath(unityPath);

66+ loadDir(unityPath);

67+ }

70

68

71− loadDir(indicator_dir);

69+ const auto ayatanaPath = QDir::cleanPath(xdgPath + "/ayatana/indicators");

70+ if (QFile::exists(ayatanaPath)) {

71+ // watch folder for changes.

72+ m_fsWatcher->addPath(ayatanaPath);

73+ loadDir(ayatanaPath);

72 }

74 }

73 }

75 }

74

76

@@ -131,13 +133,13 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)

131 QStringList xdgLocations = shellDataDirs();

133 QStringList xdgLocations = shellDataDirs();

132 for (int i = 0; i < xdgLocations.size(); i++)

134 for (int i = 0; i < xdgLocations.size(); i++)

133 {

135 {

134− const QString indicatorDir = QDir::cleanPath(xdgLocations[i] + "/unity/indicators");

136+ const QString xdgLocation = QDir::cleanPath(xdgLocations[i]);

135

137

136− if (newFileInfoDir == indicatorDir)

138+ if (newFileInfoDir.startsWith(xdgLocation))

137 {

139 {

138 file_info_location = i;

140 file_info_location = i;

139 }

141 }

140− if (currentDataDir == indicatorDir)

142+ if (currentDataDir.startsWith(xdgLocation))

141 {

143 {

142 current_data_location = i;

144 current_data_location = i;

143 }

145 }

@@ -284,8 +286,10 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

284 // 2) enable keyboard indicator

286 // 2) enable keyboard indicator

285 //

287 //

286 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

288 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

287− if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

289+ if (new_indicator->identifier() == QStringLiteral("indicator-session") ||

290+ new_indicator->identifier() == QStringLiteral("indicator-keyboard") ||

291+ new_indicator->identifier() == QStringLiteral("ayatana-indicator-session") ||

288− || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {

292+ new_indicator->identifier() == QStringLiteral("ayatana-indicator-keyboard")) {

289 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));

293 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));

290 } else {

294 } else {

291 new_indicator->setProfile(m_profile);

295 new_indicator->setProfile(m_profile);

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

plugins/Utils/windowstatestorage.cpp+13−31

@@ -18,7 +18,6 @@

18

19#include <QtConcurrent>

20#include <QDebug>

21−#include <QFutureSynchronizer>

22#include <QSqlQuery>

21#include <QSqlQuery>

23#include <QSqlError>

22#include <QSqlError>

24#include <QSqlResult>

23#include <QSqlResult>

@@ -33,24 +32,23 @@ inline QString sanitiseString(QString string) {

33 .remove(QLatin1Char('\\'));

32 .remove(QLatin1Char('\\'));

34}

33}

35

34

36−WindowStateStorage::WindowStateStorage(QObject *parent):

35+WindowStateStorage::WindowStateStorage(const QString& dbName, QObject *parent):

37 QObject(parent)

36 QObject(parent)

38{

37{

39 const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");

38 const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");

40 m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));

39 m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));

41 QDir dir;

40 QDir dir;

42 dir.mkpath(dbPath);

41 dir.mkpath(dbPath);

42+ if (dbName != nullptr) {

43+ m_db.setDatabaseName(dbName);

44+ } else {

43− m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");

45+ m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");

46+ }

44 initdb();

47 initdb();

45}

48}

46

49

47WindowStateStorage::~WindowStateStorage()

50WindowStateStorage::~WindowStateStorage()

48{

51{

49− QFutureSynchronizer<void> futureSync;

50− for (int i = 0; i < m_asyncQueries.count(); ++i) {

51− futureSync.addFuture(m_asyncQueries[i]);

52− }

53− futureSync.waitForFinished();

54 m_db.close();

52 m_db.close();

55}

53}

56

54

@@ -110,19 +108,6 @@ int WindowStateStorage::getStage(const QString &appId, int defaultValue) const

110 return query.value("stage").toInt();

108 return query.value("stage").toInt();

111}

109}

112

110

113−void WindowStateStorage::executeAsyncQuery(const QString &queryString)

114−{

115− QMutexLocker l(&s_mutex);

116− QSqlQuery query;

117−

118− bool ok = query.exec(queryString);

119− if (!ok) {

120− qWarning() << "Error executing query" << queryString

121− << "Driver error:" << query.lastError().driverText()

122− << "Database error:" << query.lastError().databaseText();

123− }

124−}

125−

126QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

111QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

127{

112{

128 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

113 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

@@ -171,16 +156,13 @@ void WindowStateStorage::initdb()

171void WindowStateStorage::saveValue(const QString &queryString)

156void WindowStateStorage::saveValue(const QString &queryString)

172{

157{

173 QMutexLocker mutexLocker(&s_mutex);

158 QMutexLocker mutexLocker(&s_mutex);

174−

159+ QSqlQuery query;

175− QFuture<void> future = QtConcurrent::run(&m_threadPool, executeAsyncQuery, queryString);

160+ auto ok = query.exec(queryString);

176− m_asyncQueries.append(future);

161+ if (!ok) {

177−

162+ qWarning() << "Error executing query" << queryString

178− QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

163+ << "Driver error:" << query.lastError().driverText()

179− futureWatcher->setFuture(future);

164+ << "Database error:" << query.lastError().databaseText();

180− connect(futureWatcher, &QFutureWatcher<void>::finished,

165+ }

181− this,

182− [=](){ m_asyncQueries.removeAll(futureWatcher->future());

183− futureWatcher->deleteLater(); });

184}

166}

185

167

186QSqlQuery WindowStateStorage::getValue(const QString &queryString) const

168QSqlQuery WindowStateStorage::getValue(const QString &queryString) const

plugins/Utils/windowstatestorage.h+1−7

@@ -17,8 +17,6 @@

17#include <QObject>

18#include <QSqlDatabase>

19#include <QMutex>

20−#include <QFuture>

21−#include <QThreadPool>

22

20

23// unity-api

21// unity-api

24#include <unity/shell/application/Mir.h>

22#include <unity/shell/application/Mir.h>

@@ -46,7 +44,7 @@ public:

46 Q_DECLARE_FLAGS(WindowStates, WindowState)

44 Q_DECLARE_FLAGS(WindowStates, WindowState)

47 Q_FLAG(WindowStates)

45 Q_FLAG(WindowStates)

48

46

49− WindowStateStorage(QObject *parent = nullptr);

47+ WindowStateStorage(const QString& dbName = nullptr, QObject *parent = nullptr);

50 virtual ~WindowStateStorage();

48 virtual ~WindowStateStorage();

51

49

52 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

50 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

@@ -66,12 +64,8 @@ private:

66 void saveValue(const QString &queryString);

64 void saveValue(const QString &queryString);

67 QSqlQuery getValue(const QString &queryString) const;

65 QSqlQuery getValue(const QString &queryString) const;

68

66

69− static void executeAsyncQuery(const QString &queryString);

70 static QMutex s_mutex;

67 static QMutex s_mutex;

71

68

72 // NB: This is accessed from threads. Make sure to mutex it.

69 // NB: This is accessed from threads. Make sure to mutex it.

73 QSqlDatabase m_db;

70 QSqlDatabase m_db;

74−

75− QList<QFuture<void>> m_asyncQueries;

76− QThreadPool m_threadPool;

77};

71};

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/ApplicationMenus/ApplicationMenuItemFactory.qml+7−7

@@ -21,7 +21,7 @@ import QMenuModel 0.1

21import Utils 0.1 as Utils

22import Ubuntu.Components 1.3

23

24−Object {

24+Item {

25 id: menuFactory

26

27 property string context

@@ -45,7 +45,7 @@ Object {

45

46 Action {

47 id: action

48− text: menuData.label.replace("_", "&")

48+ text: menuData ? menuData.label.replace("_", "&") : ""

49 }

50

51 ListItemLayout {

@@ -53,14 +53,14 @@ Object {

53 title.text: action.text

54

55 Icon {

56− source: menuData && menuData.icon || ""

56+ source: menuData ? menuData.icon : ""

57 SlotsLayout.position: SlotsLayout.Leading

58 height: units.gu(3)

59 }

60

61 Label {

62− text: menuData.shortcut

62+ text: menuData ? menuData.shortcut : ""

63− visible: menuData.shortcut && QuickUtils.keyboardAttached

63+ visible: menuData && menuData.shortcut && QuickUtils.keyboardAttached

64 SlotsLayout.position: SlotsLayout.Trailing

65 color: enabled ? theme.palette.normal.backgroundSecondaryText :

66 theme.palette.disabled.backgroundSecondaryText

@@ -86,7 +86,7 @@ Object {

86

87 Action {

88 id: action

89− text: menuData.label.replace("_", "&")

89+ text: menuData ? menuData.label.replace("_", "&") : ""

90 }

91

92 ListItemLayout {

@@ -94,7 +94,7 @@ Object {

94 title.text: action.text

95

96 Icon {

97− source: menuData && menuData.icon || ""

97+ source: menuData ? menuData.icon : ""

98 SlotsLayout.position: SlotsLayout.Leading

99 height: units.gu(3)

100 }

qml/ApplicationMenus/RegisteredApplicationMenuModel.qml+1−1

@@ -20,7 +20,7 @@ import Unity.Indicators 0.1

20import Unity.ApplicationMenu 0.1

21import Unity.Indicators 0.1 as Indicators

22

23−Object {

23+Item {

24 property string persistentSurfaceId

25 readonly property alias model: sharedAppModel.model

26

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

The content is the same.

qml/Components/ResponsiveGridView.qmldeleted−98

@@ -1,98 +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−import QtQuick 2.4

18−import Ubuntu.Components 1.3

19−import "."

20−

21−/*

22− Essentially a GridView

23− */

24−Item {

25− property int minimumHorizontalSpacing: units.gu(0.5)

26− readonly property int columns: gridView.columns

27− property alias verticalSpacing: gridView.verticalSpacing

28− readonly property alias margins: gridView.margin

29− property int delegateWidth

30− property int delegateHeight

31− property alias model: gridView.model

32− property alias delegate: gridView.delegate

33− readonly property int cellWidth: gridView.cellWidth

34− readonly property int cellHeight: gridView.cellHeight

35− readonly property int totalContentHeight: {

36− if (gridView.model) {

37− return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

38− } else {

39− return 0;

40− }

41− }

42− property alias interactive: gridView.interactive

43− readonly property alias flicking: gridView.flicking

44− readonly property alias moving: gridView.moving

45− readonly property alias pressDelay: gridView.pressDelay

46− readonly property alias originY: gridView.originY

47− property alias displayMarginBeginning: gridView.displayMarginBeginning

48− property alias displayMarginEnd: gridView.displayMarginEnd

49− property alias highlightIndex: gridView.highlightIndex

50− property alias cacheBuffer: gridView.cacheBuffer

51− readonly property alias currentItem: gridView.currentItem

52−

53− function contentHeightForRows(rows, height) {

54− return rows * height

55− }

56−

57− GridView {

58− id: gridView

59− objectName: "responsiveGridViewGrid"

60− anchors {

61− fill: parent

62− leftMargin: margin/2

63− rightMargin: margin/2

64− }

65− clip: parent.height != totalContentHeight

66−

67− function pixelToGU(value) {

68− return Math.floor(value / units.gu(1));

69− }

70−

71− function spacingForColumns(columns) {

72− // spacing between columns as an integer number of GU, the remainder goes in the margins

73− var spacingGU = pixelToGU(allocatableHorizontalSpace / columns);

74− return units.gu(spacingGU);

75− }

76−

77− function columnsForSpacing(spacing) {

78− // minimum margin is half of the spacing

79− return Math.max(1, Math.floor(parent.width / (delegateWidth + spacing)));

80− }

81−

82− property real allocatableHorizontalSpace: parent.width - columns * delegateWidth

83− property int columns: columnsForSpacing(minimumHorizontalSpacing)

84− property real horizontalSpacing: spacingForColumns(columns)

85− property real verticalSpacing: horizontalSpacing

86− property int margin: allocatableHorizontalSpace - columns * horizontalSpacing

87− property int highlightIndex: -1

88−

89− cellWidth: delegateWidth + horizontalSpacing

90− cellHeight: delegateHeight + verticalSpacing

91−

92− onHighlightIndexChanged: {

93− if (highlightIndex != -1) {

94− currentIndex = highlightIndex

95− }

96− }

97− }

98−}

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/DrawerGridView.qml+2−3

@@ -34,7 +34,7 @@ FocusScope {

34 property alias topMargin: gridView.topMargin

35 property alias bottomMargin: gridView.bottomMargin

36

37− readonly property int columns: width / delegateWidth

37+ readonly property int columns: Math.floor(width / delegateWidth)

38 readonly property int rows: Math.ceil(gridView.model.count / root.columns)

39

40 property alias refreshing: pullToRefresh.refreshing

@@ -44,11 +44,10 @@ FocusScope {

44 id: gridView

45 anchors.fill: parent

46 anchors.topMargin: units.gu(2)

47− leftMargin: spacing

48 focus: true

47 focus: true

49

48

50 readonly property int overflow: width - (root.columns * root.delegateWidth)

49 readonly property int overflow: width - (root.columns * root.delegateWidth)

51− readonly property real spacing: overflow / (root.columns)

50+ readonly property real spacing: Math.ceil(overflow / root.columns)

52

51

53 cellWidth: root.delegateWidth + spacing

52 cellWidth: root.delegateWidth + spacing

54 cellHeight: root.delegateHeight

53 cellHeight: root.delegateHeight

qml/Launcher/LauncherDelegate.qml+1−1

@@ -37,7 +37,7 @@ Item {

37

38 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight

39 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight

40− readonly property alias wiggling: wiggleAnim.running

40+ readonly property alias wiggling: root.alerting

41

42 property int itemWidth

43 property int itemHeight

qml/Launcher/LauncherPanel.qml+15−4

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

@@ -556,7 +567,7 @@ Rectangle {

556

567

557 function processPositionChanged(mouse) {

568 function processPositionChanged(mouse) {

558 if (draggedIndex >= 0) {

569 if (draggedIndex >= 0) {

559− if (!selectedItem.dragging) {

570+ if (selectedItem && !selectedItem.dragging) {

560 var distance = Math.max(Math.abs(mouse.x - startX), Math.abs(mouse.y - startY))

571 var distance = Math.max(Math.abs(mouse.x - startX), Math.abs(mouse.y - startY))

561 if (!preDragging && distance > units.gu(1.5)) {

572 if (!preDragging && distance > units.gu(1.5)) {

562 preDragging = true;

573 preDragging = true;

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/IndicatorMenuItemFactory.qml+45−1

@@ -25,7 +25,7 @@ import Ubuntu.Components 1.3

25import Unity.Session 0.1

26import Unity.Platform 1.0

27

28−Object {

28+Item {

29 id: menuFactory

30

31 property string indicator

@@ -65,6 +65,32 @@ Object {

65

66 "com.canonical.indicator.calendar": calendarMenu,

67 "com.canonical.indicator.location": timezoneMenu,

68+

69+ "org.ayatana.indicator.button" : buttonMenu,

70+ "org.ayatana.indicator.div" : separatorMenu,

71+ "org.ayatana.indicator.section" : sectionMenu,

72+ "org.ayatana.indicator.progress" : progressMenu,

73+ "org.ayatana.indicator.slider" : sliderMenu,

74+ "org.ayatana.indicator.switch" : switchMenu,

75+ "org.ayatana.indicator.alarm" : alarmMenu,

76+ "org.ayatana.indicator.appointment" : appointmentMenu,

77+ "org.ayatana.indicator.transfer" : transferMenu,

78+ "org.ayatana.indicator.button-section" : buttonSectionMenu,

79+ "org.ayatana.indicator.link" : linkMenu,

80+

81+ "org.ayatana.indicator.messages.messageitem" : messageItem,

82+ "org.ayatana.indicator.messages.sourceitem" : groupedMessage,

83+

84+ "org.ayatana.unity.slider" : sliderMenu,

85+ "org.ayatana.unity.switch" : switchMenu,

86+

87+ "org.ayatana.unity.media-player" : mediaPayerMenu,

88+ "org.ayatana.unity.playback-item" : playbackItemMenu,

89+

90+ "org.ayatana.indicator.network.modeminfoitem" : modeminfoitem,

91+

92+ "org.ayatana.indicator.calendar": calendarMenu,

93+ "org.ayatana.indicator.location": timezoneMenu,

68 },

94 },

69 "indicator-session": {

95 "indicator-session": {

70 "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,

96 "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,

@@ -73,6 +99,14 @@ Object {

73 },

99 },

74 "indicator-messages": {

100 "indicator-messages": {

75 "com.canonical.indicator.button": messagesButtonMenu

101 "com.canonical.indicator.button": messagesButtonMenu

102+ },

103+ "ayatana-indicator-session": {

104+ "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,

105+ "indicator.guest-menu-item": Platform.isPC ? userMenuItem : null,

106+ "org.ayatana.indicator.switch": Math.min(Screen.width, Screen.height) > units.gu(60) ? switchMenu : null // Desktop mode switch

107+ },

108+ "ayatana-indicator-messages": {

109+ "org.ayatana.indicator.button": messagesButtonMenu

76 }

110 }

77 }

111 }

78

112

@@ -86,6 +120,16 @@ Object {

86 "indicator-keyboard": {

120 "indicator-keyboard": {

87 "indicator.map": null,

121 "indicator.map": null,

88 "indicator.chart": null

122 "indicator.chart": null

123+ },

124+ "ayatana-indicator-session": {

125+ "indicator.logout": Platform.isPC ? undefined : null,

126+ "indicator.suspend": Platform.isPC ? undefined : null,

127+ "indicator.hibernate": Platform.isPC ? undefined : null,

128+ "indicator.reboot": Platform.isPC ? undefined : null

129+ },

130+ "ayatana-indicator-keyboard": {

131+ "indicator.map": null,

132+ "indicator.chart": null

89 }

133 }

90 }

134 }

91

135

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

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

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

204 property variant deviceState: action("device-state").state

205 Component.onCompleted: start()

206 onBatteryLevelChanged: {

207− root.batteryLevel = batteryLevel

207+ root.batteryLevel = batteryLevel ? batteryLevel : 0.00

208 updateLightState("onBatteryLevelChanged")

209 }

210 onDeviceStateChanged: {

211− root.deviceState = deviceState

211+ root.deviceState = deviceState ? deviceState : "unknown"

212 updateLightState("onDeviceStateChanged")

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+2−2

@@ -90,7 +90,7 @@ StyledItem {

90 } else if (showingGreeter || notifications.topmostIsFullscreen) {

91 return Qt.PrimaryOrientation;

92 } else {

93− return shell.orientations.map(stage.supportedOrientations);

93+ return shell.orientations ? shell.orientations.map(stage.supportedOrientations) : Qt.PrimaryOrientation;

94 }

95 }

96

@@ -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/Stage/Splash.qml+1−4

@@ -89,11 +89,8 @@ Item {

89 id: overlaidImage

90 anchors.centerIn: parent

91 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0

92− sourceSize {

93− width: root.width

94− height: root.height

95− }

96 asynchronous: true

92 asynchronous: true

93+ fillMode: Image.PreserveAspectFit

97 cache: false

94 cache: false

98 }

95 }

99

96

qml/Stage/Stage.qml+2−2

@@ -2210,8 +2210,8 @@ FocusScope {

2210 consumesInput: false

2211 interactive: false

2212 focus: false

2213− requestedWidth: appDelegate.requestedWidth

2213+ requestedWidth: appDelegate ? appDelegate.requestedWidth : 0

2214− requestedHeight: appDelegate.requestedHeight

2214+ requestedHeight: appDelegate ? appDelegate.requestedHeight : 0

2215

2216 width: units.gu(40)

2217 height: units.gu(40)

qml/Stage/WindowDecoration.qml+5−6

@@ -99,13 +99,12 @@ MouseArea {

99 spacing: units.gu(3)

100

101 WindowControlButtons {

102+ Layout.fillHeight: true

103+ Layout.fillWidth: false

104+ Layout.topMargin: units.gu(0.5)

105+ Layout.bottomMargin: units.gu(0.5)

106+

102 id: buttons

107 id: buttons

103− anchors {

104− top: parent.top

105− bottom: parent.bottom

106− topMargin: units.gu(0.5)

107− bottomMargin: units.gu(0.5)

108− }

109 active: root.active

108 active: root.active

110 onCloseClicked: root.closeClicked();

109 onCloseClicked: root.closeClicked();

111 onMinimizeClicked: root.minimizeClicked();

110 onMinimizeClicked: root.minimizeClicked();

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/50-timezone.qml+9−11

@@ -174,10 +174,9 @@ LocalComponents.Page {

174 width: Math.min(parent.width, units.gu(34))

175

176 LocalComponents.WizardTextField {

177+ Layout.fillWidth: true

177 id: searchField

178 id: searchField

178 objectName: "tzFilter"

179 objectName: "tzFilter"

179− anchors.left: parent.left

180− anchors.right: parent.right

181 anchors.leftMargin: !showingMap && !wideMode ? staticMargin : undefined

180 anchors.leftMargin: !showingMap && !wideMode ? staticMargin : undefined

182 anchors.rightMargin: !showingMap && !wideMode ? staticMargin : undefined

181 anchors.rightMargin: !showingMap && !wideMode ? staticMargin : undefined

183 placeholderText: i18n.tr("Enter your city")

182 placeholderText: i18n.tr("Enter your city")

@@ -186,12 +185,11 @@ LocalComponents.Page {

186 }

185 }

187

186

188 ListView {

187 ListView {

188+ Layout.fillWidth: true

189 Layout.fillHeight: true

190 id: tzList

191 objectName: "tzList"

192 clip: true

193− anchors.left: parent.left

194− anchors.right: parent.right

195 currentIndex: -1

193 currentIndex: -1

196 model: TimeZoneModel {

194 model: TimeZoneModel {

197 id: timeZoneModel

195 id: timeZoneModel

@@ -199,14 +197,14 @@ LocalComponents.Page {

199 country: i18n.language.split('_')[1].split('.')[0]

197 country: i18n.language.split('_')[1].split('.')[0]

200 }

198 }

201 delegate: tzComponent

199 delegate: tzComponent

202− }

203

200

204− ActivityIndicator {

201+ ActivityIndicator {

205− anchors.centerIn: tzList

202+ anchors.centerIn: parent

206− running: tzList.count == 0 &&

203+ running: tzList.count == 0 &&

207− searchField.length > 0 &&

204+ searchField.length > 0 &&

208− timeZoneModel.listUpdating

205+ timeZoneModel.listUpdating

209− visible: running

206+ visible: running

207+ }

210 }

208 }

211 }

209 }

212

210

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/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/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/Unity/Application/SurfaceManager.cpp+3

@@ -35,6 +35,9 @@ SurfaceManager *SurfaceManager::m_instance = nullptr;

35

36SurfaceManager *SurfaceManager::instance()

37{

38+ if (m_instance == nullptr) {

39+ auto inst = new SurfaceManager();

40+ }

38 return m_instance;

41 return m_instance;

39}

42}

40

43

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cpp+2−2

@@ -41,7 +41,7 @@ void MockApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surface,

41 service);

42}

43

44−void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)

44+void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QString &menuObjectPath)

45{

46− ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, menuObjectPath);

46+ ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, QDBusObjectPath(menuObjectPath));

47}

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.h+1−1

@@ -32,7 +32,7 @@ public:

32 const QString &service);

33

34 Q_INVOKABLE void UnregisterSurfaceMenu(const QString &surfaceId,

35− const QDBusObjectPath &menuObjectPath);

35+ const QString &menuObjectPath);

36

37private:

38 MockApplicationMenuRegistry(QObject *parent = 0);

tests/mocks/Utils/CMakeLists.txt+5−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

@@ -48,9 +49,11 @@ 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

55+ ${DEVICEINFO_LDFLAGS}

53− )

56+)

54

57

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

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

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

59# 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)