xenial...15fc2b8 · unity8

CMakeLists.txt+1

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

7474find_package(Qt5Network 5.6 REQUIRED)

7575find_package(Qt5Xml 5.6 REQUIRED)

7676

77+pkg_check_modules(DEVICEINFO REQUIRED deviceinfo)

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

7879pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

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

debian/control+204−189

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

22Section: x11

33Priority: optional

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

5−Build-Depends: cmake,

6− cmake-extras,

7− dbus-test-runner,

8− debhelper (>= 9),

9− dh-apparmor,

10− 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,

15− gdb,

16− graphviz,

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

18− libandroid-properties-dev,

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

20− libevdev-dev,

21− libgeonames-dev (>= 0.2),

22− libgnome-desktop-3-dev,

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

24− libgl1-mesa-dri,

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

26− libglib2.0-dev,

27− libgsettings-qt-dev,

28− libhardware-dev,

29− liblightdm-qt5-3-dev,

30− libpam0g-dev,

31− libpulse-dev,

32− libqmenumodel-dev (>= 0.2.12),

33− libqtdbusmock1-dev (>= 0.7),

34− libqtdbustest1-dev,

35− libqt5svg5-dev,

36− libqt5xmlpatterns5-dev,

37− libsystemsettings-dev,

38− libubuntu-app-launch2-dev,

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

40− libubuntugestures5-dev (>= 1.3.2030),

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

42− libudev-dev,

43− libudm-common-dev,

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

45− 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],

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

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

50−# End of X11 libs

51− pkg-config,

52− python3-all:any,

53− python3-setuptools,

54− qtdbustest-runner,

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

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

57− qml-module-qtqml-statemachine,

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

59− qml-module-qtquick-layouts,

60− qml-module-qtquick-xmllistmodel,

61− qml-module-qtquick2,

62− qml-module-qtsysteminfo,

63− qml-module-qttest,

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

65− qml-module-ubuntu-layouts,

66− qml-module-ubuntu-test,

67− qt5-default,

68− qtbase5-dev (>= 5.6),

69− qtbase5-dev-tools,

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

71− qtdeclarative5-dev (>= 5.6),

72− qtdeclarative5-dev-tools,

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

74− qtdeclarative5-ubuntu-content1,

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

76− ttf-ubuntu-font-family,

77− xvfb,

78− android-headers,

5+Build-Depends:

6+ cmake,

7+ cmake-extras,

8+ dbus-test-runner,

9+ debhelper (>= 9),

10+ dh-apparmor,

11+ doxyqml,

12+ g++:native,

13+ gdb,

14+ graphviz,

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

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

17+ libdeviceinfo-dev,

18+ libevdev-dev,

19+ libgeonames-dev (>= 0.2),

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

21+ libgl1-mesa-dri,

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

23+ libglib2.0-dev,

24+ libgnome-desktop-3-dev,

25+ libgsettings-qt-dev,

26+ liblightdm-qt5-3-dev,

27+ libpam0g-dev,

28+ libpulse-dev,

29+ libqmenumodel-dev (>= 0.2.12),

30+ libqt5sql5-sqlite,

31+ libqt5svg5-dev,

32+ libqt5xmlpatterns5-dev,

33+ libqtdbusmock1-dev (>= 0.7),

34+ libqtdbustest1-dev,

35+ libsystemsettings-dev,

36+ libubuntu-app-launch2-dev,

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

38+ libubuntugestures5-dev (>= 1.3.2030),

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

40+ libudev-dev,

41+ libudm-common-dev,

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

43+ libusermetricsoutput1-dev,

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

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

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

47+ pkg-config,

48+ python3-all:any,

49+ python3-setuptools,

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

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

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

53+ qml-module-qtqml-statemachine,

54+ qml-module-qtquick-layouts,

55+ qml-module-qtquick-xmllistmodel,

56+ qml-module-qtquick2,

57+ qml-module-qtsysteminfo,

58+ qml-module-qttest,

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

60+ qml-module-ubuntu-layouts,

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

62+ qml-module-ubuntu-test,

63+ qtbase5-dev (>= 5.6),

64+ qtbase5-dev-tools,

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

66+ qtdbustest-runner,

67+ qtdeclarative5-dev (>= 5.6),

68+ qtdeclarative5-dev-tools,

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

70+ qtdeclarative5-ubuntu-content1,

71+ ttf-ubuntu-font-family,

72+ ubports-wallpapers,

73+ xvfb,

7974Standards-Version: 3.9.4

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

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

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

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

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

8677XS-Testsuite: autopkgtest

8778X-Ubuntu-Use-Langpack: yes

8879

8980Package: indicators-client

9081Architecture: any

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

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

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

94− ${misc:Depends},

95− ${shlibs:Depends},

82+Depends:

83+ qmenumodel-qml (>= 0.2.11),

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

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

86+ ${misc:Depends},

87+ ${shlibs:Depends},

9688Description: Indicators client test application

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

9890

9991Package: unity8-greeter

10092Architecture: any

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

102− unity-system-compositor,

103− ${misc:Depends},

104− ${shlibs:Depends}

105−Recommends: lightdm

106−Provides: lightdm-greeter

93+Depends:

94+ unity-system-compositor,

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

96+ ${misc:Depends},

97+ ${shlibs:Depends},

98+Recommends:

99+ lightdm,

100+Provides:

101+ lightdm-greeter,

107102Description: The Unity8 Greeter

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

109104

110105Package: unity8

111106Architecture: any

112−Provides: indicator-renderer,

113−Depends: dmz-cursor-theme,

114− gsettings-desktop-schemas,

115− libcap2-bin,

116− libglib2.0-bin,

117− qmenumodel-qml (>= 0.2.11),

118− qml-module-biometryd,

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

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

121− qml-module-qtqml-statemachine,

122− qml-module-qtquick-xmllistmodel,

123− qml-module-qtsysteminfo,

124−# qml-module-ubuntu-web,

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

126− qtdeclarative5-ubuntu-telephony0.1,

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

128− unity-launcher-impl-13,

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

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

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

132− ${misc:Depends},

133− ${shlibs:Depends},

134−Recommends: indicator-keyboard,

135− indicator-session,

136− unity-greeter-session-broadcast,

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

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

139− unity8-greeter (<< 7.89),

140− unity-scope-tool,

141− ubuntu-keyboard (<< 0.100),

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

143− unity8-greeter (<< 7.89),

144− unity-scope-tool,

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

107+Provides:

108+ indicator-renderer,

109+Depends:

110+ dmz-cursor-theme,

111+ gsettings-desktop-schemas,

112+ libcap2-bin,

113+ libglib2.0-bin,

114+ qmenumodel-qml (>= 0.2.11),

115+ qml-module-biometryd,

116+ qml-module-hfd,

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

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

119+ qml-module-qtqml-statemachine,

120+ qml-module-qtquick-xmllistmodel,

121+ qml-module-qtsysteminfo,

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

123+ qtdeclarative5-ubuntu-telephony0.1,

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

125+ unity-launcher-impl-13,

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

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

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

129+ ${misc:Depends},

130+ ${shlibs:Depends},

131+Recommends:

132+ indicator-keyboard,

133+ indicator-session,

134+ unity-greeter-session-broadcast,

135+Breaks:

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

137+ ubuntu-keyboard (<< 0.100),

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

139+ unity-scope-tool,

140+ unity8-greeter (<< 7.89),

141+Replaces:

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

143+ unity-scope-tool,

144+ unity8-greeter (<< 7.89),

145+Conflicts:

146+ ubuntu-system-settings-wizard,

146147Description: Unity 8 shell

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

148149

149150Package: unity8-common

150151Architecture: all

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

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

153− 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,

156− qttranslations5-l10n,

157− ubuntu-thumbnailer-impl-0,

158− unity-application-impl-27,

159− unity-notifications-impl-3,

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

161− unity8-schemas,

162− ${misc:Depends},

163−Breaks: unity8 (<< 7.86),

164−Replaces: unity8 (<< 7.86),

152+Depends:

153+ qml-module-qtquick-layouts,

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

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

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

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

158+ qttranslations5-l10n,

159+ ubuntu-thumbnailer-impl-0,

160+ unity-application-impl-27,

161+ unity-notifications-impl-3,

162+ unity8-schemas,

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

164+ ${misc:Depends},

165+Breaks:

166+ unity8 (<< 7.86),

167+Replaces:

168+ unity8 (<< 7.86),

165169Description: Unity 8 shell (common files)

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

167171 .

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

169173

170174Package: unity8-autopilot

171175Architecture: all

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

173− gir1.2-glib-2.0,

174− gir1.2-notify-0.7,

175− libqt5test5,

176− libqt5widgets5,

177− ofono-phonesim,

178− python3-autopilot,

179− python3-evdev,

180− python3-fixtures,

181− python3-gi,

182− qttestability-autopilot (>= 1.4),

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

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

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

186− url-dispatcher-tools,

187− xvfb,

188− ${misc:Depends},

189− ${python3:Depends},

176+Depends:

177+ autopilot-qt5 (>= 1.4),

178+ gir1.2-glib-2.0,

179+ gir1.2-notify-0.7,

180+ libqt5test5,

181+ libqt5widgets5,

182+ ofono-phonesim,

183+ python3-autopilot,

184+ python3-evdev,

185+ python3-fixtures,

186+ python3-gi,

187+ qttestability-autopilot (>= 1.4),

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

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

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

191+ url-dispatcher-tools,

192+ xvfb,

193+ ${misc:Depends},

194+ ${python3:Depends},

190195Description: Test package for Unity 8 shell

191196 Autopilot tests for the unity8 package

192197

193198Package: unity8-tests

194199Architecture: any

195200Multi-Arch: same

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

197−Depends: dbus-test-runner,

198− parallel,

199− qtdbustest-runner,

200− qt5-default,

201− qtdeclarative5-dev-tools,

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

203− xvfb,

204− ${misc:Depends},

205− ${shlibs:Depends},

206−Provides: unity-application-impl,

207− unity-application-impl-27,

208− unity8-fake-env,

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

210− unity8-fake-env,

211−Conflicts: unity8-fake-env,

201+Pre-Depends:

202+ ${misc:Pre-Depends},

203+Depends:

204+ dbus-test-runner,

205+ parallel,

206+ qt5-default,

207+ qtdbustest-runner,

208+ qtdeclarative5-dev-tools,

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

210+ xvfb,

211+ ${misc:Depends},

212+ ${shlibs:Depends},

213+Provides:

214+ unity-application-impl,

215+ unity-application-impl-27,

216+ unity8-fake-env,

217+Replaces:

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

219+ unity8-fake-env,

220+Conflicts:

221+ unity8-fake-env,

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

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

214224 (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

217227Package: unity8-private

218228Architecture: any

219229Multi-Arch: same

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

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

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

223− libhardware2,

224− unity8-schemas,

225− qtdeclarative5-gsettings1.0,

226− qml-module-qtmultimedia,

227− ${misc:Depends},

228− ${shlibs:Depends},

229−Provides: unity-launcher-impl,

230− unity-launcher-impl-13,

230+Pre-Depends:

231+ ${misc:Pre-Depends},

232+Depends:

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

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

235+ qml-module-qtmultimedia,

236+ qtdeclarative5-gsettings1.0,

237+ unity8-schemas,

238+ ${misc:Depends},

239+ ${shlibs:Depends},

240+Provides:

241+ unity-launcher-impl,

242+ unity-launcher-impl-13,

231243Description: Unity 8 private libs

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

233245 .

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

235247 only used by the shell.

236248

237−

238249Package: unity8-schemas

239250Architecture: all

240251Multi-Arch: foreign

241−Depends: ${misc:Depends},

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

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

252+Depends:

253+ ${misc:Depends},

254+Replaces:

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

256+Breaks:

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

244258Description: Unity 8 schemas

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

246260 .

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

250264Section: doc

251265Architecture: all

252266Multi-Arch: foreign

253−Depends: ${misc:Depends},

267+Depends:

268+ ${misc:Depends},

254269Description: Documentation for Unity8

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

debian/rules+18

@@ -7,6 +7,17 @@ include /usr/share/dpkg/default.mk

77#export DH_VERBOSE=1

88export DPKG_GENSYMBOLS_CHECK_LEVEL=4

99export NO_PNG_PKG_MANGLE=1

10+export QT_SELECT=qt5

11+

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

13+

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

15+testskip_architectures := arm64 powerpc ppc64el s390x

16+

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

18+

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

20+testskip_architectures := arm64

1021

1122%:

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

@@ -21,10 +32,17 @@ override_dh_auto_build:

2132 dh_auto_build -- -O all doc

2233

2334override_dh_auto_test:

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

2436 # Run the entire test battery

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

2638 # causing the whole battery to fail.

39+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

40+ifneq (,$(filter $(DEB_HOST_ARCH),$(testskip_architectures)))

41+ -dh_auto_test --no-parallel -- -O -k xvfballtests

42+else

2743 dh_auto_test --no-parallel -- -O -k xvfballtests

44+endif

45+endif

2846

2947override_dh_install:

3048 # install autopilot tests

debian/tests/control+5−3

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

11Tests: qmluitests.sh

22Restrictions: allow-stderr

3−Depends: dpkg-dev,

4− unity8-tests,

3+Depends:

4+ dpkg-dev,

5+ unity8-tests,

56

67Tests: autopilot.sh

78Restrictions: allow-stderr,

89 isolation-machine,

9−Depends: unity8-autopilot,

10+Depends:

11+ unity8-autopilot,

debian/unity8-greeter.install+1−1

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

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

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

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

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

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

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

debian/unity8-private.install+1−2

@@ -4,13 +4,12 @@ usr/lib/*/unity8/qml/Cursor

44usr/lib/*/unity8/qml/GlobalShortcut

55usr/lib/*/unity8/qml/Greeter

66usr/lib/*/unity8/qml/LightDM

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

87usr/lib/*/unity8/qml/Powerd

98usr/lib/*/unity8/qml/ScreenshotDirectory

109usr/lib/*/unity8/qml/SessionBroadcast

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

1111usr/lib/*/unity8/qml/Ubuntu

1212usr/lib/*/unity8/qml/Unity

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

1413usr/lib/*/unity8/qml/Utils

1514usr/lib/*/unity8/qml/WindowManager

1615usr/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/

41data/devices.conf etc/ubuntu/

52data/test.sensors etc/ubuntusensors/

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

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

65usr/bin/unity8

76usr/share/applications/unity8.desktop

87usr/share/unity8/ApplicationMenus

8+usr/share/unity8/DeviceConfiguration.qml

9+usr/share/unity8/DisabledScreenNotice.qml

910usr/share/unity8/Greeter

1011usr/share/unity8/Launcher

12+usr/share/unity8/OrientedShell.qml

1113usr/share/unity8/Panel

1214usr/share/unity8/Rotation

13−usr/share/unity8/DeviceConfiguration.qml

14−usr/share/unity8/OrientedShell.qml

15−usr/share/unity8/DisabledScreenNotice.qml

1615usr/share/unity8/Shell.qml

1716usr/share/unity8/Stage

1817usr/share/unity8/Tutorial

1918usr/share/unity8/Wizard

19+var/lib/unity8/version

plugins/CMakeLists.txt−1

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

1616add_subdirectory(GlobalShortcut)

1717add_subdirectory(Greeter)

1818add_subdirectory(LightDM)

19−add_subdirectory(Lights)

2019add_subdirectory(Powerd)

2120add_subdirectory(ScreenshotDirectory)

2221add_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()

5555{

5656 unload();

5757

58− const QStringList xdgLocations = shellDataDirs();

59−

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

6159

62− Q_FOREACH(const QString& xdgLocation, xdgLocations)

63− {

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

65− QDir indicator_dir(indicator_path);

66− if (indicator_dir.exists())

67− {

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

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

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

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

6864 // watch folder for changes.

69− m_fsWatcher->addPath(indicator_path);

65+ m_fsWatcher->addPath(unityPath);

66+ loadDir(unityPath);

67+ }

7068

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

7274 }

7375 }

7476

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

131133 QStringList xdgLocations = shellDataDirs();

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

133135 {

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

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

135137

136− if (newFileInfoDir == indicatorDir)

138+ if (newFileInfoDir.startsWith(xdgLocation))

137139 {

138140 file_info_location = i;

139141 }

140− if (currentDataDir == indicatorDir)

142+ if (currentDataDir.startsWith(xdgLocation))

141143 {

142144 current_data_location = i;

143145 }

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

284286 // 2) enable keyboard indicator

285287 //

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

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

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

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

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

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

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

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

290294 } else {

291295 new_indicator->setProfile(m_profile);

plugins/Utils/CMakeLists.txt+4−2

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

77 SYSTEM

88 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

99 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

10+ ${DEVICEINFO_INCLUDE_DIRS}

1011)

1112

1213set(QMLPLUGIN_SRC

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

3031 windowstatestorage.cpp

3132 timezoneFormatter.cpp

3233 inputeventgenerator.cpp

33− deviceconfigparser.cpp

34+ deviceconfig.cpp

3435 globalfunctions.cpp

3536 URLDispatcher.cpp

3637 tabfocusfence.cpp

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

4546

4647target_link_libraries(Utils-qml

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

48− )

49+ ${DEVICEINFO_LDFLAGS}

50+)

4951

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

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

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

1515 */

1616

17−#ifndef DEVICECONFIGPARSER_H

18−#define DEVICECONFIGPARSER_H

17+#pragma once

1918

2019#include <QObject>

21−#include <QSettings>

20+#include <memory>

2221

23−class DeviceConfigParser: public QObject

22+class DeviceInfo;

23+class DeviceConfig: public QObject

2424{

2525 Q_OBJECT

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

26+ Q_PROPERTY(QString name READ name NOTIFY changed)

2727

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

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

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

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

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

3535 Q_PROPERTY(QString category READ category NOTIFY changed)

36− Q_PROPERTY(bool supportsMultiColorLed READ supportsMultiColorLed NOTIFY changed)

36+ Q_PROPERTY(bool supportsMultiColorLed READ supportsMultiColorLed)

3737

3838public:

39− DeviceConfigParser(QObject *parent = nullptr);

39+ DeviceConfig(QObject *parent = nullptr);

4040

4141 QString name() const;

42− void setName(const QString &name);

4342

4443 Qt::ScreenOrientation primaryOrientation() const;

4544 Qt::ScreenOrientations supportedOrientations() const;

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

5453 void changed();

5554

5655private:

57− QString m_name;

58− QSettings *m_config;

56+ std::shared_ptr<DeviceInfo> m_info;

5957

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;

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

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

6459};

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

3636#include "timezoneFormatter.h"

3737#include "applicationsfiltermodel.h"

3838#include "inputeventgenerator.h"

39−#include "deviceconfigparser.h"

39+#include "deviceconfig.h"

4040#include "globalfunctions.h"

4141#include "URLDispatcher.h"

4242#include "appdrawerproxymodel.h"

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

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

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

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

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

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

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

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

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

plugins/Utils/windowstatestorage.cpp+13−31

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

1818

1919#include <QtConcurrent>

2020#include <QDebug>

21−#include <QFutureSynchronizer>

2221#include <QSqlQuery>

2322#include <QSqlError>

2423#include <QSqlResult>

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

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

3433}

3534

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

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

3736 QObject(parent)

3837{

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

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

4140 QDir dir;

4241 dir.mkpath(dbPath);

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

42+ if (dbName != nullptr) {

43+ m_db.setDatabaseName(dbName);

44+ } else {

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

46+ }

4447 initdb();

4548}

4649

4750WindowStateStorage::~WindowStateStorage()

4851{

49− QFutureSynchronizer<void> futureSync;

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

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

52− }

53− futureSync.waitForFinished();

5452 m_db.close();

5553}

5654

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

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

111109}

112110

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−

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

127112{

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

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

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

172157{

173158 QMutexLocker mutexLocker(&s_mutex);

174−

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

176− m_asyncQueries.append(future);

177−

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

179− futureWatcher->setFuture(future);

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

181− this,

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

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

159+ QSqlQuery query;

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

161+ if (!ok) {

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

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

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

165+ }

184166}

185167

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

plugins/Utils/windowstatestorage.h+1−7

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

1717#include <QObject>

1818#include <QSqlDatabase>

1919#include <QMutex>

20−#include <QFuture>

21−#include <QThreadPool>

2220

2321// unity-api

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

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

4644 Q_DECLARE_FLAGS(WindowStates, WindowState)

4745 Q_FLAG(WindowStates)

4846

49− WindowStateStorage(QObject *parent = nullptr);

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

5048 virtual ~WindowStateStorage();

5149

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

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

6664 void saveValue(const QString &queryString);

6765 QSqlQuery getValue(const QString &queryString) const;

6866

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

7067 static QMutex s_mutex;

7168

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

7370 QSqlDatabase m_db;

74−

75− QList<QFuture<void>> m_asyncQueries;

76− QThreadPool m_threadPool;

7771};

po/unity8.pot+15−7

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

88msgstr ""

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

1010"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"

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

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

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

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

5050msgid "Guest Session"

5151msgstr ""

5252

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

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

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

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

5555msgid "Pin shortcut"

5656msgstr ""

5757

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

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

5959msgid "Quit"

6060msgstr ""

6161

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

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

6363msgid "Unpin shortcut"

6464msgstr ""

6565

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

427427msgid "Select desktop environment"

428428msgstr ""

429429

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

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

431431msgid "Search…"

432432msgstr ""

433433

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+

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

435443msgid "Show password"

436444msgstr ""

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

688696msgstr ""

689697

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

691−msgid "Welcome to Ubuntu"

699+msgid "Welcome to Ubuntu Touch"

692700msgstr ""

693701

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

qml/ApplicationMenus/ApplicationMenuItemFactory.qml+7−7

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

2121import Utils 0.1 as Utils

2222import Ubuntu.Components 1.3

2323

24−Object {

24+Item {

2525 id: menuFactory

2626

2727 property string context

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

4545

4646 Action {

4747 id: action

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

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

4949 }

5050

5151 ListItemLayout {

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

5353 title.text: action.text

5454

5555 Icon {

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

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

5757 SlotsLayout.position: SlotsLayout.Leading

5858 height: units.gu(3)

5959 }

6060

6161 Label {

62− text: menuData.shortcut

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

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

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

6464 SlotsLayout.position: SlotsLayout.Trailing

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

6666 theme.palette.disabled.backgroundSecondaryText

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

8686

8787 Action {

8888 id: action

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

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

9090 }

9191

9292 ListItemLayout {

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

9494 title.text: action.text

9595

9696 Icon {

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

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

9898 SlotsLayout.position: SlotsLayout.Leading

9999 height: units.gu(3)

100100 }

qml/ApplicationMenus/RegisteredApplicationMenuModel.qml+1−1

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

2020import Unity.ApplicationMenu 0.1

2121import Unity.Indicators 0.1 as Indicators

2222

23−Object {

23+Item {

2424 property string persistentSurfaceId

2525 readonly property alias model: sharedAppModel.model

2626

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/Components/Showable.qml+4−4

@@ -35,13 +35,13 @@ Item {

3535 property bool __skipHideAnimation: false

3636

3737 property list<QtObject> hides

38− property var showAnimation

39− property var hideAnimation

38+ property Animation showAnimation

39+ property Animation hideAnimation

4040

4141 // automatically set the target on showAnimation and hideAnimation to be the

4242 // showable itself

43− onShowAnimationChanged: if (showAnimation) showAnimation["target"] = showable

44− onHideAnimationChanged: if (hideAnimation) hideAnimation["target"] = showable

43+ onShowAnimationChanged: if (showAnimation && showAnimation.hasOwnProperty("target")) showAnimation["target"] = showable

44+ onHideAnimationChanged: if (hideAnimation && hideAnimation.hasOwnProperty("target")) hideAnimation["target"] = showable

4545

4646 Component.onCompleted: required = shown;

4747

qml/DeviceConfiguration.qml+26−15

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

2020QtObject {

2121 id: root

2222

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

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

25+ property var overrideName: false

26+

2327 readonly property int useNativeOrientation: -1

2428

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;

2830

2931 readonly property alias primaryOrientation: priv.primaryOrientation

3032 readonly property alias supportedOrientations: priv.supportedOrientations

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

3537

3638 readonly property alias category: priv.category

3739

38− readonly property alias supportsMultiColorLed: priv.supportsMultiColorLed

40+ readonly property var deviceConfig: DeviceConfig {}

3941

40− readonly property var deviceConfigParser: DeviceConfigParser {

41− name: root.name

42+ readonly property var binding: Binding {

43+ target: priv

44+ property: "state"

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

4246 }

4347

4448 readonly property var priv: StateGroup {

4549 id: priv

4650

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

48− root.useNativeOrientation : deviceConfigParser.primaryOrientation

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

52+ root.useNativeOrientation : deviceConfig.primaryOrientation

4953

50− property int supportedOrientations: deviceConfigParser.supportedOrientations

54+ property int supportedOrientations: deviceConfig.supportedOrientations

5155

52− property int landscapeOrientation: deviceConfigParser.landscapeOrientation

53− property int invertedLandscapeOrientation: deviceConfigParser.invertedLandscapeOrientation

54− property int portraitOrientation: deviceConfigParser.portraitOrientation

55− property int invertedPortraitOrientation: deviceConfigParser.invertedPortraitOrientation

56− property string category: deviceConfigParser.category

57− property bool supportsMultiColorLed: deviceConfigParser.supportsMultiColorLed

56+ property int landscapeOrientation: deviceConfig.landscapeOrientation

57+ property int invertedLandscapeOrientation: deviceConfig.invertedLandscapeOrientation

58+ property int portraitOrientation: deviceConfig.portraitOrientation

59+ property int invertedPortraitOrientation: deviceConfig.invertedPortraitOrientation

60+ property string category: deviceConfig.category

61+ property string name: deviceConfig.name

62+ property bool supportsMultiColorLed: deviceConfig.supportsMultiColorLed

5863

5964 states: [

6065 State {

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

7075 portraitOrientation: Qt.PortraitOrientation

7176 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

7277 category: "phone"

78+ name: "mako"

7379 }

7480 },

7581 State {

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

8591 portraitOrientation: Qt.PortraitOrientation

8692 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

8793 category: "phone"

94+ name: "krillin"

8895 }

8996 },

9097 State {

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

102109 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

103110 supportsMultiColorLed: false

104111 category: "phone"

112+ name: "arale"

105113 }

106114 },

107115 State {

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

118126 portraitOrientation: Qt.PortraitOrientation

119127 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

120128 category: "tablet"

129+ name: "manta"

121130 }

122131 },

123132 State {

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

134143 portraitOrientation: Qt.PortraitOrientation

135144 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

136145 category: "tablet"

146+ name: "flo"

137147 }

138148 },

139149 State {

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

147157 portraitOrientation: Qt.PortraitOrientation

148158 invertedPortraitOrientation: Qt.InvertedPortraitOrientation

149159 category: "desktop"

160+ name: "desktop"

150161 }

151162 },

152163 State {

qml/DisabledScreenNotice.qml+1−1

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

2727 // For testing

2828 property var screen: Screen

2929 property var orientationLock: OrientationLock

30+ property alias overrideDeviceName: deviceConfiguration.overrideName

3031

3132 DeviceConfiguration {

3233 id: deviceConfiguration

33− name: applicationArguments.deviceName

3434 }

3535

3636 Item {

qml/Launcher/DrawerGridView.qml+2−3

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

3434 property alias topMargin: gridView.topMargin

3535 property alias bottomMargin: gridView.bottomMargin

3636

37− readonly property int columns: width / delegateWidth

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

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

3939

4040 property alias refreshing: pullToRefresh.refreshing

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

4444 id: gridView

4545 anchors.fill: parent

4646 anchors.topMargin: units.gu(2)

47− leftMargin: spacing

4847 focus: true

4948

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

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

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

5251

5352 cellWidth: root.delegateWidth + spacing

5453 cellHeight: root.delegateHeight

qml/Launcher/LauncherDelegate.qml+1−1

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

3737

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

3939 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

4141

4242 property int itemWidth

4343 property int itemHeight

qml/Launcher/LauncherPanel.qml+15−6

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

9090 color: UbuntuColors.orange

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

9292

93− Icon {

93+ Image {

9494 objectName: "dashItem"

9595 width: parent.width * .6

9696 height: width

9797 anchors.centerIn: parent

98− source: "graphics/home.svg"

99− color: "white"

98+ source: homeIconResolver.background

10099 rotation: root.rotation

101100 }

102101

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+

103114 AbstractButton {

104115 id: dashItem

105116 anchors.fill: parent

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

556567

557568 function processPositionChanged(mouse) {

558569 if (draggedIndex >= 0) {

559− if (!selectedItem.dragging) {

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

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

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

562573 preDragging = true;

@@ -566,8 +577,6 @@ Rectangle {

566577 selectedItem.dragging = true

567578 preDragging = false;

568579 }

569− }

570− if (!selectedItem.dragging) {

571580 return

572581 }

573582

qml/OrientedShell.qml+4−1

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

3333 implicitHeight: units.gu(71)

3434

3535 onWidthChanged: calculateUsageMode();

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

3637

3738 DeviceConfiguration {

3839 id: deviceConfiguration

39− name: applicationArguments.deviceName

40+

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

42+ overrideName: root.overrideDeviceName

4043 }

4144

4245 property alias orientations: d.orientations

qml/Panel/Indicators/IndicatorMenuItemFactory.qml+47−3

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

2525import Unity.Session 0.1

2626import Unity.Platform 1.0

2727

28−Object {

28+Item {

2929 id: menuFactory

3030

3131 property string indicator

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

6565

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

6767 "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,

6894 },

6995 "indicator-session": {

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

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

7399 },

74100 "indicator-messages": {

75101 "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

76110 }

77111 }

78112

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

86120 "indicator-keyboard": {

87121 "indicator.map": null,

88122 "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

89133 }

90134 }

91135

@@ -964,8 +1008,8 @@ Object {

9641008 QDBusActionGroup {

9651009 id: actionGroup

9661010 busType: 1

967− busName: rootModel.busName

968− objectPath: rootModel.actions["indicator"]

1011+ busName: menuFactory.rootModel.busName

1012+ objectPath: menuFactory.rootModel.actions["indicator"]

9691013

9701014 property var activateAction: action("activate-transfer")

9711015 property var cancelAction: action("cancel-transfer")

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

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

2020

2121import QtQuick 2.4

2222import Powerd 0.1

23−import Lights 0.1

23+import Hfd 0.1

2424import QMenuModel 0.1 as QMenuModel

2525import Unity.Indicators 0.1 as Indicators

2626import Wizard 0.1

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

171171 }

172172

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

174− Lights.state = Lights.Off

174+ Leds.state = Leds.Off

175175 if (indicatorState != "INDICATOR_OFF")

176− Lights.state = Lights.On

176+ Leds.state = Leds.On

177177 }

178178

179179 // 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)

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

205205 Component.onCompleted: start()

206206 onBatteryLevelChanged: {

207− root.batteryLevel = batteryLevel

207+ root.batteryLevel = batteryLevel ? batteryLevel : 0.00

208208 updateLightState("onBatteryLevelChanged")

209209 }

210210 onDeviceStateChanged: {

211− root.deviceState = deviceState

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

212212 updateLightState("onDeviceStateChanged")

213213 }

214214 }

215215

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

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

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

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

218218

219219 property var _colorBinding: Binding {

220− target: Lights

220+ target: Leds

221221 property: "color"

222222 value: root.color

223223 }

224224

225225 property var _onMillisecBinding: Binding {

226− target: Lights

226+ target: Leds

227227 property: "onMillisec"

228228 value: root.onMillisec

229229 }

230230

231231 property var _offMillisecBinding: Binding {

232− target: Lights

232+ target: Leds

233233 property: "offMillisec"

234234 value: root.offMillisec

235235 }

qml/Panel/PanelMenuPage.qml+1−1

@@ -59,7 +59,7 @@ PageStack {

5959 function reset(clearModel) {

6060 if (clearModel) {

6161 clear();

62− var model = submenuIndex == undefined ? menuModel : menuModel.submenu(submenuIndex)

62+ var model = root.submenuIndex == undefined ? menuModel : menuModel.submenu(root.submenuIndex)

6363 if (model) {

6464 push(pageComponent, { "menuModel": model });

6565 }

qml/Shell.qml+2−2

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

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

9191 return Qt.PrimaryOrientation;

9292 } else {

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

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

9494 }

9595 }

9696

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

157157

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

159159

160− WallpaperResolver {

160+ ImageResolver {

161161 id: wallpaperResolver

162162 objectName: "wallpaperResolver"

163163

qml/Stage/MoveHandler.qml+7−7

@@ -47,13 +47,13 @@ QtObject {

4747 property bool moving

4848

4949 readonly property int triggerArea: units.gu(8)

50− property bool nearLeftEdge: target.maximizedLeft

51− property bool nearTopEdge: target.maximized

52− property bool nearRightEdge: target.maximizedRight

53− property bool nearTopLeftCorner: target.maximizedTopLeft

54− property bool nearTopRightCorner: target.maximizedTopRight

55− property bool nearBottomLeftCorner: target.maximizedBottomLeft

56− property bool nearBottomRightCorner: target.maximizedBottomRight

50+ property bool nearLeftEdge: target && target.maximizedLeft

51+ property bool nearTopEdge: target && target.maximized

52+ property bool nearRightEdge: target && target.maximizedRight

53+ property bool nearTopLeftCorner: target && target.maximizedTopLeft

54+ property bool nearTopRightCorner: target && target.maximizedTopRight

55+ property bool nearBottomLeftCorner: target && target.maximizedBottomLeft

56+ property bool nearBottomRightCorner: target && target.maximizedBottomRight

5757

5858 property Timer mouseDownTimer: Timer {

5959 interval: 175

qml/Stage/Splash.qml+1−4

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

8989 id: overlaidImage

9090 anchors.centerIn: parent

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

92− sourceSize {

93− width: root.width

94− height: root.height

95− }

9692 asynchronous: true

93+ fillMode: Image.PreserveAspectFit

9794 cache: false

9895 }

9996

qml/Stage/Stage.qml+2−2

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

22102210 consumesInput: false

22112211 interactive: false

22122212 focus: false

2213− requestedWidth: appDelegate.requestedWidth

2214− requestedHeight: appDelegate.requestedHeight

2213+ requestedWidth: appDelegate ? appDelegate.requestedWidth : 0

2214+ requestedHeight: appDelegate ? appDelegate.requestedHeight : 0

22152215

22162216 width: units.gu(40)

22172217 height: units.gu(40)

qml/Stage/WindowDecoration.qml+5−6

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

9999 spacing: units.gu(3)

100100

101101 WindowControlButtons {

102+ Layout.fillHeight: true

103+ Layout.fillWidth: false

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

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

106+

102107 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− }

109108 active: root.active

110109 onCloseClicked: root.closeClicked();

111110 onMinimizeClicked: root.minimizeClicked();

qml/Tutorial/TutorialContent.qml+8−8

@@ -77,7 +77,7 @@ Item {

7777

7878 readonly property bool skipped: !d.mobileScenario || d.haveShown("top")

7979 readonly property bool shown: item && item.shown

80− active: !skipped || (item && item.visible)

80+ active: !skipped

8181 onSkippedChanged: if (skipped && shown) item.hide()

8282

8383 sourceComponent: TutorialTop {

@@ -85,7 +85,7 @@ Item {

8585 objectName: "tutorialTop"

8686 anchors.fill: parent

8787 panel: root.panel

88− hides: [launcher, panel.indicators]

88+ hides: [root.launcher, panel.indicators]

8989 paused: root.paused

9090

9191 skipped: tutorialTopLoader.skipped

@@ -111,7 +111,7 @@ Item {

111111

112112 readonly property bool skipped: !d.mobileScenario || d.haveShown("left")

113113 readonly property bool shown: item && item.shown

114− active: !skipped || (item && item.visible)

114+ active: !skipped

115115 onSkippedChanged: if (skipped && shown) item.hide()

116116

117117 sourceComponent: TutorialLeft {

@@ -119,7 +119,7 @@ Item {

119119 objectName: "tutorialLeft"

120120 anchors.fill: parent

121121 launcher: root.launcher

122− hides: [launcher, panel.indicators]

122+ hides: [launcher, root.panel.indicators]

123123 paused: root.paused

124124

125125 isReady: !tutorialLeftLoader.skipped

@@ -151,7 +151,7 @@ Item {

151151

152152 readonly property bool skipped: !d.mobileScenario || d.haveShown("left-drawer")

153153 readonly property bool shown: item && item.shown

154− active: !skipped || (item && item.visible)

154+ active: !skipped

155155 onSkippedChanged: if (skipped && shown) item.hide()

156156

157157 sourceComponent: TutorialLeftLong {

@@ -159,7 +159,7 @@ Item {

159159 objectName: "tutorialLeftLong"

160160 anchors.fill: parent

161161 launcher: root.launcher

162− hides: [launcher, panel.indicators]

162+ hides: [launcher, root.panel.indicators]

163163 paused: root.paused

164164

165165 skipped: tutorialLeftLongLoader.skipped

@@ -189,7 +189,7 @@ Item {

189189

190190 readonly property bool skipped: d.haveShown("right")

191191 readonly property bool shown: item && item.shown

192− active: !skipped || (item && item.visible)

192+ active: !skipped

193193 onSkippedChanged: if (skipped && shown) item.hide()

194194

195195 sourceComponent: TutorialRight {

@@ -198,7 +198,7 @@ Item {

198198 anchors.fill: parent

199199 stage: root.stage

200200 usageScenario: root.usageScenario

201− hides: [launcher, panel.indicators]

201+ hides: [root.launcher, panel.indicators]

202202 paused: root.paused

203203

204204 skipped: tutorialRightLoader.skipped

qml/Tutorial/TutorialLeft.qml+1−1

@@ -26,7 +26,7 @@ TutorialPage {

2626 opacityOverride: 1 - launcher.visibleWidth / launcher.panelWidth

2727

2828 mouseArea {

29− anchors.leftMargin: launcher.dragAreaWidth

29+ anchors.leftMargin: root.launcher.dragAreaWidth

3030 }

3131

3232 background {

qml/Tutorial/TutorialLeftLong.qml+1−1

@@ -28,7 +28,7 @@ TutorialPage {

2828 opacityOverride: shown ? 1 - launcher.dragDistance / (launcher.panelWidth * 3) : 1

2929

3030 mouseArea {

31− anchors.leftMargin: launcher.dragAreaWidth

31+ anchors.leftMargin: root.launcher.dragAreaWidth

3232 }

3333

3434 background {

qml/Tutorial/TutorialTop.qml+2−2

@@ -28,11 +28,11 @@ TutorialPage {

2828 QtObject {

2929 id: d

3030 readonly property bool landscape: root.width > units.gu(50)

31− readonly property real columnWidth: landscape ? panel.indicators.width : root.width

31+ readonly property real columnWidth: landscape ? root.panel.indicators.width : root.width

3232 }

3333

3434 mouseArea {

35− anchors.topMargin: panel.indicators.minimizedPanelHeight

35+ anchors.topMargin: root.panel.indicators.minimizedPanelHeight

3636 }

3737

3838 background {

qml/Wizard/Pages.qml+8−5

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

8484 }

8585 }

8686

87− function quitWizard() {

88− pageStack.currentPage.enabled = false;

89−

87+ function savePassword() {

9088 if (password != "") {

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

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

9290 if (errorMsg !== "") {

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

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

9593 // 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);

9795 }

9896 }

9997

98+ }

99+

100+ function quitWizard() {

101+ pageStack.currentPage.enabled = false;

102+ savePassword();

100103 quit();

101104 }

102105

qml/Wizard/Pages/30-wifi.qml+4−5

@@ -163,8 +163,8 @@ LocalComponents.Page {

163163

164164 Label {

165165 id: label

166− anchors.left: parent.left

167− anchors.right: parent.right

166+ Layout.fillWidth: true

167+ Layout.fillHeight: false

168168 anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

169169 font.weight: Font.Light

170170 color: textColor

@@ -176,11 +176,10 @@ LocalComponents.Page {

176176 ListView {

177177 id: listview

178178 objectName: "accessPointsListView"

179− anchors.left: parent.left

180− anchors.right: parent.right

179+ Layout.fillWidth: true

180+ Layout.fillHeight: true

181181 clip: true

182182 model: menuModel

183− Layout.fillHeight: true

184183

185184 delegate: Loader {

186185 readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"

qml/Wizard/Pages/50-timezone.qml+9−11

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

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

175175

176176 LocalComponents.WizardTextField {

177+ Layout.fillWidth: true

177178 id: searchField

178179 objectName: "tzFilter"

179− anchors.left: parent.left

180− anchors.right: parent.right

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

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

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

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

186185 }

187186

188187 ListView {

188+ Layout.fillWidth: true

189189 Layout.fillHeight: true

190190 id: tzList

191191 objectName: "tzList"

192192 clip: true

193− anchors.left: parent.left

194− anchors.right: parent.right

195193 currentIndex: -1

196194 model: TimeZoneModel {

197195 id: timeZoneModel

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

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

200198 }

201199 delegate: tzComponent

202− }

203200

204− ActivityIndicator {

205− anchors.centerIn: tzList

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

207− searchField.length > 0 &&

208− timeZoneModel.listUpdating

209− visible: running

201+ ActivityIndicator {

202+ anchors.centerIn: parent

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

204+ searchField.length > 0 &&

205+ timeZoneModel.listUpdating

206+ visible: running

207+ }

210208 }

211209 }

212210

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

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

116116 objectName: "installButton"

117117 anchors.fill: parent

118118 onClicked: {

119+ root.savePassword();

119120 System.skipUntilFinishedPage();

120121 SystemImage.applyUpdate();

121122 }

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

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

8888 fontSize: "x-large"

8989 font.weight: Font.Light

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

9292 color: whiteColor

9393 }

9494

src/ApplicationArguments.h−13

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

2626class ApplicationArguments : public QObject

2727{

2828 Q_OBJECT

29− Q_PROPERTY(QString deviceName READ deviceName NOTIFY deviceNameChanged)

3029 Q_PROPERTY(QString mode READ mode CONSTANT)

3130public:

3231 ApplicationArguments(QObject *parent = nullptr);

3332

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−

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

4334 QString mode() const { return m_mode; }

4435

45−Q_SIGNALS:

46− void deviceNameChanged(const QString&);

47−

4836private:

49− QString m_deviceName;

5037 QString m_mode;

5138};

5239

src/CMakeLists.txt+1−5

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

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

4343endif()

4444

45−pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

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

4746

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

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

50−endif()

5147target_link_libraries(${SHELL_APP}

5248 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test

53− ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}

49+ ${GSETTINGS_QT_LDFLAGS}

5450 UbuntuGestures connectivity-qt1 unity8-private

5551 )

5652

src/ShellApplication.cpp−15

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

2525

2626#include <libintl.h>

2727

28−// libandroid-properties

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

30−

3128// local

3229#include <paths.h>

3330#include "CachingNetworkManagerFactory.h"

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

4744

4845 UnityCommandLineParser parser(*this);

4946

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−

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

6048

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

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

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

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

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

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

114101

115102 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

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

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

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

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

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

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

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

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

188174 m_shellView->setVisible(true);

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

214200 delete m_secondaryWindow;

215201 m_secondaryWindow = nullptr;

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

217− m_qmlArgs.setDeviceName(m_deviceName);

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

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

220205 m_shellView->requestActivate();

src/ShellApplication.h−1

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

4646

4747private:

4848 void setupQmlEngine(bool isMirServer);

49− QString m_deviceName;

5049 ApplicationArguments m_qmlArgs;

5150 ShellView *m_shellView{nullptr};

5251 SecondaryWindow *m_secondaryWindow{nullptr};

src/UnityCommandLineParser.cpp−5

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

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

5252 parser.addOption(testabilityOption);

5353

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−

5854 QCommandLineOption modeOption(QStringLiteral("mode"),

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

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

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

8379 #endif

8480

8581 m_hasFullscreen = parser.isSet(fullscreenOption);

86− m_deviceName = parser.value(devicenameOption);

8782 resolveMode(parser, modeOption);

8883}

8984

src/UnityCommandLineParser.h−2

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

3434 #endif

3535

3636 bool hasFullscreen() const { return m_hasFullscreen; }

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

3837 QString mode() const { return m_mode; }

3938private:

4039

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

5352 #endif

5453

5554 bool m_hasFullscreen;

56− QString m_deviceName;

5755 QString m_mode;

5856};

5957

tests/mocks/CMakeLists.txt+1−1

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

3535add_subdirectory(liblightdm)

3636add_subdirectory(libusermetrics)

3737add_subdirectory(LightDMController)

38−add_subdirectory(Lights)

38+add_subdirectory(Hfd)

3939add_subdirectory(MeeGo)

4040add_subdirectory(Powerd)

4141add_subdirectory(QMenuModel)

tests/mocks/GSettings.1.0/fake_gsettings.cpp+22−5

@@ -28,7 +28,7 @@ GSettingsControllerQml::GSettingsControllerQml()

2828 , m_launcherWidth(8)

2929 , m_edgeDragWidth(2)

3030 , m_enableIndicatorMenu(true)

31− , m_appstoreUri("http://uappexplorer.com")

31+ , m_oskSwitchVisible(false)

3232{

3333}

3434

@@ -160,9 +160,17 @@ void GSettingsControllerQml::setEnableIndicatorMenu(bool enableIndicatorMenu)

160160 }

161161}

162162

163−QString GSettingsControllerQml::appstoreUri() const

163+bool GSettingsControllerQml::oskSwitchVisible() const

164164{

165− return m_appstoreUri;

165+ return m_oskSwitchVisible;

166+}

167+

168+void GSettingsControllerQml::setOskSwitchVisible(bool oskSwitchVisible)

169+{

170+ if (m_oskSwitchVisible != oskSwitchVisible) {

171+ m_oskSwitchVisible = oskSwitchVisible;

172+ Q_EMIT oskSwitchVisibleChanged(oskSwitchVisible);

173+ }

166174}

167175

168176GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

@@ -231,6 +239,8 @@ void GSettingsQml::componentComplete()

231239 this, &GSettingsQml::edgeDragWidthChanged);

232240 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableIndicatorMenuChanged,

233241 this, &GSettingsQml::enableIndicatorMenuChanged);

242+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::oskSwitchVisibleChanged,

243+ this, &GSettingsQml::oskSwitchVisibleChanged);

234244

235245 Q_EMIT disableHeightChanged();

236246 Q_EMIT pictureUriChanged();

@@ -356,10 +366,10 @@ QVariant GSettingsQml::enableIndicatorMenu() const

356366 }

357367}

358368

359−QVariant GSettingsQml::appstoreUri() const

369+QVariant GSettingsQml::oskSwitchVisible() const

360370{

361371 if (m_valid && m_schema->id() == "com.canonical.Unity8") {

362− return GSettingsControllerQml::instance()->appstoreUri();

372+ return GSettingsControllerQml::instance()->oskSwitchVisible();

363373 }

364374 return QVariant();

365375}

@@ -398,3 +408,10 @@ void GSettingsQml::setEnableIndicatorMenu(const QVariant &enableIndicatorMenu)

398408 GSettingsControllerQml::instance()->setEnableIndicatorMenu(enableIndicatorMenu.toBool());

399409 }

400410}

411+

412+void GSettingsQml::setOskSwitchVisible(const QVariant &oskSwitchVisible)

413+{

414+ if (m_valid && m_schema->id() == "com.canonical.Unity8") {

415+ GSettingsControllerQml::instance()->setOskSwitchVisible(oskSwitchVisible.toBool());

416+ }

417+}

tests/mocks/GSettings.1.0/fake_gsettings.h+8−6

@@ -58,7 +58,7 @@ class GSettingsQml: public QObject, public QQmlParserStatus

5858 Q_PROPERTY(QVariant launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

5959 Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)

6060 Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)

61− Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)

61+ Q_PROPERTY(QVariant oskSwitchVisible READ oskSwitchVisible WRITE setOskSwitchVisible NOTIFY oskSwitchVisibleChanged)

6262

6363public:

6464 GSettingsQml(QObject *parent = nullptr);

@@ -76,7 +76,7 @@ public:

7676 QVariant launcherWidth() const;

7777 QVariant edgeDragWidth() const;

7878 QVariant enableIndicatorMenu() const;

79− QVariant appstoreUri() const;

79+ QVariant oskSwitchVisible() const;

8080

8181 void setDisableHeight(const QVariant &val);

8282 void setPictureUri(const QVariant &str);

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

8787 void setLauncherWidth(const QVariant &launcherWidth);

8888 void setEdgeDragWidth(const QVariant &edgeDragWidth);

8989 void setEnableIndicatorMenu(const QVariant &enableIndicatorMenu);

90+ void setOskSwitchVisible(const QVariant &oskSwitchVisible);

9091

9192Q_SIGNALS:

9293 void disableHeightChanged();

@@ -99,7 +100,7 @@ Q_SIGNALS:

99100 void launcherWidthChanged();

100101 void edgeDragWidthChanged();

101102 void enableIndicatorMenuChanged();

102− void appstoreUriChanged();

103+ void oskSwitchVisibleChanged();

103104

104105private:

105106 GSettingsSchemaQml* m_schema;

@@ -143,7 +144,8 @@ public:

143144 bool enableIndicatorMenu() const;

144145 Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);

145146

146− QString appstoreUri() const;

147+ bool oskSwitchVisible() const;

148+ Q_INVOKABLE void setOskSwitchVisible(bool oskSwitchVisible);

147149

148150Q_SIGNALS:

149151 void disableHeightChanged();

@@ -155,7 +157,7 @@ Q_SIGNALS:

155157 void launcherWidthChanged(int launcherWidth);

156158 void edgeDragWidthChanged(uint edgeDragWidth);

157159 void enableIndicatorMenuChanged(bool enableIndicatorMenu);

158− void appstoreUriChanged(const QString &appstoreUri);

160+ void oskSwitchVisibleChanged(bool oskSwitchVisible);

159161

160162private:

161163 GSettingsControllerQml();

@@ -169,7 +171,7 @@ private:

169171 int m_launcherWidth;

170172 uint m_edgeDragWidth;

171173 bool m_enableIndicatorMenu;

172− QString m_appstoreUri;

174+ bool m_oskSwitchVisible;

173175

174176 static GSettingsControllerQml* s_controllerInstance;

175177 QList<GSettingsQml *> m_registeredGSettings;

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

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

1515 */

1616

17−#include "Lights.h"

17+#include "Leds.h"

1818

1919#include <QDebug>

2020

21−Lights::Lights(QObject* parent)

21+Leds::Leds(QObject* parent)

2222 : QObject(parent),

2323 m_color("blue"),

24− m_state(Lights::Off),

24+ m_state(Leds::Off),

2525 m_onMs(1000),

2626 m_offMs(3000)

2727{

2828}

2929

30−Lights::~Lights()

30+Leds::~Leds()

3131{

3232}

3333

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

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

3535{

3636 if (m_state != newState) {

3737 m_state = newState;

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

3939 }

4040}

4141

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

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

4343{

4444 return m_state;

4545}

4646

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

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

4848{

4949 if (m_color != color) {

5050 m_color = color;

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

5252 }

5353}

5454

55−QColor Lights::color() const

55+QColor Leds::color() const

5656{

5757 return m_color;

5858}

5959

60−int Lights::onMillisec() const

60+int Leds::onMillisec() const

6161{

6262 return m_onMs;

6363}

6464

65−void Lights::setOnMillisec(int onMs)

65+void Leds::setOnMillisec(int onMs)

6666{

6767 if (m_onMs != onMs) {

6868 m_onMs = onMs;

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

7070 }

7171}

7272

73−int Lights::offMillisec() const

73+int Leds::offMillisec() const

7474{

7575 return m_offMs;

7676}

7777

78−void Lights::setOffMillisec(int offMs)

78+void Leds::setOffMillisec(int offMs)

7979{

8080 if (m_offMs != offMs) {

8181 m_offMs = offMs;

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

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

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

1515 */

1616

17−#ifndef UNITY_MOCK_LIGHTS_H

18−#define UNITY_MOCK_LIGHTS_H

17+#pragma once

1918

2019#include <QtCore/QObject>

2120#include <QtGui/QColor>

2221

23−class Lights: public QObject

22+class Leds: public QObject

2423{

2524 Q_OBJECT

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

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

3534 };

3635 Q_ENUM(State)

3736

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

39− ~Lights();

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

38+ ~Leds();

4039

4140 void setState(State newState);

4241 State state() const;

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

6261 int m_onMs;

6362 int m_offMs;

6463};

65−

66−#endif

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

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

1515 */

1616

1717#include "plugin.h"

18−#include "Lights.h"

18+#include "Leds.h"

1919

2020#include <QtQml/qqml.h>

2121

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

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

2323{

2424 Q_UNUSED(engine)

2525 Q_UNUSED(scriptEngine)

26− return new Lights();

26+ return new Leds();

2727}

2828

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

3030{

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

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

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

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

3333}

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

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

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

1515 */

1616

17−#ifndef MOCK_POWER_PLUGIN_H

18−#define MOCK_POWER_PLUGIN_H

17+#pragma once

1918

2019#include <QtQml/QQmlEngine>

2120#include <QtQml/QQmlExtensionPlugin>

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

2827public:

2928 void registerTypes(const char *uri) override;

3029};

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;

3535

3636SurfaceManager *SurfaceManager::instance()

3737{

38+ if (m_instance == nullptr) {

39+ auto inst = new SurfaceManager();

40+ }

3841 return m_instance;

3942}

4043

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

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

4141 service);

4242}

4343

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

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

4545{

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

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

4747}

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

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

3232 const QString &service);

3333

3434 Q_INVOKABLE void UnregisterSurfaceMenu(const QString &surfaceId,

35− const QDBusObjectPath &menuObjectPath);

35+ const QString &menuObjectPath);

3636

3737private:

3838 MockApplicationMenuRegistry(QObject *parent = 0);

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

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

99 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

1010 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

1111 ${GIO_INCLUDE_DIRS}

12+ ${DEVICEINFO_INCLUDE_DIRS}

1213)

1314

1415set(QMLPLUGIN_SRC

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

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

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

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

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

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

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

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

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

@@ -48,9 +49,11 @@ add_library(FakeUtils-qml SHARED

4849 )

4950

5051target_link_libraries(FakeUtils-qml

52+ ${DEVICEINFO_LDFLAGS}

5153 ${GIO_LDFLAGS}

5254 Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui

53− )

55+ ${DEVICEINFO_LDFLAGS}

56+)

5457

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

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

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

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

3838#include <timezoneFormatter.h>

3939#include <applicationsfiltermodel.h>

4040#include <inputeventgenerator.h>

41−#include <deviceconfigparser.h>

41+#include <deviceconfig.h>

4242#include <globalfunctions.h>

4343#include <appdrawerproxymodel.h>

4444#include <tabfocusfence.h>

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