git.iko.soy/unity8

on xenial help sign in

from

swap

toc73a8d39597 ahead, 0 behind

compare

.bazaar/Makefiledeleted−6

since splitsnapshots

unifiedsplit

@@ -1,6 +0,0 @@

1−install:

2− mkdir -p ~/.bazaar/plugins

3− cp plugins/* ~/.bazaar/plugins

4−

5−uninstall:

6− rm ~/.bazaar/plugins/makecheck_unity_phablet.py*

.bazaar/plugins/makecheck_unity_phablet.pydeleted−51

@@ -1,51 +0,0 @@

1−#!/usr/bin/python

2−# Copyright 2013, 2014 Canonical Ltd.

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−import os

17−import subprocess

18−from bzrlib import branch

19−from bzrlib.urlutils import local_path_from_url

20−

21−

22−def execute_makecheck(

23− local_branch, master_branch, old_revision_number, old_revision_id,

24− future_revision_number, future_revision_id, tree_delta, future_tree):

25− if not master_branch.basis_tree().has_filename("qml/Shell.qml"):

26− return

27−

28− os.chdir(local_path_from_url(master_branch.base))

29−

30− print "Executing 'make -C builddir test'.."

31− os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"

32− if (subprocess.call("make -C builddir test", shell=True) != 0):

33−

34− print("\n\n*** Warning ***\n\n"

35− "Basic tests failed. This commit will not pass continuous "

36− "integration.")

37−

38− branch = local_branch or master_branch

39− revision = branch.repository.get_revision(future_revision_id)

40− msg_file = open('message.txt', 'w')

41− msg_file.write(revision.message)

42− msg_file.close()

43−

44− print("\n\nSaved commit message to $SRC_DIR/message.txt.")

45− print("You can uncommit this revision, fix the tests and reuse your "

46− "message running:\n\nbzr commit -F message.txt\n\n")

47− elif os.path.isfile("message.txt"):

48− os.remove("message.txt")

49−

50−branch.Branch.hooks.install_named_hook(

51− 'pre_commit', execute_makecheck, 'make check pre-commit')

.bzr-builddeb/default.confdeleted−2

@@ -1,2 +0,0 @@

1−[BUILDDEB]

2−split = True

.bzrignoredeleted−7

@@ -1,7 +0,0 @@

1−# default build dir

2−/builddir

3−# QtCreator project files

4−/*.user

5−# Eclipse project files

6−.settings

7−message.txt

.crossbuilder/post_deploynew file+1

@@ -0,0 +1 @@

1+restart unity8

.gitignore+7

@@ -2,8 +2,15 @@

2/builddir

2/builddir

3# QtCreator project files

3# QtCreator project files

4/*.user

4/*.user

5+*.qmlc

6+*.jsc

5# Eclipse project files

7# Eclipse project files

6/.project

8/.project

7/.cproject

9/.cproject

8/.settings

10/.settings

9/.pydevproject

11/.pydevproject

12+# KDevelop project Files

13+/.kdev4/

14+/build/

15+/*.kdev4

16+.clickable/

CMakeLists.txt+88−13

@@ -13,8 +13,9 @@ endif()

13

13

14set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

14set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

15

15

16−# Instruct CMake to run moc automatically when needed.

16+# Instruct CMake to run moc and rcc automatically when needed.

17set(CMAKE_AUTOMOC ON)

17set(CMAKE_AUTOMOC ON)

18+set(CMAKE_AUTORCC ON)

18

19

19# enable QML debugging

20# enable QML debugging

20string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

21string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

@@ -39,6 +40,19 @@ if(cmake_build_type_lower MATCHES coverage)

39 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

40endif()

41endif()

41

42

43+find_package (ECM 1.7.0 QUIET NO_MODULE)

44+if (ECM_FOUND)

45+ # Provides us with -DECM_ENABLE_SANITIZERS='X'

46+ # Where X can be address, thread, memory, leak, undefined

47+ include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")

48+endif()

49+

50+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

51+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")

52+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )

53+ endif()

54+endif()

55+

42# Make sure we have all the needed symbols

56# Make sure we have all the needed symbols

43set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")

57set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")

44set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")

58set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")

@@ -48,11 +62,41 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2

48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

62 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

49

63

50include(FindPkgConfig)

64include(FindPkgConfig)

51−find_package(Qt5Core 5.2 REQUIRED)

65+find_package(Qt5Core 5.6 REQUIRED)

52−find_package(Qt5Qml 5.2 REQUIRED)

66+find_package(Qt5Qml 5.6 REQUIRED)

53−find_package(Qt5Quick 5.2 REQUIRED)

67+find_package(Qt5Quick 5.6 REQUIRED)

54−find_package(Qt5Gui 5.2 REQUIRED)

68+find_package(Qt5Gui 5.6 REQUIRED)

55−find_package(Qt5DBus 5.2 REQUIRED)

69+find_package(Qt5DBus 5.6 REQUIRED)

70+find_package(Qt5Concurrent 5.6 REQUIRED)

71+find_package(Qt5Sql 5.6 REQUIRED)

72+find_package(Qt5Test 5.6 REQUIRED)

73+find_package(Qt5Svg 5.6 REQUIRED)

74+find_package(Qt5Network 5.6 REQUIRED)

75+find_package(Qt5Xml 5.6 REQUIRED)

76+

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

78+pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

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

80+pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

81+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)

82+pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

83+pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

84+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)

85+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

86+pkg_check_modules(QTDBUSTEST REQUIRED

87+ libqtdbustest-1

88+ libqtdbusmock-1

89+ )

90+

91+### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them

92+find_path(UBUNTUGESTUREPRIV

93+ NAMES UbuntuGestures/private/damper_p.h UbuntuGestures/private/ucswipearea_p.h UbuntuGestures/private/ucswipearea_p_p.h

94+ PATHS ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

95+ NO_DEFAULT_PATH)

96+if (${UBUNTUGESTUREPRIV} STREQUAL UBUNTUGESTUREPRIV-NOTFOUND)

97+ message(FATAL_ERROR "UbuntuGestures private headers not found.")

98+endif()

99+# end of UbuntuGesture private headers check

56

100

57# Standard install paths

101# Standard install paths

58include(GNUInstallDirs)

102include(GNUInstallDirs)

@@ -60,6 +104,11 @@ include(GNUInstallDirs)

60set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

104set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

61set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

105set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

62

106

107+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)

108+if(USS_PRIVATE_PLUGINDIR STREQUAL "")

109+ message(FATAL_ERROR "Could not determine USS private plugin installation dir.")

110+endif()

111+

63execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)

112execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)

64if(SHELL_INSTALL_QML STREQUAL "")

113if(SHELL_INSTALL_QML STREQUAL "")

65 message(FATAL_ERROR "Could not determine plugin installation dir.")

114 message(FATAL_ERROR "Could not determine plugin installation dir.")

@@ -91,30 +140,56 @@ add_definitions(-DQT_NO_KEYWORDS)

91# Save a few container detach and conversions

140# Save a few container detach and conversions

92add_definitions(-DQT_STRICT_ITERATORS)

141add_definitions(-DQT_STRICT_ITERATORS)

93

142

94−# Tests

143+# Use the fast string builder

95−include(CTest)

144+add_definitions(-DQT_USE_QSTRINGBUILDER)

96−enable_testing()

97

145

98# Autopilot tests

146# Autopilot tests

99include(autopilot)

147include(autopilot)

100declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

148declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

101

149

102set(SHELL_APP unity8)

150set(SHELL_APP unity8)

103−set(DASH_APP unity8-dash)

151+set(INDICATORS_CLIENT_APP indicators-client)

104−set(SCOPE_TOOL unity-scope-tool)

152+set(GREETER_APP unity8-greeter)

153+set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

105

154

106include_directories(

155include_directories(

107 ${CMAKE_SOURCE_DIR}/include

156 ${CMAKE_SOURCE_DIR}/include

108 ${CMAKE_BINARY_DIR}/include

157 ${CMAKE_BINARY_DIR}/include

158+ ${APPLICATION_API_INCLUDE_DIRS}

109)

159)

110

160

161+# Quiet logger

162+set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")

163+if(NOT QUIET_LOGGER)

164+ set(STDOUT_LOGGER "-o" "-,txt")

165+endif()

166+

167+execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)

168+if (NOT ARCH MATCHES "arm*")

169+ set(ENABLE_TOUCH_EMULATION true)

170+ add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)

171+ pkg_check_modules(MOUSETOUCHADAPTOR_LIBS REQUIRED x11 xcb xi)

172+else()

173+ set(ENABLE_TOUCH_EMULATION false)

174+ message(STATUS "Touch emulation support disabled.")

175+endif()

176+

111# add subdirectories to build

177# add subdirectories to build

112add_subdirectory(include)

178add_subdirectory(include)

113−add_subdirectory(libs)

114add_subdirectory(src)

179add_subdirectory(src)

115add_subdirectory(tools)

180add_subdirectory(tools)

116add_subdirectory(qml)

181add_subdirectory(qml)

182+

183+# Tests

184+set(NO_TESTS OFF CACHE BOOL "Disable tests.")

185+if (NOT NO_TESTS)

186+ include(CTest)

187+ enable_testing()

117−add_subdirectory(tests)

188+ add_subdirectory(tests)

189+else()

190+ message(STATUS "Tests disabled")

191+endif()

192+

118add_subdirectory(plugins)

193add_subdirectory(plugins)

119

194

120#

195#

CODING+54−63

@@ -15,23 +15,17 @@ download source

15 $ bzr branch lp:unity8 ~/unity8/trunk

15 $ bzr branch lp:unity8 ~/unity8/trunk

16 $ cd ~/unity8/trunk

16 $ cd ~/unity8/trunk

17

17

18−install dependencies

18+install dependencies and build Unity 8

19--------------------

19--------------------

20−If its your first time, install build dependencies

21

20

22$ cd ~/unity8/trunk

21$ cd ~/unity8/trunk

23−$ ./build.sh --setup

22+$ ./build.sh

24−

25− this will:

26− - install the required dependencies to build, as well as run on the desktop

27− - it should also install unity-scope-home and unity-lens-application which

28− are technically "recommends", not strict dependencies

29

23

30−build Unity 8

24+ If its your first time, this will install the required dependencies to build and

31−-------------

25+ build it.

32

26

33−$ cd ~/unity8/trunk

27+ You might want to also install unity-scope-home and unity-scope-click which

34−$ ./build.sh

28+ are technically "recommends", not strict dependencies

35

29

36You may also rebuild with the -c for clean, which just deletes the build

30You may also rebuild with the -c for clean, which just deletes the build

37directory.

31directory.

@@ -43,17 +37,21 @@ Running Unity 8 on your desktop

43run the Unity 8 shell

37run the Unity 8 shell

44---------------------

38---------------------

45$ cd ~/unity8/trunk

39$ cd ~/unity8/trunk

46−$ ./run.sh

40+$ cd builddir

47

41

48−Options can be passed to test the lock screen

42+Each component of unity8 can be ran independently for development and testing

49−$ ./run.sh -p OR -k

43+For example:

44+$ make tryShell

45+$ make tryLauncher

46+$ make tryLockscreen

50

47

51−-p is for pin lock, for which the default prompt answer is "1234"

48+Check out the tests/qmltests/ directory for a list of things that can be ran.

52−-k is for keylock passphrase, for which the default prompt answer is "password"

53

49

54Notes

50Notes

55-----

51-----

56- to navigate, utilize the mouse left button as you would your finger

52- to navigate, utilize the mouse left button as you would your finger

53+- a three point drag (for side stage operations) can be performed by using

54+ the Shift+Control+Alt (all together) keyboard modifiers while using the mouse.

57- to get the translations work, currently you have to do make install to

55- to get the translations work, currently you have to do make install to

58 put the *.mo files into correct structure. We'll look for a better solution

56 put the *.mo files into correct structure. We'll look for a better solution

59 later.

57 later.

@@ -68,50 +66,15 @@ Notes

68

66

69Running Unity 8 on devices

67Running Unity 8 on devices

70==========================

68==========================

71−- Ubuntu Touch builds are currently only available in 14.04 flavour

72−- supported hardware should match one of those listed here

73− https://wiki.ubuntu.com/Touch/Devices#Running_fine

74−- follow the Ubuntu Touch install instructions for your chosen device

75− https://wiki.ubuntu.com/Touch/Install

76−- make sure your device is connected to a network

77−- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one

78− on the device yourself)

79−

80−$ cd ~/unity/trunk

81−$ ./run_on_device.sh --setup

82− this will:

83− - install your public SSH key on the device

84− - install the needed dependencies

85

69

86−$ ./run_on_device.sh

70+Running unity8 on a device should be done using crossbuilder.

87− this will:

71+Go to

88− - rsync the code to the device

72+* https://launchpad.net/crossbuilder and

89− - build on the device

73+* https://wiki.ubuntu.com/Touch/Crossbuilder

90− - replace the running shell

74+for more details on crossbuilder.

91−

92−Options can be passed to test the lock screen

93−$ ./run_on_device.sh -p OR -k

94−

95−-p is for pin lock, for which the default prompt answer is "1234"

96−-k is for keylock passphrase, for which the default prompt answer is "password"

97−

98−Notes

99−-----

100−- using adb over TCP has some advantages, Google will be of help here

101− - NOTE: this is not yet available for flipped images

102− - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`

103− - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`

104− - it's unsafe - anyone can connect to your device

105− - with TCP the Nexus 10 doesn't drop the adb connection when locking

106− the screen

107−- exporting ANDROID_SERIAL=$your_device_serial or

108− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

109− multiple devices

110−- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh

111− to not use adb forwarding - useful if you use multiple devices

112−- using Ninja (package ninja-build - run_on_device.sh -s installs this now)

113− will improve build times (especially in the nothing-to-build case)

114

75

76+unity8 will automatically restart on the phone once deployment

77+has finished due to post-build-steps set up in this repository.

115

78

116Coding guidelines

79Coding guidelines

117=================

80=================

@@ -144,7 +107,7 @@ $ ctest

144

107

145To run all graphical tests, which can take a couple of minutes:

108To run all graphical tests, which can take a couple of minutes:

146

109

147−$ make qmluitests

110+$ make uitests

148

111

149To run the tests for a single component/class:

112To run the tests for a single component/class:

150

113

@@ -158,6 +121,10 @@ To run the tests for a single component/class under gdb (so you can catch SEGFAU

158

121

159$ make gdbtestComponentName

122$ make gdbtestComponentName

160

123

124+To run a single test function of a single component/class:

125+

126+$ make testComponentName FUNCTION="TestCaseName::functionName"

127+

161To run a test application that allow you to manually test or to simply try out

128To run a test application that allow you to manually test or to simply try out

162a given component:

129a given component:

163

130

@@ -186,12 +153,36 @@ $ make install

186

153

187To see the list of existing autopilot tests you can do

154To see the list of existing autopilot tests you can do

188

155

189−$ PYTHONPATH=../tests/autopilot autopilot list unity8

156+$ PYTHONPATH=../tests/autopilot autopilot3 list unity8

190

157

191And then run a single test with

158And then run a single test with

192

159

193−$ PYTHONPATH=../tests/autopilot autopilot run unity8.some.very.long.test.name

160+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name

194

161

195or run them all with

162or run them all with

196

163

197−$ PYTHONPATH=../tests/autopilot autopilot run unity8

164+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8

165+

166+Debugging techniques

167+====================

168+

169+Unity8 heavily uses Qt and with that Qt debugging techniques mostly apply in the

170+same fashion. There are, however, some additional unity8-specific notes:

171+

172+* Enable/disable Qt scenegraph visualizer on the fly:

173+

174+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSceneGraphVisualizer <mode>

175+

176+ This is equivalent to exporting QSG_VISUALIZE=<mode> before running unity8, except it does it on the

177+ fly.

178+

179+* Toggle slow animations on the fly:

180+

181+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSlowAnimations <true|false>

182+

183+* Change logging filter rules on the fly:

184+

185+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetLoggingFilterRules <filter>

186+

187+ This is equivalent to exporting QT_LOGGING_RULES or defining them in QT_LOGGING_CONF, except it does

188+ it on the fly.

Jenkinsfilenew file+2

@@ -0,0 +1,2 @@

1+@Library('ubports-build-tools') _

2+buildAndProvideDebianPackage()

README.mdnew file+31

@@ -0,0 +1,31 @@

1+# Lomiri

2+

3+Lomiri is the operating environment for everywhere. It is able to span the gaps between touch, mouse, and keyboard; between phones, tablets, and workstations; and look good doing it.

4+

5+If you want to contribute to Lomiri on Ubuntu Touch, you've come to the right place. If you want to package Lomiri for other operating systems, you'll be better served by the main branch on the repository that we're migrating to: https://gitlab.com/ubports/core/lomiri

6+

7+Lomiri has been renamed from Unity8. Most of the software on-device in Ubuntu Touch based on Ubuntu 16.04 is still called `unity8`.

8+

9+## Where to report issues

10+

11+Issues related to the version of Lomiri that currently runs on Ubuntu Touch devices may still be reported on this repository. We will move these reports to the GitLab repository as part of our final migration.

12+

13+## Developing Lomiri on Ubuntu Touch

14+

15+This repository contains the code for Lomiri currently running on Ubuntu Touch. If you would like to modify this version of Lomiri, follow the steps below. If you would like to modify Lomiri in another operating system, check out our new repository: https://gitlab.com/ubports/core/lomiri

16+

17+Lomiri can be built and its test suite run using [`clickable`](https://clickable-ut.dev). This is a convenient method to try out most graphical changes to Lomiri without an annoying redeployment process. If you wish to test your changes on your device or make changes that are more difficult to test without real hardware, check out [Making changes and testing locally on the UBports documentation](https://docs.ubports.com/en/latest/systemdev/testing-locally.html). If not, read on.

18+

19+Before you start, [install Clickable](https://clickable-ut.dev/en/latest/install.html).

20+

21+Now, clone this repository to your computer: `git clone https://github.com/ubports/unity8.git`

22+

23+Move into this directory: `cd unity8`

24+

25+Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:

26+

27+* `clickable ide qtcreator` will open QtCreator with this repository open as a project. You can edit and build the project this way, but running the tests will be a bit difficult.

28+* `clickable build --libs --verbose` will build Lomiri in the same environment as it would receive in Ubuntu Touch.

29+* `clickable test --libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...

30+* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make tryShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow trying out some Lomiri components in a mock environment. You can use this to try out your changes to Lomiri as you develop.

31+* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make xvfbtestShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow running a single TestCase. You can remove the `xvfb` part of the make target to run the test case graphically, which might help you see what is causing the test to fail.

build.sh+26−39

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

1#!/bin/sh

1#!/bin/sh

2

2

3+#

4+# Copyright (C) 2017 Canonical Ltd

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License version 3 as

8+# published by the Free Software Foundation.

9+#

10+# This program is distributed in the hope that it will be useful,

11+# but WITHOUT ANY WARRANTY; without even the implied warranty of

12+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13+# GNU General Public License for more details.

14+#

15+# You should have received a copy of the GNU General Public License

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

17+#

18+

3SETUP=false

19SETUP=false

4CLEAN=false

20CLEAN=false

5NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))

21NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))

@@ -9,7 +25,6 @@ usage() {

9 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2

25 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2

10 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2

26 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2

11 echo "OPTIONS:" >&2

27 echo "OPTIONS:" >&2

12− echo " -s, --setup Setup the build environment and branch Unity" >&2

13 echo " -c, --clean Clean the build tree before building" >&2

28 echo " -c, --clean Clean the build tree before building" >&2

14 echo >&2

29 echo >&2

15 exit 1

30 exit 1

@@ -22,7 +37,6 @@ eval set -- "$ARGS"

22while [ $# -gt 0 ]

37while [ $# -gt 0 ]

23do

38do

24 case "$1" in

39 case "$1" in

25− -s|--setup) SETUP=true;;

26 -c|--clean) CLEAN=true;;

40 -c|--clean) CLEAN=true;;

27 -h|--help) usage;;

41 -h|--help) usage;;

28 --) shift;break;;

42 --) shift;break;;

@@ -35,34 +49,11 @@ done

35BUILD_TYPE="debug"

49BUILD_TYPE="debug"

36[ $# -eq 1 ] && BUILD_TYPE="$1"

50[ $# -eq 1 ] && BUILD_TYPE="$1"

37

51

38−install_dependencies() {

39− sudo apt-get update || exit 4

40− echo "Installing Unity 8 dependencies.."

41− sudo apt-get install devscripts \

42− equivs \

43− gsettings-desktop-schemas \

44− gsettings-ubuntu-schemas \

45− pay-service \

46− qmenumodel-qml \

47− qml-module-qtquick-layouts \

48− qml-module-qtquick-xmllistmodel \

49− qtdeclarative5-gsettings1.0 \

50− qtdeclarative5-ubuntu-ui-toolkit-plugin \

51− qtdeclarative5-ubuntu-settings-components \

52− qtdeclarative5-ubuntu-telephony0.1 \

53− qtdeclarative5-ubuntu-thumbnailer0.1 \

54− qml-module-ubuntu-connectivity \

55− unity-notifications-impl \

56− ubuntu-mobile-icons \

57− unity-scope-home \

58− unity-lens-applications \

59− unity-plugin-scopes \

60− xvfb \

61− || exit 5

62−}

63−

64mk_build_deps() {

52mk_build_deps() {

53+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

54+ sed 's/\:native//g' $CODE_DIR/debian/control > control

65− [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control

55+ mk-build-deps --install --root-cmd sudo control

56+ fi

66}

57}

67

58

68if [ -f "/usr/bin/ccache" ] ; then

59if [ -f "/usr/bin/ccache" ] ; then

@@ -83,13 +74,9 @@ else

83 BUILD_COMMAND="make -j$NUM_JOBS"

74 BUILD_COMMAND="make -j$NUM_JOBS"

84fi

75fi

85

76

86−if $SETUP; then

87− install_dependencies

88−else

89− if $CLEAN; then rm -rf builddir; fi

77+if $CLEAN; then rm -rf builddir; fi

90− mkdir -p builddir

78+mkdir -p builddir

91− cd builddir

79+cd builddir

92− mk_build_deps

80+mk_build_deps

93− cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

81+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

94− ${BUILD_COMMAND} || exit 7

82+${BUILD_COMMAND} || exit 7

95−fi

clickable.yamlnew file+153

@@ -0,0 +1,153 @@

1+clickable_minimum_required: '7'

2+builder: custom

3+build: echo Run \'clickable build --libs --verbose\' to build && false

4+restrict_arch: amd64

5+libraries:

6+ unity8:

7+ builder: cmake

8+ src_dir: "${ROOT}"

9+ test: make xvfballtests -j${NUM_PROCS}

10+ dependencies_host:

11+ - android-headers

12+ - cmake

13+ - cmake-extras

14+ - dbus-test-runner

15+ - debhelper

16+ - dh-apparmor

17+ - doxyqml

18+ - g++:native

19+ - gdb

20+ - graphviz

21+ - gsettings-ubuntu-schemas

22+ - libandroid-properties-dev

23+ - libconnectivity-qt1-dev

24+ - libevdev-dev

25+ - libgeonames-dev

26+ - libgl1-mesa-dev

27+ - libgl1-mesa-dri

28+ - libgles2-mesa-dev

29+ - libglib2.0-dev

30+ - libgnome-desktop-3-12

31+ - libgnome-desktop-3-dev

32+ - libgsettings-qt-dev

33+ - libhardware-dev

34+ - liblightdm-qt5-3-dev

35+ - libpam0g-dev

36+ - libpulse-dev

37+ - libqmenumodel-dev

38+ - libqt5sql5-sqlite

39+ - libqt5svg5-dev

40+ - libqt5xmlpatterns5-dev

41+ - libqtdbusmock1-dev

42+ - libqtdbustest1-dev

43+ - libsystemsettings-dev

44+ - libubuntu-app-launch2-dev

45+ - libubuntu-download-manager-common-dev

46+ - libubuntugestures5-dev

47+ - libubuntugestures5-private-dev

48+ - libudev-dev

49+ - libudm-common-dev

50+ - libunity-api-dev

51+ - libusermetricsoutput1-dev

52+ - libx11-dev

53+ - libxcb1-dev

54+ - libxi-dev

55+ - pkg-config

56+ - python3-all:any

57+ - python3-setuptools:native

58+ - qml-module-qt-labs-folderlistmodel

59+ - qml-module-qt-labs-settings

60+ - qml-module-qtmultimedia

61+ - qml-module-qtqml-statemachine

62+ - qml-module-qtquick-layouts

63+ - qml-module-qtquick-xmllistmodel

64+ - qml-module-qtquick2

65+ - qml-module-qtsysteminfo

66+ - qml-module-qttest

67+ - qml-module-ubuntu-components

68+ - qml-module-ubuntu-layouts

69+ - qml-module-ubuntu-settings-components

70+ - qml-module-ubuntu-test

71+ - qtbase5-dev

72+ - qtbase5-dev-tools

73+ - qtbase5-private-dev

74+ - qtdbustest-runner

75+ - qtdeclarative5-dev

76+ - qtdeclarative5-dev-tools

77+ - qtdeclarative5-private-dev

78+ - qtdeclarative5-ubuntu-content1

79+ - ttf-ubuntu-font-family

80+ - ubports-wallpapers

81+ - xvfb

82+dependencies_target:

83+ - android-headers

84+ - cmake

85+ - cmake-extras

86+ - dbus-test-runner

87+ - debhelper

88+ - dh-apparmor

89+ - doxyqml

90+ - g++:native

91+ - gdb

92+ - graphviz

93+ - gsettings-ubuntu-schemas

94+ - libandroid-properties-dev

95+ - libconnectivity-qt1-dev

96+ - libevdev-dev

97+ - libgeonames-dev

98+ - libgl1-mesa-dev

99+ - libgl1-mesa-dri

100+ - libgles2-mesa-dev

101+ - libglib2.0-dev

102+ - libgnome-desktop-3-12

103+ - libgnome-desktop-3-dev

104+ - libgsettings-qt-dev

105+ - libhardware-dev

106+ - liblightdm-qt5-3-dev

107+ - libpam0g-dev

108+ - libpulse-dev

109+ - libqmenumodel-dev

110+ - libqt5sql5-sqlite

111+ - libqt5svg5-dev

112+ - libqt5xmlpatterns5-dev

113+ - libqtdbusmock1-dev

114+ - libqtdbustest1-dev

115+ - libsystemsettings-dev

116+ - libubuntu-app-launch2-dev

117+ - libubuntu-download-manager-common-dev

118+ - libubuntugestures5-dev

119+ - libubuntugestures5-private-dev

120+ - libudev-dev

121+ - libudm-common-dev

122+ - libunity-api-dev

123+ - libusermetricsoutput1-dev

124+ - libx11-dev

125+ - libxcb1-dev

126+ - libxi-dev

127+ - pkg-config

128+ - python3-all:any

129+ - python3-setuptools:native

130+ - qml-module-qt-labs-folderlistmodel

131+ - qml-module-qt-labs-settings

132+ - qml-module-qtmultimedia

133+ - qml-module-qtqml-statemachine

134+ - qml-module-qtquick-layouts

135+ - qml-module-qtquick-xmllistmodel

136+ - qml-module-qtquick2

137+ - qml-module-qtsysteminfo

138+ - qml-module-qttest

139+ - qml-module-ubuntu-components

140+ - qml-module-ubuntu-layouts

141+ - qml-module-ubuntu-settings-components

142+ - qml-module-ubuntu-test

143+ - qtbase5-dev

144+ - qtbase5-dev-tools

145+ - qtbase5-private-dev

146+ - qtdbustest-runner

147+ - qtdeclarative5-dev

148+ - qtdeclarative5-dev-tools

149+ - qtdeclarative5-private-dev

150+ - qtdeclarative5-ubuntu-content1

151+ - ttf-ubuntu-font-family

152+ - ubports-wallpapers

153+ - xvfb

cmake/modules/QmlPlugins.cmakedeleted−150

@@ -1,150 +0,0 @@

1−# If you need to override the qmlplugindump binary, create the qmlplugin executable

2−# target before loading this plugin.

3−

4−if(NOT TARGET qmlplugindump)

5− find_program(qmlplugindump_exe qmlplugindump)

6−

7− if(NOT qmlplugindump_exe)

8− msg(FATAL_ERROR "Could not locate qmlplugindump.")

9− endif()

10−

11− add_executable(qmlplugindump IMPORTED)

12− set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})

13−endif()

14−

15−#

16−# A custom target for building the qmltypes files manually.

17−#

18−if (NOT TARGET qmltypes)

19− add_custom_target(qmltypes)

20−endif()

21−

22−# Creates a target for copying resource files into build dir and optionally installing them.

23−#

24−# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed

25−# into ${DESTINATION}/${path}.

26−#

27−# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.

28−#

29−# export_qmlfiles(plugin path

30−# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})

31−# [BINARY_DIR path]

32−# [DESTINATION path]

33−# [TARGET_PREFIX string] # Will be prefixed to the target name

34−# )

35−#

36−# Created target:

37−# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.

38−

39−macro(export_qmlfiles PLUGIN PATH)

40− set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)

41− cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})

42−

43− if(NOT QMLFILES_SEARCH_PATH)

44− set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})

45− endif()

46−

47− if(QMLFILES_BINARY_DIR)

48− set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})

49− else()

50− set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})

51− endif()

52−

53− file(GLOB QMLFILES

54− ${QMLFILES_SEARCH_PATH}/*.qml

55− ${QMLFILES_SEARCH_PATH}/*.js

56− ${QMLFILES_SEARCH_PATH}/*.jpg

57− ${QMLFILES_SEARCH_PATH}/*.png

58− ${QMLFILES_SEARCH_PATH}/*.sci

59− ${QMLFILES_SEARCH_PATH}/*.svg

60− ${QMLFILES_SEARCH_PATH}/*.qmltypes

61− ${QMLFILES_SEARCH_PATH}/qmldir

62− )

63−

64− execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})

65−

66− # copy the files

67− add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL

68− COMMAND cp ${QMLFILES} ${qmlfiles_dir}

69− DEPENDS ${QMLFILES}

70− SOURCES ${QMLFILES}

71− )

72−

73− if(QMLFILES_DESTINATION)

74− # install the qmlfiles file.

75− install(FILES ${QMLFILES}

76− DESTINATION ${QMLFILES_DESTINATION}/${PATH}

77− )

78− endif()

79−endmacro()

80−

81−

82−# Creates a target for generating the typeinfo file for a QML plugin and/or installs the plugin

83−# targets.

84−#

85−# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed

86−# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source

87−# path ends with ${path}.

88−#

89−# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.

90−#

91−# export_qmlplugin(plugin version path

92−# [BINARY_DIR path]

93−# [DESTINATION path]

94−# [TARGET_PREFIX string] # Will be prefixed to the target name

95−# [ENVIRONMENT string] # Will be added to qmlplugindump's env

96−# [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)

97−# [NO_TYPES] # Do not create the qmltypes target

98−# )

99−#

100−# Created target:

101−# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the source dir.

102−# It will be made a dependency of the "qmltypes" target.

103−

104−macro(export_qmlplugin PLUGIN VERSION PATH)

105− set(options NO_TYPES)

106− set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)

107− set(multi TARGETS)

108− cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})

109−

110− get_target_property(qmlplugindump_executable qmlplugindump LOCATION)

111−

112− if(QMLPLUGIN_BINARY_DIR)

113− set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})

114− else()

115− # Find import path to point qmlplugindump at

116− string(REGEX REPLACE "/${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")

117− set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})

118− endif()

119−

120− if(NOT QMLPLUGIN_NO_TYPES)

121− # Relative path for the module

122− string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")

123−

124− # Find the last segment of the plugin name to use as qmltypes basename

125− string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})

126− set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})

127− set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)

128−

129− add_custom_target(${target_prefix}-qmltypes

130− COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable

131− ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}

132− WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

133− )

134− add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})

135− add_dependencies(qmltypes ${target_prefix}-qmltypes)

136− endif()

137−

138− set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES

139− ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}

140− LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}

141− RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}

142− )

143−

144− if (QMLPLUGIN_DESTINATION)

145− # Install additional targets

146− install(TARGETS ${QMLPLUGIN_TARGETS}

147− DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}

148− )

149− endif()

150−endmacro()

cmake/modules/QmlTest.cmake+451−175

@@ -1,213 +1,489 @@

1−# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS]

1+# If you need to override the qmlscene or qmltestrunner executables,

2−# [TARGETS target1 [target2 [...]]]

2+# create the corresponding executable target.

3−# [IMPORT_PATHS import_path1 [import_path2 [...]]

3+

4−# [PROPERTIES prop1 value1 [prop2 value2 [...]]])

4+# These functions respect the global STDOUT_LOGGER and ARTIFACTS_DIR variables.

5+

6+# You can use those with cmake_parse_arguments

7+# if you need to wrap and mangle arguments.

8+set(QMLTEST_OPTIONS ADD_TEST CACHE INTERNAL "")

9+set(QMLTEST_SINGLE ITERATIONS ARG_PREFIX CACHE INTERNAL "")

10+set(QMLTEST_MULTI ARGS ENVIRONMENT DEPENDS IMPORT_PATHS TARGETS CACHE INTERNAL "")

11+

12+# import_executables(name1 [name2 [...]]

13+# [OPTIONAL] # continue when not found

14+# )

5#

15#

6−# NO_ADD_TEST will prevent adding the test to the "test" target

16+# This will find the named executables and import them

7−# NO_TARGETS will prevent adding the test to any targets

17+# to an imported target of the same name.

8−# TARGETS lists the targets the test should be added to

18+

9−# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments

19+function(import_executables)

10−# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()

20+ cmake_parse_arguments(QMLTEST "OPTIONAL" "" "" ${ARGN})

21+

22+ foreach(NAME ${QMLTEST_UNPARSED_ARGUMENTS})

23+ if(NOT TARGET ${NAME})

24+ add_executable(${NAME} IMPORTED GLOBAL)

25+ find_program(${NAME}_exe ${NAME})

26+

27+ if(NOT QMLTEST_OPTIONAL AND NOT ${NAME}_exe)

28+ message(FATAL_ERROR "Could not locate ${NAME}.")

29+ elseif(NOT ${NAME}_exe)

30+ message(STATUS "Could not locate ${NAME}, skipping.")

31+ else()

32+ set_target_properties(${NAME} PROPERTIES IMPORTED_LOCATION ${${NAME}_exe})

33+ endif()

34+ endif()

35+ endforeach()

36+endfunction()

37+

38+

39+# add_qml_test(path component_name

40+# [...]

41+# )

11#

42#

12−# Two targets will be created:

43+# Add test targets for ${component_name} under ${path}. It's assumed

13−# - testComponentName - Runs the test with qmltestrunner

44+# that the test file is named ${path}/tst_${component_name}.qml.

14−# - tryComponentName - Runs the test with uqmlscene, for manual interaction

15−# - gdbtestComponentName - Runs the test with qmltestrunner under gdb

16#

45#

17−# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:

46+# This function wraps add_manual_qml_test and add_qml_unittest,

18−# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)

47+# see below for available arguments.

19−# qmltest_DEFAULT_TARGETS

20−# qmltest_DEFAULT_IMPORT_PATHS

21−# qmltest_DEFAULT_PROPERTIES

22−

23−find_program(qmltestrunner_exe qmltestrunner)

24

48

25−if(NOT qmltestrunner_exe)

49+function(add_qml_test PATH COMPONENT_NAME)

26− msg(FATAL_ERROR "Could not locate qmltestrunner.")

50+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

27−endif()

51+ mangle_arguments()

28

52

29−set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)

53+ add_qml_unittest(${ARGV})

54+ add_manual_qml_test(${ARGV})

55+endfunction()

30

56

31−set(test_env UNITY_TESTING=1)

32

57

33−macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

58+# add_qml_test_data(path component_name

34− set(options NO_ADD_TEST NO_TARGETS)

59+# [...]

35− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

60+# )

61+#

62+# Install file called ${component_name} (or ${component_name}.qml) under

63+# ${path}.

64+

65+function(add_qml_test_data PATH COMPONENT_NAME)

66+ cmake_parse_arguments(TEST "" "DESTINATION" "" ${ARGN})

67+

68+ set(filename "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/${COMPONENT_NAME}")

69+

70+ if (IS_DIRECTORY "${filename}")

71+ # As a convenience, allow specifying a directory and we will install

72+ # all files in the dir. We do it this way rather than passing

73+ # DIRECTORY to install() because we want to process any qml files.

74+ file(GLOB subfiles RELATIVE "${filename}" "${filename}/*")

75+ foreach(subfile ${subfiles})

76+ add_qml_test_data("${PATH}/${COMPONENT_NAME}" "${subfile}")

77+ endforeach()

78+ return()

79+ endif()

36

80

37− cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})

81+ if (NOT EXISTS "${filename}")

38− cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})

82+ set(filename "${filename}.qml")

83+ set(COMPONENT_NAME "${COMPONENT_NAME}.qml")

84+ endif()

39

85

40− set(qmlscene_TARGET try${COMPONENT_NAME})

86+ if ("${filename}" MATCHES "\\.qml$")

41− set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})

87+ file(READ "${filename}" contents)

88+ string(REGEX REPLACE "(\"[./]*)/qml(/|\")" "\\1\\2" contents "${contents}")

89+ # this is for (at least) cardcreatortest which pulls in an architecture-specific

90+ # import into the plugins directory (which is a 'qml' once installed).

91+ string(REGEX REPLACE "(import \"[./]*)/plugins(/|\")" "\\1/qml\\2" contents "${contents}")

92+ set(filename "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${COMPONENT_NAME}")

93+ file(WRITE "${filename}" "${contents}")

94+ endif()

42

95

43− set(qmlscene_imports "")

96+ if (TEST_DESTINATION)

44− if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")

97+ set(DESTINATION "${TEST_DESTINATION}")

45− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

98+ else()

46− list(APPEND qmlscene_imports "-I")

99+ file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")

47− list(APPEND qmlscene_imports ${IMPORT_PATH})

100+ set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")

48− endforeach(IMPORT_PATH)

49− elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")

50− foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})

51− list(APPEND qmlscene_imports "-I")

52− list(APPEND qmlscene_imports ${IMPORT_PATH})

53− endforeach(IMPORT_PATH)

54 endif()

101 endif()

55

102

56− if("${qmltest_ENVIRONMENT}" STREQUAL "")

103+ install(FILES "${filename}" DESTINATION "${DESTINATION}")

57− set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")

104+endfunction()

105+

106+

107+# add_qml_unittest(path component_name

108+# [...]

109+# )

110+#

111+# Add test targets for ${component_name} under ${path}. It's assumed

112+# that the test file is named ${path}/tst_${component_name}.qml.

113+#

114+# This function wraps add_executable_test, see below for available arguments.

115+

116+function(add_qml_unittest PATH COMPONENT_NAME)

117+ import_executables(qmltestrunner)

118+

119+ add_executable_test(${COMPONENT_NAME} qmltestrunner

120+ ${ARGN}

121+ ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}

122+ )

123+

124+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")

125+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")

58 endif()

126 endif()

127+endfunction()

128+

129+

130+# add_manual_qml_test(path component_name

131+# [...]

132+# )

133+#

134+# Add manual test targets for ${component_name} under ${path}. It's assumed

135+# that the test file is named ${path}/tst_${component_name}.qml.

136+#

137+# This function wraps add_manual_test, see below for available arguments.

138+

139+function(add_manual_qml_test PATH COMPONENT_NAME)

140+ import_executables(qmlscene)

141+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

59

142

60− set(qmlscene_command

143+ add_manual_test(${COMPONENT_NAME} qmlscene

61− env ${test_env} ${qmltest_ENVIRONMENT}

144+ ${ARGN}

62− ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml

145+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}

63− ${qmlscene_imports}

64 )

146 )

65− add_custom_target(${qmlscene_TARGET} ${qmlscene_command})

66

147

148+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")

149+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")

150+ endif()

151+endfunction()

152+

153+

154+# add_executable_test(target component_name

67−endmacro(add_manual_qml_test)

155+# [...] # see doc for add_manual_qml_test for common arguments

156+# [ADD_TEST] # whether to add to the "test" target

157+# [ARG_PREFIX arg_prefix] # prefix logging arguments with this string

158+# [ARGS] arg1 [arg2 [...]] # pass these arguments to the test executable

159+# [TARGETS target1 [target2 [...]]] # make the listed targets depend on this test

160+# # if a corresponding xvfbtarget1, xvfbtarget2 etc. exists,

161+# # this test running under xvfb will be added as a dependency

162+# # of those targets

163+# [ITERATIONS count] # run this test as a benchmark for ${count} iterations

164+# )

165+#

166+# Logging options in the standard form of "-o filename,format"

167+# will be appended to the arguments list, prefixed with ARG_PREFIX.

168+# XUnitXML files will be stored in current binary dir.

169+#

170+# Three targets will be created:

171+# - test${component_name} - Runs the test

172+# - xvfbtest${component_name} - Runs the test under xvfb

173+# - gdbtest${component_name} - Runs the test under gdb

174+

175+function(add_executable_test COMPONENT_NAME TARGET)

176+ import_executables(gdb xvfb-run OPTIONAL)

68

177

69−macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)

178+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

70− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})

179+ mangle_arguments()

71−endmacro(add_qml_benchmark)

72

180

73−macro(add_qml_test SUBPATH COMPONENT_NAME)

181+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

74− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})

182+ set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)

75−endmacro(add_qml_test)

76

183

77−macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)

184+ bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})

78− set(options NO_ADD_TEST NO_TARGETS)

79− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

80

185

81− cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})

186+ set(qmltest_command

82− cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})

187+ $<TARGET_FILE:${TARGET}>

188+ ${QMLTEST_ARGS}

189+ ${args}

190+ )

83

191

84− set(qmltest_TARGET test${COMPONENT_NAME})

192+ add_qmltest_target(test${COMPONENT_NAME} ${TARGET}

85− set(qmltest_gdb_TARGET gdbtest${COMPONENT_NAME})

193+ COMMAND ${qmltest_command}

86− set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})

194+ ${depends}

87− set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})

195+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

196+ ${add_test}

197+ ${targets}

198+ )

88

199

89− set(qmltestrunner_imports "")

200+ if(TARGET xvfb-run)

90− if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")

201+ add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}

91− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

202+ COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}

92− list(APPEND qmltestrunner_imports "-import")

203+ ${depends}

93− list(APPEND qmltestrunner_imports ${IMPORT_PATH})

204+ ENVIRONMENT QT_QPA_PLATFORM=xcb QML2_IMPORT_PATH=${imports} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1 ${QMLTEST_ENVIRONMENT}

94− endforeach(IMPORT_PATH)

205+ TARGETS ${xvfb_targets}

95− elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")

206+ )

96− foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})

97− list(APPEND qmltestrunner_imports "-import")

98− list(APPEND qmltestrunner_imports ${IMPORT_PATH})

99− endforeach(IMPORT_PATH)

100 endif()

207 endif()

101

208

102− string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)

209+ if(TARGET gdb)

103− if(cmake_generator_lower STREQUAL "unix makefiles")

210+ add_qmltest_target(gdbtest${COMPONENT_NAME} ${TARGET}

104− set(function_ARGS $(FUNCTION))

211+ COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltest_command}

105− else()

212+ ${depends}

106− set(function_ARGS "")

213+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

214+ )

107 endif()

215 endif()

216+endfunction()

108

217

109− if (${ITERATIONS} GREATER 0)

218+

110− set(ITERATIONS_STRING "-iterations" ${ITERATIONS})

219+# add_manual_test(target component_name

111− else()

220+# [DEPENDS target1 [target2 [...]]] # make this test depend on the specified targets

112− set(ITERATIONS_STRING "")

221+# [IMPORT_PATHS import_path1 [import_path2 [...]] # use these QML import paths

222+# # (they're searched first to last)

223+# [ENVIRONMENT var1=value1 [var2=value2 [...]]] # set these environment variables

224+# )

225+#

226+# Two targets will be created:

227+# - try${component_name} - Runs the test for manual interaction

228+# - gdbtry${component_name} - Runs the test under gdb

229+

230+function(add_manual_test COMPONENT_NAME TARGET)

231+ import_executables(gdb OPTIONAL)

232+

233+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

234+ mangle_arguments()

235+

236+ bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768,3800)

237+

238+ set(qmltry_command

239+ $<TARGET_FILE:${TARGET}>

240+ ${QMLTEST_ARGS}

241+ ${args}

242+ )

243+

244+ add_qmltest_target(try${COMPONENT_NAME} ${TARGET}

245+ COMMAND ${qmltry_command}

246+ ${depends}

247+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

248+ )

249+

250+ if(TARGET gdb)

251+ add_qmltest_target(gdbtry${COMPONENT_NAME} ${TARGET}

252+ COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltry_command}

253+ ${depends}

254+ ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

255+ )

113 endif()

256 endif()

257+endfunction()

258+

259+

260+# add_meta_test(target)

261+#

262+# Adds a test target that will run one of our "meta" test targets, like

263+# xvfbuitests. This script will run the specified suite of tests on an

264+# installed system.

265+

266+function(add_meta_test TARGET_NAME)

267+ cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})

114

268

115− if("${qmltest_ENVIRONMENT}" STREQUAL "")

269+ add_custom_target(${TARGET_NAME})

116− set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")

270+

271+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

272+ if(TEST_SERIAL)

273+ file(WRITE "${filename}" "#!/bin/sh\n\n")

274+ else()

275+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")

117 endif()

276 endif()

118

277

119− set(qmltest_command

278+ add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})

120− env ${test_env} ${qmltest_ENVIRONMENT}

279+ # else we will write the rest of the script as we add cmake targets

121− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml

280+

122− ${qmltestrunner_imports}

281+ install(FILES "${filename}"

123− ${ITERATIONS_STRING}

282+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

124− -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml

283+ GROUP_EXECUTE GROUP_READ

125− -o -,txt

284+ WORLD_EXECUTE WORLD_READ

126− ${function_ARGS}

285+ DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"

127 )

286 )

128− find_program(DPKG dpkg-architecture)

287+endfunction()

129− if(DPKG)

288+

130− exec_program(${DPKG} ARGS "-qDEB_BUILD_MULTIARCH" OUTPUT_VARIABLE ARCH_TRIPLET )

289+

131− set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")

290+################### INTERNAL ####################

132− endif()

291+

133− set(qmltest_xvfb_command

292+function(install_test_script TARGET_NAME)

134− env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}

293+ cmake_parse_arguments(TEST "" "" "COMMAND;ENVIRONMENT" ${ARGN})

135− xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum

294+

136− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml

295+ # Now write the above test into a shell script that we can run on an

137− ${qmltestrunner_imports}

296+ # installed system.

138− -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml

297+ set(script "#!/bin/sh\n\nset -x\n\n")

139− -o -,txt

298+ foreach(ONE_ENV ${TEST_ENVIRONMENT})

140− ${function_ARGS}

299+ set(script "${script}export ${ONE_ENV}\n")

300+ endforeach()

301+ set(script "${script}export UNITY_TESTING_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}\"\n")

302+ set(script "${script}export UNITY_TESTING_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\"\n")

303+ set(script "${script}\n")

304+ set(script "${script}XML_ARGS=\n")

305+ set(script "${script}if [ -n \"\$ARTIFACTS_DIR\" ]; then\n")

306+ set(script "${script} XML_ARGS=\"@XML_ARGS@\"\n")

307+ set(script "${script} mkdir -p \"@XML_DIR@\"\n")

308+ set(script "${script} touch \"@XML_FILE@\"\n")

309+ set(script "${script}fi\n")

310+ set(script "${script}\n")

311+ foreach(ONE_CMD ${TEST_COMMAND})

312+ set(script "${script}'${ONE_CMD}' ")

313+ endforeach()

314+ set(script "${script}\"\$@\"") # Allow passing arguments if desired

315+

316+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

317+

318+ # Generate script to file then read it back to resolve any generator

319+ # expressions before we try to replace paths.

320+ file(GENERATE

321+ OUTPUT "${filename}"

322+ CONTENT "${script}"

141 )

323 )

142

324

143− set(qmltest_gdb_command

325+ # Do replacement at install time to save needless work and to make sure

144− env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}

326+ # we are modifying file after generate step above (which doesn't happen

145− gdb -e ${qmltestrunner_exe} -ex \"run -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml ${qmltestrunner_imports} ${ITERATIONS_STRING}\"

327+ # immediately). We can't use a custom-defined function or macro here...

328+ # So instead we use a giant ugly code block.

329+

330+ # START OF CODE BLOCK --------------------------------------------------

331+ install(CODE "

332+ file(READ \"${filename}\" replacestr)

333+

334+ # Now some replacements...

335+ # tests like to write xml output to our builddir; we don't need that, but we do want them in ARTIFACTS_DIR

336+ string(REGEX MATCH \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" xmlargs \"\${replacestr}\")

337+ string(REGEX REPLACE \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" \" \\\$XML_ARGS \" replacestr \"\${replacestr}\")

338+ string(REGEX REPLACE \"'[^']*/tests/\" \"'\\\$ARTIFACTS_DIR/tests/\" xmlargs \"\${xmlargs}\")

339+ string(REGEX REPLACE \".*'([^']*),xunitxml'.*\" \"\\\\1\" xmlfile \"\${xmlargs}\")

340+ string(REGEX REPLACE \"(.*)/[^/]*\" \"\\\\1\" xmldir \"\${xmlfile}\")

341+ string(REGEX REPLACE \"'\" \"\" xmlargs \"\${xmlargs}\") # strip single quotes

342+ string(REGEX REPLACE \"@XML_ARGS@\" \"\${xmlargs}\" replacestr \"\${replacestr}\")

343+ string(REGEX REPLACE \"@XML_DIR@\" \"\${xmldir}\" replacestr \"\${replacestr}\")

344+ string(REGEX REPLACE \"@XML_FILE@\" \"\${xmlfile}\" replacestr \"\${replacestr}\")

345+ # replace build/source roots with their install paths

346+ string(REPLACE \"${CMAKE_BINARY_DIR}/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")

347+ string(REPLACE \"${CMAKE_BINARY_DIR}/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}\" replacestr \"\${replacestr}\")

348+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/libs\" replacestr \"\${replacestr}\")

349+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/mocks\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks\" replacestr \"\${replacestr}\")

350+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/plugins\" replacestr \"\${replacestr}\")

351+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/qmltests\" replacestr \"\${replacestr}\")

352+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/uqmlscene\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")

353+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/utils/modules\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/utils\" replacestr \"\${replacestr}\")

354+ string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/plugins\" replacestr \"\${replacestr}\")

355+ string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/qmltests\" replacestr \"\${replacestr}\")

356+

357+ file(WRITE \"${filename}\" \"\${replacestr}\")

358+ ")

359+ # END OF CODE BLOCK --------------------------------------------------

360+

361+ install(FILES "${filename}"

362+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

363+ GROUP_EXECUTE GROUP_READ

364+ WORLD_EXECUTE WORLD_READ

365+ DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"

146 )

366 )

367+endfunction()

368+

369+function(add_meta_dependencies UPSTREAM_TARGET)

370+ cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})

371+

372+ foreach(depend ${TEST_DEPENDS})

373+ add_dependencies(${UPSTREAM_TARGET} ${depend})

147

374

148− add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})

375+ # add depend to the meta test script that we will install on system

149− add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)

376+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")

150− add_qmltest_target(${qmltest_gdb_TARGET} "${qmltest_gdb_command}" TRUE TRUE)

377+ if (EXISTS "${filename}")

151− add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})

378+ file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh \"\$@\" 2>&1\n")

152−endmacro(add_qml_test_internal)

153−

154−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155− set(testCommand

156− LD_LIBRARY_PATH=${LD_PATH}

157− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

158− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

159− -o -,txt)

160−

161− add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)

162− add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})

163−

164− find_program( HAVE_GCC gcc )

165− if (NOT ${HAVE_GCC} STREQUAL "")

166− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )

167− set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")

168− endif()

169− set(xvfbtestCommand

170− ${LD_PRELOAD_PATH}

171− ${ENVVAR}

172− LD_LIBRARY_PATH=${LD_PATH}

173− xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum

174− ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

175− -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

176− -o -,txt)

177−

178− add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)

179− add_dependencies(qmluitests xvfbtest${CLASS_NAME})

180−endmacro(add_binary_qml_test)

181−

182−macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

183− add_custom_target(${qmltest_TARGET} ${qmltest_command})

184−

185− if(NOT "${qmltest_PROPERTIES}" STREQUAL "")

186− set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})

187− elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")

188− set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})

189− endif()

190−

191− if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")

192− add_test(${qmltest_TARGET} ${qmltest_command})

193−

194− if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")

195− set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})

196− elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")

197− set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})

198 endif()

379 endif()

199− endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")

380+ endforeach()

200−

381+endfunction()

201− if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")

382+

202− if(NOT "${qmltest_TARGETS}" STREQUAL "")

383+# add_qmltest_target(target_name target

203− foreach(TARGET ${qmltest_TARGETS})

384+# COMMAND test_exe [arg1 [...]] # execute this test with arguments

204− add_dependencies(${TARGET} ${qmltest_TARGET})

385+# [...] # see above for available arguments:

205− endforeach(TARGET)

386+# # ADD_TEST, ENVIRONMENT, DEPENDS and TARGETS

206− elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")

387+# )

207− foreach(TARGET ${qmltest_DEFAULT_TARGETS})

388+

208− add_dependencies(${TARGET} ${qmltest_TARGET})

389+function(add_qmltest_target TARGET_NAME TARGET)

209− endforeach(TARGET)

390+ cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "COMMAND;${QMLTEST_MULTI}" ${ARGN})

391+ mangle_arguments()

392+

393+ # Additional arguments

394+ string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)

395+ if(cmake_generator_lower STREQUAL "unix makefiles")

396+ set(function "$(FUNCTION)")

397+ endif()

398+

399+ add_custom_target(${TARGET_NAME}

400+ env ${QMLTEST_ENVIRONMENT}

401+ ${QMLTEST_COMMAND} ${function}

402+ DEPENDS ${TARGET} ${QMLTEST_DEPENDS}

403+ )

404+

405+ install_test_script(${TARGET_NAME}

406+ ENVIRONMENT ${QMLTEST_ENVIRONMENT}

407+ COMMAND ${QMLTEST_COMMAND}

408+ )

409+

410+ if(QMLTEST_ADD_TEST)

411+ add_test(

412+ NAME ${TARGET_NAME}

413+ COMMAND ${QMLTEST_COMMAND}

414+ )

415+

416+ foreach(ENV ${QMLTEST_ENVIRONMENT})

417+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY ENVIRONMENT ${ENV})

418+ endforeach()

419+

420+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${TARGET})

421+ foreach(DEPEND ${DEPENDS})

422+ set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${DEPEND})

423+ endforeach()

424+ endif()

425+

426+ foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})

427+ add_meta_dependencies(${UPSTREAM_TARGET} DEPENDS ${TARGET_NAME})

428+ endforeach()

429+endfunction()

430+

431+

432+# mangle_arguments(${ARGN})

433+#

434+# Verify there were no unparsed arguments and

435+# mangle the known ones for further processing.

436+

437+macro(mangle_arguments)

438+ if(QMLTEST_UNPARSED_ARGUMENTS)

439+ message(FATAL_ERROR "Unexpected arguments: ${QMLTEST_UNPARSED_ARGUMENTS}")

440+ endif()

441+

442+ if(QMLTEST_ADD_TEST)

443+ set(add_test ADD_TEST)

444+ endif()

445+

446+ if(QMLTEST_IMPORT_PATHS)

447+ string(REPLACE ";" ":" imports "${QMLTEST_IMPORT_PATHS}")

448+ endif()

449+

450+ if(QMLTEST_ITERATIONS)

451+ set(iterations -iterations ${QMLTEST_ITERATIONS})

452+ endif()

453+

454+ if(QMLTEST_DEPENDS)

455+ set(depends DEPENDS ${QMLTEST_DEPENDS})

456+ endif()

457+

458+ if(QMLTEST_TARGETS)

459+ set(targets TARGETS ${QMLTEST_TARGETS})

460+ endif()

461+

462+ set(xvfb_targets "")

463+ foreach(target ${QMLTEST_TARGETS})

464+ if(TARGET xvfb${target})

465+ list(APPEND xvfb_targets xvfb${target})

210 endif()

466 endif()

211− endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")

467+ endforeach()

468+ set(xvfb_targets "${xvfb_targets}" PARENT_SCOPE)

469+endmacro()

470+

212

471

213−endmacro(add_qmltest_target)

472+# bake_arguments(prefix output

473+# arg1 [arg2 [...]]

474+# )

475+#

476+# If set, add the argument prefix before every passed

477+# argument and store the result in ${OUTPUT} variable.

478+

479+function(bake_arguments PREFIX OUTPUT)

480+ set(args "${ARGN}")

481+ if(PREFIX)

482+ set(args "")

483+ foreach(arg ${ARGN})

484+ list(APPEND args ${PREFIX})

485+ list(APPEND args ${arg})

486+ endforeach()

487+ endif()

488+ set(${OUTPUT} "${args}" PARENT_SCOPE)

489+endfunction()

cmake/modules/autopilot.cmake−8

@@ -13,12 +13,4 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

13

13

14 add_dependencies(autopilot autopilot-${TEST_NAME})

14 add_dependencies(autopilot autopilot-${TEST_NAME})

15

15

16− add_custom_target(autopilot2-${TEST_NAME}

17− COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}

18− WORKING_DIRECTORY ${WORKING_DIR}

19− DEPENDS fake_install

20− )

21−

22− add_dependencies(autopilot autopilot2-${TEST_NAME})

23−

24endfunction()

16endfunction()

data/51-unity8-greeter.confnew file+2

@@ -0,0 +1,2 @@

1+[Seat:*]

2+greeter-session=unity8-greeter

data/CMakeLists.txt+18−4

@@ -1,13 +1,27 @@

1# generate desktop files

1# generate desktop files

2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

3−configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

3+configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

4+configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)

4

5

5# install desktop files

6# install desktop files

6install(FILES

7install(FILES

7 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

8 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

8− ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop

9+ ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop

9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

10 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

10 )

11 )

11

12

12−# install url dispatcher files

13+install(FILES

13−install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)

14+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop

15+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters

16+ )

17+

18+install(FILES

19+ 51-unity8-greeter.conf

20+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d

21+ )

22+

23+add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)

24+

25+install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

26+install(FILES com.canonical.Unity.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

27+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)

data/com.canonical.Unity.gschema.xmlnew file+255

@@ -0,0 +1,255 @@

1+<schemalist>

2+ <enum id="form-factor-enum">

3+ <value nick="Automatic" value="0" />

4+ <value nick="Desktop" value="1" />

5+ <value nick="Netbook" value="2" />

6+ <value nick="TV" value="3" />

7+ </enum>

8+ <enum id="home-expanded-enum">

9+ <value nick="Not Expanded" value="0" />

10+ <value nick="Expanded" value="1" />

11+ </enum>

12+ <enum id="launcher-position-enum">

13+ <value nick="Left" value="0" />

14+ <value nick="Bottom" value="1" />

15+ </enum>

16+ <enum id="desktop-type-enum">

17+ <value nick="Ubuntu" value="0" />

18+ <value nick="UbuntuKylin" value="1" />

19+ </enum>

20+

21+ <schema path="/com/canonical/unity/" id="com.canonical.Unity" gettext-domain="unity">

22+ <key enum="form-factor-enum" name="form-factor">

23+ <default>"Automatic"</default>

24+ <summary>The form factor Unity should target.</summary>

25+ <description>The form factor chosen will affect the size and appearance of the Dash, Launcher and also the Window Management behaviour.</description>

26+ </key>

27+ <key enum="home-expanded-enum" name="home-expanded">

28+ <default>"Expanded"</default>

29+ <summary>Whether the home screen should be expanded.</summary>

30+ <description>Whether the home screen should be expanded.</description>

31+ </key>

32+ <key enum="desktop-type-enum" name="desktop-type">

33+ <default>"Ubuntu"</default>

34+ <summary>The current desktop name.</summary>

35+ <description>The current desktop name.</description>

36+ </key>

37+ <key type="i" name="minimize-count">

38+ <default>0</default>

39+ <summary>Number of times a normal window has been minimized.</summary>

40+ <description>This is used to adjust the animation speed by making it progressively faster the more it is used.</description>

41+ </key>

42+ <key type="i" name="minimize-fast-duration">

43+ <default>300</default>

44+ <summary>The duration for the minimize animation when it is at its fastest setting.</summary>

45+ <description>This is the duration that the minimize animation will have when it has been used more than an number of times equal minimize-speed-threshold.</description>

46+ </key>

47+ <key type="i" name="minimize-slow-duration">

48+ <default>800</default>

49+ <summary>The duration for the minimize animation when it is at its slowest setting.</summary>

50+ <description>This is the duration that the minimize animation will have when it has never been used.</description>

51+ </key>

52+ <key type="i" name="minimize-speed-threshold">

53+ <default>100</default>

54+ <summary>The number of minimizations required to reach maximum speed.</summary>

55+ <description>The speed of the minimize animation will progressively get faster as minimize-count approaches this value.</description>

56+ </key>

57+ <key type="b" name="double-click-activate">

58+ <default>true</default>

59+ <summary>Enable/Disable dash result double-click activation.</summary>

60+ <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>

61+ </key>

62+ <key type="b" name="integrated-menus">

63+ <default>false</default>

64+ <summary>Enable/Disable the integrated menus in Unity.</summary>

65+ <description>When this is enabled, the application menus will be shown

66+ on the window decoration, otherwise they will be always shown on the

67+ unity top panel</description>

68+ </key>

69+ <key type="u" name="show-menus-now-delay">

70+ <default>180</default>

71+ <range min="0" max="5000"/>

72+ <summary>Delay (in ms) before showing the menus when pressing Alt</summary>

73+ <description>This allows tune the delay before presenting unity menus

74+ (in non always-show-menus mode).</description>

75+ </key>

76+ <key type="b" name="always-show-menus">

77+ <default>false</default>

78+ <summary>Toggle the menu visibility based on mouse hovering.</summary>

79+ <description>When this is enabled, the application menus will be always

80+ shown (on the window decoration or in the unity panel, depending whether

81+ integrated menus are enabled), otherwise they will be shown only when

82+ the mouse cursor is over the relative mouse area.</description>

83+ </key>

84+ <key type="as" name="whitelist-repeated-keys">

85+ <default>[

86+ 'XF86KbdBrightnessUp',

87+ 'XF86KbdBrightnessDown',

88+ 'XF86MonBrightnessUp',

89+ 'XF86MonBrightnessDown',

90+ 'XF86AudioRaiseVolume',

91+ 'XF86AudioLowerVolume'

92+ ]</default>

93+ <summary>List of keycodes that should be processed even if auto-repated.</summary>

94+ <description>These keycodes are processed even if they are auto-repeated.</description>

95+ </key>

96+ <key type="b" name="pam-check-account-type">

97+ <default>false</default>

98+ <summary>Enable/Disable PAM account checking</summary>

99+ <description>Whether PAM should check the result of account modules

100+ when authenticating. Only do this if you have account

101+ configured properly on your system.</description>

102+ </key>

103+ <key type="b" name="lowgfx">

104+ <default>false</default>

105+ <summary>Enable/Disable Low Graphics Mode</summary>

106+ <description>Whether Unity runs in Low Graphics Mode.</description>

107+ </key>

108+ </schema>

109+ <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">

110+ <key type="d" name="text-scale-factor">

111+ <default>1.0</default>

112+ <range min="0.5" max="3.0"/>

113+ <summary>Font scaling for unity and applications.</summary>

114+ <description>This value defines the global font scaling used by both

115+ unity and applications. It will match the current system font scaling.</description>

116+ </key>

117+ <key type="d" name="cursor-scale-factor">

118+ <default>1.0</default>

119+ <range min="0.5" max="3.0"/>

120+ <summary>Mouse cursor scaling.</summary>

121+ <description>This value defines the global mouse cursor scaling used by both

122+ unity and applications. Changing this value allows to use a custom scaling

123+ for the mouse cursor.</description>

124+ </key>

125+ <key type="s" name="app-scale-factor-monitor">

126+ <default>''</default>

127+ <summary>The name of the monitor that controls the global app scaling factor.</summary>

128+ <description>This value defines the monitor that unity will use (if found) as reference

129+ for scaling all the applications.</description>

130+ </key>

131+ <key type="b" name="app-fallback-to-maximum-scale-factor">

132+ <default>true</default>

133+ <summary>Use the maximum per-monitor scale-factor as application scale factor if no target monitor is found.</summary>

134+ <description>When this is enabled, the applications scale factor will match

135+ the scale factor of the monitor with the greater value, in case the monitor

136+ defined in 'app-scale-factor-monitor' is not provided or available.</description>

137+ </key>

138+ </schema>

139+ <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">

140+ <key type="as" name="favorites">

141+ <default>[

142+ 'application://ubiquity.desktop',

143+ 'application://org.gnome.Nautilus.desktop',

144+ 'application://firefox.desktop',

145+ 'application://libreoffice-writer.desktop',

146+ 'application://libreoffice-calc.desktop',

147+ 'application://libreoffice-impress.desktop',

148+ 'application://org.gnome.Software.desktop',

149+ 'application://ubuntu-amazon-default.desktop',

150+ 'application://unity-control-center.desktop',

151+ 'unity://running-apps',

152+ 'unity://expo-icon',

153+ 'unity://devices'

154+ ]</default>

155+ <summary>List of items that should be shown by default in the launcher</summary>

156+ <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description>

157+ </key>

158+ <key type="as" name="items">

159+ <default>[

160+ 'application:///dialer-app.desktop',

161+ 'application:///messaging-app.desktop',

162+ 'application:///address-book-app.desktop',

163+ 'application:///ubuntu-system-settings.desktop',

164+ 'appid://openstore.openstore-team/openstore/current-user-version',

165+ 'appid://com.ubuntu.camera/camera/current-user-version',

166+ 'appid://com.ubuntu.gallery/gallery/current-user-version',

167+ 'application:///morph-browser.desktop'

168+ ]</default>

169+ <summary>List of items that should be shown by default in the launcher</summary>

170+ <description>These items can be: application:///desktop-id.desktop or appid://package/app/current-user-version.</description>

171+ </key>

172+ <key type="s" name="favorite-migration">

173+ <default>''</default>

174+ <summary>Version of last migration done</summary>

175+ <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description>

176+ </key>

177+ <key enum="launcher-position-enum" name="launcher-position">

178+ <default>"Left"</default>

179+ <summary>The position of launcher.</summary>

180+ <description>The position of launcher.</description>

181+ </key>

182+ </schema>

183+ <schema path="/com/canonical/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">

184+ <key type="as" name="blacklist">

185+ <default>[]</default>

186+ <summary>List of device uuid blacklist from the launcher.</summary>

187+ <description>These devices are not shown in the launcher by default.</description>

188+ </key>

189+ </schema>

190+ <schema path="/com/canonical/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">

191+ <key type="as" name="scopes">

192+ <default>[ 'home.scope', 'applications.scope', 'files.scope', 'video.scope', 'music.scope', 'photos.scope', 'social.scope' ]</default>

193+ <summary>List of scope ids specifying which scopes should be created and the order to display them in.</summary>

194+ <description>The scopes listed in the scope bar will be ordered according to this list.</description>

195+ </key>

196+ <key type="as" name="favorite-scopes">

197+ <default>[ 'scope://clickscope', 'scope://musicaggregator', 'scope://videoaggregator' ]</default>

198+ <summary>List of scope queries specifying what should be displayed in the dash.</summary>

199+ <description>List of favorite scopes displayed in the dash.</description>

200+ </key>

201+ </schema>

202+ <schema path="/com/canonical/unity/decorations/" id="com.canonical.Unity.Decorations" gettext-domain="unity">

203+ <key type="u" name="grab-wait">

204+ <default>175</default>

205+ <range min="0" max="1000"/>

206+ <summary>Milliseconds to wait before considering a mouse pressure a grab</summary>

207+ <description>The number of ms to wait before starting the window movement (and then

208+ showing the proper mouse cursor, and grabbing the window)</description>

209+ </key>

210+ </schema>

211+ <schema path="/com/canonical/unity/integrated-menus/" id="com.canonical.Unity.IntegratedMenus" gettext-domain="unity">

212+ <key type="u" name="click-movement-threshold">

213+ <default>15</default>

214+ <range min="0" max="30"/>

215+ <summary>Number of pixels to ignore on mouse pressure</summary>

216+ <description>This value define how many pixels the user can move the mouse

217+ when holding the mouse button, before we consider his action a movement

218+ (to grab the window).</description>

219+ </key>

220+ <key type="u" name="double-click-wait">

221+ <default>0</default>

222+ <range min="0" max="300"/>

223+ <summary>Milliseconds to wait before activating a menu after mouse release</summary>

224+ <description>The number of ms to wait after a mouse button release event before considering

225+ it a click. When this value is greater than 0, then it's possible to maximize

226+ a window by double-clicking on its menus if the second click happens before the

227+ specified value of ms is elapsed</description>

228+ </key>

229+ <key type="b" name="unfocused-windows-popup">

230+ <default>true</default>

231+ <summary>Whether to pop-up a menu when clicking over unfocused windows entries</summary>

232+ <description>By disabling this setting you can make unity to only focus a window

233+ when clicking over unfocused menu entries</description>

234+ </key>

235+ </schema>

236+ <schema path="/com/canonical/unity/gestures/" id="com.canonical.Unity.Gestures" gettext-domain="unity">

237+ <key type="b" name="launcher-drag">

238+ <default>true</default>

239+ <summary>Multi-touch gesture to reveal the launcher.</summary>

240+ <description>When this is enabled, a 4 finger swipe from left to right will reveal launcher,

241+ provided that the launcher is set to auto-hide.</description>

242+ </key>

243+ <key type="b" name="dash-tap">

244+ <default>true</default>

245+ <summary>Multi-touch gesture to open the dash.</summary>

246+ <description>When this is enabled, a 4 finger tap will open the dash.</description>

247+ </key>

248+ <key type="b" name="windows-drag-pinch">

249+ <default>true</default>

250+ <summary>Multi-touch gestures to manage the windows.</summary>

251+ <description>When this is enabled, 3 finger gestures such as drag, and pinch, will

252+ help manage the windows.</description>

253+ </key>

254+ </schema>

255+</schemalist>

data/com.canonical.Unity8.gschema.xmlnew file+75

@@ -0,0 +1,75 @@

1+<schemalist>

2+ <enum id="usage-mode-enum">

3+ <value nick="Staged" value="0" />

4+ <value nick="Windowed" value="1" />

5+ <value nick="Automatic" value="2" />

6+ </enum>

7+

8+ <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">

9+ <key enum="usage-mode-enum" name="usage-mode">

10+ <default>"Automatic"</default>

11+ <summary>The usage mode.</summary>

12+ <description>The usage mode chosen will affect the Window Management behaviour.</description>

13+ </key>

14+ <key type="u" name="edge-barrier-sensitivity">

15+ <default>50</default>

16+ <range min="1" max="100"/>

17+ <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>

18+ <description>Some UI actions like revealing the launcher or the applications spread are triggered by pushing the mouse pointer against a screen edge. This key defines how much you have to push in order to trigger the associated action.</description>

19+ </key>

20+ <key type="u" name="edge-barrier-min-push">

21+ <default>2</default>

22+ <summary>Minimum push needed to overcome edge barrier</summary>

23+ <description>How much you have to push (in grid units)the mouse against an edge barrier when sensibility is 100.</description>

24+ </key>

25+ <key type="u" name="edge-barrier-max-push">

26+ <default>120</default>

27+ <summary>Maximum push needed to overcome edge barrier</summary>

28+ <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>

29+ </key>

30+ <key type="u" name="edge-drag-width">

31+ <default>2</default>

32+ <summary>The width of the edge drag areas</summary>

33+ <description>How big (in grid units) the edge-drag sensitive area should be.</description>

34+ </key>

35+ <key type="b" name="autohide-launcher">

36+ <default>false</default>

37+ <summary>Autohide the launcher</summary>

38+ <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>

39+ </key>

40+ <key type="u" name="launcher-width">

41+ <default>8</default>

42+ <range min="6" max="12"/>

43+ <summary>Width of the launcher in grid units.</summary>

44+ <description>Changes the width of the launcher in all usage modes.</description>

45+ </key>

46+ <key type="b" name="enable-indicator-menu">

47+ <default>true</default>

48+ <summary>Enable or disable the indicator pull down menus</summary>

49+ <description>Toggle the availability of the indicator pull down menus</description>

50+ </key>

51+ <key type="s" name="appstore-uri">

52+ <default>'appid://openstore.openstore-team/openstore/current-user-version'</default>

53+ <summary>The uri to the app store</summary>

54+ <description>This will be used whenever the user triggers an action to open the app store.</description>

55+ </key>

56+ <key type="b" name="always-show-osk">

57+ <default>false</default>

58+ <summary>Force showing/hiding the OSK</summary>

59+ <description>Toggle the visibility of the On Screen Keyboard unconditionally</description>

60+ </key>

61+ <key type="b" name="osk-switch-visible">

62+ <default>false</default>

63+ <summary>Whether the OSK switch should be visible</summary>

64+ <description>Toggle the visibility of the OSK switch</description>

65+ </key>

66+ </schema>

67+

68+ <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">

69+ <key type="x" name="locked-out-time">

70+ <default>0</default>

71+ <summary>When the greeter was last locked.</summary>

72+ <description>If too many unsuccessful login attempts have been made in a row, the greeter locks you out for a while. This unix timestamp indicates when you were locked out, so unity8 knows when to let you back in.</description>

73+ </key>

74+ </schema>

75+</schemalist>

data/devices.confnew file+30

@@ -0,0 +1,30 @@

1+# This file can hold multiple device configs. Devices are separated by sections.

2+#

3+# SupportedOrientations holds a list of all enabled orientations. A standard

4+# phone will usually have Portrait,Landcape,InvertedLandscape in order to

5+# disable upside down usage.

6+#

7+# PrimaryOrientation gives the orientation the device will start up with

8+# when there is no orientations sensor input available (yet) or lock to

9+# when an application specifies to be locked to PrimaryOrientation.

10+#

11+# The other Orientation settings can be used to re-map the orientations.

12+# A device might be used with different orientations than how the screen

13+# is physically mounted on the hardware.

14+#

15+# Category can be phone, tablet, or desktop. This option determines

16+# whether the side stage is shown (tablet) or not (phone). Using

17+# desktop will load the shell in windowed mode. Note that the user

18+# can override/change this by connecting input hardware or change

19+# user settings.

20+#

21+# Any options not listed will default to the values of the example below.

22+

23+# [devicename]

24+# SupportedOrientations=Portrait,InvertedPortrait,Landscape,InvertedLandscape

25+# PrimaryOrientation=PrimaryOrienation

26+# PortraitOrientation=Portrait

27+# InvertedPortraitOrientation=InvertedPortrait

28+# LandscapeOrientation=Landscape

29+# InvertedLandscapeOrientation=InvertedLandscape

30+# Category=phone

data/indicators-client.desktop.innew file+9

@@ -0,0 +1,9 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Indicators Client

4+Comment=Application for testing the Indicators system

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/indicators-client

6+Terminal=false

7+Icon=

8+NoDisplay=false

9+X-Ubuntu-Touch=true

data/test.sensorsnew file+12

@@ -0,0 +1,12 @@

1+create light 0 10 1

2+create accel 0 1000 0.1

3+create proximity

4+

5+200 proximity near

6+500 light 5

7+# simulate crash on the ground

8+500 accel 0.2 0.1 10

9+100 accel 0.2 0.2 1000

10+20 accel 0 0 0

11+10 proximity far

12+10 light 10

data/unity-mock-indicator-service.confnew file+7

@@ -0,0 +1,7 @@

1+description "Unity Shell v8 Mock Indicator"

2+author "Nick Dedekind <nick.dedekind@canonical.com>"

3+

4+respawn

5+respawn limit 2 10

6+

7+exec ${BINARY:-unity-mock-indicator-service} $ARGS

data/unity8-dash.confdeleted−29

@@ -1,29 +0,0 @@

1−description "Unity Shell v8 Dash"

2−author "Michael Zanetti <michael.zanetti@canonical.com>"

3−

4−emits scope-ui-starting

5−

6−start on started unity8

7−stop on stopping unity8

8−

9−kill timeout 120

10−

11−# Focused app is 100 so we want to be less likely to get

12−# killed than the focused app but more than Unity8

13−

14−oom score 50

15−

16−respawn

17−

18−env APP_ID=unity8-dash

19−

20−pre-start script

21− if [ -z "$UNITY_SCOPES_LIST" ]; then

22− # FIXME: remove once we have this in dconf

23− initctl set-env UNITY_SCOPES_LIST="clickscope;musicaggregator;videoaggregator"

24− fi

25−

26− initctl emit scope-ui-starting

27−end script

28−

29−exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=/usr/share/applications/unity8-dash.desktop

data/unity8-dash.desktop.indeleted−9

@@ -1,9 +0,0 @@

1−[Desktop Entry]

2−Type=Application

3−Name=Scopes

4−Comment=An interface for using the Scopes system

5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash

6−Terminal=false

7−Icon=

8−NoDisplay=true

9−X-Ubuntu-Touch=true

data/unity8-dash.url-dispatcherdeleted−6

@@ -1,6 +0,0 @@

1−[

2− {

3− "protocol": "scope"

4− }

5−]

6−

data/unity8-filewatcher.conf+5

@@ -1,6 +1,11 @@

1description "File system watcher for unity8"

1description "File system watcher for unity8"

2author "Michael Zanetti <michael.zanetti@canonical.com>"

2author "Michael Zanetti <michael.zanetti@canonical.com>"

3

3

4+# This method of updating the launcher will not work in our new snappy world,

5+# neither for snaps installed in the system nor if we are running inside a snap.

6+# Plus it hardcodes the phablet user... To be replaced once bug 1630997 is

7+# fixed in ubuntu-app-launch.

8+

4# Workaround for bug 1360208. ~ and * in one expression doesn't work currently

9# Workaround for bug 1360208. ~ and * in one expression doesn't work currently

5start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)

10start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)

6

11

data/unity8-greeter-init.confnew file+12

@@ -0,0 +1,12 @@

1+description "Unity 8 Greeter initialization"

2+author "Michael Terry <mterry@ubuntu.com>"

3+

4+start on unity8-greeter-started

5+task

6+emits indicator-services-start

7+

8+script

9+ start --no-wait ofono-setup || true

10+ initctl emit --no-wait indicator-services-start || true

11+ start --no-wait maliit-server || true

12+end script

data/unity8-greeter-wrappernew file+109

@@ -0,0 +1,109 @@

1+#!/bin/sh

2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-

3+#

4+# Copyright (C) 2011,2013,2016 Canonical Ltd

5+#

6+# This program is free software: you can redistribute it and/or modify it under

7+# the terms of the GNU General Public License as published by the Free Software

8+# Foundation, version 3 of the License.

9+#

10+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.

11+

12+# This wrapper merely ensures that init and friends live only as long as this

13+# script does. Otherwise, it's very easy for some processes to not notice that

14+# the session died. We could try to do this in-process, but we want to do this

15+# cleanup even if the greeter aborts.

16+

17+trap cleanup TERM EXIT

18+

19+cleanup()

20+{

21+ trap - TERM EXIT

22+ # Kill upstart and indicators

23+ if [ -n "$INIT_PID" ]; then

24+ kill "$INIT_PID"

25+ fi

26+ if [ -n "$CMD_PID" ]; then

27+ kill "$CMD_PID"

28+ fi

29+ exit 0

30+}

31+

32+set_greeter_var()

33+{

34+ export "$1=$2"

35+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"

36+ if [ -n "$INIT_PID" ]; then

37+ initctl set-env --global "$1=$2"

38+ fi

39+}

40+

41+SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket

42+rm -f $SUB_SOCKET # clear socket in case we were hard shut down

43+

44+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"

45+

46+# If touch session script (which sets up grid units and mir variables) is available, use it

47+TOUCH_WRAPPER=

48+if which ubuntu-touch-session >/dev/null; then

49+ TOUCH_WRAPPER=ubuntu-touch-session

50+fi

51+

52+# Advertise as a unity8 session, so that indicator-network will start.

53+export XDG_SESSION_DESKTOP=unity8

54+export DESKTOP_SESSION=$XDG_SESSION_DESKTOP

55+

56+set_greeter_var QT_IM_MODULE maliitphablet

57+set_greeter_var QT_QPA_PLATFORM ubuntumirclient

58+

59+# We disable ofono using pulse. It causes problems with racing with the user's

60+# pulse. We need to come up with a better long-term fix for this, because we

61+# eventually need the greeter to play ringtones for users that aren't logged in.

62+set_greeter_var PA_DISABLED 1

63+

64+# Normal unity8 sessions are entirely driven by Upstart. But greeters

65+# are special. They need access to the file descriptors that lightdm

66+# creates for them and don't want to start all the services that a normal

67+# session would. So it's inconvenient to live within an upstart session.

68+# But... we still want to use Upstart for some services. So launch here.

69+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event &

70+INIT_PID=$!

71+while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done

72+. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"

73+export UPSTART_SESSION

74+

75+# Connect upstart to system, but do first command in a loop to avoid any

76+# race condition between the session file above being written and upstart being

77+# ready to handle requests.

78+while ! initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done

79+initctl start notify-cgmanager

80+

81+# Start any pre-greeter tasks if needed (like wizard)

82+initctl emit unity8-greeter-starting

83+

84+# Define language here for phone if available. When phone user switches their

85+# language, they expect that to affect the greeter too. But the user doesn't

86+# have permission to switch system language, only their own. So we notice if

87+# the phablet user exists and use their language if so. TODO: talk to design

88+# about whether we should switch language on fly as users are selected (this

89+# is very hard to do technically).

90+#

91+# Do this after unity8-greeter-starting, in case a customization upstart job

92+# changes language.

93+if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then

94+ USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)

95+ if [ -n "$USER_LANG" ]; then

96+ set_greeter_var LANGUAGE "$USER_LANG"

97+ fi

98+ USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)

99+ if [ -n "$USER_LOCALE" ]; then

100+ set_greeter_var LANG "$USER_LOCALE"

101+ set_greeter_var LC_ALL "$USER_LOCALE"

102+ fi

103+fi

104+

105+# And finally actually start the greeter

106+exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

107+CMD_PID=$!

108+wait $CMD_PID

109+CMD_PID=

data/unity8-greeter.desktop.innew file+7

@@ -0,0 +1,7 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Unity 8 Greeter

4+Comment=The converged Unity shell's Greeter

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter

6+X-LightDM-Session-Type=mir

7+X-Ubuntu-Touch=true

data/unity8-greeter.pklanew file+44

@@ -0,0 +1,44 @@

1+# DO NOT EDIT THIS FILE, it will be overwritten on update

2+# Place your local configurations under /etc/polkit-1/localauthority/

3+

4+[Disable Controlling of Network Devices]

5+Identity=unix-user:lightdm

6+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;

7+ResultActive=no

8+ResultInactive=no

9+ResultsAny=no

10+

11+[Disable Sleep and Wake]

12+Identity=unix-user:lightdm

13+Action=org.freedesktop.NetworkManager.sleep-wake

14+ResultActive=no

15+ResultInactive=no

16+ResultsAny=no

17+

18+[Disable WiFi Sharing]

19+Identity=unix-user:lightdm

20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open

21+ResultActive=no

22+ResultInactive=no

23+ResultsAny=no

24+

25+[Disable Settings Modifications]

26+Identity=unix-user:lightdm

27+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname

28+ResultActive=no

29+ResultInactive=no

30+ResultsAny=no

31+

32+[Disable User Connections]

33+Identity=unix-user:lightdm

34+Action=org.freedesktop.NetworkManager.use-user-connections

35+ResultActive=no

36+ResultInactive=no

37+ResultsAny=no

38+

39+[Enable Controlling of Network Connections]

40+Identity=unix-user:lightdm

41+Action=org.freedesktop.NetworkManager.network-control

42+ResultActive=yes

43+ResultInactive=no

44+ResultsAny=no

data/unity8.conf+61−19

@@ -2,37 +2,51 @@ description "Unity Shell v8"

2author "Ricardo Mendoza <ricmm@ubuntu.com>"

2author "Ricardo Mendoza <ricmm@ubuntu.com>"

3

3

4emits indicator-services-start

4emits indicator-services-start

5+emits indicator-services-end

5

6

6−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus

7+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus

7stop on desktop-end

8stop on desktop-end

8

9

9kill timeout 120

10kill timeout 120

10

11

12+#

13+# Ensure the shell always gets unthrottled touch events, so that applications

14+# who want full speed low-latency input can get it (LP: #1497105) and so that

15+# apps can use QML touch compression safely (the QML touch compression

16+# algorithm does not support nesting well - LP: #1486341, LP: #1556763 - so

17+# must be fed by the raw input event stream from Unity8).

18+#

19+env QML_NO_TOUCH_COMPRESSION=1

20+

11respawn

21respawn

12expect stop

22expect stop

13

23

24+# FIXME Create an autopilot test that makes sure start+stop and restart

25+# work fine at least 2 times

26+

14pre-start script

27pre-start script

15 # Tell unity-mir to raise SIGSTOP after we start

28 # Tell unity-mir to raise SIGSTOP after we start

16 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

29 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

17

30

18− if [ -n "$MIR_SOCKET" ]; then

19− if [ -z "$UNITY_MIR_SOCKET" ]; then

20− # Save original value of MIR_SOCKET in case we are restarted,

31+ # Save original value of MIR_SOCKET so that we can restore it when stopped,

21− # as we modify the variable for future jobs, including ourself.

32+ # as we modify the variable for future jobs, including ourself.

22− UNITY_MIR_SOCKET=$MIR_SOCKET

23− initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET

33+ initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET

24− fi

25

34

26− # Point unity8 at unity-system-compositor

35+ # Decide where we are going to put our own socket file

36+ if [ -n "$SNAP" ]; then

37+ # In snappy, we want to hard code our path because our apparmor profile

38+ # only lets us put the socket in one place. And consumers expect it

39+ # there.

40+ MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket

41+ else

27 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket

42 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket

28− initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE

29− initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET

30−

31− # Point all future jobs in this session to our Mir socket instead of

32− # unity-system-compositor's socket.

33− initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE

34− gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"

35 fi

43 fi

44+ initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE

45+

46+ # Point all future jobs in this session to our Mir socket instead of

47+ # unity-system-compositor's socket.

48+ initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE

49+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"

36

50

37 # Remove the normal and trusted sockets if still there

51 # Remove the normal and trusted sockets if still there

38 if [ -S "$MIR_SERVER_FILE" ]; then

52 if [ -S "$MIR_SERVER_FILE" ]; then

@@ -45,13 +59,41 @@ pre-start script

45

59

46 initctl set-env --global MIR_SERVER_PROMPT_FILE=1

60 initctl set-env --global MIR_SERVER_PROMPT_FILE=1

47

61

48− initctl emit --no-wait indicator-services-start

62+ # Disable Qt's stuttering 'touch compression' to fix scrolling smoothness

63+ # issues (LP: #1486341, LP: #1556763). As a bonus, this eliminates most of

64+ # the lag seen in the indicator panel pull-down (LP: #1488327) and also

65+ # reduces lag seen in apps:

66+ initctl set-env --global QML_NO_TOUCH_COMPRESSION=1

67+

68+ # Workaround for text not rendering correctly

69+ initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1

70+

71+ if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then

72+ # On Ubuntu Touch, we currently use a trick where we auto-login the

73+ # user without a LightDM greeter at all. In this case, we want to

74+ # start with the lockscreen visible. Once we switch to using a

75+ # proper greeter for the first login, we can remove this code path.

76+ initctl set-env MODE=full-greeter

77+ else

78+ initctl set-env MODE=full-shell

79+ fi

80+

81+ # HACK! WORKAROUND FOR HALIUM MISSING UBUNTU_PLATFORM_API

82+ if [ ! -f /system/lib/libubuntu_application_api.so ]; then

83+ initctl set-env --global UBUNTU_PLATFORM_API_BACKEND=test.so.3

84+ initctl set-env --global UBUNTU_PLATFORM_API_SENSOR_TEST=/etc/ubuntusensors/test.sensors

85+ fi

49end script

86end script

50

87

51−exec ${BINARY:-unity8} $ARGS

88+exec ${BINARY:-unity8} --mode=$MODE $ARGS

89+

90+post-start script

91+ initctl emit --no-wait indicator-services-start

92+end script

52

93

53post-stop script

94post-stop script

54 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

95 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

55− initctl unset-env --global UNITY_MIR_SOCKET

56 initctl unset-env --global MIR_SERVER_PROMPT_FILE

96 initctl unset-env --global MIR_SERVER_PROMPT_FILE

97+ initctl emit application-end

98+ initctl emit indicator-services-end

57end script

99end script

debian/bileto_pre_release_hooknew file+5

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

1+#!/bin/sh

2+

3+set -eux

4+

5+sh ./po/update-unity-pot

debian/changelog+3163−19

@@ -1,3 +1,3142 @@

1+unity8 (8.20+ubports) xenial; urgency=medium

2+

3+ * Replace dependency on ubuntu-wallpapers with ubports-wallpapers

4+

5+ -- Dalton Durst <dalton@ubports.com> Fri, 5 Oct 2018 13:28:20 -0500

6+

7+unity8 (8.17+ubports3) xenial; urgency=medium

8+

9+ * Imported to UBports

10+

11+ -- UBports auto importer <infra@ubports.com> Mon, 31 Jul 2017 03:12:43 +0200

12+

13+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium

14+

15+ [ Michael Zanetti ]

16+ * Make the default store uri point to gnome software center

17+

18+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 06 Apr 2017 10:49:29 +0300

19+

20+unity8 (8.15+17.04.20170404.7-0ubuntu1) zesty; urgency=medium

21+

22+ [ Albert Astals Cid ]

23+ * Tweak app drawer a bit (LP: #1667570)

24+

25+ [ Josh Arenson ]

26+ * Make some small changes to the greeter's session list

27+ * Handle a user in the greeter having never selected a session better

28+ (LP: #1673199)

29+

30+ [ Lukáš Tinkl ]

31+ * Do not occlude windows with an ongoing unmaximize transition (LP:

32+ #1666363)

33+ * Show and implement close buttons for child windows (LP: #1668053)

34+ * Sanitize the logic for pointer vs. touch menus, fixes hiding the

35+ window title in staged mode, when hovering the panel with mouse and

36+ no menus available.

37+

38+ [ Michael Zanetti ]

39+ * Don't hide the launcher on super press if it's locked visible (LP:

40+ #1675373)

41+ * fix searchfield selection in drawer (LP: #1677259)

42+ * make sure the stage has focus when going to spread (LP: #1672053,

43+ #1672673, #1676995)

44+ * don't autostart the dash app, but show its .desktop file instead

45+

46+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Apr 2017 22:56:06 +0000

47+

48+unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium

49+

50+ [ Albert Astals Cid ]

51+ * mock: Remove empty property and move invokable

52+ * Tune quicklist item selection

53+ * Fix unminimizing going to the wrong position the second time (LP:

54+ #1671458)

55+ * Remove unclickable gaps on the menubar (LP: #1672722)

56+ * indicators client is a tool

57+ * Make sure we destroy the popups when the item goes away (LP:

58+ #1670338)

59+ * UnityApplicationMocks: Initialize m_state and m_requestedState

60+ * Don't use appInfo after checking it if is null

61+ * Initialize m_privateMode

62+ * Hook up aboutToShow for overflow menus (LP: #1676016)

63+

64+ [ Daniel d'Andrada ]

65+ * Give active focus to child surface qml items (LP: #1671072)

66+ * Satellite child windows (LP: #1673415)

67+ * Tell qtmir/miral about the available desktop area

68+

69+ [ Florian Boucault ]

70+ * WindowStateStorage: use a private QThreadPool to ensure that

71+ WindowStateStorage::saveValue always has a thread available to

72+ execute the query in. (LP: #1675424)

73+

74+ [ Lukáš Tinkl ]

75+ * Protect against loading invalid window geometry (LP: #1674262)

76+ * Remove usage of the deprecated (and non-functional) system-image-

77+ dbus service.

78+ * Implement Ctrl+Alt+T to launch the terminal app (LP: #1673500)

79+ * Only take normal and dialog surface types into account for launcher

80+ items (LP: #1669047)

81+ * Fix the shutdown dialog after recent refactoring in

82+ DBusUnitySessionService (LP: #1676426)

83+

84+ [ Michael Zanetti ]

85+ * drop the grey background behind icons in the drawer (LP: #1675688)

86+

87+ [ Pete Woods ]

88+ * Fix Unity/Platform::isPC, and add tests (LP: #1670657)

89+

90+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 28 Mar 2017 21:50:20 +0000

91+

92+unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium

93+

94+ [ Albert Astals Cid ]

95+ * Signal aboutToShow (LP: #1664578)

96+ * Support Panel top level items to be disabled (LP: #1670694)

97+ * Improve Launcher ←→ touch menu interaction (LP: #1667620, #1671069)

98+ * Fix real world submenus (e.g. kate) not getting their first item

99+ selected on open (LP: #1666859)

100+

101+ [ Daniel d'Andrada ]

102+ * Really disable the window decoration when in staged mode (LP:

103+ #1670361)

104+ * Don't let clients resize their surfaces while in staged

105+ (phone/tablet) mode (LP: #1670390)

106+ * TopLevelWindowModel: don't put hidden windows in the model (LP:

107+ #1665286)

108+

109+ [ Lukáš Tinkl ]

110+ * Reset always-show-osk gsetting on startup to default value (false

111+ atm)

112+ * Fix the restored-to position with Miral due to the state changes

113+ being async (LP: #1669819)

114+ * Add a cursor name fallback mapping "grabbing" -> "closedhand" for

115+ Breeze

116+ * Fix unsnapping a maximized window from the panel (LP: #1671721)

117+ * Disable altDrag feature outside windowed mode

118+

119+ [ Michael Terry ]

120+ * Don't lock the screen for guest users or users in the nopasswdlogin

121+ group. (LP: #1644237)

122+ * Support GNOME-style logout DBus API (making the Logout, Reboot, and

123+ Shutdown launcher commands work) (LP: #1673229)

124+

125+ [ Michael Zanetti ]

126+ * Add support for closing apps from the spread with "Q" (LP: #1670327)

127+ * hide "private" launcher quicklist entries when the greeter is locked

128+ (LP: #1667649)

129+ * add surface titles to launcher's quicklist (LP: #1661668)

130+ * properly reset the drawer state when cancelling a horizontal drag

131+ (LP: #1669536)

132+ * fix the focus moving correctly between launcher and drawer (LP:

133+ #1669880)

134+ * unfocus the drawer's textfield when it is moved (LP: #1669839)

135+

136+ [ Pete Woods ]

137+ * Fix up indicators-client after refactoring (LP: #1672797)

138+

139+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 21 Mar 2017 10:58:13 +0000

140+

141+unity8 (8.15+17.04.20170308-0ubuntu1) zesty; urgency=medium

142+

143+ [ Albert Astals Cid ]

144+ * Let's follow the keyboard order

145+ * Enable the license check (LP: #1590044)

146+ * Show a barebones error message if loading the QML doesn't work

147+ * Make sure cursor is back to normal when closing the window (LP:

148+ #1666158)

149+ * Fix small warning when sensitive is undefined

150+ * Remove unused member variable

151+ * Initialize m_msecsSinceReference

152+ * Add warning if registerService fails

153+ * Move menus Component {} out of the repeater

154+ * Add tool to browse menus of a running app

155+

156+ [ Daniel d'Andrada ]

157+ * Drag child windows with Alt+LeftMouseButton (LP: #1664947)

158+

159+ [ Gerry Boland ]

160+ * TopLevelWindowModel: connect to the OSK surface to know when it goes

161+ away so we can clean up after it. (LP: #1670681)

162+

163+ [ Josh Arenson ]

164+ * Initialize sessionMode to single when mock is reset (LP: #1667463)

165+

166+ [ Lukáš Tinkl ]

167+ * Make the menu string "Back" translatable

168+ * Let the OSK be driven by a switch in indicator-keyboard (LP:

169+ #1521518)

170+ * Disable the tutorial when there's no touchscreen (LP: #1661557)

171+ * Shell chrome fixes (LP: #1658117, #1665723, #1665724, #1669010)

172+ * Cancel the drag as soon as we're entering the spread (LP: #1668642)

173+ * Fix being unable to use window control buttons or menus with touch

174+ (LP: #1667604, #1668387)

175+

176+ [ Michael Terry ]

177+ * Set QT_IM_MODULE in the greeter so that the OSK can come up. (LP:

178+ #1670383)

179+ * Simplify our startup handling of Mir environment variables and set

180+ the right socket path in snappy.

181+

182+ [ Michael Zanetti ]

183+ * Cancel the home key activation if something else is pressed along

184+ with Meta (LP: #1670678)

185+ * close the drawer when something is launched from the launcher (LP:

186+ #1660367)

187+ * use a svg instead of a png for the Launcher's BFB (LP: #1668057)

188+ * change the default setting for the launcher autohiding (LP:

189+ #1670655)

190+

191+ [ Nick Dedekind ]

192+ * Split up Shell::test_spreadDisabled to ensure initial state for each

193+ test.

194+

195+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 08 Mar 2017 09:56:46 +0000

196+

197+unity8 (8.15+17.04.20170221-0ubuntu1) zesty; urgency=medium

198+

199+ * Handle ubuntu-app-launch API/ABI break

200+

201+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2017 13:23:23 +0000

202+

203+unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium

204+

205+ [ Albert Astals Cid ]

206+ * Make menus items close the menu when clicking on them (LP: #1657082,

207+ #1657399)

208+ * Clicking on an open menu closes it + test

209+ * Make the menus and submenus do not go outside the screen when

210+ popping out

211+ * Auto open submenus on hover (LP: #1657085)

212+ * Make the double click on a menu not be maximize the window below

213+ (LP: #1657079)

214+ * Make the MenuBar InverseMouseArea eat hover events when there's a

215+ popup open (LP: #1657763)

216+ * Make double click on the window decoration maximize (LP: #1657758)

217+ * Eat hover events when the launcher quicklist is open (LP: #1640776)

218+ * Remove TODO now that we require Qt > 5.5

219+ * Serialize two make targets that want to cp to the same target file

220+ (LP: #1660576)

221+ * Remove variable that is always false (LP: #1585910)

222+

223+ [ Daniel d'Andrada ]

224+ * Consolidate launcher API checks

225+

226+ [ Lukáš Tinkl ]

227+ * Fixes for activating minimized windows and restoring fullscreen ones

228+ (LP: #1656808, #1658937, #1658938)

229+

230+ [ Michael Zanetti ]

231+ * move right edge push area up some levels so it can be used on top of

232+ the indicators

233+ * fix minimizing/restoring transitions (LP: #1658936)

234+ * fix some glitches with spread positioning

235+ * fix jumpy animation when closing an item from the spread

236+ * Show the wallpaper while the focused app is moving in staged mode

237+ (LP: #1648251)

238+ * Update the tutorial to mention the app drawer instead of the dash on

239+ long left edge swipe (LP: #1658932)

240+ * prevent hiding the launcher when the mouse hover event is eaten by

241+ the EdgePushArea (LP: #1657045)

242+ * properly invalidate the whole model (LP: #1658190)

243+ * stabilize OrientedShell test (LP: #1658994)

244+

245+ [ Nick Dedekind ]

246+ * Added overflow support to application menus.

247+ * Updated menu colors

248+

249+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 16 Feb 2017 13:49:18 +0000

250+

251+unity8 (8.15+17.04.20170206-0ubuntu1) zesty; urgency=medium

252+

253+ [ Daniel d'Andrada ]

254+ * Initial support for child windows (menus, dialogs, tooltips) (LP:

255+ #1543467, #1591384, #1656727)

256+

257+ -- Albert Astals Cid <albert.astals@canonical.com> Mon, 06 Feb 2017 09:12:23 +0000

258+

259+unity8 (8.15+17.04.20170131.1-0ubuntu1) zesty; urgency=medium

260+

261+ [ Rodney Dawes ]

262+ * Remove dependencies on clickscope.

263+

264+ -- Albert Astals Cid <albert.astals@canonical.com> Tue, 31 Jan 2017 14:40:33 +0000

265+

266+unity8 (8.15+17.04.20170124-0ubuntu1) zesty; urgency=medium

267+

268+ [ Albert Astals Cid ]

269+ * Limit tab-focus travelling on dialogs with a fence

270+ * Restore focus to where it was when our ShellDialogs get unloaded

271+ * Update current session after changing the user

272+ * Add keyboard navigation for Indicators

273+ * a window -> the current window

274+ * There's no spreadDelegate_ anymore

275+

276+ [ Daniel d'Andrada ]

277+ * Simplify DecoratedWindow

278+ * Remove unnecessary warning message

279+

280+ [ Josh Arenson ]

281+ * Add a test for the session chooser icon in the greeter's sessions

282+ list

283+

284+ [ Lukáš Tinkl ]

285+ * Fix keymap not being applied on the shell itself (LP: #1626435)

286+ * Shell dialog improvements (kbd focus, mouse eater)

287+ * Start searching directly as you type, w/o having to first

288+ focus/click the search field.

289+ * Add a test for the real implementation of WindowStateStorage

290+ * Use a four finger gesture to open the drawer, much like in u7

291+

292+ [ Michael Terry ]

293+ * Simplify the lightdm mock to make future greeter improvements easier

294+ to test.

295+ * Add support for guest sessions in unity8-greeter.

296+ * Use a model for PAM prompts, supporting more possible interactions.

297+ * Fix grouping of autopkg output and allow optionally passing

298+ arguments to installed test scripts.

299+ * Add support for LightDM hints for manual logins and hiding normal

300+ users.

301+

302+ [ Michael Zanetti ]

303+ * hint the launcher to indicate a successful size change to the user

304+ (LP: #1646457)

305+ * Improvements for the appdrawer (LP: #1648173)

306+ * Adjust home key to still focus the dash instead of messing with the

307+ drawer

308+ * allow 4 finger simulation with mousetouchadaptor

309+

310+ [ Nick Dedekind ]

311+ * Added Alt+F10 shortcut to open app menus. (LP: #1656896)

312+ * Fixed menu layout width calculations. (LP: #1657050)

313+ * Skip Panel::test_drag_indicator_item_down_shows_menu

314+

315+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 24 Jan 2017 07:46:58 +0000

316+

317+unity8 (8.15+17.04.20170110.4-0ubuntu1) zesty; urgency=medium

318+

319+ [ Albert Astals Cid ]

320+ * Give focus to one of the buttons of the dialog

321+ * tst_WindowResizeArea: Use default values for mouseFlick speed and

322+ iterations (LP: #1651580)

323+ * Require Qt 5.6 & misc fixes

324+

325+ [ Daniel van Vugt ]

326+ * Deprecate usage of Mir's input resampling, instead opting for: (LP:

327+ #1497105, #1591328)

328+

329+ [ Josh Arenson ]

330+ * Allow the scopes list to automatically scroll when a scope is being

331+ dragged past the bounds of the screen. (LP: #1575319)

332+

333+ [ Lukáš Tinkl ]

334+ * Fix touch window controls being unreachable when the overlay is

335+ being displayed (LP: #1648167)

336+ * Fixup paths for window state storage in snappy environment

337+ * Add Unity.Platform mock for our tests (LP: #1655336)

338+

339+ [ Michael Zanetti ]

340+ * PreviewRatingInput: Use displayText instead of text to

341+ enable/disable the Send button (LP: #1595910)

342+ * Add a D-Bus interface to control some debug facilities on the fly

343+ * some launcher workarounds for the snapping

344+

345+ [ Michał Sawicz ]

346+ * Nuke leftover Platform in IndicatorsManager

347+

348+ [ Nick Dedekind ]

349+ * Added registry for application menus

350+

351+ [ Michael Terry, Nick Dedekind ]

352+ * Run the qmluitests.sh autopkg test against the installed package.

353+

354+ [ Michał Sawicz, Nick Dedekind ]

355+ * Application menus

356+

357+ [ Rodney Dawes ]

358+ * Remove the payments widget and dependency on libpay as no longer

359+ needed.

360+

361+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 10 Jan 2017 14:48:42 +0000

362+

363+unity8 (8.15+17.04.20161215-0ubuntu2~1) zesty; urgency=medium

364+

365+ * No change rebuild

366+

367+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 04 Jan 2017 10:54:32 +0200

368+

369+unity8 (8.15+17.04.20161215-0ubuntu1) zesty; urgency=medium

370+

371+ * Let the model deal with some window management decisions (LP:

372+ #1346633)

373+

374+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Thu, 15 Dec 2016 16:17:29 +0000

375+

376+unity8 (8.15+17.04.20161207.1-0ubuntu1) zesty; urgency=medium

377+

378+ [ Albert Astals Cid ]

379+ * Add the Wsuggest-override flag to gcc

380+ * Add support for compiler sanitizers via ECM

381+ * Use timeStep as delay time (LP: #1642919)

382+ * Bring back fix for 1517830 (LP: #1517830)

383+ * Fix compile warnings in mocks

384+ * Do not hide panel when launching an application if the mouse is on

385+ the panel (LP: #1591311)

386+

387+ [ Daniel d'Andrada ]

388+ * Fix "make tryApplicationWindow"

389+ * Take save/restore functions out of WindowResizeArea

390+

391+ [ Josh Arenson ]

392+ * Enable the greeter to remember which session the user last logged

393+ into (LP: #1631365)

394+

395+ [ Lukáš Tinkl ]

396+ * Fix the Super key not invoking the dash scope home (LP: #1607427)

397+

398+ [ Michael Zanetti ]

399+ * Add the ApplicationDrawer

400+ * tune right edge push (LP: #1646094)

401+ * improve close button visiblity when hovering with the mouse

402+ * Update virtual touchpad visuals and add a tutorial. (LP: #1585220)

403+

404+ [ Pete Woods ]

405+ * MenuItemFactory: Add subtitle support to SwitchItem widget

406+

407+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 07 Dec 2016 13:49:24 +0000

408+

409+unity8 (8.15+17.04.20161129-0ubuntu1) zesty; urgency=medium

410+

411+ [ Albert Astals Cid ]

412+ * Fix PreviewProgress implicitHeight (LP: #1641943)

413+ * Adapt to dummy notification being gone

414+ * Fix autopilot test_lock_screen tests

415+ * Autopilot: Add more applications to the list for wider screens

416+ * Fix autopilot DashHelperTestCase.test_search

417+ * Also install the Screens mock

418+ * Give default value to gu-px size

419+

420+ [ Andrea Azzarone ]

421+ * Set Mir.cursorName to "grabbing" on first mouse press on a window

422+ decoration. Don't wait for press+motion. (LP: #1618078)

423+ * Do not show a divider between each quicklist entry but just between

424+ each section, similar to how unity7 does. (LP: #1637478)

425+

426+ [ Andrea Cimitan ]

427+ * Fix white text (LP: #1644468)

428+ * Make MascotLoader in CardCreator flat

429+ * Make the remaining UbuntuShape flat

430+ * added dropshadow from panel indicators to dash page header extra

431+ panel, so there is right shadow when the extra panel is narrow

432+ * Look up for expandable template dash category flag

433+

434+ [ Brian Douglass ]

435+ * Added a setting to enable/disable the indicator dropdown menu.

436+

437+ [ Daniel d'Andrada ]

438+ * There's no need for WindowDecoration to access the appDelegate

439+

440+ [ Lukáš Tinkl ]

441+ * Enable brightness (laptop backlight) handling on desktop/laptop PCs

442+ (LP: #1595947)

443+

444+ [ Michael Zanetti ]

445+ * disable spread interaction while locked (LP: #1641578)

446+

447+ [ Andrea Azzarone, Michał Sawicz ]

448+ * Implement launcher tooltips.

449+

450+ [ Olivier Tilloy ]

451+ * Remove dependency on transitional package. (LP: #1583079)

452+

453+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 29 Nov 2016 09:43:33 +0000

454+

455+unity8 (8.15+17.04.20161116.1-0ubuntu1) zesty; urgency=medium

456+

457+ [ Marco Trevisan (Treviño) ]

458+ * MenuItemFactory: bind calendar backend properties to calendarMenu item

459+

460+ Adds support for showing the calendar at the requested date, marking days

461+ with events properly and toggling the visibility of the week number.

462+

463+ * MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu

464+

465+ * Bump version as USC breaks with unity8 << 8.14

466+

467+ [ Albert Astals Cid ]

468+ * [Hopefully] Fix infinite loop in some of the GSV tests (LP:

469+ #1599301)

470+

471+ [ Marco Trevisan (Treviño) ]

472+ * testLauncher: use tryCompare to check launcher contentY

473+

474+ [ Michael Zanetti ]

475+ * Stabilize OrientedShell tests

476+

477+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Wed, 16 Nov 2016 10:44:59 +0000

478+

479+unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium

480+

481+ [ Albert Astals Cid ]

482+ * Make more CardTool properties readonly

483+ * Make the > in Dash Section Header be after text (LP: #1508905)

484+ * Rework Dash Preview column margins

485+ * Improve LVWPH <-> GenericScopeView interaction (LP: #1508905,

486+ #1622423)

487+ * Make the PreviewButtons be of the width of the button and not half

488+ the total width

489+ * Fix first column of the preview table to be 25%

490+

491+ [ Andrea Cimitan ]

492+ * Remove background under header pagination dots, update dots assets,

493+ remove dash paper background, update bottom edge asset

494+ * Few styling changes for cards

495+ * various tweaks to fonts inside previews

496+ * More visual tweaks

497+

498+ [ Brian Douglass ]

499+ * Add a new setting to enable/disable the launcher

500+

501+ [ Lukáš Tinkl ]

502+ * Stabilize test_doubleTapToMaximizeWindow()

503+ * Enable loading the main Qt catalog which in turn allows for using

504+ RTL languages

505+ * Fix the pixelated notification icon by setting sourceSize (LP:

506+ #1637712)

507+

508+ [ Michael Terry ]

509+ * More path lookup fixes for running inside of a snap. (LP: #1629009)

510+

511+ [ Michael Zanetti ]

512+ * Added blur and darkening to wallpaper while in spread

513+ * Fixes in the spread after design review (LP: #1637502, #1638848)

514+ * More fixes to the unified stages code (LP: #1637205, #1637249,

515+ #1637258)

516+ * Delay alt tab for tiny bit in order to avoid flickering on quick alt-

517+ tabs

518+

519+ [ Tomás Tormo ]

520+ * Reload Infographics userdata when the day changes (LP: #1378814)

521+

522+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 09 Nov 2016 15:10:32 +0000

523+

524+unity8 (8.14+17.04.20161027-0ubuntu1) zesty; urgency=medium

525+

526+ * MenuItemFactory: activate item on calendar selection change (LP:

527+ #1541125)

528+

529+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000

530+

531+unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium

532+

533+ [ Albert Astals Cid ]

534+ * Make PreviewProgress be thicker again (LP: #1629382)

535+ * tst_PreviewZoomableImage: Wait for LazyImage transitions on init()

536+ (LP: #1630136)

537+

538+ [ Andrea Azzarone ]

539+ * Remove UbuntuShapeForItem and replace its use with the more standard

540+ Ubuntu.Components.UbuntuShape.

541+

542+ [ Lukáš Tinkl ]

543+ * Restore the double tap decoration to maximize feature (LP: #1627281)

544+ * Hide the cursor for fullscreen apps after 3 seconds of inactivity

545+ * Implement moving windows by Alt + left mouse button

546+

547+ [ Marco Trevisan (Treviño) ]

548+ * MenuItemFactory: use more features from SlotsLayout based settings

549+ components

550+

551+ [ Michael Terry ]

552+ * Grab launcher icon information from ubuntu-app-launch, not directly

553+ from desktop files.

554+ * Adjust root paths if we're running inside a snap. (LP: #1629009)

555+

556+ [ Michael Zanetti ]

557+ * Merge all Stages into one single codebase. Apply new spread visuals.

558+ (LP: #1489517, #1603914, #1635800)

559+

560+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 24 Oct 2016 11:37:28 +0000

561+

562+unity8 (8.14+16.10.20160922-0ubuntu2) yakkety; urgency=medium

563+

564+ * debian/control:

565+ - Drop unity-scope-mediascanner2 to a Suggests rather than a Recommends,

566+ to ease our transition to main. It's already seeded directly in

567+ Touch, so this will only affect the Desktop variant of unity8.

568+

569+ -- Michael Terry <mterry@ubuntu.com> Mon, 03 Oct 2016 10:43:25 -0400

570+

571+unity8 (8.14+16.10.20160922-0ubuntu1) yakkety; urgency=medium

572+

573+ [ Albert Astals Cid ]

574+ * LVWPH: update clipItem height when list height changes (LP:

575+ #1606935)

576+ * Put the touchdown shape inside a loader

577+ * No need for the touchdown in the card for the cardtool

578+ * Add bottom gradient to the Show Less floating button

579+ * Remove artShapeSize from non cardtool cards

580+ * LVWPH: Fix case in which header was shown incorrectly

581+ * LVWPH: Fix items cut on top in the dash (or at least some instances

582+ of it)

583+ * Reduce calls to CardCreatorCache.getCardComponent while the

584+ component is being created (LP: #1615675)

585+ * Dash::test_cardIconStyle change compare into tryCompareFunction

586+ * Make PreviewActionsTest::test_comboButton more stable

587+ * Adapt onShiftedContentXChanged to work when the content changes very

588+ abruptly

589+ * Make tryGenericScopeView show the scope correctly

590+ * Make sure the spinner does not get too close to the title text (LP:

591+ #1597392)

592+ * Show "Pull to refresh" in white when overlaid in low luminance

593+ colors (LP: #1596849)

594+ * Make test_Shell non ultra slow again (LP: #1597366)

595+ * Improve findChild calls inside tryCompareFunction.

596+

597+ [ Andrea Cimitan ]

598+ * override some Qt Components definitions so we can have sane default

599+ values for flick speeds

600+ * Elide the label text inside recent searches panel (LP: #1611796)

601+ * Add a PreviewSingleton module to store some data for previews (LP:

602+ #1595235)

603+ * Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput

604+ (LP: #1595235)

605+ * rework GenericScopeView PullToRefresh test

606+ * use mouseFlick instead touchFlick for manage_dash_move_current

607+ * add a couple of waiting tricks for a flaky dash test

608+

609+ [ Daniel d'Andrada ]

610+ * Set progress bar indeterminate when processing signal received. (LP:

611+ #1249349)

612+ * Implement cursor confinement (LP: #1590099)

613+

614+ [ Josh Arenson ]

615+ * Add a frontend to the sessions model and enable a session chooser in

616+ the greeter.

617+

618+ [ Lukáš Tinkl ]

619+ * Implement edge maximizing (aka window snapping) (LP: #1602628)

620+ * On the PC platform (as opposed to running on $devices), use the

621+ "mute" action instead of silent mode

622+ * Respect Fitt's law wrt the window control buttons in panel (LP:

623+ #1611959)

624+ * Fix 2 failing color-related tests

625+

626+ [ Marco Trevisan (Treviño) ]

627+ * Indicators, mocks: add fake indicators menuitem to populate mocks

628+ with different menu types

629+ * IndicatorsClient: use PageHeader and ListItemLayout's

630+

631+ [ Michael Terry ]

632+ * Support launching apps inside a unity8 session from the greeter and

633+ support emergency dialing inside the greeter.

634+ * Fix tryShell to actually show appropriate backgrounds for each mock

635+ user.

636+ * Add an indicator to the greeter when a user is logged in (only shown

637+ if we have more than one user)

638+ * Hide the greeter OSK if indicators are open and don't show the edge

639+ tutorial during an emergency call.

640+ * Switch from lockscreen PIN pad to a passcode entry box that uses the

641+ OSK.

642+ * Use the default system wallpaper instead of our custom one.

643+ * Update look of infographic a bit

644+ * Make infographic bubbles white even on the default wallpaper.

645+

646+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 22 Sep 2016 07:46:57 +0000

647+

648+unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium

649+

650+ [ Daniel d'Andrada ]

651+ * Added implementation for MirSurfaceInterface::persistentId

652+

653+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 31 Aug 2016 11:56:09 +0000

654+

655+unity8 (8.14+16.10.20160826-0ubuntu1) yakkety; urgency=medium

656+

657+ * Make sure we emit sounds when taking a screenshot even after media-

658+ hub (LP: #1544477)

659+

660+ -- Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com> Fri, 26 Aug 2016 08:14:14 +0000

661+

662+unity8 (8.14+16.10.20160819-0ubuntu1) yakkety; urgency=medium

663+

664+ [ Lukáš Tinkl ]

665+ * Reset topmostIsFullscreen to correctly rotate the shell when

666+ dismissing SIM PIN screen (LP: #1614070)

667+

668+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 19 Aug 2016 14:16:54 +0000

669+

670+unity8 (8.14+16.10.20160811.1-0ubuntu1) yakkety; urgency=medium

671+

672+ [ Albert Astals Cid ]

673+ * Take into account carousel selectedItemScaleFactor when setting card

674+ fixedArtShapeSize (LP: #1599238)

675+ * Remove unused LimitProxyModel

676+ * Do not calculate implicitHeight for Cards in a CardGrid

677+ * Small clazy fixes

678+

679+ [ Daniel d'Andrada ]

680+ * Remove stage property from Application

681+

682+ [ Larry Price ]

683+ * Allow libertine-scope to show empty search result hint unmodified.

684+ (LP: #1606693)

685+

686+ [ Lukáš Tinkl ]

687+ * Open the quicklist (context) menu also using the Menu key (LP:

688+ #1608265)

689+ * Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:

690+ #1596076)

691+ * Apply the correct keymap also on prompt surfaces (LP: #1610124)

692+ * Implement an optional system update feature during OOBE wizard (LP:

693+ #1580785)

694+ * Implement a page for choosing HW keyboard layout in OOBE wizard

695+

696+ [ Michael Zanetti ]

697+ * Clean up some build script legacy

698+ * Add a crossbuilder_post file to make crossbuilder restart unity8

699+ after deploying

700+ * fixes for the automatic switching between usage modes (LP: #1590944)

701+

702+ [ Omer Akram ]

703+ * Add object names for setup wizard

704+

705+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 11 Aug 2016 06:28:20 +0000

706+

707+unity8 (8.14+16.10.20160803-0ubuntu1) yakkety; urgency=medium

708+

709+ [ Albert Astals Cid ]

710+ * Fix DisabledScreenNotice::test_rotation

711+ * Make the delegate of DashNavigationList an async Loader

712+ * unity-scope-tool: Use parse instead of process

713+ * VerticalJournal improvements regarding model insertions and item

714+ height changes (LP: #1599754)

715+ * Add math.h includes for compilation in yakkety (LP: #1605502)

716+

717+ [ Andrea Cimitan ]

718+ * Unfocus the search text field in the dash page header when requested

719+ (LP: #1590820)

720+ * Use binding for filter popover contentWidth (LP: #1595116)

721+ * Add few sourceSize for Image we forgot (LP: #1595113)

722+ * Replace Flickable with an Item inside DashPageHeader for

723+ headerContainer (LP: #1599235)

724+

725+ [ Albert Astals Cid, Andrea Cimitan ]

726+ * Unbox the artshapeLoader

727+

728+ [ Daniel d'Andrada ]

729+ * Fix splashscreen orientation when app rotates own contents (LP:

730+ #1586050)

731+ * tst_PreviewIconActions: Make test name match filename

732+ * Cursor: make its size grid unit based (LP: #1604014)

733+ * TouchEventSequenceWrapper: item might get deleted when touch

734+ sequence is committed (LP: #1607686)

735+

736+ [ Lukáš Tinkl ]

737+ * Implement frontend support for running keyboard indicator

738+ * Provide window/surface close shortcuts across all the stages (LP:

739+ #1578392, #1606528)

740+ * Restart the location trust prompt service when exiting the wizard

741+ (LP: #1594430)

742+ * Implement clearing the search and closing the panel on pressing

743+ Escape key in the dash header

744+ * Fix log timestamps (LP: #1602196)

745+ * Don't display the mode switch warning dialog on tablets (LP:

746+ #1600290)

747+

748+ [ Michael Terry ]

749+ * Fix indicator profile bug that caused sound indicator to say Mute

750+ instead of Silent Mode. (LP: #1604205)

751+ * Fix lockscreen appearing right after unlocking a locked session on

752+ the desktop. (LP: #1604374)

753+

754+ [ Michał Sawicz ]

755+ * Add arm64 support, drop unnecessary B-D on web plugin

756+

757+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 03 Aug 2016 15:56:27 +0000

758+

759+unity8 (8.14+16.10.20160728-0ubuntu1) yakkety; urgency=medium

760+

761+ [ Zoltán Balogh ]

762+ * Bump the version to secure UITK compatibility

763+

764+ [ Albert Astals Cid ]

765+ * Pass the correct number of arguments to mapToItem (LP: #1606835)

766+

767+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 28 Jul 2016 08:17:13 +0000

768+

769+unity8 (8.13+16.10.20160714+fix1-0ubuntu2~1) yakkety; urgency=medium

770+

771+ * Rebuild against Qt 5.6.

772+ * Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850

773+

774+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 22 Jul 2016 09:03:54 +0300

775+

776+unity8 (8.13+16.10.20160714-0ubuntu1) yakkety; urgency=medium

777+

778+ [ Daniel d'Andrada ]

779+ * Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

780+

781+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 14 Jul 2016 07:09:29 +0000

782+

783+unity8 (8.12+16.10.20160711-0ubuntu1) yakkety; urgency=medium

784+

785+ [ Josh Arenson ]

786+ * Add a SessionsModel to lightdm to support the greeter's session

787+ chooser

788+ * Add unity8-greeter package which contains a basic, but usable

789+ LightDM greeter. (LP: #1324602)

790+

791+ [ Michael Terry ]

792+ * Make sure indicators and launcher hide when power button is pressed

793+ on greeter. (LP: #1595569)

794+ * Fix tablet greeter focus to be always-on, no longer hiding the OSK

795+ or forcing a mouse click to type a password. (LP: #1435923)

796+

797+ -- Michael Terry <michael.terry@canonical.com> Mon, 11 Jul 2016 17:24:20 +0000

798+

799+unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium

800+

801+ [ Michael Zanetti ]

802+ * emit the correct role changed signal on count visible changed (LP:

803+ #1599925)

804+

805+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 07 Jul 2016 16:49:32 +0000

806+

807+unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium

808+

809+ [ Michael Zanetti ]

810+ * don't displace windows if the OSK is on another screen (LP:

811+ #1598917)

812+

813+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 05 Jul 2016 10:00:57 +0000

814+

815+unity8 (8.12+16.10.20160627.5-0ubuntu1) yakkety; urgency=medium

816+

817+ [ Albert Astals Cid ]

818+ * Stop watching the old header item height once it's not our header

819+ anymore

820+ * LVWPH: cull the header item when not on view to save some painting

821+ * Adapt test to new mock behaviour

822+ * Don't let the mouse go outside the parentItem (LP: #1525350)

823+ * Use non deprecated package names

824+ * Mark system includes as such

825+ * Fix initialization order warning

826+ * Do not rely on deleteLater not crashing on null pointers

827+ * Add more headers of classes we use for automoc to be run

828+ * CardTool: Fix the fallback value to be a size and not an integer

829+ * CardTool: Include Ubuntu Components since we're using units.gu

830+ * Rework tst_PreviewRatingDisplayCreationRanges

831+

832+ [ Daniel d'Andrada ]

833+ * Cursor: Let AnimatedSprite run only on animated cursors and while

834+ the display is on (LP: #1588873, #1594358)

835+ * Fix missing screenshot when orientation changes while shell rotation

836+ ongoing (LP: #1587796)

837+

838+ [ Josh Arenson ]

839+ * Make PreviewRatingSingleDisplay visible again after editing a

840+ review. (LP: #1587097)

841+ * Correct errors in all png images to prevent libpng warnings.

842+

843+ [ Lukáš Tinkl ]

844+ * Fix some smaller issues with OOBE wizard password pages (LP:

845+ #1590467)

846+ * Prevent mouse wheel events from going through shell elements (LP:

847+ #1536268)

848+ * Do not let mouse and wheel events pass thru the titlebar (LP:

849+ #1588424)

850+ * Hide the maximize window button based on size restrictions (LP:

851+ #1541982)

852+

853+ [ Marco Trevisan (Treviño) ]

854+ * Unity8.conf: ensure MIR_SOCKET is set for future customers (such as

855+ the dash)

856+ * ClientIndicator: be more informative about loading failures for

857+ dynamically created objects

858+

859+ [ Michael Terry ]

860+ * Stop unity8 from getting in a "switch-to-greeter" loop when locking

861+ on a desktop. (LP: #1593718)

862+

863+ [ Michael Zanetti ]

864+ * set minimum window sizes on dash

865+ * displace application windows when the OSK would cover them

866+

867+ [ Nick Dedekind ]

868+ * Force dash to always stay in the main stage. (lp:#1592404) (LP:

869+ #1592404)

870+ * Save the last surface stage on stage drop. (LP: #1579003)

871+ * Default portrait only apps to the side stage. (LP: #1573153)

872+

873+ [ Albert Astals Cid, Andrea Cimitan, Michał Sawicz, Nick Dedekind ]

874+ * Added live video playback in dash previews

875+

876+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 27 Jun 2016 18:48:59 +0000

877+

878+unity8 (8.12+16.10.20160620.3-0ubuntu1) yakkety; urgency=medium

879+

880+ [ Michael Terry, Michał Sawicz ]

881+ * Support unlocking via fingerprint, if one is registered.

882+

883+ -- Michael Terry <michael.terry@canonical.com> Mon, 20 Jun 2016 20:25:25 +0000

884+

885+unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium

886+

887+ [ Michael Terry ]

888+ * Do not create Label/Icon if we don't need it

889+ * Fix Z-ordering of prompt surfaces (LP: #1586219)

890+ * Drop bottom edge tutorials completely and small fixes for other

891+ edges. (LP: #1565103)

892+ * Redo visuals for greeter prompt box. (LP: #1435923)

893+ * Make tutorial qmltests more robust. (LP: #1590810)

894+ * Stop showing an extra lockscreen in desktop unity8 sessions. (LP:

895+ #1582987)

896+

897+ [ Albert Astals Cid ]

898+ * Improve dash plugin mock

899+ * Stabilize PreviewExpandableTest::test_all_widgets_height

900+ * Workaround QTBUG-53460

901+ * Split artShape code for cardTool card and regular card

902+ * Simplify the code since fixedArtSize code is mandatory for regular

903+ cards

904+ * Desktop stage: Support rotatesWindowContents (LP: #1547481)

905+ * Turn if if else into if elseif else

906+ * Fix leaks in QInputDeviceManagerPrivate::addDevice

907+ * Do not call |= on uninitialized sigterm.sa_flags

908+ * initialize udevMonitor

909+ * Make notifier and notifierFd function local variables

910+ * Fix crash if a component that is not an Item is given to

911+ sectionDelegate

912+ * Tests: Do not use dynamic_cast if we're not going to test it anyway

913+ * Minor coverity fixes

914+ * Fix warning about anchors.fill in ProportionalShape (LP: #1590963)

915+ * Make wait in cleanup() wait for snapTo animation to have finished

916+

917+ [ Alexandros Frantzis ]

918+ * Improve the way notifications interact with power management (LP:

919+ #1570922)

920+

921+ [ Andrea Cimitan ]

922+ * Correctly refresh cardcreator cache on artshapestyle changes (LP:

923+ #1588335)

924+ * Same tweaks we have for click scope now for libertine

925+ * add a timer to pull to refresh to work on small windows (LP:

926+ #1589060)

927+

928+ [ Daniel d'Andrada ]

929+ * Clean up debug leftovers

930+ * Ensure mouse and window movement are pixel-aligned (LP: #1510382)

931+ * Fix SpreadDelegate rotation animations

932+ * No point in version-controlling files that are automatically

933+ generated

934+ * Center cursor on screen when it's first shown

935+ * Custom cursor name just have to start with "custom"

936+ * Work around AnimatedSprite infinite loop bug (LP: #1588929)

937+

938+ [ Josh Arenson ]

939+ * Disable showDash when it is already shown. (LP: #1506708)

940+ * Add a timestamp to the dash log (LP: #1580074)

941+ * Add timestamp to unity8 log (LP: #1498169)

942+

943+ [ Lukáš Tinkl ]

944+ * Implement keyboard shortcuts info panel

945+ * Implement window controls overlay activatable with 3 fingers tap

946+ (LP: #1489020)

947+ * Select correct Chinese input method for OSK in the wizard (LP:

948+ #1588633)

949+

950+ [ Michael Zanetti ]

951+ * Add support for the launcher surface pips displaying the correct

952+ number of surfaces

953+ * Add support for the persistent alert state. (LP: #1575147, #1584348,

954+ #1586621)

955+ * send a Alt-release event on alt+tab instead of delaying it

956+ completely and invoking it later (LP: #1565236)

957+

958+ [ Stephen M. Webb ]

959+ * added a new upstart $SESSION for unity8-desktop-session (LP:

960+ #1376715)

961+

962+ -- Michael Terry <michael.terry@canonical.com> Fri, 17 Jun 2016 01:22:57 +0000

963+

964+unity8 (8.12+16.10.20160601.1-0ubuntu1) yakkety; urgency=medium

965+

966+ [ Pawel Stolowski ]

967+ * Added apparmor profile for unity8-dash.

968+

969+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 01 Jun 2016 20:59:03 +0000

970+

971+unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium

972+

973+ [ Albert Astals Cid ]

974+ * Activate on click for SimpleMessages (LP: #1421696)

975+ * Add override

976+ * Change the art back to the cardData value if it changes from broken

977+ to valid image (LP: #1533577)

978+ * Concierge mode generated code optimization

979+ * Don't use context properties but properties of the delegates

980+ * Listen to contentItem::widthChanged instead of

981+ Flickable::contentWidthChanged (LP: #1565763)

982+ * Make some AP code faster

983+ * Make tests a bit more stable

984+ * Make unity8 and unity8-dash handle termination signals

985+ * Remove workaround not needed anymore (LP: #1475643)

986+ * Resolve cardArtStyle on compile time

987+ * Set the theme earlier (LP: #1574048)

988+

989+ [ Albert Astals Cid, Daniel d'Andrada ]

990+ * Remove DirectionalDragArea and libs/UbuntuGestures and port to SDK

991+ equivalents

992+

993+ [ Andrea Cimitan ]

994+ * Hide the preview review input field when a rating is required (LP:

995+ #1541971)

996+

997+ [ CI Train Bot ]

998+ * Resync trunk.

999+

1000+ [ Daniel d'Andrada ]

1001+ * Fix DragHandle so it works in all directions

1002+ * Support animated cursors

1003+ * WindowInputMonitor - also map Qt::Key_HomePage to our home key

1004+ * plugins/Cursor: properly register to the screen's QPlatformCursor

1005+ when screen changes (LP: #1579742)

1006+

1007+ [ Josh Arenson ]

1008+ * Close the PageHeaderExtraPanel when a filter option is selected (LP:

1009+ #1569498)

1010+ * Wrap primaryFilter in a flickable to make it behave nicely. (LP:

1011+ #1569492)

1012+

1013+ [ Lukáš Tinkl ]

1014+ * First snap decision should always be expanded, unless user decides

1015+ otherwise (LP: #1580090, #1575045)

1016+ * Fullscreen notification bug fixes (LP: #1583944, #1581498, #1422711)

1017+ * Implement maximizing windows horizontally/vertically

1018+ * Lock the session when putting the laptop into sleep (LP: #1581063)

1019+

1020+ [ Lukáš Tinkl, Michael Terry ]

1021+ * With a maximized window, "dragging" the panel down should restore it

1022+

1023+ [ Michael Terry ]

1024+ * Change some dash button colors from orange to green. (LP: #1581047)

1025+ * Use PageHeader instead Ambiance's PageHeadStyle

1026+ * Use new setTimeZone method to set user-friendly timezone name in the

1027+ wizard. (LP: #1566295)

1028+

1029+ [ Michael Zanetti ]

1030+ * Remove the background dimming when the launcher is revealed by a

1031+ drag (LP: #1575137)

1032+ * reenable or drop disabled tests

1033+

1034+ -- Michael Terry <michael.terry@canonical.com> Fri, 27 May 2016 13:54:44 +0000

1035+

1036+unity8 (8.12+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium

1037+

1038+ [ Lukáš Tinkl ]

1039+ * Don't dim screen when the indicators are open (LP: #1564342)

1040+ * Fix upcoming alarms ETA labels (LP: #1576741)

1041+ * Stabilize flaky wizard tests (LP: #1582994)

1042+

1043+ [ Michael Zanetti ]

1044+ * fix the SIM PIN darkening after it got removed accidentally (LP:

1045+ #1577147)

1046+

1047+ [ Michał Sawicz, Nick Dedekind ]

1048+ * Fixed saving current stage and loss of surface focus when switching

1049+ stages

1050+

1051+ [ Nick Dedekind ]

1052+ * Fixed incorrect osk surface item resizing the surface.

1053+

1054+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 20 May 2016 08:44:19 +0000

1055+

1056+unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium

1057+

1058+ [ CI Train Bot ]

1059+ * Resync trunk.

1060+

1061+ [ Daniel d'Andrada, Michał Sawicz ]

1062+ * Move prompt surfaces from MirSurface to Application

1063+

1064+ -- Nick Dedekind <ci-train-bot@canonical.com> Wed, 18 May 2016 11:20:04 +0000

1065+

1066+unity8 (8.12+16.04.20160504.2-0ubuntu1) xenial; urgency=medium

1067+

1068+ [ Albert Astals Cid ]

1069+ * Expandable Filter Widget

1070+ * Pass the category correctly

1071+

1072+ [ Albert Astals Cid, CI Train Bot ]

1073+ * Make the previewActions react to the actions model changing (LP:

1074+ #1485887)

1075+ * Reload Preview Zoomable Image source if it gets updated

1076+ * Update the icon also to the original one if that's what the scope

1077+ wants

1078+

1079+ [ Andrea Cimitan ]

1080+ * Add social actions to cards

1081+

1082+ [ CI Train Bot ]

1083+ * Resync trunk.

1084+

1085+ -- Pawel Stolowski <ci-train-bot@canonical.com> Wed, 04 May 2016 18:09:33 +0000

1086+

1087+unity8 (8.12+16.04.20160429.2-0ubuntu1) xenial; urgency=medium

1088+

1089+ [ CI Train Bot ]

1090+ * Resync trunk.

1091+

1092+ [ Daniel d'Andrada ]

1093+ * Ensure shell transformations use bindings as OrientedShell can get

1094+ resized

1095+ * Make shell rotation animation work on multimonitor scenarios.

1096+ * Refactor screenshotting code and make it work in multimonitor

1097+ scenarios

1098+

1099+ [ Gerry Boland, Nick Dedekind ]

1100+ * Indicators: set menu height binding while fully open/closed, fixes

1101+ dynamic grid unit bug.

1102+

1103+ [ Michael Zanetti ]

1104+ * Call the dash sizing hack when units.gu changes

1105+ * Temporary means to override GUs on the internal screen

1106+ * reduce some paint layers.

1107+

1108+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 29 Apr 2016 20:07:37 +0000

1109+

1110+unity8 (8.12+16.04.20160427.3-0ubuntu1) xenial; urgency=medium

1111+

1112+ [ Albert Astals Cid ]

1113+ * Add env var to enable js debugging/profiling even if not built on

1114+ debug mode

1115+ * Better error message if the item does not exist

1116+ * CardCreator: Remove ShaderEffectSource (LP: #1544875)

1117+ * Compile with Qt 5.6 (LP: #1565632)

1118+ * LVWPH: Account for contentHeight not really being "all" of the

1119+ content height (LP: #1569976)

1120+ * NotificationAudio: We don't need weird "ifdef" for multimedia 5.6 vs

1121+ 5.0 roles anymore

1122+ * See all/less -> Show all/less (LP: #1349471)

1123+ * Stabilize test_superTabToCycleLauncher

1124+ * Take into account that sectionItem height can change

1125+ * Turn verify intro tryCompareFunction

1126+ * forceLayout before calling positionViewAtIndex (LP: #1553475)

1127+ * rootObject can be null for a small moment after setSource is called

1128+ (LP: #1560501)

1129+

1130+ [ CI Train Bot ]

1131+ * Resync trunk.

1132+

1133+ [ Daniel van Vugt ]

1134+ * Reinstate the touch performance/smoothness fix (LP: #1486341, LP:

1135+ #1556763). (LP: #1556763, #1486341)

1136+

1137+ [ Josh Arenson ]

1138+ * Change the color of the activity pulse to blue (LP: #1568082)

1139+ * Make scope filter settings button the same color as other foreground

1140+ elements (LP: #1563357)

1141+

1142+ [ Lukáš Tinkl ]

1143+ * Drop OOBE wizard autopilot tests

1144+ * Fix labels in desktop spread

1145+ * Fix upcoming event ETAs falling out of sync (LP: #1557571)

1146+ * Hide the close button for dash (LP: #1550056, #1564347)

1147+ * Notifications visual update, close button on mouse hover (LP:

1148+ #1564343)

1149+ * Shell visual update

1150+ * Stabilize wizard tests

1151+ * Unity8 windows now cascade instead of opening all in the top left

1152+ corner (LP: #1513813)

1153+

1154+ [ Michael Terry ]

1155+ * Fix some unreliable test code.

1156+ * Ignore Home Key presses when the greeter is up. (LP: #1565818)

1157+

1158+ [ Michael Zanetti ]

1159+ * Drop the rotation lock for the dash (LP: #1465331, #1574165)

1160+ * improve the pin lockscreen

1161+ * install devices.conf by default

1162+

1163+ [ Ted Gould ]

1164+ * Switch to using uid/pwdent for getting username

1165+

1166+ -- Michael Terry <michael.terry@canonical.com> Wed, 27 Apr 2016 15:01:28 +0000

1167+

1168+unity8 (8.12+16.04.20160421.1-0ubuntu1) xenial; urgency=medium

1169+

1170+ [ Daniel d'Andrada ]

1171+ * Refactor keymap switching code

1172+ * Surface-based window management

1173+ * Use Item.grabToImage() instead of qtmir's ApplicationScreenshot

1174+ provider

1175+

1176+ [ Michael Zanetti ]

1177+ * Fixes for programmatically closing Applications

1178+

1179+ [ Robert Bruce Park ]

1180+ * Use new bileto_pre_release_hook

1181+

1182+ -- Gerry Boland <ci-train-bot@canonical.com> Thu, 21 Apr 2016 13:48:02 +0000

1183+

1184+unity8 (8.12+16.04.20160414.1-0ubuntu1) xenial; urgency=medium

1185+

1186+ [ Michael Terry ]

1187+ * Make sure that usageMode is set on startup, fixing a problem with

1188+ the tutorial not noticing that it is running on a desktop. (LP:

1189+ #1564351)

1190+

1191+ [ Michael Zanetti ]

1192+ * make the edge drag area width configurable (LP: #1559512)

1193+

1194+ -- Michael Zanetti <michael.zanetti@canonical.com> Thu, 14 Apr 2016 21:20:28 +0000

1195+

1196+unity8 (8.12+16.04.20160401-0ubuntu1) xenial; urgency=medium

1197+

1198+ * Add missing Testsuite header

1199+ * Skip the failing test until we have a working solution for bug

1200+ #1564571 (LP: #1564571)

1201+

1202+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 01 Apr 2016 08:32:16 +0000

1203+

1204+unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium

1205+

1206+ [ Albert Astals Cid ]

1207+ * Use tutorialLeftLoader instead of tutorialLeft

1208+

1209+ [ CI Train Bot ]

1210+ * Update translation template

1211+

1212+ [ Lukáš Tinkl ]

1213+ * Fix the last chance popup colors/theme

1214+

1215+ [ Michael Terry ]

1216+ * Adjust text for desktop right edge tutorial to be accurate. (LP:

1217+ #1563103)

1218+ * Fix OOBE wizard not setting your name. (LP: #1562872)

1219+ * Fix showing "Retry" in password prompt when turning on screen in

1220+ tablet mode.

1221+

1222+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 30 Mar 2016 07:46:51 +0000

1223+

1224+unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium

1225+

1226+ [ Michael Terry ]

1227+ *

1228+ * Fix setting OSK layout in OOBE wizard

1229+ * Stop the left edge tutorial from being shown when the bottom edge

1230+ tutorial wants to be shown after receiving a call.

1231+

1232+ [ Albert Astals Cid ]

1233+ * Filter implementation with Option Selector filter as the only filter

1234+ * Get the engine from the parent context

1235+ * Implement the API changes due to filters

1236+ * Match design visuals for the new dash navigation/page header popup

1237+ * New Dash Navigation UX

1238+ * Range Input filter

1239+ * Value slider filter

1240+ * Workaround SDK ListItem bug

1241+

1242+ [ Albert Astals Cid, Lukáš Tinkl ]

1243+ * Fix various tests

1244+

1245+ [ CI Train Bot ]

1246+ * Resync trunk.

1247+ * Update translation template

1248+

1249+ [ Lukáš Tinkl, Michael Terry ]

1250+ * New first-run wizard for the phone (part of the OOBE effort) (LP:

1251+ #1536688, #1536617, #1543790, #1555222)

1252+

1253+ [ Lukáš Tinkl, Michał Sawicz ]

1254+ * Keymap switching support (LP: #1524400, #1412492, #1491340)

1255+

1256+ [ Michael Terry, Michael Zanetti ]

1257+ * Redesign the first-boot edge tutorial

1258+

1259+ [ Michael Zanetti ]

1260+ * disabling some tests that are flaky in adt but can't be made fail on

1261+ our machines

1262+

1263+ [ Michael Zanetti, Michał Sawicz ]

1264+ * Change the behavior alond with the switch in indicator-display (LP:

1265+ #1538591)

1266+

1267+ [ Michael Zanetti, Michał Sawicz, Nick Dedekind ]

1268+ * Add support for low shell chrome. (LP: #1535397)

1269+ * Sidestage load/unload redesign (LP: #1544479)

1270+

1271+ -- Michael Zanetti <michael.zanetti@canonical.com> Wed, 23 Mar 2016 09:53:17 +0000

1272+

1273+unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium

1274+

1275+ [ CI Train Bot ]

1276+ * Update translation template

1277+

1278+ [ Lukáš Tinkl ]

1279+ * Fix notifications with the new UITK color schemes (LP: #1554616,

1280+ #1556523)

1281+

1282+ [ Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]

1283+ * more fixes for the new theme palette (LP: #1554616, #1557534)

1284+

1285+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 18 Mar 2016 17:12:53 +0000

1286+

1287+unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium

1288+

1289+ [ Albert Astals Cid ]

1290+ * Add context for Re-dock as asked by translators (LP: #1534608)

1291+ * Add emblem to the preview header widget (LP: #1424720)

1292+ * Add haptics to ScopesListCategoryItem buttons

1293+ * Audio Cards: Make some of the image loading async (LP: #1533432)

1294+ * Do not create fallback code for the card tool fake card (LP:

1295+ #1545865)

1296+ * Fix resizing the dash bringing temp scopes size out of sync (LP:

1297+ #1543130)

1298+ * Minor fixes for unity-scope-tool

1299+ * Resolve title alignment on card creator time instead of on runtime

1300+ * Use fixedHeaderHeight only in the non cardtool cards

1301+ * Use the new undeprecated connectivityqt::Connectivity

1302+ * asynchronous is only false on the fake card in cardtool

1303+ * clazy fixes

1304+

1305+ [ Albert Astals Cid, CI Train Bot ]

1306+ * click scope: Add the else branch so we reset the card size in all

1307+ situations

1308+

1309+ [ Andrea Cimitan ]

1310+ * PreviewSharing widget now accepts both string and array of

1311+ widgetData["share-data"]["uri"] (LP: #1549056)

1312+ * Update AP tests for new single preview

1313+ * Use Text.Wrap for body notification text (LP: #1544909)

1314+

1315+ [ Andrea Cimitan, Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]

1316+ * some fixes for the new palette (LP: #1554616)

1317+

1318+ [ CI Train Bot ]

1319+ * Resync trunk.

1320+ * Update translation template

1321+

1322+ [ CI Train Bot, Daniel d'Andrada ]

1323+ * Ensure the QML engine doesn't delete our mock MirSurfaces on its

1324+ own.

1325+

1326+ [ Daniel d'Andrada ]

1327+ * tst_Shell: Remove unused qml items

1328+

1329+ [ Josh Arenson ]

1330+ * Allow the shell to blacklist input devices and force the OSK shown.

1331+ (LP: #1542224)

1332+

1333+ [ Lukáš Tinkl ]

1334+ * Disallow resizing windows up, past the Panel (LP: #1544766)

1335+ * Elide the window title not to let it overflow into the indicators

1336+ area (LP: #1535767)

1337+ * Enable the PIN lockscreen to be used with a HW keyboard (LP:

1338+ #1550359)

1339+ * Fix tiny windows when switching stages

1340+ * Provide a range of ports to QML JS Debugger

1341+ * Watch for launcher item icon changes (LP: #1543290)

1342+

1343+ [ Michael Terry ]

1344+ * Proxy more mouse and touchpad properties to USC (LP: #1540398) (LP:

1345+ #1543344, #1540398)

1346+ * Refactor the AccountsService plugin and make it slightly faster.

1347+ * To let the user log in if a mouse is connected, hide the greeter

1348+ cover page on a mouse click (but NOT a touch click). (LP: #1540497)

1349+ * Watch AccountsService for changes to the user's real name. This was

1350+ preventing us from noticing when the user set their name in the

1351+ welcome wizard.

1352+

1353+ [ Michael Zanetti ]

1354+ * Allow alt+tabbing in staged mode too (LP: #1540502)

1355+ * Allow invoking the staged mode spreads by mouse right edge pushes

1356+ too (LP: #1540392)

1357+ * Allow loading the device configuration from an external file

1358+ * Implement Launcher's keyboard navigation and updated pip design

1359+ * Make launcher scalable, allow it locking (LP: #1511015)

1360+ * Properly parent launcher items in all cases (LP: #1495732)

1361+ * Read inputMethod surface from the new property int QtMir (LP:

1362+ #1545286)

1363+ * Some visual updates and rotation lock for the virtual touchpad (LP:

1364+ #1549087)

1365+ * Visual updates for the windowed spread (LP: #1488148)

1366+ * stabilize swipeAwayGreeter()

1367+

1368+ [ Michał Sawicz ]

1369+ * Add udev rules to make sure we have access to uinput

1370+ * Make dash respawn indefinitely (LP: #1550056)

1371+ * Use dpkg-architecture, not arch, to disable touch emulation

1372+

1373+ [ Vesa Rautiainen ]

1374+ * Fixing the vertical position of desktop spread item icon.

1375+

1376+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 10 Mar 2016 22:44:16 +0000

1377+

1378+unity8 (8.11+16.04.20160308-0ubuntu1) xenial; urgency=medium

1379+

1380+ [ Albert Astals Cid ]

1381+ * Make these tests pass with the new SDK

1382+

1383+ [ Andrea Cimitan, Nick Dedekind ]

1384+ * replace selected.backgroundText with normal.backgroundText in

1385+ Splash, Notifications, Wizard

1386+

1387+ [ CI Train Bot ]

1388+ * Update translation template

1389+

1390+ [ Michał Sawicz, Nick Dedekind ]

1391+ * Fixed colours palette value set. Moved ModemItem to USC.

1392+

1393+ [ Michał Sawicz, Tim Peeters ]

1394+ * Update headers for Dash and Splash to work properly with the new UI

1395+ toolkit release.

1396+

1397+ [ Zoltán Balogh, Zsombor Egri ]

1398+ * Use SuruDark theme instead of the deprecated SuruGradient.

1399+

1400+ -- Zoltan Balogh <zoltan.balogh@canonical.com> Tue, 08 Mar 2016 20:59:34 +0000

1401+

1402+unity8 (8.11+16.04.20160307-0ubuntu1) xenial; urgency=medium

1403+

1404+ [ CI Train Bot ]

1405+ * Resync trunk.

1406+ * Update translation template

1407+

1408+ [ Rodney Dawes ]

1409+ * Re-enable the purchaseCancelled signal.

1410+

1411+ -- Rodney Dawes <ci-train-bot@canonical.com> Mon, 07 Mar 2016 14:12:08 +0000

1412+

1413+unity8 (8.11+16.04.20160301-0ubuntu1) xenial; urgency=medium

1414+

1415+ [ Albert Astals Cid ]

1416+ * Hook the new scope.activationInProgress property (LP: #1537132)

1417+

1418+ [ Andrea Cimitan ]

1419+ * Updated the Preview view to use a single PreviewModel instead old

1420+ PreviewStack, using a Loader instead ListView (LP: #1541967)

1421+

1422+ [ CI Train Bot ]

1423+ * Resync trunk.

1424+ * Update translation template

1425+

1426+ [ Michał Sawicz ]

1427+ * Add autopilot as DEP-8 tests added: debian/tests/autopilot.sh

1428+

1429+ -- Pawel Stolowski <ci-train-bot@canonical.com> Tue, 01 Mar 2016 10:28:52 +0000

1430+

1431+unity8 (8.11+16.04.20160216.1-0ubuntu1) xenial; urgency=medium

1432+

1433+ [ Albert Astals Cid ]

1434+ * Make the audio previews create a playlist (LP: #1540477)

1435+

1436+ [ CI Train Bot ]

1437+ * Resync trunk. added: po/aa.po

1438+ * Update translation template

1439+

1440+ -- Pawel Stolowski <ci-train-bot@canonical.com> Tue, 16 Feb 2016 03:24:46 +0000

1441+

1442+unity8 (8.11+16.04.20160212-0ubuntu1) xenial; urgency=medium

1443+

1444+ [ Albert Astals Cid ]

1445+ * Do not use components in card creator generated code

1446+ * Forward the makesurevisible signal from the inner preview widget

1447+ * Make fallback also be fallback when the image is empty and not only

1448+ on error (LP: #1531913)

1449+ * Make the artShapeSize assignment be updated when using dynamic grid

1450+ units

1451+ * Visual improvements to the dash audio play cards

1452+ * We don't use the unity-scope-scopes anymore (LP: #1439172)

1453+

1454+ [ Andrea Cimitan ]

1455+ * only request a bigger image if zoomable widget data property is

1456+ true, otherwise just leave the screen size (LP: #1536814)

1457+

1458+ [ CI Train Bot ]

1459+ * Update translation template

1460+

1461+ [ Daniel d'Andrada ]

1462+ * Set initial surface size (LP: #1532974)

1463+

1464+ [ Daniel d'Andrada, Michał Sawicz ]

1465+ * Window Size Hints

1466+

1467+ [ Florian Boucault ]

1468+ * Splash screen: delay showing the ActivityIndicator by 2 seconds.

1469+

1470+ [ Lukáš Tinkl ]

1471+ * Replace the word "phone" with a more generic term "device" in the

1472+ welcome wizard (LP: #1294732, #1543527)

1473+

1474+ [ Michael Terry ]

1475+ * Have the tablet greeter set appropriate OSK hints if the user has a

1476+ passcode instead of a passphrase. (LP: #1544173)

1477+

1478+ [ Michael Zanetti ]

1479+ * Don't eat mouse events in the edgebarrer

1480+

1481+ [ Michał Sawicz ]

1482+ * Bump unity-api dependencies

1483+

1484+ [ Nick Dedekind ]

1485+ * Added support for secondary indicator actions (LP: #1398888)

1486+ * Remove zombie if they're not animated. (LP: #1534541)

1487+ * Removed unused panel resources

1488+

1489+ [ Ted Gould ]

1490+ * Start the indicators after Unity8 starts instead of before

1491+

1492+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 12 Feb 2016 00:12:41 +0000

1493+

1494+unity8 (8.11+16.04.20160208-0ubuntu1) xenial; urgency=medium

1495+

1496+ [ Albert Astals Cid ]

1497+ * LVWPH: Reset to initial values when list is empty (LP: #1540490)

1498+ * Make LazyImage qmltest less flaky on CI

1499+

1500+ [ Andrea Cimitan ]

1501+ * Make LazyImage qmltest less flaky on CI

1502+

1503+ [ CI Train Bot ]

1504+ * Resync trunk.

1505+ * Update translation template

1506+

1507+ [ Michael Terry ]

1508+ * Display the current user's real name on the tablet lockscreen. (LP:

1509+ #1536714)

1510+

1511+ -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 08 Feb 2016 09:38:00 +0000

1512+

1513+unity8 (8.11+16.04.20160129-0ubuntu1) xenial; urgency=medium

1514+

1515+ [ Albert Astals Cid ]

1516+ * Audio Preview Button: Don't gain focus on press (LP: #1517830)

1517+ * Better attempt at sanitization

1518+ * Better looking application scopes for wide screens

1519+ * Call printSettings correctly

1520+ * Card test: Limit the precision we ask for doubles to be equal

1521+ * Convert while into tryCompareFunction

1522+ * Do not use the same filepath parameter for all the card creator

1523+ createQmlObject calls (LP: #1536379)

1524+ * Fix some test shells being unstable in the armhf builders

1525+ * Make revealByEdgePush more stable

1526+ * More reliable compares

1527+ * Move the mouse over the bfb before waiting for rendering

1528+ * Remove the DDAs constrains for every test

1529+ * Set the background source size to the max we'll need + new

1530+ background (LP: #1539011)

1531+

1532+ [ Andrea Cimitan ]

1533+ * Dynamically change click scope card size according to size (LP:

1534+ #1536745)

1535+ * Should fix lazyimage test failures on fast machines

1536+

1537+ [ CI Train Bot ]

1538+ * Fix card tests on the phone

1539+ * Update translation template

1540+

1541+ [ Daniel d'Andrada ]

1542+ * Desktop stage rotates only to follow screen orientation (LP:

1543+ #1515977)

1544+

1545+ [ Lukáš Tinkl ]

1546+ * Hide/reveal the mouse pointer on touch/mouse events renamed:

1547+ plugins/Utils/HomeKeyWatcher.cpp =>

1548+ plugins/Utils/WindowInputMonitor.cpp plugins/Utils/HomeKeyWatcher.h

1549+ => plugins/Utils/WindowInputMonitor.h

1550+ tests/mocks/Utils/HomeKeyWatcher.qml =>

1551+ tests/mocks/Utils/WindowInputMonitor.qml

1552+ tests/plugins/Utils/HomeKeyWatcherTest.cpp =>

1553+ tests/plugins/Utils/WindowInputMonitorTest.cpp

1554+

1555+ [ Michael Terry ]

1556+ * Synchronize the mouse-cursor-speed and touchpad-cursor-speed

1557+ properties with USC. (LP: #1536383)

1558+

1559+ [ Michael Zanetti ]

1560+ * Add InputMethod to secondary screen

1561+ * Add a virtual Touchpad while external screen is connected

1562+ * Make big tablets switch to windowed mode by plugging a kbd only (LP:

1563+ #1535399)

1564+ * Prevent alt key presses from being dispatched to the app on alt+tab

1565+ (LP: #1532862)

1566+

1567+ [ Michał Sawicz ]

1568+ * Make qmluitests.sh more robust and allow parallel test execution

1569+ * Skip SessionBackendTest::testLogin1Capabilities until we talk to a

1570+ mock instead (LP: #1532112, #1532113)

1571+

1572+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 29 Jan 2016 11:53:27 +0000

1573+

1574+unity8 (8.11+16.04.20160122-0ubuntu1) xenial; urgency=medium

1575+

1576+ [ Albert Astals Cid ]

1577+ * Fix bug #1536296 added: tests/plugins/Dash/cardcreator/10.tst (LP:

1578+ #1536296)

1579+ * Fix card tests on the phone

1580+

1581+ [ CI Train Bot ]

1582+ * Update translation template

1583+

1584+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 22 Jan 2016 16:56:04 +0000

1585+

1586+unity8 (8.11+16.04.20160111.1-0ubuntu1) xenial; urgency=medium

1587+

1588+ [ Albert Astals Cid ]

1589+ * Clear fake item icon name as soon as it goes invisible (LP:

1590+ #1531172)

1591+ * Fix LVWPH test failing on Xenial (Qt 5.5)

1592+ * Fix dragging so that test passes on Xenial

1593+ * Fix focus on the dash page header text field with new SDK (LP:

1594+ #1528178)

1595+ * Make the card creator test pass again

1596+ * Quit the dash communicator thread before destroying it (LP:

1597+ #1508485)

1598+ * Remove duplicated override_dh_auto_clean

1599+ * SDK changed the name they give to the buttons, follow

1600+

1601+ [ Andrea Cimitan ]

1602+ * Fix a broken binding

1603+

1604+ [ CI Train Bot ]

1605+ * Resync trunk.

1606+ * Update translation template

1607+

1608+ [ Daniel d'Andrada ]

1609+ * Have "make tryFoo" work with Qt 5.5

1610+ * Make DragHandle tests run again.

1611+

1612+ [ Lukáš Tinkl ]

1613+ * Fix dismissing the launcher when clicking/tapping outside (LP:

1614+ #1531339, #1530940)

1615+ * Fix panel drop shadow and click-to-focus of maximized apps (LP:

1616+ #1531854)

1617+ * Fix wifi access point indicator items signal strength icon on

1618+ desktop

1619+

1620+ [ Michael Terry ]

1621+ * Guard against a couple odd timing scenarios for the too-many-failed-

1622+ login-attempts lockout screen.

1623+ * Skip the wizard's password screens if there is already a password

1624+ set by other means. (LP: #1531268)

1625+ * Stop the emergency dialer from accidentally exposing the mtp

1626+ service. (LP: #1525981)

1627+

1628+ [ Michael Zanetti ]

1629+ * Make sure the triangle of the quicklist is in bounds (LP: #1531340)

1630+

1631+ [ Pawel Stolowski ]

1632+ * Changes 'shareData' and 'contentType' attributes to 'share-data' and

1633+ 'content-type', to match existing naming schema.

1634+

1635+ -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 11 Jan 2016 17:38:49 +0000

1636+

1637+unity8 (8.11+16.04.20160107-0ubuntu1) xenial; urgency=medium

1638+

1639+ [ Albert Astals Cid ]

1640+ * Introduce audio cards

1641+

1642+ [ CI Train Bot ]

1643+ * Update translation template

1644+

1645+ [ Michael Zanetti ]

1646+ * Introduce audio cards

1647+

1648+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 07 Jan 2016 08:04:47 +0000

1649+

1650+unity8 (8.11+16.04.20160105.1-0ubuntu1) xenial; urgency=medium

1651+

1652+ [ CI Train Bot ]

1653+ * Resync trunk.

1654+ * Update translation template

1655+

1656+ [ Nick Dedekind ]

1657+ * Use volume-sync action to resync the volume control. (LP: #1520548)

1658+

1659+ -- Xavi Garcia <xavi.garcia.mena@canonical.com> Tue, 05 Jan 2016 13:55:38 +0000

1660+

1661+unity8 (8.11+16.04.20151208.1-0ubuntu1) xenial; urgency=medium

1662+

1663+ [ Albert Astals Cid ]

1664+ * Allow dragging launcher items with the quicklist open (LP: #1250861)

1665+ * Create ratings on demand instead of all at the same time (LP:

1666+ #1519898, #1492214)

1667+ * LVWPH: Process correctly section changes (LP: #1519893)

1668+ * Make sure that unfavoriting a scope gives us the next one

1669+ * Move images only used in tests to tests folder

1670+

1671+ [ Andrea Cimitan ]

1672+ * Add shadows to ubuntu store icon

1673+

1674+ [ Daniel d'Andrada ]

1675+ * MirSurfaceItem got a new property: fillMode (LP: #1497083)

1676+ * Session can have multiple surfaces now

1677+ * plugins/Cursor: Do not force loading a specific cursor size (LP:

1678+ #1517878)

1679+

1680+ [ Lukáš Tinkl ]

1681+ * Indicators convergence: use the "phone" profile everywhere (LP:

1682+ #1520492)

1683+

1684+ [ Michael Terry ]

1685+ * Let qtmir know which apps are exempt from the lifecycle management.

1686+ This way, it can manage its own wakelocks better (and stop

1687+ preventing the system from deep sleeping).

1688+

1689+ [ Michael Zanetti ]

1690+ * Use proper z ordering instead of app index for occlusion detection

1691+ * add some debug prints to the uinput backend

1692+ * drop the ignoredMice hack again (LP: #1521580)

1693+

1694+ [ Michał Sawicz ]

1695+ * Let qtmir know which apps are exempt from the lifecycle management.

1696+ This way, it can manage its own wakelocks better (and stop

1697+ preventing the system from deep sleeping).

1698+ * Update .pot file in debian/clean when in train

1699+

1700+ -- Gerry Boland <ci-train-bot@canonical.com> Tue, 08 Dec 2015 15:37:58 +0000

1701+

1702+unity8 (8.11+16.04.20151126-0ubuntu2) xenial; urgency=medium

1703+

1704+ * Rebuild against Qt 5.5.1.

1705+

1706+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 30 Nov 2015 16:19:18 +0200

1707+

1708+unity8 (8.11+16.04.20151126-0ubuntu1) xenial; urgency=medium

1709+

1710+ [ Albert Astals Cid ]

1711+ * Initialize the image to be transparent (LP: #1517128)

1712+ * Update pot file

1713+ * clazy improvements

1714+

1715+ [ Andrea Cimitan ]

1716+ * Shadows in launcher and dash using UbuntuShapeIcon

1717+

1718+ [ CI Train Bot ]

1719+ * Resync trunk.

1720+

1721+ [ Daniel d'Andrada ]

1722+ * Cursor plugin: add scroll wheel handling (LP: #1497091)

1723+ * Cursor: Add more fallback names, a blank and custom cursor support

1724+ * DesktopStage: swiping from right edge shows window spread

1725+ * Don't stretch application surfaces when resizing (LP: #1497083)

1726+ * Mouse has to push against edges to show launcher or apps spread (LP:

1727+ #1510969)

1728+

1729+ [ Josh Arenson ]

1730+ * Don't let IntegratedLightDM muck with the username (LP: #1497081)

1731+

1732+ [ Lukáš Tinkl ]

1733+ * Implement new visuals for panel and window decorations (LP:

1734+ #1493066, #1511020, #1497095)

1735+ * Let systemd/logind handle the lid-close action

1736+ * Make saving screenshots really async

1737+

1738+ [ Michael Zanetti ]

1739+ * detect touchpads too, not only mice (LP: #1518395)

1740+ * move screenshots out of the Dash dir

1741+

1742+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 26 Nov 2015 13:52:00 +0000

1743+

1744+unity8 (8.11+16.04.20151112.1-0ubuntu1) xenial; urgency=medium

1745+

1746+ [ Albert Astals Cid ]

1747+ * Make cardWidth and cardHeight real

1748+ * Reset instead of qFatal when removing things from the middle (LP:

1749+ #1238979)

1750+ * Warn we're using only the cache when not connected to the interwebs

1751+

1752+ [ Andrea Cimitan ]

1753+ * Add sharing widget to zoomable image and video playback

1754+

1755+ [ Daniel d'Andrada ]

1756+ * Cursor: properly initialize hotspot position (LP: #1510407)

1757+ * Update GSettings mock in tst_OrientedShell

1758+

1759+ [ Lukáš Tinkl ]

1760+ * Restore windows when activating from the spread, maintain a focus

1761+ stack

1762+

1763+ [ Michael Terry ]

1764+ * Make a few DBus calls asynchronous, for a smoother UX.

1765+

1766+ [ Michael Zanetti ]

1767+ * Add a warning dialog when disconnecting the external monitor.

1768+ * added icon for the dash (LP: #1488146)

1769+ * prevent windows to be moved under the panel (LP: #1438465)

1770+ * update inputinfo api to the latest upstream snapshot

1771+ * use UbuntuNumberAnimations instead of linear ones for window state

1772+ transitions (LP: #1497097)

1773+

1774+ -- Michael Zanetti <michael.zanetti@canonical.com> Thu, 12 Nov 2015 20:41:02 +0000

1775+

1776+unity8 (8.11+16.04.20151104-0ubuntu1) xenial; urgency=medium

1777+

1778+ [ Albert Astals Cid ]

1779+ * Add an Item that proxies for old and new audio roles (LP: #1493851)

1780+ * CroppedImageMinimumSourceSize: Fix 'Binding loop detected for

1781+ property "imageAspectRatio"'

1782+ * Make the scope settings list scroll to text visible area (LP:

1783+ #1499084)

1784+ * Move to importing QtQuick 2.4 & friends

1785+ * Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)

1786+

1787+ [ Andrea Cimitan ]

1788+ * Add sharing widget to zoomable image and video playback

1789+ * Make zoomable and video playback widgets edge to edge

1790+ * Updated all 1.3 UbuntuShape to use new APIs where possible

1791+ * Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)

1792+

1793+ [ CI Train Bot ]

1794+ * Resync trunk.

1795+

1796+ [ Christopher Lee ]

1797+ * Quick spelling fix in process control output.

1798+

1799+ [ Daniel d'Andrada ]

1800+ * Enable support for overriding application orientations based on

1801+ device type (LP: #1478637)

1802+ * Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)

1803+ * Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)

1804+

1805+ [ Josh Arenson ]

1806+ * Enable support for overriding application orientations based on

1807+ device type (LP: #1478637)

1808+

1809+ [ Michael Terry ]

1810+ * Avoid showing the shutdown dialog when turning on the screen if your

1811+ device is under heavy load. (LP: #1508563)

1812+ * Handle lifecycle policy exceptions ourselves, instead of letting

1813+ qtmir do it for us and allow non-Touch apps to opt-out of the Touch

1814+ lifecycle.

1815+

1816+ [ Michael Zanetti ]

1817+ * Fixes for the panel buttons (LP: #1510360, #1504269, #1431566,

1818+ #1443319)

1819+ * Use SDK 1.3 across all files (LP: #1503498, #1508363, #1449628)

1820+

1821+ [ Michał Sawicz ]

1822+ * Add missing copyright to Cursor.qml

1823+ * Enable support for overriding application orientations based on

1824+ device type (LP: #1478637)

1825+ * Support server->client visibility change to stop rendering

1826+ (lp:#1475678) (LP: #1475678)

1827+

1828+ [ Nick Dedekind ]

1829+ * Support server->client visibility change to stop rendering

1830+ (lp:#1475678) (LP: #1475678)

1831+

1832+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 04 Nov 2015 14:58:41 +0000

1833+

1834+unity8 (8.11+15.10.20151021-0ubuntu1) wily; urgency=medium

1835+

1836+ [ Albert Astals Cid ]

1837+ * Clazy fixes

1838+ * Enable Efficient String Construction by default

1839+

1840+ [ CI Train Bot ]

1841+ * New rebuild forced.

1842+

1843+ [ Daniel d'Andrada ]

1844+ * Have unity8 drawing its own cursor (LP: #1488417)

1845+ * Initial multi-monitor support

1846+

1847+ [ Daniel van Vugt ]

1848+ * Disable Qt's stuttering 'touch compression' to fix scrolling

1849+ smoothness (LP: #1486341, #1488327)

1850+

1851+ [ Lukáš Tinkl ]

1852+ * Fix autopilot wizard test skipping the reporting page

1853+ * Implement Unity.Platform plugin wrapping org.freedesktop.hostname1

1854+ (LP: #1504318)

1855+ * React to window title (aka surface name) changes (LP: #1497092)

1856+ * Rotate the screenshots according to the actual orientation

1857+

1858+ [ Michał Sawicz ]

1859+ * Fix application API dependency

1860+ * Have unity8 drawing its own cursor (LP: #1488417)

1861+ * Initial multi-monitor support

1862+ * Rotate the screenshots according to the actual orientation

1863+

1864+ [ Nick Dedekind ]

1865+ * Fixed leak in UnityMenuModelStackTest

1866+ * Moved time translation to SDK (LP: #1372061)

1867+

1868+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 21 Oct 2015 11:51:53 +0000

1869+

1870+unity8 (8.11+15.10.20151009-0ubuntu1) wily; urgency=medium

1871+

1872+ [ CI Train Bot ]

1873+ * New rebuild forced.

1874+

1875+ [ Pawel Stolowski ]

1876+ * Store unity8 package version in /var/lib/.../version file for fast

1877+ retrieval from the shell plugin.

1878+

1879+ -- Pawel Stolowski <ci-train-bot@canonical.com> Fri, 09 Oct 2015 09:13:03 +0000

1880+

1881+unity8 (8.11+15.10.20151008-0ubuntu1) wily; urgency=medium

1882+

1883+ [ Lukáš Tinkl ]

1884+ * Revert to using plaintext instead of HTML-like markup for the

1885+ notifications (LP: #1504256)

1886+

1887+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 08 Oct 2015 20:46:26 +0000

1888+

1889+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium

1890+

1891+ [ CI Train Bot ]

1892+ * Resync trunk.

1893+

1894+ [ Lukáš Tinkl ]

1895+ * Wizard: skip the reporting page if the system is configured not to

1896+ report crashes (LP: #1494442)

1897+

1898+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000

1899+

1900+unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium

1901+

1902+ [ Alexandros Frantzis ]

1903+ * Use power state change reason SnapDecision to turn screen on when a

1904+ SnapDecision arrives (LP: #1291455)

1905+

1906+ [ CI Train Bot ]

1907+ * New rebuild forced.

1908+

1909+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 01 Oct 2015 12:04:04 +0000

1910+

1911+unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium

1912+

1913+ [ Albert Astals Cid ]

1914+ * Make Launcher::test_quickListMenuOnRMB stable (LP: #1500359)

1915+

1916+ [ CI Train Bot ]

1917+ * New rebuild forced.

1918+

1919+ [ Michael Zanetti ]

1920+ * Stabilize Launcher DND test

1921+

1922+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 30 Sep 2015 10:09:33 +0000

1923+

1924+unity8 (8.11+15.10.20150925-0ubuntu1) wily; urgency=medium

1925+

1926+ [ Albert Astals Cid ]

1927+ * Improvements from running clazy over the code

1928+

1929+ [ Daniel d'Andrada ]

1930+ * PhoneStage: ensure you're left in a consistent state after being

1931+ reset (LP: #1476757)

1932+

1933+ [ Lukáš Tinkl ]

1934+ * Improve the appearance and functionality of datetime and session

1935+ indicators in Unity8 desktop.

1936+ * Using InputInfo, determine if we need swipe or click to dismiss the

1937+ notifications (e.g. incoming phone call)

1938+

1939+ [ Michael Zanetti ]

1940+ * further development on the Desktop Spread (LP: #1488147)

1941+

1942+ [ Michał Sawicz ]

1943+ * Bump application API version

1944+ * Skip bluetooth check under wily, use expectFailure to notice when

1945+ it's back

1946+

1947+ [ Richard Somlói ]

1948+ * Fix translator comments in time formatter

1949+

1950+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 25 Sep 2015 12:13:20 +0000

1951+

1952+unity8 (8.11+15.10.20150922.1-0ubuntu1) wily; urgency=medium

1953+

1954+ [ Albert Astals Cid ]

1955+ * Adapt test to code changes

1956+ * Add DEP-8 test for all our UI and unit tests

1957+ * Keep the PreviewStack around to avoid mem leaks (LP: #1495467)

1958+

1959+ [ CI Train Bot ]

1960+ * Resync trunk.

1961+

1962+ [ Michael Terry ]

1963+ * When libusermetrics gives us an empty string, still show the

1964+ infographic circle rather than hiding it. This is a follow-on to a

1965+ branch [1] that changes the "no data available" label to the empty

1966+ string.

1967+

1968+ [ Michał Sawicz ]

1969+ * Add DEP-8 test for all our UI and unit tests

1970+ * Fix integrated LightDM path

1971+ * Resync trunk

1972+

1973+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 22 Sep 2015 12:57:15 +0000

1974+

1975+unity8 (8.11+15.10.20150915-0ubuntu1) wily; urgency=medium

1976+

1977+ [ Albert Astals Cid ]

1978+ * Fix testNotifications

1979+ * Make the wait longer to make tests pass in CI

1980+ * New simplified CroppedImageMinimumSourceSize (LP: #1467740)

1981+ * Stop animateTimer when starting the fadeOutAnimation

1982+ * Use AlreadyLaunchedUpstart so that tests passes

1983+ * Workaround keyboard issues and make test pass again

1984+

1985+ [ Daniel d'Andrada ]

1986+ * DesktopStage: Refactor focus handling

1987+ * Stabilize tstShell.test_launchedAppHasActiveFocus

1988+

1989+ [ Gary.Wzl ]

1990+ * Add widgetData["expanded"] property for expandable widget.

1991+

1992+ [ Michael Terry ]

1993+ * Fix typo that caused the tutorial to tease the launcher on top of

1994+ the greeter.

1995+ * Fix typo that caused the tutorial to tease the launcher on top of

1996+ the greeter.

1997+

1998+ -- Michael Zanetti <michael.zanetti@canonical.com> Tue, 15 Sep 2015 12:06:06 +0000

1999+

2000+unity8 (8.11+15.10.20150907-0ubuntu1) wily; urgency=medium

2001+

2002+ [ Michal Sawicz ]

2003+ * Resync wily with vivid

2004+

2005+ [ Albert Astals Cid ]

2006+ * Accomodate header height when using a card carousel with non

2007+ overlayed header (LP: #1489309)

2008+ * Fix restart unity8 from inside the phone more than two times (LP:

2009+ #1487946)

2010+

2011+ [ Gary.Wzl ]

2012+ * Move textarea up automatically when inputmethod popup. (LP:

2013+ #1485947)

2014+

2015+ [ Lukáš Tinkl ]

2016+ * Introduce a GlobalShortcut QML component for handling global

2017+ keyboard shortcuts

2018+

2019+ [ Michael Terry ]

2020+ * Fix the fact that a user that is locked out from their account for

2021+ five minutes after entering too many wrong passwords can simply

2022+ reboot to try again. (LP: #1383086)

2023+ * Fix the fact that a user that is locked out from their account for

2024+ five minutes after entering too many wrong passwords can simply

2025+ reboot to try again. (LP: #1383086)

2026+

2027+ [ Michael Zanetti ]

2028+ * Implement progressive autoscrolling in desktop spread

2029+ * add an animation transition when invoking the spread by hitting the

2030+ right edge

2031+

2032+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 07 Sep 2015 14:05:37 +0000

2033+

2034+unity8 (8.11+15.10.20150826-0ubuntu1) wily; urgency=medium

2035+

2036+ [ Michael Zanetti ]

2037+ * release for wily

2038+

2039+ [ CI Train Bot ]

2040+ * New rebuild forced.

2041+

2042+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 26 Aug 2015 09:01:03 +0000

2043+

2044+unity8 (8.11+15.04.20150831.2-0ubuntu1) vivid; urgency=medium

2045+

2046+ [ Albert Astals Cid ]

2047+ * Accept auto repeats for the power down button if timer is not yet

2048+ running (LP: #1486953, #1488927)

2049+ * Add tests for Shell+Dash interaction

2050+ * Make clicking on launcher buttons have haptic feedback

2051+ * Make test_greeter_hides_on_app_open more stable

2052+ * Move connect() to new syntax

2053+ * make pot_file (LP: #1488484)

2054+

2055+ [ Gerry Boland ]

2056+ * [spread] avoid changing sourceSize of snapshotted apps, it causes

2057+ ghost apps in the spread (LP: #1474319)

2058+

2059+ [ Josh Arenson ]

2060+ * Refactor the greeter to enable dynamic loading of backend plugins.

2061+ * Refactor the greeter to enable dynamic loading of backend plugins.

2062+

2063+ [ Lukáš Tinkl ]

2064+ * Don't show the volume notification when the sound indicator is shown

2065+ (LP: #1484126)

2066+

2067+ [ Michael Terry ]

2068+ * Unify turn-on-screen-upon-notification logic from various daemons

2069+ into unity8. (LP: #1426115, #1482317)

2070+

2071+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 31 Aug 2015 10:25:39 +0000

2072+

2073+unity8 (8.11+15.04.20150827.1-0ubuntu1) vivid; urgency=medium

2074+

2075+ [ Daniel d'Andrada ]

2076+ * MirSurfaceItem is now a view+controller instantiated from QML (LP:

2077+ #1483752)

2078+

2079+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 27 Aug 2015 14:00:05 +0000

2080+

2081+unity8 (8.11+15.04.20150821-0ubuntu1) vivid; urgency=medium

2082+

2083+ [ Michael Terry ]

2084+ * Skip the tutorial entirely when in desktop mode. This fixes the

2085+ emulator not being able to pass the tutorial.

2086+ * Skip the tutorial entirely when in desktop mode. This fixes the

2087+ emulator not being able to pass the tutorial.

2088+

2089+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 21 Aug 2015 14:34:50 +0000

2090+

2091+unity8 (8.11+15.04.20150817-0ubuntu1) vivid; urgency=medium

2092+

2093+ [ Albert Astals Cid ]

2094+ * Drop gcc 4.9 requirement in debian/rules

2095+ * Make the test more stable

2096+ * Optimize scope.preview() calls (LP: #1478022)

2097+

2098+ [ Alberto Mardegan ]

2099+ * Set currentIndex after the model change is completed (LP: #1433442)

2100+

2101+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 17 Aug 2015 11:57:31 +0000

2102+

2103+unity8 (8.11+15.04.20150814-0ubuntu1) vivid; urgency=medium

2104+

2105+ [ Albert Astals Cid ]

2106+ * Make the test pass again after rework of appmanager

2107+ * fix testPhoneStage

2108+

2109+ [ CI Train Bot ]

2110+ * New rebuild forced.

2111+

2112+ [ Daniel d'Andrada ]

2113+ * Fix and clean up InputInfo plugin

2114+

2115+ [ Rodney Dawes ]

2116+ * Do not call verify in the payments button code. (LP: #1468038)

2117+

2118+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 14 Aug 2015 09:53:11 +0000

2119+

2120+unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium

2121+

2122+ [ Albert Astals Cid ]

2123+ * Add a test that checks that items in an expandable are the correct

2124+ size after expanding the expandable

2125+ * Fix the expandable test

2126+ * Replace some waitForRendering with wait(0)

2127+ * Workaround for bug 1473471 (LP: #1473471)

2128+

2129+ [ Gary.Wzl ]

2130+ * Fix layout issue when adding audio track widget in expandable widget

2131+

2132+ [ handsome_feng ]

2133+ * Added indication for running apps. (LP: #1471577)

2134+ * Adjust the color to highlighting indicator. (LP: #1457098)

2135+ * Convert the MouseArea to MultiPointTouchArea to track multiple touch

2136+ points. (LP: #1445472)

2137+

2138+ [ handsome_feng<445865575@qq.com> ]

2139+ * Convert the MouseArea to MultiPointTouchArea to track multiple touch

2140+ points. (LP: #1445472)

2141+

2142+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 12 Aug 2015 08:41:24 +0000

2143+

2144+unity8 (8.10+15.10.20150804-0ubuntu1) wily; urgency=medium

2145+

2146+ [ Kevin Gunn ]

2147+ * No change, rebuild for gcc5

2148+

2149+ [ CI Train Bot ]

2150+ * Resync trunk. added: po/cy.po

2151+ * Resync trunk. added: po/cy.po

2152+

2153+ [ Daniel d'Andrada ]

2154+ * Stages now control the "requestedState" property of applications

2155+ * Stages now control the "requestedState" property of applications

2156+

2157+ -- CI Train Bot <ci-train-bot@canonical.com> Tue, 04 Aug 2015 20:56:05 +0000

2158+

2159+unity8 (8.10+15.10.20150729-0ubuntu1) wily; urgency=medium

2160+

2161+ [ CI Train Bot ]

2162+ * Resync trunk.

2163+ * allow opening the manage dash area by clicking with a mouse on the

2164+ arrow label (LP: #1431564)

2165+

2166+ [ Daniel d'Andrada ]

2167+ * TouchRegistry: remove null candidates from list of candidates (LP:

2168+ #1473492)

2169+

2170+ [ Lukáš Tinkl ]

2171+ * Fix power dialogs on desktop

2172+ * Provide DBUS compatibility with various session services

2173+ (suspend/hibernate, lock/unlock, screensaver, etc)

2174+ * React on PrtScr keyboard shortcut for taking screenshots on desktop

2175+ (LP: #1474149)

2176+ * launcher parity: close apps from quicklist (LP: #1457201)

2177+

2178+ [ Michael Zanetti ]

2179+ * Implement first edition for a desktop Alt+Tab spread

2180+ * drop the gcc-4.9 dependency (LP: #1452348)

2181+

2182+ [ Mirco Müller ]

2183+ * Added corresponding tests and visual tweaks to a launcher-item's

2184+ progress-overlay.

2185+ * Added corresponding tests and visual tweaks to a launcher-item's

2186+ progress-overlay.

2187+ * Implemented alert/wiggle feature for launcher-icons.

2188+ * Implemented alert/wiggle feature for launcher-icons.

2189+

2190+ [ handsome_feng ]

2191+ * makes left swip reset the search string. (LP: #1413791)

2192+

2193+ [ handsome_feng<445865575@qq.com> ]

2194+ * Don't expand indicators when tap to return to call. (LP: #1453217)

2195+ * makes left swip reset the search string. (LP: #1413791)

2196+

2197+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 29 Jul 2015 12:39:01 +0000

2198+

2199+unity8 (8.10+15.10.20150708.2-0ubuntu1) wily; urgency=medium

2200+

2201+ [ Albert Astals Cid ]

2202+ * Make the card sizes a bit dependant on the total of gu of the dash

2203+

2204+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 08 Jul 2015 15:01:41 +0000

2205+

2206+unity8 (8.10+15.10.20150702.2-0ubuntu1) wily; urgency=medium

2207+

2208+ [ Albert Astals Cid ]

2209+ * Save screenshots of suspended apps to disk

2210+ * Set width of title label when inside the title row (LP: #1461979)

2211+ * qmluitests was renamed to uitests

2212+

2213+ [ CI Train Bot ]

2214+ * Resync trunk.

2215+

2216+ [ Daniel d'Andrada ]

2217+ * Fix tst_OrientedShell and tst_Tutorial (LP: #1469761, #1466947)

2218+

2219+ [ Leo Arias ]

2220+ * Reorganized the python test helper modules. Deprecated the

2221+ unity8.shell.emulators namespace. (LP: #1306340)

2222+

2223+ [ Leonardo Arias Fonseca ]

2224+ * Reorganized the python test helper modules. Deprecated the

2225+ unity8.shell.emulators namespace. (LP: #1306340)

2226+

2227+ [ Lukáš Tinkl ]

2228+ * fix PO files extraction

2229+

2230+ [ Michael Zanetti ]

2231+ * Make use of QInputDeviceInfo in order to automatically switch

2232+ between usage modes and hide the OSK.

2233+

2234+ [ Nick Dedekind ]

2235+ * Fixed qtmultimedia mock which was generating errors in tests

2236+

2237+ [ Richard Huddie ]

2238+ * Reorganized the python test helper modules. Deprecated the

2239+ unity8.shell.emulators namespace. (LP: #1306340)

2240+

2241+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 02 Jul 2015 16:09:57 +0000

2242+

2243+unity8 (8.10+15.10.20150618-0ubuntu1) wily; urgency=medium

2244+

2245+ [ Albert Astals Cid ]

2246+ * Refactor QmlTest.cmake module so that all tests can go through it.

2247+ Also a bit of cleanup around tests.

2248+ * Support fallback images for dash card and preview widgets (LP:

2249+ #1324142)

2250+

2251+ [ CI Train Bot ]

2252+ * New rebuild forced.

2253+ * Resync trunk.

2254+

2255+ [ Daniel d'Andrada ]

2256+ * Fix Shell tests

2257+

2258+ [ Josh Arenson ]

2259+ * Refactor greeter emulator to unlock the greeter via dbus

2260+

2261+ [ Lukáš Tinkl ]

2262+ * respect target window's devicePixelRatio in MouseTouchAdaptor

2263+

2264+ [ Michael Zanetti ]

2265+ * Refactor QmlTest.cmake module so that all tests can go through it.

2266+ Also a bit of cleanup around tests.

2267+

2268+ [ Michał Sawicz ]

2269+ * Refactor QmlTest.cmake module so that all tests can go through it.

2270+ Also a bit of cleanup around tests.

2271+

2272+ [ handsome_feng ]

2273+ * Forbid closing apps during the edge gesture. (LP: #1445572)

2274+ * Removed the horizonal rule on pin unlock screen. (LP: #1368798)

2275+

2276+ [ handsome_feng<445865575@qq.com> ]

2277+ * Forbid closing apps during the edge gesture. (LP: #1445572)

2278+

2279+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 18 Jun 2015 19:40:06 +0000

2280+

2281+unity8 (8.10+15.10.20150612-0ubuntu2) wily; urgency=medium

2282+

2283+ * No-change rebuild against Qt 5.4.2.

2284+

2285+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 15 Jun 2015 12:33:07 +0300

2286+

2287+unity8 (8.10+15.10.20150612-0ubuntu1) wily; urgency=medium

2288+

2289+ [ Michał Sawicz ]

2290+ * Implement full-shell rotation (LP: #1210199)

2291+

2292+ [ CI Train Bot ]

2293+ * New rebuild forced.

2294+ * Resync trunk.

2295+

2296+ [ Daniel d'Andrada ]

2297+ * Implemented autopilot-test and fake-sensors for shell-rotation.

2298+

2299+ [ Mirco Müller ]

2300+ * Implemented autopilot-test and fake-sensors for shell-rotation.

2301+

2302+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 12 Jun 2015 16:07:47 +0000

2303+

2304+unity8 (8.10-0ubuntu1) UNRELEASED; urgency=medium

2305+

2306+ * Implement full-shell rotation (LP: #1210199)

2307+

2308+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 15 Apr 2015 14:47:17 +0200

2309+

2310+unity8 (8.02+15.10.20150603.1-0ubuntu1) wily; urgency=medium

2311+

2312+ [ CI Train Bot ]

2313+ * New rebuild forced.

2314+ * Resync trunk.

2315+

2316+ [ Renato Araujo Oliveira Filho ]

2317+ * Set the device led color to green. (LP: #1450894)

2318+

2319+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 03 Jun 2015 21:42:35 +0000

2320+

2321+unity8 (8.02+15.10.20150518.1-0ubuntu1) wily; urgency=medium

2322+

2323+ [ Albert Astals Cid ]

2324+ * Add overrides to override functions

2325+ * Implement "rating-edit" preview widget (LP: #1318144)

2326+ * Make the DashContent::test_mainNavigation test more stable (LP:

2327+ #1450809)

2328+ * Use art height as implicitHeight when the header is overlayed and

2329+ there's no summary

2330+

2331+ [ CI Train Bot ]

2332+ * New rebuild forced.

2333+ * Resync trunk.

2334+

2335+ [ Daniel d'Andrada ]

2336+ * Introducing FloatingFlickable

2337+ * Make Ubuntu.Gestures components install TouchRegistry by themselves

2338+

2339+ [ Michael Terry ]

2340+ * Fix a possible crash in our PAM threading code. (LP: #1425362) (LP:

2341+ #1425362)

2342+ * Fix the lockscreen becoming unresponsive after testing an app on the

2343+ device from QtCreator. (LP: #1435364)

2344+

2345+ [ Nick Dedekind ]

2346+ * Fixed desktop stage app focus.

2347+ * Fixed issue in laggy indicator autpilot tests (LP: #1446846)

2348+

2349+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 18 May 2015 23:04:39 +0000

2350+

2351+unity8 (8.02+15.04.20150511-0ubuntu1) vivid; urgency=medium

2352+

2353+ [ Albert Astals Cid ]

2354+ * Workarounds for concierge mode.

2355+

2356+ [ CI Train Bot ]

2357+ * New rebuild forced.

2358+ * Resync trunk.

2359+

2360+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 11 May 2015 08:29:58 +0000

2361+

2362+unity8 (8.02+15.04.20150505-0ubuntu1) vivid; urgency=medium

2363+

2364+ [ Albert Astals Cid ]

2365+ * Make runtests fake a test error if make fails

2366+ * Make the test more stable

2367+ * Use dbus-test-runner instead of dbus-launch

2368+

2369+ [ Daniel d'Andrada ]

2370+ * DirectionalDragArea: improvements & API grooming (LP: #1417920)

2371+ * Fix EdgeDragEvaluator when a drag can happen both ways

2372+ (Direction.Horizontal)

2373+

2374+ [ Josh Arenson ]

2375+ * Remove panelHeight property as it is unused.

2376+

2377+ [ Leo Arias ]

2378+ * Initial clean up of the autopilot tests set up. Removed the touch

2379+ device from the test case. Moved the restart of unity to a fixture.

2380+ Removed the unused DragMixin. Updated the setUpClass to use

2381+ process_helpers. Removed the workaround for bug #1238417, already

2382+ fixed. Use the toolkit helper to set the testability environment

2383+ variable. Fixed the indicators base class that was restarting unity

2384+ twice. (LP: #1238417, #1447206)

2385+ * Use the base class from the toolkit in autopilot tests.

2386+

2387+ [ Michael Zanetti ]

2388+ * emit application-stop when we're going down (LP: #1326513)

2389+

2390+ [ Michał Sawicz ]

2391+ * UNITY_SCOPES_LIST is no more

2392+

2393+ [ handsome_feng<445865575@qq.com> ]

2394+ * When click the favorite scope in Dash Manager , it just return to

2395+ the corresponding scope page. (LP: #1447056)

2396+

2397+ -- CI Train Bot <ci-train-bot@canonical.com> Tue, 05 May 2015 14:47:24 +0000

2398+

2399+unity8 (8.02+15.04.20150422-0ubuntu1) vivid; urgency=medium

2400+

2401+ [ Albert Astals Cid ]

2402+ * Compile with Qt 5.5 (LP: #1437238)

2403+ * Different way of top aligning labels when the other one in the row

2404+ is multiline (LP: #1442085)

2405+ * make pot_file

2406+

2407+ [ Andrea Cimitan ]

2408+ * Set sourceSize for DashBackground.qml Image

2409+

2410+ [ CI Train Bot ]

2411+ * New rebuild forced.

2412+ * Resync trunk. added: po/sk.po

2413+

2414+ [ Daniel d'Andrada ]

2415+ * Move handling of command line options to a separate class

2416+ * Refactor tst_PhysicalKeysMapper.qml

2417+

2418+ [ Leo Arias ]

2419+ * For autopilot tests, use the device simulation scenarios from the

2420+ toolkit.

2421+

2422+ [ Leonardo Arias Fonseca ]

2423+ * For autopilot tests, use the device simulation scenarios from the

2424+ toolkit.

2425+

2426+ [ Michael Zanetti ]

2427+ * Make sure dnd mode is ended properly when drag gesture is cancelled

2428+ (LP: #1444949)

2429+

2430+ [ Michał Sawicz ]

2431+ * Fix flake8 warnings (LP: #1444170)

2432+ * Move mock indicator service to unity8-fake-env, as it's a binary-

2433+ dependent package.

2434+

2435+ [ Nick Dedekind ]

2436+ * Use asynchronous dbus requests for property updates. (LP: #1436982)

2437+

2438+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 22 Apr 2015 14:46:31 +0000

2439+

2440+unity8 (8.02+15.04.20150409.1-0ubuntu1) vivid; urgency=medium

2441+

2442+ [ Albert Astals Cid ]

2443+ * Focus the shutdown dialog (LP: #1417991)

2444+ * Make url-dispatching scope activation when the dash is not on the

2445+ main scopes (LP: #1364306)

2446+ * We use autopilot3 now

2447+

2448+ [ CI Train Bot ]

2449+ * New rebuild forced.

2450+ * Resync trunk. added: po/or.po

2451+

2452+ [ Daniel d'Andrada ]

2453+ * Make tst_PreviewListView and tst_GenericScopeView work in out-of-

2454+ source builds

2455+ * MouseArea that shows the indicators panel should cover the

2456+ indicators bar only (LP: #1439318)

2457+ * Surface gets active focus also with mouse clicks

2458+

2459+ [ Josh Arenson ]

2460+ * Add a mode option to unity8 for selecting greeter mode in the future

2461+ * Remove PkgConfig include from Launcher plugin to fix cross-compile

2462+ (LP: #1437702)

2463+

2464+ [ Leo Arias ]

2465+ * Fixed the check for string in the lock screen test. (LP: #1434518)

2466+

2467+ [ Michael Terry ]

2468+ * Make sure the edge tutorial is destroyed when we receive a call

2469+ during the wizard. (LP: #1436349)

2470+ * Skip parts of the edge tutorial that require a touch device (like

2471+ spread and bottom edge). (LP: #1434712)

2472+

2473+ [ Michael Zanetti ]

2474+ * Don't hide stages just because they're empty (LP: #1439615)

2475+ * [Launcher] fix bug where an item would disappear even though the app

2476+ is running (LP: #1438172)

2477+

2478+ [ Nick Dedekind ]

2479+ * Fixed autopilot test failures related to udev input failure for

2480+ power button.

2481+ * Made improvements for laggy indicator backends (lp#1390136). (LP:

2482+ #1390136)

2483+

2484+ [ Pete Woods ]

2485+ * GPS only goes active when the Dash is in the foreground (LP:

2486+ #1434379)

2487+

2488+ [ handsome_feng<445865575@qq.com> ]

2489+ * Modified the wrong time format in ScreenGrabber (LP: #1436006)

2490+

2491+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 09 Apr 2015 14:01:11 +0000

2492+

2493+unity8 (8.02+15.04.20150320-0ubuntu1) vivid; urgency=medium

2494+

2495+ [ Albert Astals Cid ]

2496+ * Fix regression making pan not possible in Zoomable Image (LP:

2497+ #1433506)

2498+ * Make sure m_firstVisibleIndex is correctly set after processing

2499+ changeSet.removes (LP: #1433056)

2500+ * make pot_file

2501+

2502+ [ Daniel d'Andrada ]

2503+ * Don't show the rotating rect in "make tryFoo".

2504+

2505+ [ Michael Zanetti ]

2506+ * make pinlockscreen adjust better to larger displays

2507+

2508+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 20 Mar 2015 11:56:41 +0000

2509+

2510+unity8 (8.02+15.04.20150318-0ubuntu1) vivid; urgency=medium

2511+

2512+ [ Albert Astals Cid ]

2513+ * Add some context to tr calls (LP: #1431497)

2514+ * Require binaries and .pc files we call from code

2515+ * Test: More stubborn flick to the end

2516+

2517+ [ Andrea Cimitan ]

2518+ * Refactor PreviewOverlay to fix weird zoom out/in animations when

2519+ previewing images from the Previews

2520+

2521+ [ CI Train Bot ]

2522+ * Resync trunk.

2523+

2524+ [ Charles Kerr ]

2525+ * Re-enable a rotation lock test now that the bug that broke that test

2526+ has been fixed. (LP: #1410915)

2527+

2528+ [ Daniel d'Andrada ]

2529+ * Darkened area behind indicators menu should eat input until it fully

2530+ disappears (LP: #1417967)

2531+ * DesktopStage - fix focus switch when user taps on window (LP:

2532+ #1431325)

2533+ * Fix warnings when launching tutorial

2534+ * Make MouseTouchAdaptor controllable from within QML

2535+ * Make tst_Shell absorb tst_TabletShell

2536+

2537+ [ Leo Arias ]

2538+ * Changed the autopilot dependencies so they do not require qt4. (LP:

2539+ #1429158)

2540+ * Drop the support for python2 in autopilot tests. (LP: #1429163)

2541+ * Stop using the deprecated toolkit emulators namespace in autopilot

2542+ tests. (LP: #1341681)

2543+

2544+ [ Michael Terry ]

2545+ * Don't close wizard & edge tutorial when the unity8-dash closes (LP:

2546+ #1425484)

2547+ * Don't let the wizard sit indefinitely, waiting for a wizard page to

2548+ finish preparing itself. (LP: #1425737)

2549+ * Fix two broken qmluitest files by waiting for everything to settle

2550+ before starting the tests.

2551+ * Only call unlockAllModems once the wizard is done. (LP: #1425161)

2552+ (LP: #1425161)

2553+ * When we are locking the user out from too many login failures,

2554+ notice when time passes even if the device is suspended. (LP:

2555+ #1396817) (LP: #1396817)

2556+

2557+ [ Michael Zanetti ]

2558+ * Add a mouse area to the indicators panel so we can open them by

2559+ clicking. (LP: #1417650)

2560+ * fix launcher not reacting to first click when revealed by mouse

2561+ hover, add tests

2562+ * performance improvements (LP: #1430233, #1425087)

2563+

2564+ [ Michał Sawicz ]

2565+ * Remove the activity indicator from tests

2566+ * Use targets instead of custom ld arguments for linking

2567+

2568+ [ Mirco Müller ]

2569+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-

2570+ decision notifications according to new design-spec.

2571+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-

2572+ decision notifications according to new design-spec.

2573+

2574+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 18 Mar 2015 10:19:06 +0000

2575+

2576+unity8 (8.02+15.04.20150302-0ubuntu2) vivid; urgency=medium

2577+

2578+ * No-change rebuild against Qt 5.4.1.

2579+

2580+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 11 Mar 2015 10:27:23 +0200

2581+

2582+unity8 (8.02+15.04.20150302-0ubuntu1) vivid; urgency=medium

2583+

2584+ [ Albert Astals ]

2585+ * Don't precache items that are outisde the 1.5*height buffering area

2586+ (LP: #1410131)

2587+

2588+ [ Albert Astals Cid ]

2589+ * Don't precache items that are outisde the 1.5*height buffering area

2590+ (LP: #1410131)

2591+

2592+ [ Chris Townsend ]

2593+ * Add a wrapper for handling the

2594+ /org/gnome/SessionManager/EndSessionDialog DBus object used by

2595+ indicator-session. This allows indicator-session to properly talk to

2596+ the Unity 8 session management functions. (LP: #1392187)

2597+ * Allow for proper logout session management. This uses the

2598+ EndSession() Upstart DBus method on the current session bus. (LP:

2599+ #1360316)

2600+ * Make the Unity 8 session dialogs behave in the same fashion as Unity

2601+ 7. From indicator-session: Clicking "Log Out" will now present a

2602+ dialog to "Lock", "Log Out", or "Cancel". Clicking "Shut Down" will

2603+ now present a dialog to "Reboot", "Shut Down", or "Cancel". (LP:

2604+ #1416074)

2605+

2606+ [ Daniel d'Andrada ]

2607+ * Add NO_TESTS cmake option to skip tests and therefore speed up

2608+ builds

2609+ * Remove enums and properties that doesn't exist in the real

2610+ ApplicationManager

2611+ * Stabilize some Shell qml tests

2612+

2613+ [ Josh Arenson ]

2614+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:

2615+ #1390393)

2616+

2617+ [ Michael Terry ]

2618+ * Make the draggable part of the right edge (during the tutorial) a

2619+ constant size, instead of having it grow and shrink as the spread

2620+ peeks out from the side.

2621+

2622+ [ Michał Sawicz ]

2623+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:

2624+ #1390393)

2625+

2626+ [ Robert Bruce Park ]

2627+ * Launchpad automatic translations update.

2628+

2629+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 02 Mar 2015 12:11:21 +0000

2630+

2631+unity8 (8.02+15.04.20150226-0ubuntu1) vivid; urgency=medium

2632+

2633+ [ CI Train Bot ]

2634+ * New rebuild forced.

2635+

2636+ [ Pete Woods ]

2637+ * Only set scopes active when the screen is on (LP: #1422879)

2638+

2639+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 26 Feb 2015 19:39:54 +0000

2640+

2641+unity8 (8.02+15.04.20150224-0ubuntu1) vivid; urgency=medium

2642+

2643+ [ Albert Astals Cid ]

2644+ * Dash manage hint should not be visible in previews+test (LP:

2645+ #1422260)

2646+ * Do not declare the hostname property twice

2647+ * Fix some warnings in Mock Notifications

2648+ * Make qmluittests pass with Qt 5.4

2649+ * Preserve the aspect ratio for the card attribute images (LP:

2650+ #1411751)

2651+ * Update qmltypes

2652+

2653+ [ Andrea Cimitan ]

2654+ * Add maximumLineCount for subtitle label in cards (LP: #1414870)

2655+

2656+ [ Michael Terry ]

2657+ * Move the gschema file to data/ and install it via cmake, not dpkg.

2658+ * Refactor the greeter code to be more compartmented and isolatable.

2659+ * Silence a couple qml warnings. (LP: #1423286)

2660+ * Wait for libqofono to finish initializing before we decide whether

2661+ to skip the wizard's SIM page or not.

2662+

2663+ [ Michael Zanetti ]

2664+ * enable revealing the launcher by hitting the left edge using the

2665+ mouse

2666+

2667+ [ Ying-Chun Liu ]

2668+ * Add Autopilot Notification helper.

2669+

2670+ -- CI Train Bot <ci-train-bot@canonical.com> Tue, 24 Feb 2015 10:17:16 +0000

2671+

2672+unity8 (8.02+15.04.20150216.1-0ubuntu1) vivid; urgency=medium

2673+

2674+ [ Andrea Cimitan ]

2675+ * Fix temp scopes opening temp scopes, correctly close previously

2676+ opened temp scope with its preview (LP: #1410337)

2677+ * Set sourcesize for scopes images in manage dash

2678+

2679+ [ CI Train Bot ]

2680+ * Resync trunk

2681+

2682+ [ Albert Astals Cid ]

2683+ * Test for bug #1316660 (LP: #1316660)

2684+ * Hardcode tranlsation for internal.location field (LP: #1393438)

2685+ * Make sure the height it's the height it will have

2686+

2687+ [ Michael Zanetti ]

2688+ * Cleanup cmake warning about missing Qt5Sql module

2689+

2690+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 16 Feb 2015 13:14:26 +0000

2691+

2692+unity8 (8.02+15.04.20150211-0ubuntu2) vivid; urgency=medium

2693+

2694+ * No-change rebuild against Qt 5.4.0.

2695+

2696+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 13 Feb 2015 15:17:18 +0200

2697+

2698+unity8 (8.02+15.04.20150211-0ubuntu1) vivid; urgency=medium

2699+

2700+ [ Michael Terry ]

2701+ * Redesign tutorial to match latest spec (just removing obsolete pages

2702+ and redesigning look, no new pages yet)

2703+ * Add new right-edge and bottom-edge screens to the first-boot edge

2704+ tutorial (LP: #1383297)

2705+ * Support switching the indicator profile on the fly, as the greeter

2706+ appears and disappears. (But don't use it yet, not until the

2707+ settings panel to control this is in place.)

2708+ * Clip the infographic to its bounding box, instead of letting it

2709+ bleed past the welcome page (visible when dragging the welcome page

2710+ to the side).

2711+

2712+ [ Michael Zanetti ]

2713+ * Add an AccountService based launcher model to be used with split

2714+ greeter

2715+ * Launcher fixes for windowed mode

2716+ * save and restore window size and position

2717+ * Fix resizing windows when making it smaller than minSize and then

2718+ larger again.

2719+

2720+ [ handsome_feng<445865575@qq.com> ]

2721+ * makes the header fully reveal when tapping the search icon. (LP:

2722+ #1379327)

2723+

2724+ [ Mirco Müller ]

2725+ * Allow swipe-to-dismiss for contracted snap-decision notifications,

2726+ interactive notifications and ephemeral notifications. (LP:

2727+ #1355422, #1334855)

2728+

2729+ [ Daniel d'Andrada ]

2730+ * Make indicators bar eat all events

2731+ * Improve Launcher tests, making them more reliable

2732+ * Tapping on a surface gives it active focus

2733+

2734+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 11 Feb 2015 17:13:16 +0000

2735+

2736+unity8 (8.02+15.04.20150123.3-0ubuntu1) vivid; urgency=low

2737+

2738+ [ Sebastien Bacher ]

2739+ * Set text hint property for the messaging menus inline reply widget

2740+ (LP: #1389234)

2741+

2742+ [ Ying-Chun Liu ]

2743+ * Added an initial set of autopilot tests for the display indicator.

2744+

2745+ [ Nick Dedekind ]

2746+ * Removed filtering the indicator model by visibility.

2747+

2748+ [ Michael Zanetti ]

2749+ * fixes left edge drag when in spread

2750+

2751+ [ Albert Astals Cid ]

2752+ * Fix ninja build in a different way The previous one was adding rpath

2753+ to some .so that broke our tests that use LD_LIBRARY_PATH to change

2754+ which one is picked up

2755+

2756+ [ Leo Arias ]

2757+ * Added an initial set of autopilot tests for the display indicator.

2758+

2759+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Jan 2015 12:12:41 +0000

2760+

2761+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low

2762+

2763+ [ Michael Terry ]

2764+ * Don't show any power dialogs while the screen is off. This is a

2765+ band-aid to avoid the symptom, while we still investigate the source

2766+ of why the screen doesn't turn on (and why we seem to not handle the

2767+ power-button-release event). (LP: #1409003, #1410830)

2768+ * Don't refocus the dialer-app when a call is started by the user.

2769+ Because of how qtmir works, this would cause the dialer-app to

2770+ unfocus momentarily, causing interface oddities for the user. (LP:

2771+ #1413065)

2772+

2773+ [ CI Train Bot ]

2774+ * Resync trunk

2775+

2776+ [ Albert Astals Cid ]

2777+ * Build with ninja

2778+ * Fixes for Table Preview Widget (LP: #1410420)

2779+

2780+ [ Michael Zanetti ]

2781+ * Add support for earpiece media buttons (LP: #1398427)

2782+ * Add a WindowMoveResizeArea and tests for it

2783+

2784+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000

2785+

2786+unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low

2787+

2788+ [ Andrea Cimitan ]

2789+ * support background on horizontal cards with summary (LP: #1393008)

2790+

2791+ [ Gerry Boland ]

2792+ * DashCommunicator: replace QDBusInterface with a non-blocking

2793+ simplification which does not introspect the service on creation

2794+ (LP: #1403508)

2795+

2796+ [ Leo Arias ]

2797+ * Added an autopilot test for the edges demo.

2798+

2799+ [ Albert Astals ]

2800+ * Don't show the manage dash pull up arrow on temp scopes (LP:

2801+ #1401869)

2802+ * Remove hack, newer Qt already support keyClick(char)

2803+ * Tests: Add Qt 5.5 removal TODOs

2804+ * Make sure we use fPIC when compiling files for the static library

2805+ too

2806+ * Make sure changing a scope doesn't trigger creation/destruction of

2807+ delegates until it's finished (LP: #1410122)

2808+

2809+ [ Michael Zanetti ]

2810+ * patch debian/control file before using it to make it work with mk-

2811+ build-deps

2812+

2813+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 Jan 2015 20:58:08 +0000

2814+

2815+unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low

2816+

2817+ [ Michał Sawicz ]

2818+ * We don't need the SIGSTOP in main() any more.

2819+ * Add a test to make sure the shell always starts disabled until it is

2820+ enabled by a complete PAM interaction.

2821+

2822+ [ Leo Arias ]

2823+ * Added an autopilot test for the edges demo.

2824+

2825+ [ Nick Dedekind ]

2826+ * Unhook Lights interface from indicator widgets (LP: #1385331)

2827+

2828+ [ Albert Astals ]

2829+ * Fix going to scopes when the Manage Dash is open (LP: #1403464)

2830+ * QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML

2831+ * Clip the Scopes List header

2832+ * Fix ScopesList not being under finger

2833+ * Make waitForRendering with no item fail instead of crash

2834+ * Disable Dash horizontal scroll while Navigation InverseMouseArea is

2835+ pressed (LP: #1403048)

2836+ * Test: Make sure the mouse area is enabled before clicking into it

2837+ * Test: We actually need to click on the customBackButton and not on

2838+ backButton

2839+ * Test: By default mouseX act on the middle

2840+

2841+ [ Michael Terry ]

2842+ * Don't block handling power events on loading the greeter's qml and

2843+ the background image.

2844+ * Show OSK above the wizard. (LP: #1401213)

2845+ * Unify the name of the Greeter DBus test, make it use our standard

2846+ binary test macro (which also nicely exports xml results), and make

2847+ the test a little more robust against timing issues.

2848+ * Add a test to make sure the shell always starts disabled until it is

2849+ enabled by a complete PAM interaction.

2850+

2851+ [ Martin Pitt ]

2852+ * tests: Fix Notify.Notification.add_action invocation to work also

2853+ with unpatched libnotify API. (LP: #1223401)

2854+

2855+ [ Rodney Dawes ]

2856+ * Depend on :native version of g++ to allow cross-compiling to work.

2857+ (LP: #1353855)

2858+

2859+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 09 Jan 2015 10:43:06 +0000

2860+

2861+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low

2862+

2863+ [ Ubuntu daily release ]

2864+ * New rebuild forced

2865+

2866+ [ Albert Astals ]

2867+ * Need to wait until loaded is true to use the count property

2868+ * Manage Dash: Ellide properly

2869+

2870+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000

2871+

2872+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low

2873+

2874+ [ Albert Astals Cid ]

2875+ * ScopesList: Use the default scope style for the header

2876+

2877+ [ Daniel d'Andrada ]

2878+ * Refactor Dialogs.qml to use proper in-scene dialogs

2879+ * Make Greeter nicely handle being resized

2880+

2881+ [ Albert Astals ]

2882+ * Rework how we set the ranges so we get some more asynchronousity

2883+ from item views (LP: #1384374)

2884+ * clickscope is back to being unfavoritable (LP: #1400762)

2885+ * Fix clicking on the manage dash list after having moved the current

2886+ scope

2887+ * Make the drag range be a multiple of the drag "rate" value.

2888+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690

2889+

2890+ [ Gerry Boland ]

2891+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)

2892+

2893+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000

2894+

2895+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low

2896+

2897+ [ Ubuntu daily release ]

2898+ * New rebuild forced

2899+

2900+ [ Albert Astals ]

2901+ * Make Navigation work when "jumping" to the non root

2902+

2903+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000

2904+

2905+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium

2906+

2907+ [ Michał Sawicz ]

2908+ * Bump version due to new Manage Dash

2909+

2910+ [ Gerry Boland ]

2911+ * [indicators] Fix positioning on panel resize.

2912+

2913+ [ Nick Dedekind ]

2914+ * [indicators] Fix positioning on panel resize.

2915+

2916+ [ Albert Astals ]

2917+ * Fix the Dash Header hamburger menu background color

2918+ * Fix tests (LP: #1400449)

2919+ * Allow pulling manage dash if there's no favorite scopes (LP:

2920+ #1400774)

2921+ * Manage Dash: Make store button work even if you have no favorites

2922+ (LP: #1400771)

2923+ * Make pot_file

2924+

2925+ [ CI Train Bot ]

2926+ * Resync trunk

2927+

2928+ [ Andrea Cimitan ]

2929+ * Remove dismiss timer in Launcher (LP: #1368778)

2930+

2931+ [ Michael Zanetti ]

2932+ * decrease opacity changes in spread, move it to a separate surface.

2933+ * Add an initial, rudimentary DesktopStage to get started

2934+ * Uninvert Launcher in Desktop Mode

2935+ * Add support for Wallpaper in Desktop stage

2936+ * Add window control buttons to panel for fullscreen applications

2937+

2938+ [ Rodney Dawes ]

2939+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.

2940+ (LP: #1400437)

2941+

2942+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000

2943+

2944+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low

2945+

2946+ [ CI Train Bot ]

2947+ * Resync trunk

2948+

2949+ [ Albert Astals ]

2950+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,

2951+ #1368670)

2952+

2953+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000

2954+

2955+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low

2956+

2957+ [ Michael Terry ]

2958+ * Import wizard code from ubuntu-system-settings.

2959+ * Convert the welcome wizard from a separate executable into a qml

2960+ plugin (with a small C++ plugin for support).

2961+ * Add tests for welcome wizard.

2962+

2963+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000

2964+

2965+unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low

2966+

2967+ [ Michael Terry ]

2968+ * Make sure that there is no window of opportunity for swiping away

2969+ greeter before the lockscreen appears.

2970+ * Don't allow dragging the greeter out from the left edge if it's

2971+ hidden there. (LP: #1372952)

2972+

2973+ [ Michał Sawicz ]

2974+ * Move from Theme colour to direct UbuntuColors.orange for activity

2975+ indicator and preview buttons

2976+

2977+ [ Albert Astals ]

2978+ * Use QImageReader not to load the image into memory twice (LP:

2979+ #1384374)

2980+ * Don't create the whole current scope delegates, just height * 3 (LP:

2981+ #1384393, #1384374)

2982+ * Make CroppedImageSizer async

2983+ * Use ubuntu::connectivity::NetworkingStatus instead of

2984+ QNetworkConfigurationManager

2985+ * Compile with Qt 5.4 (LP: #1395636)

2986+

2987+ [ Michael Zanetti ]

2988+ * close previews and temp scopes on left edge/BFB (LP: #1391798)

2989+ * make spread reversible (LP: #1368668, #1355284, #1368677)

2990+

2991+ [ Andrea Cimitan ]

2992+ * Different drag behaviour for not closable apps in spread (LP:

2993+ #1368287)

2994+

2995+ [ Daniel d'Andrada ]

2996+ * Make UnityTestCase.touchFlick properly map event coordinates

2997+

2998+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 02 Dec 2014 09:26:49 +0000

2999+

3000+unity8 (8.01+15.04.20141125.2-0ubuntu1) vivid; urgency=low

3001+

3002+ [ Michael Zanetti ]

3003+ * improve snapping after dragging

3004+ * Make the launcher BFB rounded on one end (LP: #1382596)

3005+ * disable swipeToClose while some snapping is happening (LP: #1378938)

3006+ * increase threshold and avoid jumping in SpreadDelegate dragging (LP:

3007+ #1352842, #1350803)

3008+

3009+ [ Ying-Chun Liu ]

3010+ * Notifications should be on right side when wide. (LP: 1379384) (LP:

3011+ #1379384)

3012+

3013+ [ Albert Astals ]

3014+ * Fix qml warnings

3015+ * Fix some qmluitests

3016+

3017+ [ Lars Uebernickel ]

3018+ * Use Icon instead of StatusIcon

3019+

3020+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 25 Nov 2014 13:54:47 +0000

3021+

3022+unity8 (8.01+15.04.20141117-0ubuntu1) vivid; urgency=low

3023+

3024+ [ josharenson ]

3025+ * Return focus to the application after a tusted session overlay is

3026+ closing. (LP: #1381292)

3027+

3028+ [ Josh Arenson ]

3029+ * Return focus to the application after a tusted session overlay is

3030+ closing. (LP: #1381292)

3031+

3032+ [ Albert Astals ]

3033+ * Remove unused ResponsiveFlowView

3034+ * Fix a few cmake warnings when running ./build.sh in a clean checkout

3035+

3036+ [ Mirco Müller ]

3037+ * Make sure non-square icons are not cropped. (LP: #1378417)

3038+

3039+ [ Michael Terry ]

3040+ * Drop the "EARLY ALPHA" scare label when running in testing mode.

3041+

3042+ [ Michael Zanetti ]

3043+ * unify Greeter and Lockscreen wallpaper again

3044+ * hide quicklist when launcher hides (LP: #1387088)

3045+ * Keep applications suspended while lockscreen is shown (LP: #1378126)

3046+ * change spread background color to 111111

3047+

3048+ [ Omer Akram ]

3049+ * show password when tapped on the 'Show password' label, not just the

3050+ checkbox. (LP: #1389832)

3051+

3052+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 17 Nov 2014 13:48:33 +0000

3053+

3054+unity8 (8.01+15.04.20141107.2-0ubuntu2) vivid; urgency=medium

3055+

3056+ * No-change rebuild against Qt 5.3.2.

3057+

3058+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Sat, 08 Nov 2014 13:50:11 +0200

3059+

3060+unity8 (8.01+15.04.20141107.2-0ubuntu1) vivid; urgency=low

3061+

3062+ [ Michael Terry ]

3063+ * Skip second SIM unlock dialog if user presses Emergency Call on

3064+ first one (LP: #1387925)

3065+

3066+ [ Michael Zanetti ]

3067+ * fix positive/negative answer order on the new swipe notification

3068+ (LP: #1358343)

3069+ * Update PageHeader to use new SDK api

3070+ * antialias surfaces when in spread (LP: #1351559)

3071+

3072+ [ Albert Astals ]

3073+ * Remove Hud

3074+

3075+ [ Mirco Müller ]

3076+ * Replace ComboButton in snap-decision notifications, used for

3077+ additional actions (> 3 actions), with custom widget immune to

3078+ accidental taps. (LP: #1384730)

3079+

3080+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Nov 2014 14:33:02 +0000

3081+

3082+unity8 (8.01+15.04.20141104-0ubuntu1) vivid; urgency=low

3083+

3084+ [ Sebastien Bacher ]

3085+ * Drop workaround, it's not needed and create issues for desktop-next

3086+ (LP: #1387671)

3087+

3088+ [ Albert Astals ]

3089+ * Do not append integer to char *

3090+ * Remove unused end() function

3091+ * Update build.sh

3092+ * Fix i18n

3093+

3094+ [ Michael Zanetti ]

3095+ * rework launcher quicklist visuals to fit new design (LP: #1368660)

3096+ * Fix DBusVariant conversion for launcher emblems (LP: #1387261)

3097+ * Fix desktop file encoding in launcher (LP: #1387083)

3098+ * Add a hinting animation to indicate changes in the backend (LP:

3099+ #1376707)

3100+

3101+ [ Alberto Aguirre ]

3102+ * Add audioRole to QtMultimedia mock

3103+ * Add a plugin to take screenshots on vol up + vol down

3104+

3105+ [ CI bot ]

3106+ * Fix relative time formatter when using non-UTC timezone. (LP:

3107+ #1378821)

3108+

3109+ [ Leo Arias ]

3110+ * Removed the tests for the alternate paths of the autopilot helpers.

3111+

3112+ [ Nick Dedekind ]

3113+ * Fix relative time formatter when using non-UTC timezone. (LP:

3114+ #1378821)

3115+ * Reset current item selection on deleted. (LP: #1378462)

3116+ * Added timer to re-assert server value after indicator menu item

3117+ activation. (LP: #1336715)

3118+

3119+ [ Mirco Müller ]

3120+ * Added dedicated swipe-to-act button for snap-decisions, which avoids

3121+ accidental taps/button-presses. (LP: #1358343)

3122+

3123+ [ Chris Gagnon ]

3124+ * add missing unity-scope-click dependancy to unity8-autopilot package

3125+ (LP: #1336276)

3126+

3127+ [ Michael Terry ]

3128+ * Don't lock phone if user tries to switch back to an active call.

3129+ (LP: #1388156)

3130+

3131+ [ Daniel d'Andrada ]

3132+ * DirectionalDragArea: Update TODO comment in light of new events

3133+ * TouchDispatcher: synthesize MouseButtonDblClick events

3134+

3135+ [ Leonardo Arias Fonseca ]

3136+ * Removed the tests for the alternate paths of the autopilot helpers.

3137+

3138+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 04 Nov 2014 12:56:08 +0000

3139+

1unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium

3140unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium

2

3141

3 [ Michael Terry ]

3142 [ Michael Terry ]

@@ -797,7 +3936,7 @@ unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium

797 * Re-architecture unity8 to use the QtMirCompositor library so that

3936 * Re-architecture unity8 to use the QtMirCompositor library so that

798 the Qt scenegraph renderer is used as the Mir compositor, and

3937 the Qt scenegraph renderer is used as the Mir compositor, and

799 application surfaces are added to the QML scene as items.

3938 application surfaces are added to the QML scene as items.

800−

3939+

801 [ Michael Zanetti ]

3940 [ Michael Zanetti ]

802 * Port phone right-edge spread code to use QtCompositor

3941 * Port phone right-edge spread code to use QtCompositor

803 * Add right-edge spread animation for tablet

3942 * Add right-edge spread animation for tablet

@@ -1071,8 +4210,8 @@ unity8 (7.90+14.10.20140703.1-0ubuntu1) utopic; urgency=low

1071

4210

1072unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium

4211unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium

1073

4212

1074− * debian/control:

4213+ * debian/control:

1075− list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative

4214+ list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative

1076 choice, since provides are not versionned, should restore installability

4215 choice, since provides are not versionned, should restore installability

1077 on amd64 and i386

4216 on amd64 and i386

1078

4217

@@ -4174,7 +7313,7 @@ unity8 (7.81.2) saucy; urgency=low

4174 [ Michał Sawicz ]

7313 [ Michał Sawicz ]

4175 * Fix icons in ApplicationsFilterGrid.qml.

7314 * Fix icons in ApplicationsFilterGrid.qml.

4176 * Support flipped image in run_on_device.

7315 * Support flipped image in run_on_device.

4177−

7316+

4178 [ Michael Zanetti ]

7317 [ Michael Zanetti ]

4179 * Don't clear lockscreen when it's fading out.

7318 * Don't clear lockscreen when it's fading out.

4180 * Reworked Launcher folding.

7319 * Reworked Launcher folding.

@@ -4259,7 +7398,7 @@ qml-phone-shell (1.79) raring; urgency=low

4259

7398

4260 [ Michael Terry ]

7399 [ Michael Terry ]

4261 * Make greeter look like the desktop one

7400 * Make greeter look like the desktop one

4262−

7401+

4263 [ Gerry Boland ]

7402 [ Gerry Boland ]

4264 * Fix a bug where a minimized app gets focus after closing another app

7403 * Fix a bug where a minimized app gets focus after closing another app

4265 * Applied a workaround to reduce flickering when launching apps

7404 * Applied a workaround to reduce flickering when launching apps

@@ -4275,7 +7414,7 @@ qml-phone-shell (1.79) raring; urgency=low

4275qml-phone-shell (1.78) raring; urgency=low

7414qml-phone-shell (1.78) raring; urgency=low

4276

7415

4277 [ Sergio Schvezov ]

7416 [ Sergio Schvezov ]

4278− * Replacing the music and ski safari mock apps with calendar and weather in

7417+ * Replacing the music and ski safari mock apps with calendar and weather in

4279 the launcher (LP: #1178262).

7418 the launcher (LP: #1178262).

4280

7419

4281 [ Daniel d'Andrada ]

7420 [ Daniel d'Andrada ]

@@ -4317,7 +7456,7 @@ qml-phone-shell (1.77) raring; urgency=low

4317 [ Mathieu Trudel-Lapierre ]

7456 [ Mathieu Trudel-Lapierre ]

4318 * debian/control:

7457 * debian/control:

4319 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.

7458 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.

4320− - Add/update Vcs-Browser, Vcs-Bzr and add a notice to uploaders.

7459+ - Add/update Vcs-Browser, Vcs-Bzr and add a notice to uploaders.

4321 * debian/copyright: fix syntax.

7460 * debian/copyright: fix syntax.

4322

7461

4323 [ Michał Sawicz ]

7462 [ Michał Sawicz ]

@@ -4327,7 +7466,7 @@ qml-phone-shell (1.77) raring; urgency=low

4327 * Renamed Media player files to match with new application name.

7466 * Renamed Media player files to match with new application name.

4328

7467

4329 [ Daniel d'Andrada ]

7468 [ Daniel d'Andrada ]

4330− * New: DirectionalDragArea component. An area that detects axis-aligned

7469+ * New: DirectionalDragArea component. An area that detects axis-aligned

4331 single-finger drag gestures.

7470 single-finger drag gestures.

4332 * Make it possible to send touch events from within QML test code.

7471 * Make it possible to send touch events from within QML test code.

4333

7472

@@ -4764,7 +7903,7 @@ qml-phone-shell (1.39) quantal; urgency=low

4764

7903

4765qml-phone-shell (1.38) quantal; urgency=low

7904qml-phone-shell (1.38) quantal; urgency=low

4766

7905

4767− * fix launching of notepad

7906+ * fix launching of notepad

4768

7907

4769 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500

7908 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500

4770

7909

@@ -4777,14 +7916,14 @@ qml-phone-shell (1.37) quantal; urgency=low

4777

7916

4778qml-phone-shell (1.36) quantal; urgency=low

7917qml-phone-shell (1.36) quantal; urgency=low

4779

7918

4780− * launch real notepad app

7919+ * launch real notepad app

4781 * fix launching of mock apps

7920 * fix launching of mock apps

4782

7921

4783 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500

7922 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500

4784

7923

4785qml-phone-shell (1.35) quantal; urgency=low

7924qml-phone-shell (1.35) quantal; urgency=low

4786

7925

4787− * integrate ubuntu-browser instead of snowshoe

7926+ * integrate ubuntu-browser instead of snowshoe

4788

7927

4789 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500

7928 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500

4790

7929

@@ -4868,7 +8007,7 @@ qml-phone-shell (1.22) quantal; urgency=low

4868

8007

4869qml-phone-shell (1.21) quantal; urgency=low

8008qml-phone-shell (1.21) quantal; urgency=low

4870

8009

4871− * New release with fullscreen launcher fixes

8010+ * New release with fullscreen launcher fixes

4872

8011

4873 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000

8012 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000

4874

8013

@@ -4880,7 +8019,7 @@ qml-phone-shell (1.20) quantal; urgency=low

4880

8019

4881qml-phone-shell (1.19) quantal; urgency=low

8020qml-phone-shell (1.19) quantal; urgency=low

4882

8021

4883− * enable multi-threaded render for apps

8022+ * enable multi-threaded render for apps

4884

8023

4885 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000

8024 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000

4886

8025

@@ -4888,7 +8027,7 @@ qml-phone-shell (1.18) quantal; urgency=low

4888

8027

4889 [ Bill Filler ]

8028 [ Bill Filler ]

4890 * update launcher to use wk2-render (chromeless webkit) for facebook

8029 * update launcher to use wk2-render (chromeless webkit) for facebook

4891− and twitter

8030+ and twitter

4892

8031

4893 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000

8032 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000

4894

8033

@@ -4900,7 +8039,7 @@ qml-phone-shell (1.17) quantal; urgency=low

4900

8039

4901qml-phone-shell (1.16) quantal; urgency=low

8040qml-phone-shell (1.16) quantal; urgency=low

4902

8041

4903− * fix to launch new gallery with correct args

8042+ * fix to launch new gallery with correct args

4904

8043

4905 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500

8044 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500

4906

8045

@@ -4962,7 +8101,7 @@ qml-phone-shell (1.2) quantal; urgency=low

4962

8101

4963qml-phone-shell (1.1) quantal; urgency=low

8102qml-phone-shell (1.1) quantal; urgency=low

4964

8103

4965− * comment out console.log() to prevent crash

8104+ * comment out console.log() to prevent crash

4966

8105

4967 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100

8106 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100

4968

8107

@@ -4990,19 +8129,19 @@ qml-phone-shell (0.7) quantal; urgency=low

4990 * qml-phone-shell.conf: better setup of env vars and launch

8129 * qml-phone-shell.conf: better setup of env vars and launch

4991 via dbus-luanch to properly setup session bus

8130 via dbus-luanch to properly setup session bus

4992 * shellapplication.cpp: don't setup custom env before launching

8131 * shellapplication.cpp: don't setup custom env before launching

4993− processes

8132+ processes

4994

8133

4995 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200

8134 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200

4996

8135

4997qml-phone-shell (0.6) quantal; urgency=low

8136qml-phone-shell (0.6) quantal; urgency=low

4998

8137

4999− * added additional Android env vars to upstart script

8138+ * added additional Android env vars to upstart script

5000

8139

5001 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400

8140 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400

5002

8141

5003qml-phone-shell (0.5) quantal; urgency=low

8142qml-phone-shell (0.5) quantal; urgency=low

5004

8143

5005− * added support to launch telephony-app

8144+ * added support to launch telephony-app

5006

8145

5007 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400

8146 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400

5008

8147

@@ -5029,3 +8168,8 @@ qml-phone-shell (0.1) quantal; urgency=low

5029 * Initial release

8168 * Initial release

5030

8169

5031 -- Bill Filler <bill.filler@canonical.com> Wed, 10 Oct 2012 10:19:53 -0400

8170 -- Bill Filler <bill.filler@canonical.com> Wed, 10 Oct 2012 10:19:53 -0400

8171+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium

8172+

8173+ [ Michael Zanetti ]

8174+ * Make the default store uri point to gnome software center

8175+

debian/control+224−146

@@ -2,193 +2,271 @@ Source: unity8

2Section: x11

2Section: x11

3Priority: optional

3Priority: optional

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

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

5−Build-Depends: cmake,

5+Build-Depends:

6+ android-headers,

7+ cmake,

8+ cmake-extras,

6− dbus-test-runner,

9+ dbus-test-runner,

7− debhelper (>= 9),

10+ debhelper (>= 9),

11+ dh-apparmor,

8− doxyqml,

12+ doxyqml,

13+ g++:native,

14+ gdb,

9− graphviz,

15+ graphviz,

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

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

11−# We rely on C++11 features, and to prevent from ABI breaks

17+ libandroid-properties-dev,

12−# in libstdc++ causing us issues, we explicitly select a G++

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

13−# version.

19+ libevdev-dev,

14− g++-4.9,

20+ libgeonames-dev (>= 0.2),

15− libdee-qt5-dev (>= 3.2),

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

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

17− libgl1-mesa-dri,

22+ libgl1-mesa-dri,

18− libgles2-mesa-dev[armhf],

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

19− libglib2.0-dev,

24+ libglib2.0-dev,

25+ libgnome-desktop-3-dev,

20− libgsettings-qt-dev,

26+ libgsettings-qt-dev,

21− libhardware-dev,

27+ libhardware-dev,

22− libhud-client2-dev,

28+ liblightdm-qt5-3-dev,

23− libpam0g-dev,

29+ libpam0g-dev,

24− libpay2-dev,

25− libpulse-dev,

30+ libpulse-dev,

26− libqmenumodel-dev (>= 0.2.8),

31+ libqmenumodel-dev (>= 0.2.12),

32+ libqt5sql5-sqlite,

33+ libqt5svg5-dev,

27− libqt5xmlpatterns5-dev,

34+ libqt5xmlpatterns5-dev,

35+ libqtdbusmock1-dev (>= 0.7),

36+ libqtdbustest1-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,

28− libunity-api-dev (>= 7.92),

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

29− libusermetricsoutput1-dev,

45+ libusermetricsoutput1-dev,

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

30− libxcb1-dev,

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

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

31− pkg-config,

49+ pkg-config,

32− python-setuptools,

33− python3-all:any,

50+ python3-all:any,

34− python3-setuptools,

51+ python3-setuptools,

35− python:any (>= 2.7),

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

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

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

55+ qml-module-qtqml-statemachine,

36− qml-module-qtquick-layouts,

56+ qml-module-qtquick-layouts,

37− qml-module-qtquick-xmllistmodel,

57+ qml-module-qtquick-xmllistmodel,

38− qml-module-qtquick2,

58+ qml-module-qtquick2,

59+ qml-module-qtsysteminfo,

39− qml-module-qttest,

60+ qml-module-qttest,

40− qt5-default,

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

41− qtbase5-dev (>= 5.2.1),

62+ qml-module-ubuntu-layouts,

42− qtbase5-dev-tools,

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

43− qtbase5-private-dev (>= 5.2.1),

64+ qml-module-ubuntu-test,

44− qtdeclarative5-dev (>= 5.2.1),

65+ qtbase5-dev (>= 5.6),

45− qtdeclarative5-dev-tools,

66+ qtbase5-dev-tools,

46− qtdeclarative5-private-dev (>= 5.2.1),

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

47− qtdeclarative5-qtmultimedia-plugin,

68+ qtdbustest-runner,

48− qtdeclarative5-ubuntu-settings-components (>= 0.4),

69+ qtdeclarative5-dev (>= 5.6),

49− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

70+ qtdeclarative5-dev-tools,

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

72+ qtdeclarative5-ubuntu-content1,

50− ttf-ubuntu-font-family,

73+ ttf-ubuntu-font-family,

74+ ubports-wallpapers,

75+ xvfb,

51Standards-Version: 3.9.4

76Standards-Version: 3.9.4

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

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

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

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

55−# and sync up the code again.

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

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

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

79+XS-Testsuite: autopkgtest

58X-Ubuntu-Use-Langpack: yes

80X-Ubuntu-Use-Langpack: yes

59

81

60Package: indicators-client

82Package: indicators-client

61−Architecture: amd64 armhf i386

83+Architecture: any

84+Depends:

62−Depends: qmenumodel-qml (>= 0.2.8),

85+ qmenumodel-qml (>= 0.2.11),

63− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

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

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

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

65− ${misc:Depends},

88+ ${misc:Depends},

66− ${shlibs:Depends},

89+ ${shlibs:Depends},

67Description: Indicators client test application

90Description: Indicators client test application

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

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

69

92

70−Package: unity-scope-tool

93+Package: unity8-greeter

71Architecture: any

94Architecture: any

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

95+Depends:

96+ unity-system-compositor,

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

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

74− ${misc:Depends},

98+ ${misc:Depends},

75− ${shlibs:Depends},

99+ ${shlibs:Depends},

76−Description: Development tool for Unity scopes

100+Recommends:

77− This package contains the development tool for new generation Unity scopes, based

101+ lightdm,

78− on Unity8.

102+Provides:

103+ lightdm-greeter,

104+Description: The Unity8 Greeter

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

79

106

80Package: unity8

107Package: unity8

81Architecture: any

108Architecture: any

109+Provides:

82−Provides: indicator-renderer,

110+ indicator-renderer,

111+Depends:

112+ dmz-cursor-theme,

83−Depends: gsettings-desktop-schemas,

113+ gsettings-desktop-schemas,

84− libcap2-bin,

114+ libcap2-bin,

85− libglib2.0-bin,

115+ libglib2.0-bin,

86− qmenumodel-qml (>= 0.2.8),

116+ qmenumodel-qml (>= 0.2.11),

117+ qml-module-biometryd,

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

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

120+ qml-module-qtqml-statemachine,

87− qml-module-qtquick-xmllistmodel,

121+ qml-module-qtquick-xmllistmodel,

88− qtdeclarative5-gsettings1.0,

122+ qml-module-qtsysteminfo,

89− qtdeclarative5-qtmir-plugin (>= 0.4.4),

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

90− qtdeclarative5-ubuntu-telephony0.1,

124+ qtdeclarative5-ubuntu-telephony0.1,

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

91− unity-launcher-impl-4,

126+ unity-launcher-impl-13,

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

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

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

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

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

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

95− ${misc:Depends},

130+ ${misc:Depends},

96− ${shlibs:Depends},

131+ ${shlibs:Depends},

97−Recommends: unity-scope-click,

132+Recommends:

98− unity-scope-mediascanner2,

133+ indicator-keyboard,

99− unity-scope-scopes,

134+ indicator-session,

135+ unity-greeter-session-broadcast,

136+Breaks:

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

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

138+ ubuntu-keyboard (<< 0.100),

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

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

140+ unity-scope-tool,

102− unity8-greeter (<< 7.89),

141+ unity8-greeter (<< 7.89),

142+Replaces:

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

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

144+ unity-scope-tool,

104− unity8-greeter (<< 7.89),

145+ unity8-greeter (<< 7.89),

146+Conflicts:

147+ ubuntu-system-settings-wizard,

105Description: Unity 8 shell

148Description: Unity 8 shell

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

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

107

150

108Package: unity8-common

151Package: unity8-common

109Architecture: all

152Architecture: all

153+Depends:

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

154+ qml-module-qtquick-layouts,

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

111− qtdeclarative5-ubuntu-settings-components (>= 0.4),

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

112− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

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

113− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),

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

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

159+ qttranslations5-l10n,

115− ubuntu-thumbnailer-impl-0,

160+ ubuntu-thumbnailer-impl-0,

116− unity-application-impl-4,

161+ unity-application-impl-27,

117− unity-notifications-impl-3,

162+ unity-notifications-impl-3,

118− unity-plugin-scopes | unity-scopes-impl,

163+ unity8-schemas,

119− unity-scopes-impl-4,

120− unity8-fake-env | unity-application-impl,

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

121− ${misc:Depends},

165+ ${misc:Depends},

166+Breaks:

122−Breaks: unity8 (<< 7.86),

167+ unity8 (<< 7.86),

168+Replaces:

123−Replaces: unity8 (<< 7.86),

169+ unity8 (<< 7.86),

124Description: Unity 8 shell (common files)

170Description: Unity 8 shell (common files)

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

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

126 .

172 .

127− This package contains the QML, graphics and locale files shared between

173+ This package contains the QML, graphics and locale files for unity8.

128− unity8 and unity-scope-tool.

129

174

130Package: unity8-autopilot

175Package: unity8-autopilot

131Architecture: all

176Architecture: all

177+Depends:

178+ autopilot-qt5 (>= 1.4),

132−Depends: gir1.2-glib-2.0,

179+ gir1.2-glib-2.0,

133− libautopilot-qt (>= 1.4),

180+ gir1.2-notify-0.7,

134− libqt5test5,

181+ libqt5test5,

135− libqt5widgets5,

182+ libqt5widgets5,

136− python-autopilot,

183+ ofono-phonesim,

137− python-evdev,

138− python-fixtures,

139− python-gi,

140− python-mock,

141− python3-autopilot,

184+ python3-autopilot,

142− python3-evdev,

185+ python3-evdev,

143− python3-fixtures,

186+ python3-fixtures,

144− python3-gi,

187+ python3-gi,

188+ qttestability-autopilot (>= 1.4),

145− ubuntu-ui-toolkit-autopilot,

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

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

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

147− unity8-fake-env (= ${source:Version}),

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

148− url-dispatcher-tools,

192+ url-dispatcher-tools,

193+ xvfb,

149− ${misc:Depends},

194+ ${misc:Depends},

150− ${python3:Depends},

151− ${python:Depends},

152− ${shlibs:Depends},

195+ ${python3:Depends},

153Description: Test package for Unity 8 shell

196Description: Test package for Unity 8 shell

154 Autopilot tests for the unity8 package

197 Autopilot tests for the unity8 package

155

198

156−Package: unity8-fake-env

199+Package: unity8-tests

157Architecture: any

200Architecture: any

158Multi-Arch: same

201Multi-Arch: same

202+Pre-Depends:

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

203+ ${misc:Pre-Depends},

204+Depends:

205+ dbus-test-runner,

206+ parallel,

207+ qt5-default,

208+ qtdbustest-runner,

209+ qtdeclarative5-dev-tools,

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

211+ xvfb,

160−Depends: ${misc:Depends},

212+ ${misc:Depends},

161− ${shlibs:Depends},

213+ ${shlibs:Depends},

214+Provides:

162−Provides: unity-application-impl,

215+ unity-application-impl,

163− unity-application-impl-4,

216+ unity-application-impl-27,

217+ unity8-fake-env,

218+Replaces:

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

220+ unity8-fake-env,

221+Conflicts:

222+ unity8-fake-env,

164−Description: Fake environment for running Unity 8 shell

223+Description: Scripts and mocks for running Unity 8 shell tests

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

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

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

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

226+ and scripts to run its test suite.

167

227

168Package: unity8-private

228Package: unity8-private

169Architecture: any

229Architecture: any

170Multi-Arch: same

230Multi-Arch: same

231+Pre-Depends:

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

232+ ${misc:Pre-Depends},

233+Depends:

172−Depends: accountsservice-ubuntu-schemas (>= 0.0.3),

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

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

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

174− libhardware2,

236+ libhardware2,

175− unity-schemas (>= 7.3.1+14.10.20140915),

237+ qml-module-qtmultimedia,

176− pay-service,

238+ qtdeclarative5-gsettings1.0,

177− qml-module-ubuntu-connectivity,

239+ unity8-schemas,

178− ${misc:Depends},

240+ ${misc:Depends},

179− ${shlibs:Depends},

241+ ${shlibs:Depends},

242+Provides:

180−Provides: unity-launcher-impl,

243+ unity-launcher-impl,

181− unity-launcher-impl-4,

244+ unity-launcher-impl-13,

182Description: Unity 8 private libs

245Description: Unity 8 private libs

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

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

184 .

247 .

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

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

186 only used by the shell.

249 only used by the shell.

187

250

251+Package: unity8-schemas

252+Architecture: all

253+Multi-Arch: foreign

254+Depends:

255+ ${misc:Depends},

256+Replaces:

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

258+Breaks:

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

260+Description: Unity 8 schemas

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

262+ .

263+ This package contains the configuration schemas used by unity.

264+

188Package: unity8-doc

265Package: unity8-doc

189Section: doc

266Section: doc

190Architecture: all

267Architecture: all

191Multi-Arch: foreign

268Multi-Arch: foreign

269+Depends:

192−Depends: ${misc:Depends},

270+ ${misc:Depends},

193Description: Documentation for Unity8

271Description: Documentation for Unity8

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

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

debian/copyright+21

@@ -60,3 +60,24 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3

60 packaging of this file. Please review the following information to

60 packaging of this file. Please review the following information to

61 ensure the GNU General Public License version 3.0 requirements will be

61 ensure the GNU General Public License version 3.0 requirements will be

62 met: http://www.gnu.org/copyleft/gpl.html.

62 met: http://www.gnu.org/copyleft/gpl.html.

63+

64+Files: plugins/Cursor/3rd_party/xcursor/xcursor.*

65+Copyright: 2002 Keith Packard

66+License: Keith Packard

67+ Permission to use, copy, modify, distribute, and sell this software and its

68+ documentation for any purpose is hereby granted without fee, provided that

69+ the above copyright notice appear in all copies and that both that

70+ copyright notice and this permission notice appear in supporting

71+ documentation, and that the name of Keith Packard not be used in

72+ advertising or publicity pertaining to distribution of the software without

73+ specific, written prior permission. Keith Packard makes no

74+ representations about the suitability of this software for any purpose. It

75+ is provided "as is" without express or implied warranty.

76+ .

77+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

78+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

79+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

80+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

81+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

82+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

83+ PERFORMANCE OF THIS SOFTWARE.

debian/indicators-client.install+1

@@ -1 +1,2 @@

1/usr/bin/indicators-client

1/usr/bin/indicators-client

2+usr/share/applications/indicators-client.desktop

debian/rules+24−14

@@ -7,18 +7,15 @@ include /usr/share/dpkg/default.mk

7#export DH_VERBOSE=1

7#export DH_VERBOSE=1

8export DPKG_GENSYMBOLS_CHECK_LEVEL=4

8export DPKG_GENSYMBOLS_CHECK_LEVEL=4

9export NO_PNG_PKG_MANGLE=1

9export NO_PNG_PKG_MANGLE=1

10+export QT_SELECT=qt5

10

11

11−# Explicitly selecting a G{CC,++}-version here to avoid accidental

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

12−# ABI breaks introduced by toolchain updates.

13−export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9

14−export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9

15

13

16−%:

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

17− dh $@ --parallel --fail-missing --with python2,python3

15+testskip_architectures := arm64 powerpc ppc64el s390x

18

16

19−override_dh_auto_clean:

17+%:

20− dh_auto_clean

18+ dh $@ --parallel --fail-missing --with python3

21− rm -rf builddir

22

19

23override_dh_auto_configure:

20override_dh_auto_configure:

24 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

21 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

@@ -27,12 +24,24 @@ override_dh_auto_configure:

27

24

28override_dh_auto_build:

25override_dh_auto_build:

29 # doc is not a default target

26 # doc is not a default target

30− dh_auto_build -- all doc

27+ dh_auto_build -- -O all doc

28+

29+override_dh_auto_test:

30+ # Run the entire test battery

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

32+ # causing the whole battery to fail.

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

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

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

36+else

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

38+endif

39+endif

31

40

32override_dh_install:

41override_dh_install:

33 # install autopilot tests

42 # install autopilot tests

34 cd tests/autopilot; \

43 cd tests/autopilot; \

35− set -ex; for python in $(shell pyversions -r) $(shell py3versions -r); do \

44+ set -ex; for python in $(shell py3versions -r); do \

36 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

45 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

37 done; \

46 done; \

38 cd $(CURDIR)

47 cd $(CURDIR)

@@ -40,8 +49,9 @@ override_dh_install:

40

49

41# use private lib directories

50# use private lib directories

42override_dh_makeshlibs:

51override_dh_makeshlibs:

43− dh_makeshlibs -Nunity8-private -Nunity8-fake-env

52+ dh_makeshlibs -Nunity8-private -Nunity8-tests

44

53

45−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist

46override_dh_shlibdeps:

54override_dh_shlibdeps:

47− dh_shlibdeps -XlibMockLightDM-qml.so

55+ # Some mock libraries link against liblightdm-qt5-3.so which we want to

56+ # avoid, since we only really link against our mock one, not the system one.

57+ dh_shlibdeps -XlibMockAccountsService-qml.so -Lunity8-private

debian/shlibs.localnew file+1

@@ -0,0 +1 @@

1+libunity8-private 0 unity8-private

debian/source/formatdeleted−1

@@ -1 +0,0 @@

1−1.0

debian/tests/autopilot.shnew file+13

@@ -0,0 +1,13 @@

1+#!/bin/sh

2+

3+# log all commands and abort on error

4+set -xe

5+

6+if [ ! -f /system/build.prop ]; then

7+ echo "WARNING: Skipping autopilot test, will only run on devices at the moment."

8+ exit 0

9+fi

10+

11+initctl --session stop unity8

12+autopilot3 run --verbose --format xml --output "${ADT_ARTIFACTS}/unity8.xml" unity8

13+initctl --session start unity8

debian/tests/controlnew file+11

@@ -0,0 +1,11 @@

1+Tests: qmluitests.sh

2+Restrictions: allow-stderr

3+Depends:

4+ dpkg-dev,

5+ unity8-tests,

6+

7+Tests: autopilot.sh

8+Restrictions: allow-stderr,

9+ isolation-machine,

10+Depends:

11+ unity8-autopilot,

debian/tests/qmluitests.shnew file+11

@@ -0,0 +1,11 @@

1+#!/bin/sh

2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-

3+

4+# log all commands and abort on error

5+set -xe

6+

7+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)

8+

9+export ARTIFACTS_DIR="${ADT_ARTIFACTS}"

10+

11+/usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh

debian/unity-scope-tool.installdeleted−2

@@ -1,2 +0,0 @@

1−usr/bin/unity-scope-tool

2−usr/share/unity8/ScopeTool.qml

debian/unity8-common.install+1−1

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

1usr/share/locale

1usr/share/locale

2usr/share/unity8/Components

2usr/share/unity8/Components

3−usr/share/unity8/Dash

4usr/share/unity8/Notifications

3usr/share/unity8/Notifications

5usr/share/unity8/graphics

4usr/share/unity8/graphics

5+var/lib/polkit-1/localauthority/10-vendor.d

debian/unity8-common.udevnew file+2

@@ -0,0 +1,2 @@

1+# Make local foreground session able to inject input

2+KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess"

debian/unity8-doc.install+1

@@ -1 +1,2 @@

1+doc/devices.conf usr/share/doc/unity8/

1usr/share/doc/unity8/*

2usr/share/doc/unity8/*

debian/unity8-fake-env.installdeleted−4

@@ -1,4 +0,0 @@

1−usr/lib/*/unity8/qml/mocks

2−usr/lib/*/unity8/qml/nonmirplugins

3−usr/lib/*/unity8/qml/scopefakes

4−usr/share/unity8/mocks

debian/unity8-greeter.installnew file+5

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

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

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

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

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

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

debian/unity8-private.install+7−4

@@ -1,15 +1,18 @@

1usr/lib/*/libunity8-private.*

1usr/lib/*/libunity8-private.*

2usr/lib/*/unity8/qml/AccountsService

2usr/lib/*/unity8/qml/AccountsService

3−usr/lib/*/unity8/qml/Dash

3+usr/lib/*/unity8/qml/Cursor

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

4−usr/lib/*/unity8/qml/HudClient

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

5usr/lib/*/unity8/qml/LightDM

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

6usr/lib/*/unity8/qml/Lights

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

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

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

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

8usr/lib/*/unity8/qml/SessionBroadcast

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

9−usr/lib/*/unity8/qml/ScreenGrabber

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

10usr/lib/*/unity8/qml/Ubuntu

12usr/lib/*/unity8/qml/Ubuntu

11usr/lib/*/unity8/qml/Unity

13usr/lib/*/unity8/qml/Unity

12usr/lib/*/unity8/qml/Utils

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

13−usr/lib/*/unity8/libUbuntuGestures*

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

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

14usr/share/accountsservice/interfaces

17usr/share/accountsservice/interfaces

15usr/share/dbus-1/interfaces

18usr/share/dbus-1/interfaces

debian/unity8-schemas.installnew file+1

@@ -0,0 +1 @@

1+usr/share/glib-2.0/schemas

debian/unity8-tests.installnew file+9

@@ -0,0 +1,9 @@

1+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/

2+usr/bin/unity-mock-indicator-service

3+usr/lib/*/unity8/qml/mocks

4+usr/lib/*/unity8/qml/nonmirplugins

5+usr/lib/*/unity8/qml/utils

6+usr/lib/*/unity8/tests

7+usr/lib/*/unity8/uqmlscene

8+usr/share/unity8/mocks

9+usr/share/unity8/tests

debian/unity8-tests.lintian-overridesnew file+1

@@ -0,0 +1 @@

1+unity8-tests: unusual-interpreter usr/lib/*/unity8/tests/scripts/*.sh #!/usr/bin/parallel

debian/unity8.install+12−7

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

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

1+data/devices.conf etc/ubuntu/

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

2+data/test.sensors etc/ubuntusensors/

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

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

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

4usr/bin/unity8

5usr/bin/unity8

5−usr/bin/unity8-dash

6usr/share/applications/unity8.desktop

6usr/share/applications/unity8.desktop

7−usr/share/applications/unity8-dash.desktop

7+usr/share/unity8/ApplicationMenus

8+usr/share/unity8/DeviceConfiguration.qml

9+usr/share/unity8/DisabledScreenNotice.qml

8usr/share/unity8/Greeter

10usr/share/unity8/Greeter

9−usr/share/unity8/Hud

10usr/share/unity8/Launcher

11usr/share/unity8/Launcher

12+usr/share/unity8/OrientedShell.qml

11usr/share/unity8/Panel

13usr/share/unity8/Panel

14+usr/share/unity8/Rotation

12usr/share/unity8/Shell.qml

15usr/share/unity8/Shell.qml

13−usr/share/unity8/Stages

16+usr/share/unity8/Stage

14−usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher

17+usr/share/unity8/Tutorial

18+usr/share/unity8/Wizard

19+var/lib/unity8/version

doc/devices.confnew file+45

@@ -0,0 +1,45 @@

1+# This file can hold multiple device configs. Devices are separated by sections.

2+#

3+# SupportedOrientations holds a list of all enabled orientations. A standard

4+# phone will usually have Portrait,Landcape,InvertedLandscape in order to

5+# disable upside down usage.

6+#

7+# PrimaryOrientation gives the orientation the device will start up with

8+# when there is no orientations sensor input available (yet) or lock to

9+# when an application specifies to be locked to PrimaryOrientation.

10+#

11+# The other Orientation settings can be used to re-map the orientations.

12+# A device might be used with different orientations than how the screen

13+# is physically mounted on the hardware.

14+#

15+# Category can be phone, tablet, or desktop. This option determines

16+# whether the side stage is shown (tablet) or not (phone). Using

17+# desktop will load the shell in windowed mode. Note that the user

18+# can override/change this by connecting input hardware or change

19+# user settings.

20+#

21+# Any options not listed will default to the values of the example below.

22+

23+[devicename]

24+SupportedOrientations=Portrait,InvertedPortrait,Landscape,InvertedLandscape

25+PrimaryOrientation=PrimaryOrienation

26+PortraitOrientation=Portrait

27+InvertedPortraitOrientation=InvertedPortrait

28+LandscapeOrientation=Landscape

29+InvertedLandscapeOrientation=InvertedLandscape

30+Category=phone

31+

32+# Example for the Nexus 7

33+# This device has the screen mounted in portrait, but we run it as a landscape

34+# device and we want the side stage on it.

35+[flo]

36+PrimaryOrientation=LandscapeOrienation

37+Category=tablet

38+

39+# Example for the Nexus 4

40+# The screen is already mounted the way we want it, so no special config

41+# required. However, we don't want the phone to rotate upside down, so lets

42+# restrict that.

43+[mako]

44+SupportedOrientations=Portrait,Landscape,InvertedLandscape

45+Category=phone

include/paths.h.in+72−35

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

1/*

1/*

2− * Copyright (C) 2012 Canonical, Ltd.

2+ * Copyright (C) 2012-2016 Canonical, Ltd.

3− *

4− * Authors:

5− * Ugo Riboni <ugo.riboni@canonical.com>

6 *

3 *

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

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

8 * it under the terms of the GNU General Public License as published by

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

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

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

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

18 */

15 */

19

16

20−#ifndef PATHS_H

17+#pragma once

21−#define PATHS_H

22

18

23// Qt

19// Qt

24#include <QtCore/QCoreApplication>

20#include <QtCore/QCoreApplication>

@@ -27,32 +23,82 @@

27#include <QtQml/QQmlEngine>

23#include <QtQml/QQmlEngine>

28#include <QStandardPaths>

24#include <QStandardPaths>

29

25

26+inline QString installRoot() {

27+ static QString installRoot;

28+ static bool installRootSet = false;

29+ if (!installRootSet) {

30+ QString snapRoot = QFile::decodeName(qgetenv("SNAP"));

31+ if (!snapRoot.isEmpty() && QCoreApplication::applicationDirPath() ==

32+ QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {

33+ installRoot = snapRoot;

34+ } else if (QCoreApplication::applicationDirPath() ==

35+ QDir(QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {

36+ installRoot = QStringLiteral("");

37+ }

38+ installRootSet = true;

39+ }

40+ return installRoot;

41+}

42+

30inline bool isRunningInstalled() {

43inline bool isRunningInstalled() {

31− static bool installed = (QCoreApplication::applicationDirPath() ==

44+ // Tests don't use the normal binary, so we want to check binary *and*

32− QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());

45+ // the environment. Installed tests have UNITY_TESTING_DATADIR set.

33− return installed;

46+ static bool installed_test_env = !qgetenv("UNITY_TESTING_DATADIR").isEmpty();

47+ return !installRoot().isNull() || installed_test_env;

48+}

49+

50+inline QString buildDirectory() {

51+ if (!qEnvironmentVariableIsEmpty("UNITY_BINARY_DIR")) return qgetenv("UNITY_BINARY_DIR");

52+ return QStringLiteral("@CMAKE_BINARY_DIR@");

53+}

54+

55+inline QString sourceDirectory() {

56+ if (!qEnvironmentVariableIsEmpty("UNITY_SOURCE_DIR")) return qgetenv("UNITY_SOURCE_DIR");

57+ return QStringLiteral("@CMAKE_SOURCE_DIR@");

34}

58}

35

59

36inline QString translationDirectory() {

60inline QString translationDirectory() {

37 if (isRunningInstalled()) {

61 if (isRunningInstalled()) {

38− return QString("@CMAKE_INSTALL_PREFIX@/share/locale");

62+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");

63+ } else {

64+ return buildDirectory() + QStringLiteral("/po/locale");

65+ }

66+}

67+

68+inline QString testDataDir() {

69+ // Can't use isRunningInstalled, since tests don't use the normal unity8

70+ // executable. $UNITY_TESTING_DATADIR is set by installed tests.

71+ QString datadir(qgetenv("UNITY_TESTING_DATADIR"));

72+ if (datadir.isEmpty()) {

73+ return sourceDirectory() + "/tests";

39 } else {

74 } else {

40− return QString("@CMAKE_BINARY_DIR@/po/locale");

75+ return datadir + "/tests";

76+ }

77+}

78+

79+inline QString testLibDir() {

80+ // Can't use isRunningInstalled, since tests don't use the normal unity8

81+ // executable. $UNITY_TESTING_DATADIR is set by installed tests.

82+ QString libdir(qgetenv("UNITY_TESTING_LIBDIR"));

83+ if (libdir.isEmpty()) {

84+ return buildDirectory() + "/tests";

85+ } else {

86+ return libdir + "/tests";

41 }

87 }

42}

88}

43

89

44inline QString qmlDirectory() {

90inline QString qmlDirectory() {

45 if (isRunningInstalled()) {

91 if (isRunningInstalled()) {

46− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");

92+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");

47 } else {

93 } else {

48− return QString("@CMAKE_SOURCE_DIR@/qml/");

94+ return sourceDirectory() + QStringLiteral("/qml");

49 }

95 }

50}

96}

51

97

52inline QStringList overrideImportPaths() {

98inline QStringList overrideImportPaths() {

53 QStringList paths;

99 QStringList paths;

54 if (!isRunningInstalled()) {

100 if (!isRunningInstalled()) {

55− paths << QString("@CMAKE_BINARY_DIR@/plugins");

101+ paths << buildDirectory() + QStringLiteral("/plugins");

56 }

102 }

57 return paths;

103 return paths;

58}

104}

@@ -60,9 +106,9 @@ inline QStringList overrideImportPaths() {

60inline QStringList nonMirImportPaths() {

106inline QStringList nonMirImportPaths() {

61 QStringList paths;

107 QStringList paths;

62 if (isRunningInstalled()) {

108 if (isRunningInstalled()) {

63− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");

109+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");

64 } else {

110 } else {

65− paths << QString("@CMAKE_BINARY_DIR@/nonmirplugins");

111+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");

66 }

112 }

67 return paths;

113 return paths;

68}

114}

@@ -70,42 +116,35 @@ inline QStringList nonMirImportPaths() {

70inline QStringList fallbackImportPaths() {

116inline QStringList fallbackImportPaths() {

71 QStringList paths;

117 QStringList paths;

72 if (isRunningInstalled()) {

118 if (isRunningInstalled()) {

73− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");

119+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");

120+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");

74− paths << QString("@SHELL_PLUGINDIR@");

121+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");

75− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

122+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

76 } else {

123 } else {

124+ paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");

77− paths << QString("@SHELL_PLUGINDIR@");

125+ paths << QStringLiteral("@SHELL_PLUGINDIR@");

78− paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");

126+ paths << buildDirectory() + QStringLiteral("/tests/mocks");

79 }

127 }

80 return paths;

128 return paths;

81}

129}

82

130

83inline QString mockPluginsDir() {

131inline QString mockPluginsDir() {

84 if (isRunningInstalled()) {

132 if (isRunningInstalled()) {

85− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

133+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

86 } else {

134 } else {

87− return QString("@CMAKE_BINARY_DIR@/tests/mocks");

135+ return buildDirectory() + QStringLiteral("/tests/mocks");

88 }

136 }

89}

137}

90

138

91inline QStringList shellDataDirs() {

139inline QStringList shellDataDirs() {

92 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

140 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

93− if (!isRunningInstalled()) {

141+ if (isRunningInstalled()) {

94− if (getenv("UNITY_TEST_ENV")==nullptr) {

95− dirs.prepend("@CMAKE_BINARY_DIR@/share");

96− }

97− }

98− else {

99 // append so by default we use xdg files.

142 // append so by default we use xdg files.

100 dirs.append(qmlDirectory());

143 dirs.append(qmlDirectory());

101 }

144 }

102 return dirs;

145 return dirs;

103}

146}

104

147

105−inline QString sourceDirectory() {

106− return QString("@CMAKE_SOURCE_DIR@/");

107−}

108−

109inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

148inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

110{

149{

111 QStringList importPathList = engine->importPathList();

150 QStringList importPathList = engine->importPathList();

@@ -134,5 +173,3 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

134 }

173 }

135 engine->setImportPathList(importPathList);

174 engine->setImportPathList(importPathList);

136}

175}

137−

138−#endif

libs/CMakeLists.txtdeleted−1

@@ -1 +0,0 @@

1−add_subdirectory(UbuntuGestures)

libs/UbuntuGestures/CMakeLists.txtdeleted−40

@@ -1,40 +0,0 @@

1−# in order to include Qt's private headers

2−remove_definitions(-DQT_NO_KEYWORDS)

3−

4−set(UbuntuGestures_SOURCES

5− CandidateInactivityTimer.cpp

6− DebugHelpers.cpp

7− Timer.cpp

8− TouchOwnershipEvent.cpp

9− TouchRegistry.cpp

10− UnownedTouchEvent.cpp

11−)

12−

13−add_definitions(-DUBUNTUGESTURES_LIBRARY)

14−

15−add_library(UbuntuGestures SHARED ${UbuntuGestures_SOURCES})

16−

17−qt5_use_modules(UbuntuGestures Core Quick)

18−

19−# So that Foo.cpp can #include "Foo.moc"

20−include_directories(${CMAKE_CURRENT_BINARY_DIR})

21−

22−install(TARGETS UbuntuGestures

23− DESTINATION ${SHELL_PRIVATE_LIBDIR})

24−

25−

26−# There's no cmake var for v8 include path :-/ so create one

27−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

28−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")

29− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)

30−else()

31− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

32−endif()

33−

34−# DANGER! DANGER! Using Qt's private API!

35−include_directories(

36− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

37− ${Qt5Quick_INCLUDE_DIRS}

38− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

39− ${Qt5V8_PRIVATE_INCLUDE_DIR}

40−)

libs/UbuntuGestures/CandidateInactivityTimer.cppdeleted−41

@@ -1,41 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#include "CandidateInactivityTimer.h"

18−

19−namespace UbuntuGestures {

20−

21−CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,

22− AbstractTimerFactory &timerFactory, QObject *parent)

23− : QObject(parent)

24− , m_touchId(touchId)

25− , m_candidate(candidate)

26−{

27− m_timer = timerFactory.createTimer(this);

28− connect(m_timer, &AbstractTimer::timeout,

29− this, &CandidateInactivityTimer::onTimeout);

30− m_timer->setInterval(durationMs);

31− m_timer->setSingleShot(true);

32− m_timer->start();

33−}

34−

35−void CandidateInactivityTimer::onTimeout()

36−{

37− qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);

38− Q_EMIT candidateDefaulted(m_touchId, m_candidate);

39−}

40−

41−} // namespace UbuntuGestures

libs/UbuntuGestures/CandidateInactivityTimer.hdeleted−49

@@ -1,49 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

18−#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

19−

20−#include <QObject>

21−

22−class QQuickItem;

23−

24−#include "Timer.h"

25−

26−namespace UbuntuGestures {

27−

28−class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {

29− Q_OBJECT

30−public:

31− CandidateInactivityTimer(int touchId, QQuickItem *candidate,

32− AbstractTimerFactory &timerFactory,

33− QObject *parent = nullptr);

34−

35− const int durationMs = 350;

36−

37−Q_SIGNALS:

38− void candidateDefaulted(int touchId, QQuickItem *candidate);

39−private Q_SLOTS:

40− void onTimeout();

41−private:

42− AbstractTimer *m_timer;

43− int m_touchId;

44− QQuickItem *m_candidate;

45−};

46−

47−} // namespace UbuntuGestures

48−

49−#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

libs/UbuntuGestures/DebugHelpers.cppdeleted−95

@@ -1,95 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#include "DebugHelpers.h"

18−#include <QTouchEvent>

19−#include <QMouseEvent>

20−

21−QString touchPointStateToString(Qt::TouchPointState state)

22−{

23− switch (state) {

24− case Qt::TouchPointPressed:

25− return QString("pressed");

26− case Qt::TouchPointMoved:

27− return QString("moved");

28− case Qt::TouchPointStationary:

29− return QString("stationary");

30− case Qt::TouchPointReleased:

31− return QString("released");

32− default:

33− return QString("INVALID_STATE");

34− }

35−}

36−

37−QString touchEventToString(const QTouchEvent *ev)

38−{

39− QString message;

40−

41− switch (ev->type()) {

42− case QEvent::TouchBegin:

43− message.append("TouchBegin ");

44− break;

45− case QEvent::TouchUpdate:

46− message.append("TouchUpdate ");

47− break;

48− case QEvent::TouchEnd:

49− message.append("TouchEnd ");

50− break;

51− case QEvent::TouchCancel:

52− message.append("TouchCancel ");

53− break;

54− default:

55− message.append("INVALID_TOUCH_EVENT_TYPE ");

56− }

57−

58− foreach(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {

59− message.append(

60− QString("(id:%1, state:%2, scenePos:(%3,%4)) ")

61− .arg(touchPoint.id())

62− .arg(touchPointStateToString(touchPoint.state()))

63− .arg(touchPoint.scenePos().x())

64− .arg(touchPoint.scenePos().y())

65− );

66− }

67−

68− return message;

69−}

70−

71−QString mouseEventToString(const QMouseEvent *ev)

72−{

73− QString message;

74−

75− switch (ev->type()) {

76− case QEvent::MouseButtonPress:

77− message.append("MouseButtonPress ");

78− break;

79− case QEvent::MouseButtonRelease:

80− message.append("MouseButtonRelease ");

81− break;

82− case QEvent::MouseButtonDblClick:

83− message.append("MouseButtonDblClick ");

84− break;

85− case QEvent::MouseMove:

86− message.append("MouseButtonMove ");

87− break;

88− default:

89− message.append("INVALID_MOUSE_EVENT_TYPE ");

90− }

91−

92− message.append(QString("pos(%1, %2)").arg(ev->x()).arg(ev->y()));

93−

94− return message;

95−}

libs/UbuntuGestures/Pool.hdeleted−134

@@ -1,134 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UBUNTUGESTURES_POOL_H

18−#define UBUNTUGESTURES_POOL_H

19−

20−#include <QVector>

21−

22−#include "UbuntuGesturesGlobal.h"

23−

24−/*

25− An object pool.

26− Avoids unnecessary creations/initializations and deletions/destructions of items. Useful

27− in a scenario where items are created and destroyed very frequently but the total number

28− of items at any given time remains small. They're stored in a unordered fashion.

29−

30− To be used in Pool, ItemType needs to have the following methods:

31−

32− - ItemType();

33−

34− A constructor that takes no parameters. An object contructed with it must return false if

35− isValid() is called.

36−

37− - bool isValid() const;

38−

39− Returns wheter the object holds a valid , "filled" state or is empty.

40− Used by Pool to check if the slot occupied by this object is actually available.

41−

42− - void reset();

43−

44− Resets the object to its initial, empty, state. After calling this method, isValid() must

45− return false.

46− */

47−template <class ItemType> class Pool

48−{

49−public:

50− Pool() : m_lastUsedIndex(-1) {

51− }

52−

53− class Iterator {

54− public:

55− Iterator() : index(-1), item(nullptr) {}

56− Iterator(int index, ItemType *item)

57− : index(index), item(item) {}

58−

59− ItemType *operator->() const { return item; }

60− ItemType &operator*() const { return *item; }

61− ItemType &value() const { return *item; }

62−

63− Iterator &operator= (const Iterator& other) {

64− index = other.index;

65− item = other.item;

66−

67− // by convention, always return *this

68− return *this;

69− }

70−

71− operator bool() const { return item != nullptr; }

72−

73− int index;

74− ItemType *item;

75− };

76−

77− Iterator &end() const { return Iterator(); }

78−

79− ItemType &getEmptySlot() {

80− Q_ASSERT(m_lastUsedIndex < m_slots.size());

81−

82− // Look for an in-between vacancy first

83− for (int i = 0; i < m_lastUsedIndex; ++i) {

84− ItemType &item = m_slots[i];

85− if (!item.isValid()) {

86− return item;

87− }

88− }

89−

90− ++m_lastUsedIndex;

91− if (m_lastUsedIndex >= m_slots.size()) {

92− m_slots.resize(m_lastUsedIndex + 1);

93− }

94−

95− return m_slots[m_lastUsedIndex];

96− }

97−

98− void freeSlot(Iterator &iterator) {

99− m_slots[iterator.index].reset();

100− if (iterator.index == m_lastUsedIndex) {

101− do {

102− --m_lastUsedIndex;

103− } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());

104− }

105− }

106−

107− // Iterates through all valid items (i.e. the occupied slots)

108− // calling the given function, with the option of ending the loop early.

109− //

110− // bool Func(Iterator& item)

111− //

112− // Returning true means it wants to continue the "for" loop, false

113− // terminates the loop.

114− template<typename Func> void forEach(Func func) {

115− Iterator it;

116− for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {

117− it.item = &m_slots[it.index];

118− if (!it.item->isValid())

119− continue;

120−

121− if (!func(it))

122− break;

123− }

124− }

125−

126− bool isEmpty() const { return m_lastUsedIndex == -1; }

127−

128−

129−private:

130− QVector<ItemType> m_slots;

131− int m_lastUsedIndex;

132−};

133−

134−#endif // UBUNTUGESTURES_POOL_H

libs/UbuntuGestures/Timer.cppdeleted−109

@@ -1,109 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#include "Timer.h"

18−

19−namespace UbuntuGestures {

20−

21−Timer::Timer(QObject *parent) : AbstractTimer(parent)

22−{

23− m_timer.setSingleShot(false);

24− connect(&m_timer, &QTimer::timeout, this, &AbstractTimer::timeout);

25−}

26−

27−int Timer::interval() const

28−{

29− return m_timer.interval();

30−}

31−

32−void Timer::setInterval(int msecs)

33−{

34− m_timer.setInterval(msecs);

35−}

36−

37−void Timer::start()

38−{

39− m_timer.start();

40− AbstractTimer::start();

41−}

42−

43−void Timer::stop()

44−{

45− m_timer.stop();

46− AbstractTimer::stop();

47−}

48−

49−bool Timer::isSingleShot() const

50−{

51− return m_timer.isSingleShot();

52−}

53−

54−void Timer::setSingleShot(bool value)

55−{

56− m_timer.setSingleShot(value);

57−}

58−

59−/////////////////////////////////// FakeTimer //////////////////////////////////

60−

61−FakeTimer::FakeTimer(QObject *parent)

62− : UbuntuGestures::AbstractTimer(parent)

63− , m_interval(0)

64− , m_singleShot(false)

65−{

66−}

67−

68−int FakeTimer::interval() const

69−{

70− return m_interval;

71−}

72−

73−void FakeTimer::setInterval(int msecs)

74−{

75− m_interval = msecs;

76−}

77−

78−bool FakeTimer::isSingleShot() const

79−{

80− return m_singleShot;

81−}

82−

83−void FakeTimer::setSingleShot(bool value)

84−{

85− m_singleShot = value;

86−}

87−

88−/////////////////////////////////// FakeTimerFactory //////////////////////////////////

89−

90−AbstractTimer *FakeTimerFactory::createTimer(QObject *parent)

91−{

92− FakeTimer *fakeTimer = new FakeTimer(parent);

93−

94− timers.append(fakeTimer);

95−

96− return fakeTimer;

97−}

98−

99−void FakeTimerFactory::makeRunningTimersTimeout()

100−{

101− for (int i = 0; i < timers.count(); ++i) {

102− FakeTimer *timer = timers[i].data();

103− if (timer && timer->isRunning()) {

104− timer->emitTimeout();

105− }

106− }

107−}

108−

109−} // namespace UbuntuGestures

libs/UbuntuGestures/Timer.hdeleted−105

@@ -1,105 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UBUNTUGESTURES_TIMER_H

18−#define UBUNTUGESTURES_TIMER_H

19−

20−#include "UbuntuGesturesGlobal.h"

21−

22−#include <QObject>

23−#include <QPointer>

24−#include <QTimer>

25−

26−namespace UbuntuGestures {

27−

28−/* Defines an interface for a Timer. Useful for tests. */

29−class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject

30−{

31− Q_OBJECT

32−public:

33− AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}

34− virtual int interval() const = 0;

35− virtual void setInterval(int msecs) = 0;

36− virtual void start() { m_isRunning = true; }

37− virtual void stop() { m_isRunning = false; }

38− bool isRunning() const { return m_isRunning; }

39− virtual bool isSingleShot() const = 0;

40− virtual void setSingleShot(bool value) = 0;

41−Q_SIGNALS:

42− void timeout();

43−private:

44− bool m_isRunning;

45−};

46−

47−/* Essentially a QTimer wrapper */

48−class UBUNTUGESTURES_EXPORT Timer : public AbstractTimer

49−{

50− Q_OBJECT

51−public:

52− Timer(QObject *parent = nullptr);

53−

54− int interval() const override;

55− void setInterval(int msecs) override;

56− void start() override;

57− void stop() override;

58− bool isSingleShot() const override;

59− void setSingleShot(bool value) override;

60−private:

61− QTimer m_timer;

62−};

63−

64−/* For tests */

65−class UBUNTUGESTURES_EXPORT FakeTimer : public AbstractTimer

66−{

67− Q_OBJECT

68−public:

69− FakeTimer(QObject *parent = nullptr);

70−

71− virtual void emitTimeout() { Q_EMIT timeout(); }

72−

73− int interval() const override;

74− void setInterval(int msecs) override;

75− bool isSingleShot() const override;

76− void setSingleShot(bool value) override;

77−private:

78− int m_interval;

79− bool m_singleShot;

80−};

81−

82−class UBUNTUGESTURES_EXPORT AbstractTimerFactory

83−{

84−public:

85− virtual ~AbstractTimerFactory() {}

86− virtual AbstractTimer *createTimer(QObject *parent = nullptr) = 0;

87−};

88−

89−class UBUNTUGESTURES_EXPORT TimerFactory : public AbstractTimerFactory

90−{

91−public:

92− AbstractTimer *createTimer(QObject *parent = nullptr) override { return new Timer(parent); }

93−};

94−

95−class UBUNTUGESTURES_EXPORT FakeTimerFactory : public AbstractTimerFactory

96−{

97−public:

98− AbstractTimer *createTimer(QObject *parent = nullptr) override;

99− void makeRunningTimersTimeout();

100− QList<QPointer<FakeTimer>> timers;

101−};

102−

103−} // namespace UbuntuGestures

104−

105−#endif // UBUNTUGESTURES_TIMER_H

libs/UbuntuGestures/TouchOwnershipEvent.hdeleted−50

@@ -1,50 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H

18−#define UBUNTU_TOUCHOWNERSHIPEVENT_H

19−

20−#include <QEvent>

21−#include "UbuntuGesturesGlobal.h"

22−

23−/*

24− When an item get an ownership event for a touch it can grab/steal that touch

25− with a clean conscience.

26− */

27−class UBUNTUGESTURES_EXPORT TouchOwnershipEvent : public QEvent

28−{

29−public:

30− TouchOwnershipEvent(int touchId, bool gained);

31−

32− static Type touchOwnershipEventType();

33−

34− /*

35− Whether ownership was gained (true) or lost (false)

36− */

37− bool gained() const { return m_gained; }

38−

39− /*

40− Id of the touch whose ownership was granted.

41− */

42− int touchId() const { return m_touchId; }

43−

44−private:

45− static Type m_touchOwnershipType;

46− int m_touchId;

47− bool m_gained;

48−};

49−

50−#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H

libs/UbuntuGestures/TouchRegistry.cppdeleted−500

@@ -1,500 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#include "TouchRegistry.h"

18−

19−#include <QCoreApplication>

20−#include <QDebug>

21−

22−#pragma GCC diagnostic push

23−#pragma GCC diagnostic ignored "-pedantic"

24−#include <private/qquickitem_p.h>

25−#pragma GCC diagnostic pop

26−

27−#include "CandidateInactivityTimer.h"

28−#include "Timer.h"

29−#include "TouchOwnershipEvent.h"

30−#include "UnownedTouchEvent.h"

31−

32−#define TOUCHREGISTRY_DEBUG 0

33−

34−#if TOUCHREGISTRY_DEBUG

35− #include "DebugHelpers.h"

36− #define UG_DEBUG qDebug() << "[TouchRegistry]"

37−#endif // TOUCHREGISTRY_DEBUG

38−

39−using namespace UbuntuGestures;

40−

41−TouchRegistry *TouchRegistry::m_instance = nullptr;

42−

43−TouchRegistry::TouchRegistry(QObject *parent)

44− : TouchRegistry(parent, new TimerFactory)

45−{

46−}

47−

48−TouchRegistry::TouchRegistry(QObject *parent, AbstractTimerFactory *timerFactory)

49− : QObject(parent)

50− , m_inDispatchLoop(false)

51− , m_timerFactory(timerFactory)

52−{

53− if (m_instance == nullptr) {

54− m_instance = this;

55− } else {

56− qFatal("Cannot have more than one instance of TouchRegistry. It must be a singleton.");

57− }

58−}

59−

60−TouchRegistry::~TouchRegistry()

61−{

62− Q_ASSERT(m_instance != nullptr);

63− m_instance = nullptr;

64− delete m_timerFactory;

65−}

66−

67−void TouchRegistry::update(const QTouchEvent *event)

68−{

69− #if TOUCHREGISTRY_DEBUG

70− UG_DEBUG << "got" << qPrintable(touchEventToString(event));

71− #endif

72−

73− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();

74− for (int i = 0; i < touchPoints.count(); ++i) {

75− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);

76− if (touchPoint.state() == Qt::TouchPointPressed) {

77− TouchInfo &touchInfo = m_touchInfoPool.getEmptySlot();

78− touchInfo.init(touchPoint.id());

79− } else if (touchPoint.state() == Qt::TouchPointReleased) {

80− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchPoint.id());

81−

82− touchInfo->physicallyEnded = true;

83− }

84− }

85−

86− deliverTouchUpdatesToUndecidedCandidatesAndWatchers(event);

87−

88− freeEndedTouchInfos();

89−}

90−

91−void TouchRegistry::deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event)

92−{

93− // TODO: Look into how we could optimize this whole thing.

94− // Although it's not really a problem as we should have at most two candidates

95− // for each point and there should not be many active points at any given moment.

96− // But having three nested for-loops does scare.

97−

98− // TODO: Don't send it to the object that is already receiving the regular event

99− // because QQuickWindow is sending it to him (i.e., he's the touch owner from Qt's point of view)

100− // Problem is, we cannnot easily get this information.

101−

102− const QList<QTouchEvent::TouchPoint> &updatedTouchPoints = event->touchPoints();

103−

104− // Maps an item to the touches in this event he should be informed about.

105− // E.g.: a QTouchEvent might have three touches but a given item might be interested in only

106− // one of them. So he will get a UnownedTouchEvent from this QTouchEvent containing only that

107− // touch point.

108− QMap<QQuickItem*, QList<int>> touchIdsForItems;

109−

110− // Build touchIdsForItems

111− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {

112− if (touchInfo->isOwned() && touchInfo->watchers.isEmpty())

113− return true;

114−

115− for (int j = 0; j < updatedTouchPoints.count(); ++j) {

116− if (updatedTouchPoints[j].id() == touchInfo->id) {

117− if (!touchInfo->isOwned()) {

118− for (int i = 0; i < touchInfo->candidates.count(); ++i) {

119− CandidateInfo &candidate = touchInfo->candidates[i];

120− Q_ASSERT(!candidate.item.isNull());

121− touchIdsForItems[candidate.item.data()].append(touchInfo->id);

122− }

123− }

124−

125− const QList<QPointer<QQuickItem>> &watchers = touchInfo->watchers;

126− for (int i = 0; i < watchers.count(); ++i) {

127− if (!watchers[i].isNull()) {

128− touchIdsForItems[watchers[i].data()].append(touchInfo->id);

129− }

130− }

131−

132− return true;

133− }

134− }

135−

136− return true;

137− });

138−

139− // TODO: Consider what happens if an item calls any of TouchRegistry's public methods

140− // from the event handler callback.

141− m_inDispatchLoop = true;

142− auto it = touchIdsForItems.constBegin();

143− while (it != touchIdsForItems.constEnd()) {

144− QQuickItem *item = it.key();

145− const QList<int> &touchIds = it.value();

146− dispatchPointsToItem(event, touchIds, item);

147− ++it;

148− };

149− m_inDispatchLoop = false;

150−}

151−

152−void TouchRegistry::freeEndedTouchInfos()

153−{

154− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {

155− if (touchInfo->ended()) {

156− m_touchInfoPool.freeSlot(touchInfo);

157− }

158− return true;

159− });

160−}

161−

162−/*

163− Extracts the touches with the given touchIds from event and send them in a

164− UnownedTouchEvent to the given item

165− */

166−void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,

167− QQuickItem *item)

168−{

169− Qt::TouchPointStates touchPointStates = 0;

170− QList<QTouchEvent::TouchPoint> touchPoints;

171−

172− const QList<QTouchEvent::TouchPoint> &allTouchPoints = event->touchPoints();

173−

174− QTransform windowToCandidateTransform = QQuickItemPrivate::get(item)->windowToItemTransform();

175− QMatrix4x4 windowToCandidateMatrix(windowToCandidateTransform);

176−

177− for (int i = 0; i < allTouchPoints.count(); ++i) {

178− const QTouchEvent::TouchPoint &originalTouchPoint = allTouchPoints[i];

179− if (touchIds.contains(originalTouchPoint.id())) {

180− QTouchEvent::TouchPoint touchPoint = originalTouchPoint;

181−

182− translateTouchPointFromScreenToWindowCoords(touchPoint);

183−

184− // Set the point's local coordinates to that of the item

185− touchPoint.setRect(windowToCandidateTransform.mapRect(touchPoint.sceneRect()));

186− touchPoint.setStartPos(windowToCandidateTransform.map(touchPoint.startScenePos()));

187− touchPoint.setLastPos(windowToCandidateTransform.map(touchPoint.lastScenePos()));

188− touchPoint.setVelocity(windowToCandidateMatrix.mapVector(touchPoint.velocity()).toVector2D());

189−

190− touchPoints.append(touchPoint);

191− touchPointStates |= touchPoint.state();

192− }

193− }

194−

195− QTouchEvent *eventForItem = new QTouchEvent(event->type(),

196− event->device(),

197− event->modifiers(),

198− touchPointStates,

199− touchPoints);

200− eventForItem->setWindow(event->window());

201− eventForItem->setTimestamp(event->timestamp());

202− eventForItem->setTarget(event->target());

203−

204− UnownedTouchEvent unownedTouchEvent(eventForItem);

205−

206− #if TOUCHREGISTRY_DEBUG

207− UG_DEBUG << "Sending unowned" << qPrintable(touchEventToString(eventForItem))

208− << "to" << item;

209− #endif

210−

211− QCoreApplication::sendEvent(item, &unownedTouchEvent);

212−}

213−

214−void TouchRegistry::translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint)

215−{

216− touchPoint.setScreenRect(touchPoint.sceneRect());

217− touchPoint.setStartScreenPos(touchPoint.startScenePos());

218− touchPoint.setLastScreenPos(touchPoint.lastScenePos());

219−

220− touchPoint.setSceneRect(touchPoint.rect());

221− touchPoint.setStartScenePos(touchPoint.startPos());

222− touchPoint.setLastScenePos(touchPoint.lastPos());

223−}

224−

225−bool TouchRegistry::eventFilter(QObject *watched, QEvent *event)

226−{

227− Q_UNUSED(watched);

228−

229− switch (event->type()) {

230− case QEvent::TouchBegin:

231− case QEvent::TouchUpdate:

232− case QEvent::TouchEnd:

233− case QEvent::TouchCancel:

234− update(static_cast<QTouchEvent*>(event));

235− break;

236− default:

237− // do nothing

238− break;

239− }

240−

241− // Do not filter out the event. i.e., let it be handled further as

242− // we're just monitoring events

243− return false;

244−}

245−

246−void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)

247−{

248− #if TOUCHREGISTRY_DEBUG

249− UG_DEBUG << "addCandidateOwnerForTouch id" << id << "candidate" << candidate;

250− #endif

251−

252− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

253− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

254−

255− if (touchInfo->isOwned()) {

256− qWarning("TouchRegistry: trying to add candidate owner for a touch that's already owned");

257− return;

258− }

259−

260− // TODO: Check if candidate already exists

261−

262− CandidateInfo candidateInfo;

263− candidateInfo.undecided = true;

264− candidateInfo.item = candidate;

265− candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,

266− *m_timerFactory,

267− this);

268− connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,

269− this, &TouchRegistry::rejectCandidateOwnerForTouch);

270−

271− touchInfo->candidates.append(candidateInfo);

272−}

273−

274−void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)

275−{

276− #if TOUCHREGISTRY_DEBUG

277− UG_DEBUG << "addTouchWatcher id" << touchId << "watcher" << watcher;

278− #endif

279−

280− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);

281− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

282−

283− // TODO: Check if watcher already exists

284−

285− touchInfo->watchers.append(watcher);

286−}

287−

288−void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)

289−{

290− #if TOUCHREGISTRY_DEBUG

291− UG_DEBUG << "removeCandidateOwnerForTouch id" << id << "candidate" << candidate;

292− #endif

293−

294− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

295− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

296−

297− int indexRemoved = -1;

298−

299− // TODO: check if the candidate is in fact the owner of the touch

300−

301− for (int i = 0; i < touchInfo->candidates.count() && indexRemoved == -1; ++i) {

302− CandidateInfo &candidateInfo = touchInfo->candidates[i];

303− if (candidateInfo.item == candidate) {

304− Q_ASSERT(i > 0 || candidateInfo.undecided);

305− if (i == 0 && !candidateInfo.undecided) {

306− qCritical("TouchRegistry: touch owner is being removed.");

307− }

308− delete candidateInfo.inactivityTimer;

309− candidateInfo.inactivityTimer = nullptr;

310− touchInfo->candidates.removeAt(i);

311− indexRemoved = i;

312− }

313− }

314−

315− if (indexRemoved == 0) {

316− // the top candidate has been removed. if the new top candidate

317− // wants the touch let him know he's now the owner.

318− if (touchInfo->isOwned()) {

319− touchInfo->notifyCandidatesOfOwnershipResolution();

320− }

321− }

322−

323− if (!m_inDispatchLoop && touchInfo->ended()) {

324− m_touchInfoPool.freeSlot(touchInfo);

325− }

326−}

327−

328−void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)

329−{

330− #if TOUCHREGISTRY_DEBUG

331− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate;

332− #endif

333−

334− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

335− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

336−

337− Q_ASSERT(!touchInfo->isOwned());

338−

339− int candidateIndex = -1;

340− for (int i = 0; i < touchInfo->candidates.count(); ++i) {

341− CandidateInfo &candidateInfo = touchInfo->candidates[i];

342− if (candidateInfo.item == candidate) {

343− candidateInfo.undecided = false;

344− delete candidateInfo.inactivityTimer;

345− candidateInfo.inactivityTimer = nullptr;

346− candidateIndex = i;

347− break;

348− }

349− }

350−

351− // add it as a candidate if not present yet

352− if (candidateIndex < 0) {

353− CandidateInfo candidateInfo;

354− candidateInfo.undecided = false;

355− candidateInfo.item = candidate;

356− candidateInfo.inactivityTimer = nullptr;

357− touchInfo->candidates.append(candidateInfo);

358− // it's the last one

359− candidateIndex = touchInfo->candidates.count() - 1;

360− }

361−

362− // If it's the top candidate it means it's now the owner. Let

363− // it know about it.

364− if (candidateIndex == 0) {

365− touchInfo->notifyCandidatesOfOwnershipResolution();

366− }

367−}

368−

369−Pool<TouchRegistry::TouchInfo>::Iterator TouchRegistry::findTouchInfo(int id)

370−{

371− Pool<TouchInfo>::Iterator touchInfo;

372−

373− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &someTouchInfo) -> bool {

374− if (someTouchInfo->id == id) {

375− touchInfo = someTouchInfo;

376− return false;

377− } else {

378− return true;

379− }

380− });

381−

382− return touchInfo;

383−}

384−

385−

386−void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)

387−{

388− // NB: It's technically possible that candidate is a dangling pointer at this point.

389− // Although that would most likely be due to a bug in our code.

390− // In any case, only dereference it after it's confirmed that it indeed exists.

391−

392− #if TOUCHREGISTRY_DEBUG

393− UG_DEBUG << "rejectCandidateOwnerForTouch id" << id << "candidate" << (void*)candidate;

394− #endif

395−

396− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

397− if (!touchInfo) {

398− #if TOUCHREGISTRY_DEBUG

399− UG_DEBUG << "Failed to find TouchInfo for id" << id;

400− #endif

401− return;

402− }

403−

404− int rejectedCandidateIndex = -1;

405−

406− // Check if the given candidate is valid and still undecided

407− for (int i = 0; i < touchInfo->candidates.count() && rejectedCandidateIndex == -1; ++i) {

408− CandidateInfo &candidateInfo = touchInfo->candidates[i];

409− if (candidateInfo.item == candidate) {

410− Q_ASSERT(i > 0 || candidateInfo.undecided);

411− if (i == 0 && !candidateInfo.undecided) {

412− qCritical() << "TouchRegistry: Can't reject item (" << (void*)candidate

413− << ") as it already owns touch" << id;

414− return;

415− } else {

416− // we found the guy and it's all fine.

417− rejectedCandidateIndex = i;

418− }

419− }

420− }

421−

422− // If we reached this point it's because the given candidate exists and is indeed undecided.

423−

424− Q_ASSERT(rejectedCandidateIndex >= 0 && rejectedCandidateIndex < touchInfo->candidates.size());

425−

426− {

427− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);

428− QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);

429− }

430−

431− touchInfo->candidates.removeAt(rejectedCandidateIndex);

432−

433− if (rejectedCandidateIndex == 0) {

434− // the top candidate has been removed. if the new top candidate

435− // wants the touch let him know he's now the owner.

436− if (touchInfo->isOwned()) {

437− touchInfo->notifyCandidatesOfOwnershipResolution();

438− }

439− }

440−}

441−

442−////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////

443−

444−TouchRegistry::TouchInfo::TouchInfo(int id)

445−{

446− init(id);

447−}

448−

449−void TouchRegistry::TouchInfo::reset()

450−{

451− id = -1;

452−

453− for (int i = 0; i < candidates.count(); ++i) {

454− CandidateInfo &candidate = candidates[i];

455− delete candidate.inactivityTimer;

456− candidate.inactivityTimer.clear(); // shoundn't be needed but anyway...

457− }

458−}

459−

460−void TouchRegistry::TouchInfo::init(int id)

461−{

462− this->id = id;

463− physicallyEnded = false;

464− candidates.clear();

465− watchers.clear();

466−}

467−

468−bool TouchRegistry::TouchInfo::isOwned() const

469−{

470− return !candidates.isEmpty() && !candidates.first().undecided;

471−}

472−

473−bool TouchRegistry::TouchInfo::ended() const

474−{

475− Q_ASSERT(isValid());

476− return physicallyEnded && (isOwned() || candidates.isEmpty());

477−}

478−

479−void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()

480−{

481− Q_ASSERT(isOwned());

482−

483− #if TOUCHREGISTRY_DEBUG

484− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id

485− << " gained) to candidate" << candidates[0].item;

486− #endif

487−

488− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);

489− QCoreApplication::sendEvent(candidates[0].item, &gainedOwnershipEvent);

490−

491−

492− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);

493− for (int i = 1; i < candidates.count(); ++i) {

494− #if TOUCHREGISTRY_DEBUG

495− UG_DEBUG << "sending TouchWonershipEvent(id =" << id << " lost) to candidate"

496− << candidates[i].item;

497− #endif

498− QCoreApplication::sendEvent(candidates[i].item, &lostOwnershipEvent);

499− }

500−}

libs/UbuntuGestures/TouchRegistry.hdeleted−182

@@ -1,182 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UNITY_TOUCHREGISTRY_H

18−#define UNITY_TOUCHREGISTRY_H

19−

20−#include <QQuickItem>

21−#include <QObject>

22−#include <QPointer>

23−#include <QTouchEvent>

24−#include <QVector>

25−

26−#include "UbuntuGesturesGlobal.h"

27−#include "CandidateInactivityTimer.h"

28−#include "Pool.h"

29−

30−namespace UbuntuGestures {

31− class AbstractTimerFactory;

32−}

33−

34−/*

35− Where the ownership of touches is registered.

36−

37− Singleton used for adding a touch point ownership model analogous to the one

38− described in the XInput 2.2 protocol[1] on top of the existing input dispatch logic in QQuickWindow.

39−

40− It provides a much more flexible and powerful way of dealing with pointer ownership than the existing

41− mechanisms in Qt. Namely QQuickItem::grabTouchPoints, QuickItem::keepTouchGrab,

42− QQuickItem::setFiltersChildMouseEvents, QQuickItem::ungrabTouchPoints and QQuickItem::touchUngrabEvent.

43−

44− Usage:

45−

46− 1- An item receives a a new touch point. If he's not sure whether he wants it yet, he calls:

47− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);

48− touchEvent->ignore();

49− Ignoring the event is crucial so that it can be seen by other interested parties, which will

50− behave similarly.

51−

52− 2- That item will then start receiving UnownedTouchEvents for that touch from step 1. Once he's

53− made a decision he calls either:

54− TouchRegistry::instance()->requestTouchOwnership(touchId, this);

55− If he wants the touch point or:

56− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);

57−  if he does not want it.

58−

59− Candidates are put in a priority queue. The first one to call addCandidateOwnerForTouch() will

60− take precedence over the others for receiving ownership over the touch point (from now on called

61− simply top-candidate).

62−

63− If the top-candidate calls requestTouchOwnership() he will immediately receive a

64− TouchOwnershipEvent(gained=true) for that touch point. He can then safely call

65− QQuickItem::grabTouchPoints to actually get the owned touch points. The other candidates

66− will receive TouchOwnershipEvent(gained=false) and will no longer receive UnownedTouchEvents

67− for that touch point. They will have to undo whatever action they were performing with that

68− touch point.

69−

70− But if the top-candidate calls removeCandidateOwnerForTouch() instead, he's popped from the

71− candidacy queue and ownership is given to the new top-most candidate if he has already

72− made his decision, that is.

73−

74− The TouchRegistry cannot enforce the results of this pointer ownership negotiation (i.e.,

75− who gets to grab the touch points) as that would clash with QQuickWindow's input event

76− dispatching logic. The candidates have to respect the decision and grab the touch points

77− themselves.

78−

79− If an item wants ownership over touches as soon as he receives the TouchBegin for them, his step 1

80− would be instead:

81− TouchRegistry::instance()->requestTouchOwnership(touchId, this);

82− return true;

83− He would then be notified once ownership has been granted to him, from which point onwards he could

84− safely assume other TouchRegistry users wouldn't snatch this touch away from him.

85−

86− Items oblivious to TouchRegistry will lose their touch points without warning, just like in plain Qt.

87−

88− [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)

89− */

90−class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject

91−{

92− Q_OBJECT

93−public:

94− TouchRegistry(QObject *parent = nullptr);

95− // Useful for tests, where you should feed a fake timer

96− TouchRegistry(QObject *parent, UbuntuGestures::AbstractTimerFactory *timerFactory);

97−

98− virtual ~TouchRegistry();

99−

100− // Returns a pointer to the application's TouchRegistry instance.

101− // If no instance has been allocated, null is returned.

102− static TouchRegistry *instance() { return m_instance; }

103−

104− void update(const QTouchEvent *event);

105−

106− // Calls update() if the given event is a QTouchEvent

107− bool eventFilter(QObject *watched, QEvent *event) override;

108−

109− // An item that might later request ownership over the given touch point.

110− // He will be kept informed about that touch point through UnownedTouchEvents

111− // All candidates must eventually decide whether they want to own the touch point

112− // or not. That decision is informed through requestTouchOwnership() or

113− // removeCandidateOwnerForTouch()

114− void addCandidateOwnerForTouch(int id, QQuickItem *candidate);

115−

116− // The same as rejecting ownership of a touch

117− void removeCandidateOwnerForTouch(int id, QQuickItem *candidate);

118−

119− // The candidate object wants to be the owner of the touch with the given id.

120− // If he's currently the oldest/top-most candidate, he will get an ownership

121− // event immediately. If not, he will get ownership if (or once) he becomes the

122− // top-most candidate.

123− void requestTouchOwnership(int id, QQuickItem *candidate);

124−

125− // An item that has no interest (effective or potential) in owning a touch point

126− // but would nonetheless like to be kept up-to-date on its state.

127− void addTouchWatcher(int touchId, QQuickItem *watcherItem);

128−

129−private Q_SLOTS:

130− void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);

131−

132−private:

133− class CandidateInfo {

134− public:

135− bool undecided;

136− // TODO: Prune candidates that become null and resolve ownership accordingly.

137− QPointer<QQuickItem> item;

138− QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;

139− };

140−

141− class TouchInfo {

142− public:

143− TouchInfo() : id(-1) {}

144− TouchInfo(int id);

145− bool isValid() const { return id >= 0; }

146− void reset();

147− void init(int id);

148− int id;

149− bool physicallyEnded;

150− bool isOwned() const;

151− bool ended() const;

152− void notifyCandidatesOfOwnershipResolution();

153−

154− // TODO optimize storage (s/QList/Pool)

155− QList<CandidateInfo> candidates;

156− QList<QPointer<QQuickItem>> watchers;

157− };

158−

159− Pool<TouchInfo>::Iterator findTouchInfo(int id);

160−

161− void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);

162−

163− static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);

164−

165− static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,

166− QQuickItem *item);

167− void freeEndedTouchInfos();

168−

169− Pool<TouchInfo> m_touchInfoPool;

170−

171− // the singleton instance

172− static TouchRegistry *m_instance;

173−

174− bool m_inDispatchLoop;

175−

176− UbuntuGestures::AbstractTimerFactory *m_timerFactory;

177−

178− friend class tst_TouchRegistry;

179− friend class tst_DirectionalDragArea;

180−};

181−

182−#endif // UNITY_TOUCHREGISTRY_H

libs/UbuntuGestures/UnownedTouchEvent.hdeleted−45

@@ -1,45 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H

18−#define UBUNTU_UNOWNEDTOUCHEVENT_H

19−

20−#include <QTouchEvent>

21−#include <QScopedPointer>

22−#include "UbuntuGesturesGlobal.h"

23−

24−/*

25− A touch event with touch points that do not belong the item receiving it.

26−

27− See TouchRegistry::addCandidateOwnerForTouch and TouchRegistry::addTouchWatcher

28− */

29−class UBUNTUGESTURES_EXPORT UnownedTouchEvent : public QEvent

30−{

31−public:

32− UnownedTouchEvent(QTouchEvent *touchEvent);

33− static Type unownedTouchEventType();

34−

35− // TODO: It might be cleaner to store the information directly in UnownedTouchEvent

36− // instead of carrying around a synthesized QTouchEvent. But the latter option

37− // is very convenient.

38− QTouchEvent *touchEvent();

39−

40−private:

41− static Type m_unownedTouchEventType;

42− QScopedPointer<QTouchEvent> m_touchEvent;

43−};

44−

45−#endif // UBUNTU_UNOWNEDTOUCHEVENT_H

plugins/AccountsService/AccountsService.cpp+332−98

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,30 +12,124 @@

12 *

12 *

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

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19#include "AccountsService.h"

17#include "AccountsService.h"

20#include "AccountsServiceDBusAdaptor.h"

18#include "AccountsServiceDBusAdaptor.h"

21

19

20+#include <QDBusInterface>

21+#include <QFile>

22#include <QStringList>

22#include <QStringList>

23+#include <QDebug>

24+

25+#include <glib.h>

26+

27+#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")

28+#define IFACE_UBUNTU_INPUT QStringLiteral("com.ubuntu.AccountsService.Input")

29+#define IFACE_UBUNTU_SECURITY QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")

30+#define IFACE_UBUNTU_SECURITY_OLD QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")

31+#define IFACE_UNITY QStringLiteral("com.canonical.unity.AccountsService")

32+#define IFACE_UNITY_PRIVATE QStringLiteral("com.canonical.unity.AccountsService.Private")

33+

34+#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")

35+#define PROP_DEMO_EDGES QStringLiteral("DemoEdges2")

36+#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")

37+#define PROP_EMAIL QStringLiteral("Email")

38+#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")

39+#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")

40+#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")

41+#define PROP_FAILED_FINGERPRINT_LOGINS QStringLiteral("FailedFingerprintLogins")

42+#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")

43+#define PROP_INPUT_SOURCES QStringLiteral("InputSources")

44+#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

45+#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")

46+#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")

47+#define PROP_MOUSE_DOUBLE_CLICK_SPEED QStringLiteral("MouseDoubleClickSpeed")

48+#define PROP_MOUSE_PRIMARY_BUTTON QStringLiteral("MousePrimaryButton")

49+#define PROP_MOUSE_SCROLL_SPEED QStringLiteral("MouseScrollSpeed")

50+#define PROP_PASSWORD_DISPLAY_HINT QStringLiteral("PasswordDisplayHint")

51+#define PROP_REAL_NAME QStringLiteral("RealName")

52+#define PROP_STATS_WELCOME_SCREEN QStringLiteral("StatsWelcomeScreen")

53+#define PROP_TOUCHPAD_CURSOR_SPEED QStringLiteral("TouchpadCursorSpeed")

54+#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING QStringLiteral("TouchpadDisableWhileTyping")

55+#define PROP_TOUCHPAD_DISABLE_WITH_MOUSE QStringLiteral("TouchpadDisableWithMouse")

56+#define PROP_TOUCHPAD_DOUBLE_CLICK_SPEED QStringLiteral("TouchpadDoubleClickSpeed")

57+#define PROP_TOUCHPAD_PRIMARY_BUTTON QStringLiteral("TouchpadPrimaryButton")

58+#define PROP_TOUCHPAD_SCROLL_SPEED QStringLiteral("TouchpadScrollSpeed")

59+#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")

60+#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")

61+

62+using StringMap = QMap<QString,QString>;

63+using StringMapList = QList<StringMap>;

64+Q_DECLARE_METATYPE(StringMapList)

65+

23

66

24−AccountsService::AccountsService(QObject* parent)

67+QVariant primaryButtonConverter(const QVariant &value)

25− : QObject(parent),

26− m_service(new AccountsServiceDBusAdaptor(this)),

27− m_user(qgetenv("USER")),

28− m_demoEdges(false),

29− m_enableLauncherWhileLocked(false),

30− m_enableIndicatorsWhileLocked(false),

31− m_statsWelcomeScreen(false),

32− m_passwordDisplayHint(Keyboard),

33− m_failedLogins(0)

34{

68{

35− connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

69+ QString stringValue = value.toString();

36− this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

70+ if (stringValue == QLatin1String("left")) {

37− connect(m_service, SIGNAL(maybeChanged(const QString &)),

71+ return QVariant::fromValue(0);

38− this, SLOT(maybeChanged(const QString &)));

72+ } else if (stringValue == QLatin1String("right")) {

73+ return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same

74+ } else {

75+ return QVariant::fromValue(0); // default to left

76+ }

77+}

78+

79+AccountsService::AccountsService(QObject* parent, const QString &user)

80+ : QObject(parent)

81+ , m_service(new AccountsServiceDBusAdaptor(this))

82+{

83+ m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),

84+ QStringLiteral("/com/canonical/Unity/Input"),

85+ QStringLiteral("com.canonical.Unity.Input"),

86+ QDBusConnection::SM_BUSNAME(), this);

87+

88+ connect(m_service, &AccountsServiceDBusAdaptor::propertiesChanged, this, &AccountsService::onPropertiesChanged);

89+ connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);

90+

91+ registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));

92+ registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));

93+ registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));

94+ registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));

95+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));

96+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));

97+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));

98+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));

99+ registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));

100+ registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));

101+ registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));

102+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));

103+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));

104+

105+ registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,

106+ m_unityInput, QStringLiteral("setMouseCursorSpeed"));

107+ registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_DOUBLE_CLICK_SPEED,

108+ m_unityInput, QStringLiteral("setMouseDoubleClickSpeed"));

109+ registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_PRIMARY_BUTTON,

110+ m_unityInput, QStringLiteral("setMousePrimaryButton"),

111+ primaryButtonConverter);

112+ registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_SCROLL_SPEED,

113+ m_unityInput, QStringLiteral("setMouseScrollSpeed"));

114+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_CURSOR_SPEED,

115+ m_unityInput, QStringLiteral("setTouchpadCursorSpeed"));

116+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_SCROLL_SPEED,

117+ m_unityInput, QStringLiteral("setTouchpadScrollSpeed"));

118+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WHILE_TYPING,

119+ m_unityInput, QStringLiteral("setTouchpadDisableWhileTyping"));

120+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WITH_MOUSE,

121+ m_unityInput, QStringLiteral("setTouchpadDisableWithMouse"));

122+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DOUBLE_CLICK_SPEED,

123+ m_unityInput, QStringLiteral("setTouchpadDoubleClickSpeed"));

124+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_PRIMARY_BUTTON,

125+ m_unityInput, QStringLiteral("setTouchpadPrimaryButton"),

126+ primaryButtonConverter);

127+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TAP_TO_CLICK,

128+ m_unityInput, QStringLiteral("setTouchpadTapToClick"));

129+ registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TWO_FINGER_SCROLL,

130+ m_unityInput, QStringLiteral("setTouchpadTwoFingerScroll"));

131+

132+ setUser(!user.isEmpty() ? user : QString::fromUtf8(g_get_user_name()));

39}

133}

40

134

41QString AccountsService::user() const

135QString AccountsService::user() const

@@ -45,165 +139,305 @@ QString AccountsService::user() const

45

139

46void AccountsService::setUser(const QString &user)

140void AccountsService::setUser(const QString &user)

47{

141{

142+ if (user.isEmpty() || m_user == user)

143+ return;

144+

145+ bool wasEmpty = m_user.isEmpty();

146+

48 m_user = user;

147 m_user = user;

49 Q_EMIT userChanged();

148 Q_EMIT userChanged();

50

149

51− updateDemoEdges();

150+ // Do the first update synchronously, as a cheap way to block rendering

52− updateEnableLauncherWhileLocked();

151+ // until we have the right values on bootup.

53− updateEnableIndicatorsWhileLocked();

152+ refresh(!wasEmpty);

54− updateBackgroundFile();

55− updateStatsWelcomeScreen();

56− updatePasswordDisplayHint();

57− updateFailedLogins();

58}

153}

59

154

60bool AccountsService::demoEdges() const

155bool AccountsService::demoEdges() const

61{

156{

62− return m_demoEdges;

157+ auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);

158+ return value.toBool();

63}

159}

64

160

65void AccountsService::setDemoEdges(bool demoEdges)

161void AccountsService::setDemoEdges(bool demoEdges)

66{

162{

67− m_demoEdges = demoEdges;

163+ setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);

68− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

164+}

165+

166+QStringList AccountsService::demoEdgesCompleted() const

167+{

168+ auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED);

169+ return value.toStringList();

170+}

171+

172+void AccountsService::markDemoEdgeCompleted(const QString &edge)

173+{

174+ auto currentList = demoEdgesCompleted();

175+ if (!currentList.contains(edge)) {

176+ setProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, currentList << edge);

177+ }

178+}

179+

180+bool AccountsService::enableFingerprintIdentification() const

181+{

182+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);

183+ return value.toBool();

69}

184}

70

185

71bool AccountsService::enableLauncherWhileLocked() const

186bool AccountsService::enableLauncherWhileLocked() const

72{

187{

73− return m_enableLauncherWhileLocked;

188+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);

189+ return value.toBool();

74}

190}

75

191

76bool AccountsService::enableIndicatorsWhileLocked() const

192bool AccountsService::enableIndicatorsWhileLocked() const

77{

193{

78− return m_enableIndicatorsWhileLocked;

194+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED);

195+ return value.toBool();

79}

196}

80

197

81QString AccountsService::backgroundFile() const

198QString AccountsService::backgroundFile() const

82{

199{

83− return m_backgroundFile;

200+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE);

201+ return value.toString();

84}

202}

85

203

86bool AccountsService::statsWelcomeScreen() const

204bool AccountsService::statsWelcomeScreen() const

87{

205{

88− return m_statsWelcomeScreen;

206+ auto value = getProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN);

207+ return value.toBool();

89}

208}

90

209

91AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

210AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

92{

211{

93− return m_passwordDisplayHint;

212+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT);

213+ return (PasswordDisplayHint)value.toInt();

94}

214}

95

215

96−void AccountsService::updateDemoEdges()

216+QString AccountsService::realName() const

97{

217{

98− auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

218+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);

99− if (m_demoEdges != demoEdges) {

219+ return value.toString();

100− m_demoEdges = demoEdges;

101− Q_EMIT demoEdgesChanged();

102− }

103}

220}

104

221

105−void AccountsService::updateEnableLauncherWhileLocked()

222+void AccountsService::setRealName(const QString &realName)

106{

223{

107− auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();

224+ setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);

108− if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {

109− m_enableLauncherWhileLocked = enableLauncherWhileLocked;

110− Q_EMIT enableLauncherWhileLockedChanged();

111− }

112}

225}

113

226

114−void AccountsService::updateEnableIndicatorsWhileLocked()

227+QString AccountsService::email() const

115{

228{

116− auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();

229+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);

117− if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {

230+ return value.toString();

118− m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;

119− Q_EMIT enableIndicatorsWhileLockedChanged();

120− }

121}

231}

122

232

123−void AccountsService::updateBackgroundFile()

233+void AccountsService::setEmail(const QString &email)

124{

234{

125− auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();

235+ setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);

126− if (m_backgroundFile != backgroundFile) {

127− m_backgroundFile = backgroundFile;

128− Q_EMIT backgroundFileChanged();

129− }

130}

236}

131

237

132−void AccountsService::updateStatsWelcomeScreen()

238+QStringList AccountsService::keymaps() const

133{

239{

134− bool statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();

240+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);

135− if (m_statsWelcomeScreen != statsWelcomeScreen) {

241+ QDBusArgument arg = value.value<QDBusArgument>();

136− m_statsWelcomeScreen = statsWelcomeScreen;

242+ StringMapList maps = qdbus_cast<StringMapList>(arg);

137− Q_EMIT statsWelcomeScreenChanged();

243+ QStringList simplifiedMaps;

244+

245+ Q_FOREACH(const StringMap &map, maps) {

246+ Q_FOREACH(const QString &entry, map) {

247+ simplifiedMaps.append(entry);

248+ }

249+ }

250+

251+ if (!simplifiedMaps.isEmpty()) {

252+ return simplifiedMaps;

138 }

253 }

254+

255+ return {QStringLiteral("us")};

139}

256}

140

257

141−void AccountsService::updatePasswordDisplayHint()

258+void AccountsService::setKeymaps(const QStringList &keymaps)

142{

259{

143− PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "PasswordDisplayHint").toInt();

260+ if (keymaps.isEmpty()) {

144− if (m_passwordDisplayHint != passwordDisplayHint) {

261+ qWarning() << "Setting empty keymaps is not supported";

145− m_passwordDisplayHint = passwordDisplayHint;

262+ return;

146− Q_EMIT passwordDisplayHintChanged();

263+ }

264+

265+ StringMapList result;

266+ Q_FOREACH(const QString &keymap, keymaps) {

267+ StringMap map;

268+ map.insert(QStringLiteral("xkb"), keymap);

269+ result.append(map);

147 }

270 }

271+

272+ setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));

273+ Q_EMIT keymapsChanged();

148}

274}

149

275

150−void AccountsService::updateFailedLogins()

276+uint AccountsService::failedFingerprintLogins() const

151{

277{

152− uint failedLogins = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins").toUInt();

278+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();

153− if (m_failedLogins != failedLogins) {

279+}

154− m_failedLogins = failedLogins;

280+

155− Q_EMIT failedLoginsChanged();

281+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)

156− }

282+{

283+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);

157}

284}

158

285

159uint AccountsService::failedLogins() const

286uint AccountsService::failedLogins() const

160{

287{

161− return m_failedLogins;

288+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

162}

289}

163

290

164void AccountsService::setFailedLogins(uint failedLogins)

291void AccountsService::setFailedLogins(uint failedLogins)

165{

292{

166− m_failedLogins = failedLogins;

293+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, failedLogins);

167− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);

168}

294}

169

295

296+// ====================================================

297+// Everything below this line is generic helper methods

298+// ====================================================

299+

170−void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

300+void AccountsService::emitChangedForProperty(const QString &interface, const QString &property)

171{

301{

172− if (m_user != user) {

302+ QString signalName = m_properties[interface][property].signal;

173− return;

303+ QMetaObject::invokeMethod(this, signalName.toUtf8().data());

304+}

305+

306+QVariant AccountsService::getProperty(const QString &interface, const QString &property) const

307+{

308+ return m_properties[interface][property].value;

309+}

310+

311+void AccountsService::setProperty(const QString &interface, const QString &property, const QVariant &value)

312+{

313+ if (m_properties[interface][property].value != value) {

314+ m_properties[interface][property].value = value;

315+ m_service->setUserPropertyAsync(m_user, interface, property, value);

316+ emitChangedForProperty(interface, property);

174 }

317 }

318+}

175

319

176− if (interface == "com.canonical.unity.AccountsService") {

320+void AccountsService::updateCache(const QString &interface, const QString &property, const QVariant &value)

177− if (changed.contains("demo-edges")) {

321+{

178− updateDemoEdges();

322+ PropertyInfo &info = m_properties[interface][property];

179− }

323+

180− } else if (interface == "com.canonical.unity.AccountsService.Private") {

324+ if (info.proxyInterface) {

181− if (changed.contains("FailedLogins")) {

325+ QVariant finalValue;

182− updateFailedLogins();

326+ if (info.proxyConverter) {

327+ finalValue = info.proxyConverter(value);

328+ } else {

329+ finalValue = value;

183 }

330 }

184− } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {

331+ info.proxyInterface->asyncCall(info.proxyMethod, finalValue);

185− if (changed.contains("StatsWelcomeScreen")) {

332+ return; // don't bother saving a copy

186− updateStatsWelcomeScreen();

333+ }

334+

335+ if (info.value != value) {

336+ info.value = value;

337+ emitChangedForProperty(interface, property);

338+ }

339+}

340+

341+void AccountsService::updateProperty(const QString &interface, const QString &property)

342+{

343+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,

344+ interface,

345+ property);

346+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);

347+

348+ connect(watcher, &QDBusPendingCallWatcher::finished,

349+ this, [this, interface, property](QDBusPendingCallWatcher* watcher) {

350+

351+ QDBusPendingReply<QVariant> reply = *watcher;

352+ watcher->deleteLater();

353+ if (reply.isError()) {

354+ qWarning() << "Failed to get '" << property << "' property:" << reply.error().message();

355+ return;

187 }

356 }

188− } else if (interface == "com.ubuntu.AccountsService.SecurityPrivacy") {

357+

189− if (changed.contains("PasswordDisplayHint")) {

358+ updateCache(interface, property, reply.value());

190− updatePasswordDisplayHint();

359+ });

360+}

361+

362+void AccountsService::updateAllProperties(const QString &interface, bool async)

363+{

364+ QDBusPendingCall pendingReply = m_service->getAllPropertiesAsync(m_user,

365+ interface);

366+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);

367+

368+ connect(watcher, &QDBusPendingCallWatcher::finished,

369+ this, [this, interface](QDBusPendingCallWatcher* watcher) {

370+

371+ QDBusPendingReply< QHash<QString, QVariant> > reply = *watcher;

372+ watcher->deleteLater();

373+ if (reply.isError()) {

374+ qWarning() << "Failed to get all properties for" << interface << ":" << reply.error().message();

375+ return;

191 }

376 }

192− if (changed.contains("EnableLauncherWhileLocked")) {

377+

193− updateEnableLauncherWhileLocked();

378+ auto valueHash = reply.value();

379+ auto i = valueHash.constBegin();

380+ while (i != valueHash.constEnd()) {

381+ updateCache(interface, i.key(), i.value());

382+ ++i;

194 }

383 }

384+ });

385+ if (!async) {

386+ watcher->waitForFinished();

387+ }

388+}

389+

390+void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter)

391+{

392+ registerProperty(interface, property, nullptr);

393+

394+ m_properties[interface][property].proxyInterface = iface;

395+ m_properties[interface][property].proxyMethod = method;

396+ m_properties[interface][property].proxyConverter = converter;

397+}

398+

399+void AccountsService::registerProperty(const QString &interface, const QString &property, const QString &signal)

400+{

401+ m_properties[interface][property] = PropertyInfo();

402+ m_properties[interface][property].signal = signal;

403+}

404+

405+void AccountsService::onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

406+{

407+ if (m_user != user) {

408+ return;

409+ }

410+

411+ auto propHash = m_properties.value(interface);

412+ auto i = propHash.constBegin();

413+ while (i != propHash.constEnd()) {

195− if (changed.contains("EnableIndicatorsWhileLocked")) {

414+ if (changed.contains(i.key())) {

196− updateEnableIndicatorsWhileLocked();

415+ updateProperty(interface, i.key());

197 }

416 }

417+ ++i;

198 }

418 }

199}

419}

200

420

201−void AccountsService::maybeChanged(const QString &user)

421+void AccountsService::onMaybeChanged(const QString &user)

202{

422{

203 if (m_user != user) {

423 if (m_user != user) {

204 return;

424 return;

205 }

425 }

206

426

207− // Standard properties might have changed

427+ // Any of the standard properties might have changed!

208− updateBackgroundFile();

428+ auto propHash = m_properties.value(IFACE_ACCOUNTS_USER);

429+ auto i = propHash.constBegin();

430+ while (i != propHash.constEnd()) {

431+ updateProperty(IFACE_ACCOUNTS_USER, i.key());

432+ ++i;

433+ }

434+}

435+

436+void AccountsService::refresh(bool async)

437+{

438+ auto i = m_properties.constBegin();

439+ while (i != m_properties.constEnd()) {

440+ updateAllProperties(i.key(), async);

441+ ++i;

442+ }

209}

443}

plugins/AccountsService/AccountsService.h+64−21

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,22 +12,23 @@

12 *

12 *

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

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19#ifndef UNITY_ACCOUNTSSERVICE_H

17#ifndef UNITY_ACCOUNTSSERVICE_H

20#define UNITY_ACCOUNTSSERVICE_H

18#define UNITY_ACCOUNTSSERVICE_H

21

19

20+#include <QHash>

22#include <QObject>

21#include <QObject>

23#include <QString>

22#include <QString>

23+#include <QStringList>

24+#include <QVariant>

24

25

25class AccountsServiceDBusAdaptor;

26class AccountsServiceDBusAdaptor;

27+class QDBusInterface;

26

28

27class AccountsService: public QObject

29class AccountsService: public QObject

28{

30{

29 Q_OBJECT

31 Q_OBJECT

30− Q_ENUMS(PasswordDisplayHint)

31 Q_PROPERTY (QString user

32 Q_PROPERTY (QString user

32 READ user

33 READ user

33 WRITE setUser

34 WRITE setUser

@@ -36,6 +37,12 @@ class AccountsService: public QObject

36 READ demoEdges

37 READ demoEdges

37 WRITE setDemoEdges

38 WRITE setDemoEdges

38 NOTIFY demoEdgesChanged)

39 NOTIFY demoEdgesChanged)

40+ Q_PROPERTY (QStringList demoEdgesCompleted

41+ READ demoEdgesCompleted

42+ NOTIFY demoEdgesCompletedChanged)

43+ Q_PROPERTY (bool enableFingerprintIdentification

44+ READ enableFingerprintIdentification

45+ NOTIFY enableFingerprintIdentificationChanged)

39 Q_PROPERTY (bool enableLauncherWhileLocked

46 Q_PROPERTY (bool enableLauncherWhileLocked

40 READ enableLauncherWhileLocked

47 READ enableLauncherWhileLocked

41 NOTIFY enableLauncherWhileLockedChanged)

48 NOTIFY enableLauncherWhileLockedChanged)

@@ -55,19 +62,31 @@ class AccountsService: public QObject

55 READ failedLogins

62 READ failedLogins

56 WRITE setFailedLogins

63 WRITE setFailedLogins

57 NOTIFY failedLoginsChanged)

64 NOTIFY failedLoginsChanged)

65+ Q_PROPERTY (uint failedFingerprintLogins

66+ READ failedFingerprintLogins

67+ WRITE setFailedFingerprintLogins

68+ NOTIFY failedFingerprintLoginsChanged)

69+ Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)

70+ Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)

71+ Q_PROPERTY(QStringList keymaps READ keymaps WRITE setKeymaps NOTIFY keymapsChanged)

58

72

59public:

73public:

60 enum PasswordDisplayHint {

74 enum PasswordDisplayHint {

61 Keyboard,

75 Keyboard,

62 Numeric,

76 Numeric,

63 };

77 };

78+ Q_ENUM(PasswordDisplayHint)

64

79

65− explicit AccountsService(QObject *parent = 0);

80+ explicit AccountsService(QObject *parent = 0, const QString & user = QString());

81+ ~AccountsService() = default;

66

82

67 QString user() const;

83 QString user() const;

68 void setUser(const QString &user);

84 void setUser(const QString &user);

69 bool demoEdges() const;

85 bool demoEdges() const;

70 void setDemoEdges(bool demoEdges);

86 void setDemoEdges(bool demoEdges);

87+ QStringList demoEdgesCompleted() const;

88+ Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);

89+ bool enableFingerprintIdentification() const;

71 bool enableLauncherWhileLocked() const;

90 bool enableLauncherWhileLocked() const;

72 bool enableIndicatorsWhileLocked() const;

91 bool enableIndicatorsWhileLocked() const;

73 QString backgroundFile() const;

92 QString backgroundFile() const;

@@ -75,39 +94,63 @@ public:

75 PasswordDisplayHint passwordDisplayHint() const;

94 PasswordDisplayHint passwordDisplayHint() const;

76 uint failedLogins() const;

95 uint failedLogins() const;

77 void setFailedLogins(uint failedLogins);

96 void setFailedLogins(uint failedLogins);

97+ uint failedFingerprintLogins() const;

98+ void setFailedFingerprintLogins(uint failedFingerprintLogins);

99+ QString realName() const;

100+ void setRealName(const QString &realName);

101+ QString email() const;

102+ void setEmail(const QString &email);

103+ QStringList keymaps() const;

104+ void setKeymaps(const QStringList &keymaps);

78

105

79Q_SIGNALS:

106Q_SIGNALS:

80 void userChanged();

107 void userChanged();

81 void demoEdgesChanged();

108 void demoEdgesChanged();

109+ void demoEdgesCompletedChanged();

110+ void enableFingerprintIdentificationChanged();

82 void enableLauncherWhileLockedChanged();

111 void enableLauncherWhileLockedChanged();

83 void enableIndicatorsWhileLockedChanged();

112 void enableIndicatorsWhileLockedChanged();

84 void backgroundFileChanged();

113 void backgroundFileChanged();

85 void statsWelcomeScreenChanged();

114 void statsWelcomeScreenChanged();

86 void passwordDisplayHintChanged();

115 void passwordDisplayHintChanged();

87 void failedLoginsChanged();

116 void failedLoginsChanged();

117+ void failedFingerprintLoginsChanged();

118+ void realNameChanged();

119+ void emailChanged();

120+ void keymapsChanged();

88

121

89private Q_SLOTS:

122private Q_SLOTS:

90− void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

123+ void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

91− void maybeChanged(const QString &user);

124+ void onMaybeChanged(const QString &user);

92

125

93private:

126private:

94− void updateDemoEdges();

127+ typedef QVariant (*ProxyConverter)(const QVariant &);

95− void updateEnableLauncherWhileLocked();

128+

96− void updateEnableIndicatorsWhileLocked();

129+ void refresh(bool async);

97− void updateBackgroundFile();

130+ void registerProperty(const QString &interface, const QString &property, const QString &signal);

98− void updateStatsWelcomeScreen();

131+ void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter = nullptr);

99− void updatePasswordDisplayHint();

132+

100− void updateFailedLogins();

133+ void updateAllProperties(const QString &interface, bool async);

134+ void updateProperty(const QString &interface, const QString &property);

135+ void updateCache(const QString &interface, const QString &property, const QVariant &value);

101

136

137+ void setProperty(const QString &interface, const QString &property, const QVariant &value);

138+ QVariant getProperty(const QString &interface, const QString &property) const;

139+

140+ void emitChangedForProperty(const QString &interface, const QString &property);

141+

142+ struct PropertyInfo {

143+ QVariant value{};

144+ QString signal{};

145+ QDBusInterface *proxyInterface{};

146+ QString proxyMethod{};

147+ ProxyConverter proxyConverter{};

148+ };

149+ typedef QHash< QString, QHash<QString, PropertyInfo> > PropertyHash;

150+ PropertyHash m_properties;

102 AccountsServiceDBusAdaptor *m_service;

151 AccountsServiceDBusAdaptor *m_service;

152+ QDBusInterface *m_unityInput;

103 QString m_user;

153 QString m_user;

104− bool m_demoEdges;

105− bool m_enableLauncherWhileLocked;

106− bool m_enableIndicatorsWhileLocked;

107− QString m_backgroundFile;

108− bool m_statsWelcomeScreen;

109− PasswordDisplayHint m_passwordDisplayHint;

110− uint m_failedLogins;

111};

154};

112

155

113#endif

156#endif

plugins/AccountsService/AccountsService.qmltypesdeleted−33

@@ -1,33 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AccountsService"

12− prototype: "QObject"

13− exports: ["AccountsService/AccountsService 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "PasswordDisplayHint"

19− values: {

20− "Keyboard": 0,

21− "Numeric": 1

22− }

23− }

24− Property { name: "user"; type: "string" }

25− Property { name: "demoEdges"; type: "bool" }

26− Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }

27− Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }

28− Property { name: "backgroundFile"; type: "string"; isReadonly: true }

29− Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

30− Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

31− Property { name: "failedLogins"; type: "uint" }

32− }

33−}

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+55−29

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,8 +12,6 @@

12 *

12 *

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

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19#include "AccountsServiceDBusAdaptor.h"

17#include "AccountsServiceDBusAdaptor.h"

@@ -21,40 +19,58 @@

21#include <QDBusConnectionInterface>

19#include <QDBusConnectionInterface>

22#include <QDBusMessage>

20#include <QDBusMessage>

23#include <QDBusVariant>

21#include <QDBusVariant>

22+#include <QDebug>

24

23

25AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

24AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

26 : QObject(parent),

25 : QObject(parent),

27 m_accountsManager(nullptr),

26 m_accountsManager(nullptr),

28− m_users()

27+ m_ignoreNextChanged(false)

29{

28{

30 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

29 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

31 QDBusConnectionInterface *interface = connection.interface();

30 QDBusConnectionInterface *interface = connection.interface();

32− interface->startService("org.freedesktop.Accounts");

31+ interface->startService(QStringLiteral("org.freedesktop.Accounts"));

33− m_accountsManager = new QDBusInterface("org.freedesktop.Accounts",

32+ m_accountsManager = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),

34− "/org/freedesktop/Accounts",

33+ QStringLiteral("/org/freedesktop/Accounts"),

35− "org.freedesktop.Accounts",

34+ QStringLiteral("org.freedesktop.Accounts"),

36− connection, this);

35+ connection, this);

37}

36}

38

37

39−QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)

38+QDBusPendingReply<QVariantMap> AccountsServiceDBusAdaptor::getAllPropertiesAsync(const QString &user, const QString &interface)

40{

39{

41 QDBusInterface *iface = getUserInterface(user);

40 QDBusInterface *iface = getUserInterface(user);

42 if (iface != nullptr && iface->isValid()) {

41 if (iface != nullptr && iface->isValid()) {

43− QDBusMessage answer = iface->call("Get", interface, property);

42+ return iface->asyncCall(QStringLiteral("GetAll"), interface);

44− if (answer.type() == QDBusMessage::ReplyMessage) {

45− return answer.arguments()[0].value<QDBusVariant>().variant();

46− }

47 }

43 }

48− return QVariant();

44+ return QDBusPendingReply<QVariantMap>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

49}

45}

50

46

51−void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)

47+QDBusPendingReply<QVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync(const QString &user, const QString &interface, const QString &property)

52{

48{

53 QDBusInterface *iface = getUserInterface(user);

49 QDBusInterface *iface = getUserInterface(user);

54 if (iface != nullptr && iface->isValid()) {

50 if (iface != nullptr && iface->isValid()) {

55− // The value needs to be carefully wrapped

51+ return iface->asyncCall(QStringLiteral("Get"), interface, property);

56− iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

57 }

52 }

53+ return QDBusPendingReply<QVariant>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

54+}

55+

56+QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)

57+{

58+ QDBusInterface *iface = getUserInterface(user);

59+ if (iface != nullptr && iface->isValid()) {

60+ if (interface == QStringLiteral("org.freedesktop.Accounts.User")) {

61+ // Standard AccountsService properties use special set methods.

62+ // It will not let you use the usual DBus property setters.

63+ QDBusInterface accountsIface(iface->service(),

64+ iface->path(),

65+ interface,

66+ iface->connection());

67+ return accountsIface.asyncCall(QStringLiteral("Set") + property, value);

68+ } else {

69+ // The value needs to be carefully wrapped

70+ return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));

71+ }

72+ }

73+ return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

58}

74}

59

75

60void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

76void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

@@ -66,14 +82,22 @@ void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface,

66 combined.removeDuplicates();

82 combined.removeDuplicates();

67

83

68 Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);

84 Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);

85+

86+ // In case a non-builtin property changes, we're getting propertiesChanged *and* changed

87+ // As the generic changed requires asking back over DBus, it's quite slow to process.

88+ // We don't want to trigger that when we know it's not a built-in property change.

89+ m_ignoreNextChanged = true;

69}

90}

70

91

71void AccountsServiceDBusAdaptor::maybeChangedSlot()

92void AccountsServiceDBusAdaptor::maybeChangedSlot()

72{

93{

94+ if (!m_ignoreNextChanged) {

73− Q_EMIT maybeChanged(getUserForPath(message().path()));

95+ Q_EMIT maybeChanged(getUserForPath(message().path()));

96+ }

97+ m_ignoreNextChanged = false;

74}

98}

75

99

76−QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

100+QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path) const

77{

101{

78 QMap<QString, QDBusInterface *>::const_iterator i;

102 QMap<QString, QDBusInterface *>::const_iterator i;

79 for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {

103 for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {

@@ -88,13 +112,13 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

88{

112{

89 QDBusInterface *iface = m_users.value(user);

113 QDBusInterface *iface = m_users.value(user);

90 if (iface == nullptr && m_accountsManager->isValid()) {

114 if (iface == nullptr && m_accountsManager->isValid()) {

91− QDBusMessage answer = m_accountsManager->call("FindUserByName", user);

115+ QDBusReply<QDBusObjectPath> answer = m_accountsManager->call(QStringLiteral("FindUserByName"), user);

92− if (answer.type() == QDBusMessage::ReplyMessage) {

116+ if (answer.isValid()) {

93− QString path = answer.arguments()[0].value<QDBusObjectPath>().path();

117+ const QString path = answer.value().path();

94

118

95− iface = new QDBusInterface("org.freedesktop.Accounts",

119+ iface = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),

96 path,

120 path,

97− "org.freedesktop.DBus.Properties",

121+ QStringLiteral("org.freedesktop.DBus.Properties"),

98 m_accountsManager->connection(), this);

122 m_accountsManager->connection(), this);

99

123

100 // With its own pre-defined properties, AccountsService is oddly

124 // With its own pre-defined properties, AccountsService is oddly

@@ -104,8 +128,8 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

104 iface->connection().connect(

128 iface->connection().connect(

105 iface->service(),

129 iface->service(),

106 path,

130 path,

107− "org.freedesktop.Accounts.User",

131+ QStringLiteral("org.freedesktop.Accounts.User"),

108− "Changed",

132+ QStringLiteral("Changed"),

109 this,

133 this,

110 SLOT(maybeChangedSlot()));

134 SLOT(maybeChangedSlot()));

111

135

@@ -114,12 +138,14 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

114 iface->connection().connect(

138 iface->connection().connect(

115 iface->service(),

139 iface->service(),

116 path,

140 path,

117− "org.freedesktop.DBus.Properties",

141+ QStringLiteral("org.freedesktop.DBus.Properties"),

118− "PropertiesChanged",

142+ QStringLiteral("PropertiesChanged"),

119 this,

143 this,

120 SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));

144 SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));

121

145

122 m_users.insert(user, iface);

146 m_users.insert(user, iface);

147+ } else {

148+ qWarning() << "Couldn't get user interface" << answer.error().name() << answer.error().message();

123 }

149 }

124 }

150 }

125 return iface;

151 return iface;

plugins/AccountsService/AccountsServiceDBusAdaptor.h+10−6

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,15 +12,15 @@

12 *

12 *

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

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

17#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

20#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

18#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

21

19

20+#include <QDBusArgument>

22#include <QDBusContext>

21#include <QDBusContext>

23#include <QDBusInterface>

22#include <QDBusInterface>

23+#include <QDBusPendingReply>

24#include <QMap>

24#include <QMap>

25#include <QObject>

25#include <QObject>

26#include <QString>

26#include <QString>

@@ -31,9 +31,11 @@ class AccountsServiceDBusAdaptor: public QObject, public QDBusContext

31

31

32public:

32public:

33 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

33 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

34+ ~AccountsServiceDBusAdaptor() = default;

34

35

36+ QDBusPendingReply<QVariantMap> getAllPropertiesAsync(const QString &user, const QString &interface);

35− Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);

37+ QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);

36− Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);

38+ QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

37

39

38Q_SIGNALS:

40Q_SIGNALS:

39 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

41 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -45,10 +47,12 @@ private Q_SLOTS:

45

47

46private:

48private:

47 QDBusInterface *getUserInterface(const QString &user);

49 QDBusInterface *getUserInterface(const QString &user);

48− QString getUserForPath(const QString &path);

50+ QString getUserForPath(const QString &path) const;

49

51

50 QDBusInterface *m_accountsManager;

52 QDBusInterface *m_accountsManager;

51 QMap<QString, QDBusInterface *> m_users;

53 QMap<QString, QDBusInterface *> m_users;

54+

55+ bool m_ignoreNextChanged;

52};

56};

53

57

54#endif

58#endif

plugins/AccountsService/CMakeLists.txt+5−1

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

1add_definitions(-DSM_BUSNAME=systemBus)

1add_definitions(-DSM_BUSNAME=systemBus)

2+include_directories(${GLIB_INCLUDE_DIRS})

2

3

3add_library(AccountsService-qml MODULE

4add_library(AccountsService-qml MODULE

4 AccountsService.cpp

5 AccountsService.cpp

@@ -6,7 +7,10 @@ add_library(AccountsService-qml MODULE

6 plugin.cpp

7 plugin.cpp

7 )

8 )

8

9

9−qt5_use_modules(AccountsService-qml DBus Qml)

10+target_link_libraries(AccountsService-qml

11+ Qt5::DBus Qt5::Qml

12+ ${GLIB_LIBRARIES}

13+ )

10

14

11add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)

15add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)

12

16

plugins/AccountsService/com.canonical.unity.AccountsService.xml+16−2

@@ -9,13 +9,23 @@

9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"

9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"

10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>

10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>

11

11

12+ <!-- Marks that V1 (pre-8.21) edge demos have been run. Legacy value. -->

12 <!-- Should have been named DemoEdges, sorry folks. -mterry -->

13 <!-- Should have been named DemoEdges, sorry folks. -mterry -->

13 <property name="demo-edges" type="b" access="readwrite">

14 <property name="demo-edges" type="b" access="readwrite">

14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

15 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

15 </property>

16 </property>

16

17

17− <!-- Should have been named LauncherItems, sorry folks. -mterry -->

18+ <!-- Marks that V2 (post-8.21) edge demos have been run -->

19+ <property name="DemoEdges2" type="b" access="readwrite">

20+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

21+ </property>

22+

23+ <!-- List of tutorial pages that have been completed by the user -->

24+ <property name="DemoEdgesCompleted" type="as" access="readwrite">

25+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>

26+ </property>

27+

18− <property name="launcher-items" type="aa{sv}" access="readwrite">

28+ <property name="LauncherItems" type="aa{sv}" access="readwrite">

19 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>

29 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>

20 </property>

30 </property>

21

31

@@ -43,5 +53,9 @@

43 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

53 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

44 </property>

54 </property>

45

55

56+ <property name="FailedFingerprintLogins" type="u" access="readwrite">

57+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

58+ </property>

59+

46 </interface>

60 </interface>

47</node>

61</node>

plugins/AccountsService/plugin.h+1−1

@@ -28,7 +28,7 @@ class AccountsServicePlugin : public QQmlExtensionPlugin

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

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

29

29

30public:

30public:

31− void registerTypes(const char *uri);

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

32};

32};

33

33

34#endif

34#endif

plugins/CMakeLists.txt+8−4

@@ -1,4 +1,4 @@

1−include(QmlPlugins)

1+find_package(QmlPlugins)

2

2

3# Set up and install a plugin for unity8.

3# Set up and install a plugin for unity8.

4#

4#

@@ -12,13 +12,17 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)

12endmacro()

12endmacro()

13

13

14add_subdirectory(AccountsService)

14add_subdirectory(AccountsService)

15−add_subdirectory(HudClient)

15+add_subdirectory(Cursor)

16+add_subdirectory(GlobalShortcut)

17+add_subdirectory(Greeter)

16add_subdirectory(LightDM)

18add_subdirectory(LightDM)

17add_subdirectory(Lights)

19add_subdirectory(Lights)

18−add_subdirectory(Dash)

19add_subdirectory(Powerd)

20add_subdirectory(Powerd)

21+add_subdirectory(ScreenshotDirectory)

20add_subdirectory(SessionBroadcast)

22add_subdirectory(SessionBroadcast)

21−add_subdirectory(ScreenGrabber)

22add_subdirectory(Ubuntu)

23add_subdirectory(Ubuntu)

24+add_subdirectory(UInput)

23add_subdirectory(Unity)

25add_subdirectory(Unity)

24add_subdirectory(Utils)

26add_subdirectory(Utils)

27+add_subdirectory(WindowManager)

28+add_subdirectory(Wizard)

plugins/Cursor/3rd_party/CMakeLists.txtnew file+1

@@ -0,0 +1 @@

1+add_subdirectory(xcursor)

plugins/Cursor/3rd_party/xcursor/CMakeLists.txtnew file+15

@@ -0,0 +1,15 @@

1+add_definitions(-D_DEFAULT_SOURCE=1)

2+

3+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

4+

5+set(

6+ XCURSOR_SOURCES

7+

8+ xcursor.c

9+)

10+

11+add_library(

12+ xcursorloader-static STATIC

13+

14+ ${XCURSOR_SOURCES}

15+)

plugins/Cursor/3rd_party/xcursor/xcursor.cnew file+968

@@ -0,0 +1,968 @@

1+/*

2+ * Copyright © 2002 Keith Packard

3+ *

4+ * Permission to use, copy, modify, distribute, and sell this software and its

5+ * documentation for any purpose is hereby granted without fee, provided that

6+ * the above copyright notice appear in all copies and that both that

7+ * copyright notice and this permission notice appear in supporting

8+ * documentation, and that the name of Keith Packard not be used in

9+ * advertising or publicity pertaining to distribution of the software without

10+ * specific, written prior permission. Keith Packard makes no

11+ * representations about the suitability of this software for any purpose. It

12+ * is provided "as is" without express or implied warranty.

13+ *

14+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

15+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

16+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

17+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

18+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

19+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

20+ * PERFORMANCE OF THIS SOFTWARE.

21+ */

22+

23+#include "xcursor.h"

24+#include <stdio.h>

25+#include <stdlib.h>

26+#include <string.h>

27+#include <dirent.h>

28+

29+/*

30+ * From libXcursor/include/X11/extensions/Xcursor.h

31+ */

32+

33+#define XcursorTrue 1

34+#define XcursorFalse 0

35+

36+/*

37+ * Cursor files start with a header. The header

38+ * contains a magic number, a version number and a

39+ * table of contents which has type and offset information

40+ * for the remaining tables in the file.

41+ *

42+ * File minor versions increment for compatible changes

43+ * File major versions increment for incompatible changes (never, we hope)

44+ *

45+ * Chunks of the same type are always upward compatible. Incompatible

46+ * changes are made with new chunk types; the old data can remain under

47+ * the old type. Upward compatible changes can add header data as the

48+ * header lengths are specified in the file.

49+ *

50+ * File:

51+ * FileHeader

52+ * LISTofChunk

53+ *

54+ * FileHeader:

55+ * CARD32 magic magic number

56+ * CARD32 header bytes in file header

57+ * CARD32 version file version

58+ * CARD32 ntoc number of toc entries

59+ * LISTofFileToc toc table of contents

60+ *

61+ * FileToc:

62+ * CARD32 type entry type

63+ * CARD32 subtype entry subtype (size for images)

64+ * CARD32 position absolute file position

65+ */

66+

67+#define XCURSOR_MAGIC 0x72756358 /* "Xcur" LSBFirst */

68+

69+/*

70+ * Current Xcursor version number. Will be substituted by configure

71+ * from the version in the libXcursor configure.ac file.

72+ */

73+

74+#define XCURSOR_LIB_MAJOR 1

75+#define XCURSOR_LIB_MINOR 1

76+#define XCURSOR_LIB_REVISION 13

77+#define XCURSOR_LIB_VERSION ((XCURSOR_LIB_MAJOR * 10000) + \

78+ (XCURSOR_LIB_MINOR * 100) + \

79+ (XCURSOR_LIB_REVISION))

80+

81+/*

82+ * This version number is stored in cursor files; changes to the

83+ * file format require updating this version number

84+ */

85+#define XCURSOR_FILE_MAJOR 1

86+#define XCURSOR_FILE_MINOR 0

87+#define XCURSOR_FILE_VERSION ((XCURSOR_FILE_MAJOR << 16) | (XCURSOR_FILE_MINOR))

88+#define XCURSOR_FILE_HEADER_LEN (4 * 4)

89+#define XCURSOR_FILE_TOC_LEN (3 * 4)

90+

91+typedef struct _XcursorFileToc {

92+ XcursorUInt type; /* chunk type */

93+ XcursorUInt subtype; /* subtype (size for images) */

94+ XcursorUInt position; /* absolute position in file */

95+} XcursorFileToc;

96+

97+typedef struct _XcursorFileHeader {

98+ XcursorUInt magic; /* magic number */

99+ XcursorUInt header; /* byte length of header */

100+ XcursorUInt version; /* file version number */

101+ XcursorUInt ntoc; /* number of toc entries */

102+ XcursorFileToc *tocs; /* table of contents */

103+} XcursorFileHeader;

104+

105+/*

106+ * The rest of the file is a list of chunks, each tagged by type

107+ * and version.

108+ *

109+ * Chunk:

110+ * ChunkHeader

111+ * <extra type-specific header fields>

112+ * <type-specific data>

113+ *

114+ * ChunkHeader:

115+ * CARD32 header bytes in chunk header + type header

116+ * CARD32 type chunk type

117+ * CARD32 subtype chunk subtype

118+ * CARD32 version chunk type version

119+ */

120+

121+#define XCURSOR_CHUNK_HEADER_LEN (4 * 4)

122+

123+typedef struct _XcursorChunkHeader {

124+ XcursorUInt header; /* bytes in chunk header */

125+ XcursorUInt type; /* chunk type */

126+ XcursorUInt subtype; /* chunk subtype (size for images) */

127+ XcursorUInt version; /* version of this type */

128+} XcursorChunkHeader;

129+

130+/*

131+ * Here's a list of the known chunk types

132+ */

133+

134+/*

135+ * Comments consist of a 4-byte length field followed by

136+ * UTF-8 encoded text

137+ *

138+ * Comment:

139+ * ChunkHeader header chunk header

140+ * CARD32 length bytes in text

141+ * LISTofCARD8 text UTF-8 encoded text

142+ */

143+

144+#define XCURSOR_COMMENT_TYPE 0xfffe0001

145+#define XCURSOR_COMMENT_VERSION 1

146+#define XCURSOR_COMMENT_HEADER_LEN (XCURSOR_CHUNK_HEADER_LEN + (1 *4))

147+#define XCURSOR_COMMENT_COPYRIGHT 1

148+#define XCURSOR_COMMENT_LICENSE 2

149+#define XCURSOR_COMMENT_OTHER 3

150+#define XCURSOR_COMMENT_MAX_LEN 0x100000

151+

152+typedef struct _XcursorComment {

153+ XcursorUInt version;

154+ XcursorUInt comment_type;

155+ char *comment;

156+} XcursorComment;

157+

158+/*

159+ * Each cursor image occupies a separate image chunk.

160+ * The length of the image header follows the chunk header

161+ * so that future versions can extend the header without

162+ * breaking older applications

163+ *

164+ * Image:

165+ * ChunkHeader header chunk header

166+ * CARD32 width actual width

167+ * CARD32 height actual height

168+ * CARD32 xhot hot spot x

169+ * CARD32 yhot hot spot y

170+ * CARD32 delay animation delay

171+ * LISTofCARD32 pixels ARGB pixels

172+ */

173+

174+#define XCURSOR_IMAGE_TYPE 0xfffd0002

175+#define XCURSOR_IMAGE_VERSION 1

176+#define XCURSOR_IMAGE_HEADER_LEN (XCURSOR_CHUNK_HEADER_LEN + (5*4))

177+#define XCURSOR_IMAGE_MAX_SIZE 0x7fff /* 32767x32767 max cursor size */

178+

179+typedef struct _XcursorFile XcursorFile;

180+

181+struct _XcursorFile {

182+ void *closure;

183+ int (*read) (XcursorFile *file, unsigned char *buf, int len);

184+ int (*write) (XcursorFile *file, unsigned char *buf, int len);

185+ int (*seek) (XcursorFile *file, long offset, int whence);

186+};

187+

188+typedef struct _XcursorComments {

189+ int ncomment; /* number of comments */

190+ XcursorComment **comments; /* array of XcursorComment pointers */

191+} XcursorComments;

192+

193+/*

194+ * From libXcursor/src/file.c

195+ */

196+

197+static XcursorImage *

198+XcursorImageCreate (int width, int height)

199+{

200+ XcursorImage *image;

201+

202+ image = malloc (sizeof (XcursorImage) +

203+ width * height * sizeof (XcursorPixel));

204+ if (!image)

205+ return NULL;

206+ image->version = XCURSOR_IMAGE_VERSION;

207+ image->pixels = (XcursorPixel *) (image + 1);

208+ image->size = width > height ? width : height;

209+ image->width = width;

210+ image->height = height;

211+ image->delay = 0;

212+ return image;

213+}

214+

215+static void

216+XcursorImageDestroy (XcursorImage *image)

217+{

218+ free (image);

219+}

220+

221+static XcursorImages *

222+XcursorImagesCreate (int size)

223+{

224+ XcursorImages *images;

225+

226+ images = malloc (sizeof (XcursorImages) +

227+ size * sizeof (XcursorImage *));

228+ if (!images)

229+ return NULL;

230+ images->nimage = 0;

231+ images->images = (XcursorImage **) (images + 1);

232+ images->name = NULL;

233+ return images;

234+}

235+

236+void

237+XcursorImagesDestroy (XcursorImages *images)

238+{

239+ int n;

240+

241+ if (!images)

242+ return;

243+

244+ for (n = 0; n < images->nimage; n++)

245+ XcursorImageDestroy (images->images[n]);

246+ if (images->name)

247+ free (images->name);

248+ free (images);

249+}

250+

251+static void

252+XcursorImagesSetName (XcursorImages *images, const char *name)

253+{

254+ char *new;

255+

256+ if (!images || !name)

257+ return;

258+

259+ new = malloc (strlen (name) + 1);

260+

261+ if (!new)

262+ return;

263+

264+ strcpy (new, name);

265+ if (images->name)

266+ free (images->name);

267+ images->name = new;

268+}

269+

270+static XcursorBool

271+_XcursorReadUInt (XcursorFile *file, XcursorUInt *u)

272+{

273+ unsigned char bytes[4];

274+

275+ if (!file || !u)

276+ return XcursorFalse;

277+

278+ if ((*file->read) (file, bytes, 4) != 4)

279+ return XcursorFalse;

280+ *u = ((bytes[0] << 0) |

281+ (bytes[1] << 8) |

282+ (bytes[2] << 16) |

283+ (bytes[3] << 24));

284+ return XcursorTrue;

285+}

286+

287+static void

288+_XcursorFileHeaderDestroy (XcursorFileHeader *fileHeader)

289+{

290+ free (fileHeader);

291+}

292+

293+static XcursorFileHeader *

294+_XcursorFileHeaderCreate (int ntoc)

295+{

296+ XcursorFileHeader *fileHeader;

297+

298+ if (ntoc > 0x10000)

299+ return NULL;

300+ fileHeader = malloc (sizeof (XcursorFileHeader) +

301+ ntoc * sizeof (XcursorFileToc));

302+ if (!fileHeader)

303+ return NULL;

304+ fileHeader->magic = XCURSOR_MAGIC;

305+ fileHeader->header = XCURSOR_FILE_HEADER_LEN;

306+ fileHeader->version = XCURSOR_FILE_VERSION;

307+ fileHeader->ntoc = ntoc;

308+ fileHeader->tocs = (XcursorFileToc *) (fileHeader + 1);

309+ return fileHeader;

310+}

311+

312+static XcursorFileHeader *

313+_XcursorReadFileHeader (XcursorFile *file)

314+{

315+ XcursorFileHeader head, *fileHeader;

316+ XcursorUInt skip;

317+ unsigned int n;

318+

319+ if (!file)

320+ return NULL;

321+

322+ if (!_XcursorReadUInt (file, &head.magic))

323+ return NULL;

324+ if (head.magic != XCURSOR_MAGIC)

325+ return NULL;

326+ if (!_XcursorReadUInt (file, &head.header))

327+ return NULL;

328+ if (!_XcursorReadUInt (file, &head.version))

329+ return NULL;

330+ if (!_XcursorReadUInt (file, &head.ntoc))

331+ return NULL;

332+ skip = head.header - XCURSOR_FILE_HEADER_LEN;

333+ if (skip)

334+ if ((*file->seek) (file, skip, SEEK_CUR) == EOF)

335+ return NULL;

336+ fileHeader = _XcursorFileHeaderCreate (head.ntoc);

337+ if (!fileHeader)

338+ return NULL;

339+ fileHeader->magic = head.magic;

340+ fileHeader->header = head.header;

341+ fileHeader->version = head.version;

342+ fileHeader->ntoc = head.ntoc;

343+ for (n = 0; n < fileHeader->ntoc; n++)

344+ {

345+ if (!_XcursorReadUInt (file, &fileHeader->tocs[n].type))

346+ break;

347+ if (!_XcursorReadUInt (file, &fileHeader->tocs[n].subtype))

348+ break;

349+ if (!_XcursorReadUInt (file, &fileHeader->tocs[n].position))

350+ break;

351+ }

352+ if (n != fileHeader->ntoc)

353+ {

354+ _XcursorFileHeaderDestroy (fileHeader);

355+ return NULL;

356+ }

357+ return fileHeader;

358+}

359+

360+static XcursorBool

361+_XcursorSeekToToc (XcursorFile *file,

362+ XcursorFileHeader *fileHeader,

363+ int toc)

364+{

365+ if (!file || !fileHeader || \

366+ (*file->seek) (file, fileHeader->tocs[toc].position, SEEK_SET) == EOF)

367+ return XcursorFalse;

368+ return XcursorTrue;

369+}

370+

371+static XcursorBool

372+_XcursorFileReadChunkHeader (XcursorFile *file,

373+ XcursorFileHeader *fileHeader,

374+ int toc,

375+ XcursorChunkHeader *chunkHeader)

376+{

377+ if (!file || !fileHeader || !chunkHeader)

378+ return XcursorFalse;

379+ if (!_XcursorSeekToToc (file, fileHeader, toc))

380+ return XcursorFalse;

381+ if (!_XcursorReadUInt (file, &chunkHeader->header))

382+ return XcursorFalse;

383+ if (!_XcursorReadUInt (file, &chunkHeader->type))

384+ return XcursorFalse;

385+ if (!_XcursorReadUInt (file, &chunkHeader->subtype))

386+ return XcursorFalse;

387+ if (!_XcursorReadUInt (file, &chunkHeader->version))

388+ return XcursorFalse;

389+ /* sanity check */

390+ if (chunkHeader->type != fileHeader->tocs[toc].type ||

391+ chunkHeader->subtype != fileHeader->tocs[toc].subtype)

392+ return XcursorFalse;

393+ return XcursorTrue;

394+}

395+

396+#define dist(a,b) ((a) > (b) ? (a) - (b) : (b) - (a))

397+

398+static XcursorDim

399+_XcursorFindBestSize (XcursorFileHeader *fileHeader,

400+ XcursorDim size,

401+ int *nsizesp)

402+{

403+ unsigned int n;

404+ int nsizes = 0;

405+ XcursorDim bestSize = 0;

406+ XcursorDim thisSize;

407+

408+ if (!fileHeader || !nsizesp)

409+ return 0;

410+

411+ for (n = 0; n < fileHeader->ntoc; n++)

412+ {

413+ if (fileHeader->tocs[n].type != XCURSOR_IMAGE_TYPE)

414+ continue;

415+ thisSize = fileHeader->tocs[n].subtype;

416+ if (!bestSize || dist (thisSize, size) < dist (bestSize, size))

417+ {

418+ bestSize = thisSize;

419+ nsizes = 1;

420+ }

421+ else if (thisSize == bestSize)

422+ nsizes++;

423+ }

424+ *nsizesp = nsizes;

425+ return bestSize;

426+}

427+

428+static int

429+_XcursorFindImageToc (XcursorFileHeader *fileHeader,

430+ XcursorDim size,

431+ int count)

432+{

433+ unsigned int toc;

434+ XcursorDim thisSize;

435+

436+ if (!fileHeader)

437+ return 0;

438+

439+ for (toc = 0; toc < fileHeader->ntoc; toc++)

440+ {

441+ if (fileHeader->tocs[toc].type != XCURSOR_IMAGE_TYPE)

442+ continue;

443+ thisSize = fileHeader->tocs[toc].subtype;

444+ if (thisSize != size)

445+ continue;

446+ if (!count)

447+ break;

448+ count--;

449+ }

450+ if (toc == fileHeader->ntoc)

451+ return -1;

452+ return toc;

453+}

454+

455+static XcursorImage *

456+_XcursorReadImage (XcursorFile *file,

457+ XcursorFileHeader *fileHeader,

458+ int toc)

459+{

460+ XcursorChunkHeader chunkHeader;

461+ XcursorImage head;

462+ XcursorImage *image;

463+ int n;

464+ XcursorPixel *p;

465+

466+ if (!file || !fileHeader)

467+ return NULL;

468+

469+ if (!_XcursorFileReadChunkHeader (file, fileHeader, toc, &chunkHeader))

470+ return NULL;

471+ if (!_XcursorReadUInt (file, &head.width))

472+ return NULL;

473+ if (!_XcursorReadUInt (file, &head.height))

474+ return NULL;

475+ if (!_XcursorReadUInt (file, &head.xhot))

476+ return NULL;

477+ if (!_XcursorReadUInt (file, &head.yhot))

478+ return NULL;

479+ if (!_XcursorReadUInt (file, &head.delay))

480+ return NULL;

481+ /* sanity check data */

482+ if (head.width >= 0x10000 || head.height > 0x10000)

483+ return NULL;

484+ if (head.width == 0 || head.height == 0)

485+ return NULL;

486+ if (head.xhot > head.width || head.yhot > head.height)

487+ return NULL;

488+

489+ /* Create the image and initialize it */

490+ image = XcursorImageCreate (head.width, head.height);

491+ if (image == NULL)

492+ return NULL;

493+ if (chunkHeader.version < image->version)

494+ image->version = chunkHeader.version;

495+ image->size = chunkHeader.subtype;

496+ image->xhot = head.xhot;

497+ image->yhot = head.yhot;

498+ image->delay = head.delay;

499+ n = image->width * image->height;

500+ p = image->pixels;

501+ while (n--)

502+ {

503+ if (!_XcursorReadUInt (file, p))

504+ {

505+ XcursorImageDestroy (image);

506+ return NULL;

507+ }

508+ p++;

509+ }

510+ return image;

511+}

512+

513+static XcursorImages *

514+XcursorXcFileLoadImages (XcursorFile *file, int size)

515+{

516+ XcursorFileHeader *fileHeader;

517+ XcursorDim bestSize;

518+ int nsize;

519+ XcursorImages *images;

520+ int n;

521+ int toc;

522+

523+ if (!file || size < 0)

524+ return NULL;

525+ fileHeader = _XcursorReadFileHeader (file);

526+ if (!fileHeader)

527+ return NULL;

528+ bestSize = _XcursorFindBestSize (fileHeader, (XcursorDim) size, &nsize);

529+ if (!bestSize)

530+ {

531+ _XcursorFileHeaderDestroy (fileHeader);

532+ return NULL;

533+ }

534+ images = XcursorImagesCreate (nsize);

535+ if (!images)

536+ {

537+ _XcursorFileHeaderDestroy (fileHeader);

538+ return NULL;

539+ }

540+ for (n = 0; n < nsize; n++)

541+ {

542+ toc = _XcursorFindImageToc (fileHeader, bestSize, n);

543+ if (toc < 0)

544+ break;

545+ images->images[images->nimage] = _XcursorReadImage (file, fileHeader,

546+ toc);

547+ if (!images->images[images->nimage])

548+ break;

549+ images->nimage++;

550+ }

551+ _XcursorFileHeaderDestroy (fileHeader);

552+ if (images->nimage != nsize)

553+ {

554+ XcursorImagesDestroy (images);

555+ images = NULL;

556+ }

557+ return images;

558+}

559+

560+static int

561+_XcursorStdioFileRead (XcursorFile *file, unsigned char *buf, int len)

562+{

563+ FILE *f = file->closure;

564+ return fread (buf, 1, len, f);

565+}

566+

567+static int

568+_XcursorStdioFileWrite (XcursorFile *file, unsigned char *buf, int len)

569+{

570+ FILE *f = file->closure;

571+ return fwrite (buf, 1, len, f);

572+}

573+

574+static int

575+_XcursorStdioFileSeek (XcursorFile *file, long offset, int whence)

576+{

577+ FILE *f = file->closure;

578+ return fseek (f, offset, whence);

579+}

580+

581+static void

582+_XcursorStdioFileInitialize (FILE *stdfile, XcursorFile *file)

583+{

584+ file->closure = stdfile;

585+ file->read = _XcursorStdioFileRead;

586+ file->write = _XcursorStdioFileWrite;

587+ file->seek = _XcursorStdioFileSeek;

588+}

589+

590+static XcursorImages *

591+XcursorFileLoadImages (FILE *file, int size)

592+{

593+ XcursorFile f;

594+

595+ if (!file)

596+ return NULL;

597+

598+ _XcursorStdioFileInitialize (file, &f);

599+ return XcursorXcFileLoadImages (&f, size);

600+}

601+

602+/*

603+ * From libXcursor/src/library.c

604+ */

605+

606+#ifndef ICONDIR

607+#define ICONDIR "/usr/X11R6/lib/X11/icons"

608+#endif

609+

610+#ifndef XCURSORPATH

611+#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR

612+#endif

613+

614+static const char *

615+XcursorLibraryPath (void)

616+{

617+ static const char *path;

618+

619+ if (!path)

620+ {

621+ path = getenv ("XCURSOR_PATH");

622+ if (!path)

623+ path = XCURSORPATH;

624+ }

625+ return path;

626+}

627+

628+static void

629+_XcursorAddPathElt (char *path, const char *elt, int len)

630+{

631+ int pathlen = strlen (path);

632+

633+ /* append / if the path doesn't currently have one */

634+ if (path[0] == '\0' || path[pathlen - 1] != '/')

635+ {

636+ strcat (path, "/");

637+ pathlen++;

638+ }

639+ if (len == -1)

640+ len = strlen (elt);

641+ /* strip leading slashes */

642+ while (len && elt[0] == '/')

643+ {

644+ elt++;

645+ len--;

646+ }

647+ strncpy (path + pathlen, elt, len);

648+ path[pathlen + len] = '\0';

649+}

650+

651+static char *

652+_XcursorBuildThemeDir (const char *dir, const char *theme)

653+{

654+ const char *colon;

655+ const char *tcolon;

656+ char *full;

657+ char *home;

658+ int dirlen;

659+ int homelen;

660+ int themelen;

661+ int len;

662+

663+ if (!dir || !theme)

664+ return NULL;

665+

666+ colon = strchr (dir, ':');

667+ if (!colon)

668+ colon = dir + strlen (dir);

669+

670+ dirlen = colon - dir;

671+

672+ tcolon = strchr (theme, ':');

673+ if (!tcolon)

674+ tcolon = theme + strlen (theme);

675+

676+ themelen = tcolon - theme;

677+

678+ home = NULL;

679+ homelen = 0;

680+ if (*dir == '~')

681+ {

682+ home = getenv ("HOME");

683+ if (!home)

684+ return NULL;

685+ homelen = strlen (home);

686+ dir++;

687+ dirlen--;

688+ }

689+

690+ /*

691+ * add space for any needed directory separators, one per component,

692+ * and one for the trailing null

693+ */

694+ len = 1 + homelen + 1 + dirlen + 1 + themelen + 1;

695+

696+ full = malloc (len);

697+ if (!full)

698+ return NULL;

699+ full[0] = '\0';

700+

701+ if (home)

702+ _XcursorAddPathElt (full, home, -1);

703+ _XcursorAddPathElt (full, dir, dirlen);

704+ _XcursorAddPathElt (full, theme, themelen);

705+ return full;

706+}

707+

708+static char *

709+_XcursorBuildFullname (const char *dir, const char *subdir, const char *file)

710+{

711+ char *full;

712+

713+ if (!dir || !subdir || !file)

714+ return NULL;

715+

716+ full = malloc (strlen (dir) + 1 + strlen (subdir) + 1 + strlen (file) + 1);

717+ if (!full)

718+ return NULL;

719+ full[0] = '\0';

720+ _XcursorAddPathElt (full, dir, -1);

721+ _XcursorAddPathElt (full, subdir, -1);

722+ _XcursorAddPathElt (full, file, -1);

723+ return full;

724+}

725+

726+static const char *

727+_XcursorNextPath (const char *path)

728+{

729+ char *colon = strchr (path, ':');

730+

731+ if (!colon)

732+ return NULL;

733+ return colon + 1;

734+}

735+

736+#define XcursorWhite(c) ((c) == ' ' || (c) == '\t' || (c) == '\n')

737+#define XcursorSep(c) ((c) == ';' || (c) == ',')

738+

739+static char *

740+_XcursorThemeInherits (const char *full)

741+{

742+ char line[8192];

743+ char *result = NULL;

744+ FILE *f;

745+

746+ if (!full)

747+ return NULL;

748+

749+ f = fopen (full, "r");

750+ if (f)

751+ {

752+ while (fgets (line, sizeof (line), f))

753+ {

754+ if (!strncmp (line, "Inherits", 8))

755+ {

756+ char *l = line + 8;

757+ char *r;

758+ while (*l == ' ') l++;

759+ if (*l != '=') continue;

760+ l++;

761+ while (*l == ' ') l++;

762+ result = malloc (strlen (l) + 1);

763+ if (result)

764+ {

765+ r = result;

766+ while (*l)

767+ {

768+ while (XcursorSep(*l) || XcursorWhite (*l)) l++;

769+ if (!*l)

770+ break;

771+ if (r != result)

772+ *r++ = ':';

773+ while (*l && !XcursorWhite(*l) &&

774+ !XcursorSep(*l))

775+ *r++ = *l++;

776+ }

777+ *r++ = '\0';

778+ }

779+ break;

780+ }

781+ }

782+ fclose (f);

783+ }

784+ return result;

785+}

786+

787+static FILE *

788+XcursorScanTheme (const char *theme, const char *name)

789+{

790+ FILE *f = NULL;

791+ char *full;

792+ char *dir;

793+ const char *path;

794+ char *inherits = NULL;

795+ const char *i;

796+

797+ if (!theme || !name)

798+ return NULL;

799+

800+ /*

801+ * Scan this theme

802+ */

803+ for (path = XcursorLibraryPath ();

804+ path && f == NULL;

805+ path = _XcursorNextPath (path))

806+ {

807+ dir = _XcursorBuildThemeDir (path, theme);

808+ if (dir)

809+ {

810+ full = _XcursorBuildFullname (dir, "cursors", name);

811+ if (full)

812+ {

813+ f = fopen (full, "r");

814+ free (full);

815+ }

816+ if (!f && !inherits)

817+ {

818+ full = _XcursorBuildFullname (dir, "", "index.theme");

819+ if (full)

820+ {

821+ inherits = _XcursorThemeInherits (full);

822+ free (full);

823+ }

824+ }

825+ free (dir);

826+ }

827+ }

828+ /*

829+ * Recurse to scan inherited themes

830+ */

831+ for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))

832+ f = XcursorScanTheme (i, name);

833+ if (inherits != NULL)

834+ free (inherits);

835+ return f;

836+}

837+

838+XcursorImages *

839+XcursorLibraryLoadImages (const char *file, const char *theme, int size)

840+{

841+ FILE *f = NULL;

842+ XcursorImages *images = NULL;

843+

844+ if (!file)

845+ return NULL;

846+

847+ if (theme)

848+ f = XcursorScanTheme (theme, file);

849+ if (!f)

850+ f = XcursorScanTheme ("default", file);

851+ if (f)

852+ {

853+ images = XcursorFileLoadImages (f, size);

854+ if (images)

855+ XcursorImagesSetName (images, file);

856+ fclose (f);

857+ }

858+ return images;

859+}

860+

861+static void

862+load_all_cursors_from_dir(const char *path, int size,

863+ void (*load_callback)(XcursorImages *, void *),

864+ void *user_data)

865+{

866+ FILE *f;

867+ DIR *dir = opendir(path);

868+ struct dirent *ent;

869+ char *full;

870+ XcursorImages *images;

871+

872+ if (!dir)

873+ return;

874+

875+ for(ent = readdir(dir); ent; ent = readdir(dir)) {

876+#ifdef _DIRENT_HAVE_D_TYPE

877+ if (ent->d_type != DT_UNKNOWN &&

878+ (ent->d_type != DT_REG && ent->d_type != DT_LNK))

879+ continue;

880+#endif

881+

882+ full = _XcursorBuildFullname(path, "", ent->d_name);

883+ if (!full)

884+ continue;

885+

886+ f = fopen(full, "r");

887+ if (!f) {

888+ free(full);

889+ continue;

890+ }

891+

892+ images = XcursorFileLoadImages(f, size);

893+

894+ if (images) {

895+ XcursorImagesSetName(images, ent->d_name);

896+ load_callback(images, user_data);

897+ }

898+

899+ fclose (f);

900+ free(full);

901+ }

902+

903+ closedir(dir);

904+}

905+

906+/** Load all the cursor of a theme

907+ *

908+ * This function loads all the cursor images of a given theme and its

909+ * inherited themes. Each cursor is loaded into an XcursorImages object

910+ * which is passed to the caller's load callback. If a cursor appears

911+ * more than once across all the inherited themes, the load callback

912+ * will be called multiple times, with possibly different XcursorImages

913+ * object which have the same name. The user is expected to destroy the

914+ * XcursorImages objects passed to the callback with

915+ * XcursorImagesDestroy().

916+ *

917+ * \param theme The name of theme that should be loaded

918+ * \param size The desired size of the cursor images

919+ * \param load_callback A callback function that will be called

920+ * for each cursor loaded. The first parameter is the XcursorImages

921+ * object representing the loaded cursor and the second is a pointer

922+ * to data provided by the user.

923+ * \param user_data The data that should be passed to the load callback

924+ */

925+void

926+xcursor_load_theme(const char *theme, int size,

927+ void (*load_callback)(XcursorImages *, void *),

928+ void *user_data)

929+{

930+ char *full, *dir;

931+ char *inherits = NULL;

932+ const char *path, *i;

933+

934+ if (!theme)

935+ theme = "default";

936+

937+ for (path = XcursorLibraryPath();

938+ path;

939+ path = _XcursorNextPath(path)) {

940+ dir = _XcursorBuildThemeDir(path, theme);

941+ if (!dir)

942+ continue;

943+

944+ full = _XcursorBuildFullname(dir, "cursors", "");

945+

946+ if (full) {

947+ load_all_cursors_from_dir(full, size, load_callback,

948+ user_data);

949+ free(full);

950+ }

951+

952+ if (!inherits) {

953+ full = _XcursorBuildFullname(dir, "", "index.theme");

954+ if (full) {

955+ inherits = _XcursorThemeInherits(full);

956+ free(full);

957+ }

958+ }

959+

960+ free(dir);

961+ }

962+

963+ for (i = inherits; i; i = _XcursorNextPath(i))

964+ xcursor_load_theme(i, size, load_callback, user_data);

965+

966+ if (inherits)

967+ free(inherits);

968+}

plugins/Cursor/3rd_party/xcursor/xcursor.hnew file+65

@@ -0,0 +1,65 @@

1+/*

2+ * Copyright © 2002 Keith Packard

3+ *

4+ * Permission to use, copy, modify, distribute, and sell this software and its

5+ * documentation for any purpose is hereby granted without fee, provided that

6+ * the above copyright notice appear in all copies and that both that

7+ * copyright notice and this permission notice appear in supporting

8+ * documentation, and that the name of Keith Packard not be used in

9+ * advertising or publicity pertaining to distribution of the software without

10+ * specific, written prior permission. Keith Packard makes no

11+ * representations about the suitability of this software for any purpose. It

12+ * is provided "as is" without express or implied warranty.

13+ *

14+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

15+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

16+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

17+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

18+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

19+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

20+ * PERFORMANCE OF THIS SOFTWARE.

21+ */

22+

23+#ifndef XCURSOR_H

24+#define XCURSOR_H

25+

26+#include <stdint.h>

27+

28+

29+typedef int XcursorBool;

30+typedef uint32_t XcursorUInt;

31+

32+typedef XcursorUInt XcursorDim;

33+typedef XcursorUInt XcursorPixel;

34+

35+typedef struct _XcursorImage {

36+ XcursorUInt version; /* version of the image data */

37+ XcursorDim size; /* nominal size for matching */

38+ XcursorDim width; /* actual width */

39+ XcursorDim height; /* actual height */

40+ XcursorDim xhot; /* hot spot x (must be inside image) */

41+ XcursorDim yhot; /* hot spot y (must be inside image) */

42+ XcursorUInt delay; /* animation delay to next frame (ms) */

43+ XcursorPixel *pixels; /* pointer to pixels */

44+} XcursorImage;

45+

46+/*

47+ * Other data structures exposed by the library API

48+ */

49+typedef struct _XcursorImages {

50+ int nimage; /* number of images */

51+ XcursorImage **images; /* array of XcursorImage pointers */

52+ char *name; /* name used to load images */

53+} XcursorImages;

54+

55+XcursorImages *

56+XcursorLibraryLoadImages (const char *file, const char *theme, int size);

57+

58+void

59+XcursorImagesDestroy (XcursorImages *images);

60+

61+void

62+xcursor_load_theme(const char *theme, int size,

63+ void (*load_callback)(XcursorImages *, void *),

64+ void *user_data);

65+#endif

plugins/Cursor/CMakeLists.txtnew file+32

@@ -0,0 +1,32 @@

1+add_subdirectory(3rd_party)

2+

3+include_directories(

4+ ${CMAKE_CURRENT_SOURCE_DIR}

5+ ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor

6+)

7+

8+include_directories(

9+ SYSTEM

10+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

11+)

12+

13+set(QMLPLUGIN_SRC

14+ plugin.cpp

15+ CursorImageInfo.cpp

16+ CursorImageProvider.cpp

17+ MousePointer.cpp

18+ # We need to run moc on this header

19+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

20+ )

21+

22+add_library(Cursor-qml SHARED

23+ ${QMLPLUGIN_SRC}

24+ )

25+

26+target_link_libraries(Cursor-qml

27+ xcursorloader-static

28+ ${QT5PLATFORM_SUPPORT_LDFLAGS}

29+ Qt5::Qml Qt5::Quick Qt5::Svg

30+)

31+

32+add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)

plugins/Cursor/Cursor.qmlnew file+62

@@ -0,0 +1,62 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

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 Cursor 1.1

19+import Powerd 0.1

20+

21+MousePointer {

22+ id: mousePointer

23+

24+ CursorImageInfo {

25+ id: imageInfo

26+ themeName: mousePointer.themeName

27+ cursorName: mousePointer.cursorName

28+ cursorHeight: mousePointer.height

29+ }

30+

31+ Loader {

32+ active: mousePointer.visible && imageInfo.frameCount > 1

33+ sourceComponent: AnimatedSprite {

34+ x: -imageInfo.hotspot.x

35+ y: -imageInfo.hotspot.y

36+ source: imageInfo.imageSource

37+

38+ interpolate: false

39+

40+ width: imageInfo.frameWidth

41+ height: imageInfo.frameHeight

42+

43+ frameCount: imageInfo.frameCount

44+ frameDuration: imageInfo.frameDuration

45+ frameWidth: imageInfo.frameWidth

46+ frameHeight: imageInfo.frameHeight

47+

48+ running: Powerd.status === Powerd.On

49+ }

50+ }

51+

52+ Loader {

53+ active: mousePointer.visible && imageInfo.frameCount === 1

54+ sourceComponent: Image {

55+ x: -imageInfo.hotspot.x

56+ y: -imageInfo.hotspot.y

57+ source: imageInfo.imageSource

58+ width: sourceSize.width

59+ height: sourceSize.height

60+ }

61+ }

62+}

plugins/Cursor/CursorImageInfo.cppnew file+115

@@ -0,0 +1,115 @@

1+/*

2+ * Copyright (C) 2016 Canonical, Ltd.

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+#include "CursorImageInfo.h"

18+

19+CursorImageInfo::CursorImageInfo(QObject *parent)

20+ : QObject(parent)

21+{

22+}

23+

24+void CursorImageInfo::setCursorName(const QString &cursorName)

25+{

26+ if (cursorName != m_cursorName) {

27+ m_cursorName = cursorName;

28+ update();

29+ Q_EMIT cursorNameChanged();

30+ }

31+

32+}

33+void CursorImageInfo::setCursorHeight(qreal cursorHeight)

34+{

35+ if (cursorHeight != m_cursorHeight) {

36+ m_cursorHeight = cursorHeight;

37+ update();

38+ Q_EMIT cursorHeightChanged();

39+ }

40+}

41+

42+void CursorImageInfo::setThemeName(const QString &themeName)

43+{

44+ if (m_themeName != themeName) {

45+ m_themeName = themeName;

46+ update();

47+ Q_EMIT themeNameChanged();

48+ }

49+}

50+

51+void CursorImageInfo::update()

52+{

53+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName, (int) m_cursorHeight);

54+

55+ Q_EMIT hotspotChanged();

56+ Q_EMIT frameWidthChanged();

57+ Q_EMIT frameHeightChanged();

58+ Q_EMIT frameCountChanged();

59+ Q_EMIT frameDurationChanged();

60+ Q_EMIT imageSourceChanged();

61+}

62+

63+QPoint CursorImageInfo::hotspot() const

64+{

65+ if (m_cursorImage) {

66+ return m_cursorImage->hotspot;

67+ } else {

68+ return QPoint();

69+ }

70+}

71+

72+qreal CursorImageInfo::frameWidth() const

73+{

74+ if (m_cursorImage) {

75+ return m_cursorImage->frameWidth;

76+ } else {

77+ return 0;

78+ }

79+}

80+

81+qreal CursorImageInfo::frameHeight() const

82+{

83+ if (m_cursorImage) {

84+ return m_cursorImage->frameHeight;

85+ } else {

86+ return 0;

87+ }

88+}

89+

90+int CursorImageInfo::frameCount() const

91+{

92+ if (m_cursorImage) {

93+ return m_cursorImage->frameCount;

94+ } else {

95+ return 0;

96+ }

97+}

98+

99+int CursorImageInfo::frameDuration() const

100+{

101+ if (m_cursorImage) {

102+ return m_cursorImage->frameDuration;

103+ } else {

104+ return 0;

105+ }

106+}

107+

108+QUrl CursorImageInfo::imageSource() const

109+{

110+ auto urlString = QString("image://cursor/%1/%2/%3")

111+ .arg(m_themeName, m_cursorName)

112+ .arg(m_cursorHeight);

113+

114+ return QUrl(urlString);

115+}

plugins/Cursor/CursorImageInfo.hnew file+82

@@ -0,0 +1,82 @@

1+/*

2+ * Copyright (C) 2016 Canonical, Ltd.

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+#ifndef CURSOR_IMAGE_INFO_H

18+#define CURSOR_IMAGE_INFO_H

19+

20+#include "CursorImageProvider.h"

21+

22+#include <QObject>

23+#include <QString>

24+#include <QUrl>

25+

26+class CursorImageInfo : public QObject

27+{

28+ Q_OBJECT

29+

30+ Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)

31+ Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)

32+ Q_PROPERTY(qreal cursorHeight READ cursorHeight WRITE setCursorHeight NOTIFY cursorHeightChanged)

33+

34+ Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)

35+ Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)

36+ Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)

37+ Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)

38+ Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)

39+ Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)

40+

41+public:

42+ CursorImageInfo(QObject *parent = nullptr);

43+

44+ QString themeName() const { return m_themeName; }

45+ void setThemeName(const QString &);

46+

47+ QString cursorName() const { return m_cursorName; }

48+ void setCursorName(const QString &);

49+

50+ qreal cursorHeight() const { return m_cursorHeight; }

51+ void setCursorHeight(qreal);

52+

53+ QPoint hotspot() const;

54+ qreal frameWidth() const;

55+ qreal frameHeight() const;

56+ int frameCount() const;

57+ int frameDuration() const;

58+ QUrl imageSource() const;

59+

60+Q_SIGNALS:

61+ void themeNameChanged();

62+ void cursorNameChanged();

63+ void cursorHeightChanged();

64+ void hotspotChanged();

65+ void frameWidthChanged();

66+ void frameHeightChanged();

67+ void frameCountChanged();

68+ void frameDurationChanged();

69+ void imageSourceChanged();

70+

71+private Q_SLOTS:

72+ void update();

73+

74+private:

75+ QString m_themeName;

76+ QString m_cursorName;

77+ qreal m_cursorHeight{0};

78+

79+ CursorImage *m_cursorImage{nullptr};

80+};

81+

82+#endif // CURSOR_IMAGE_INFO_H

plugins/Cursor/CursorImageProvider.cppnew file+337

@@ -0,0 +1,337 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * 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 "CursorImageProvider.h"

18+

19+#include <QCursor>

20+#include <QDebug>

21+#include <QFile>

22+#include <QPainter>

23+#include <QSvgRenderer>

24+

25+CursorImageProvider *CursorImageProvider::m_instance = nullptr;

26+

27+/////

28+// BuiltInCursorImage

29+

30+BuiltInCursorImage::BuiltInCursorImage(int cursorHeight)

31+{

32+ const char *svgString =

33+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"

34+ "<svg"

35+ " xmlns:dc=\"http://purl.org/dc/elements/1.1/\""

36+ " xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\""

37+ " xmlns:svg=\"http://www.w3.org/2000/svg\""

38+ " xmlns=\"http://www.w3.org/2000/svg\""

39+ " version=\"1.1\">"

40+ " <path"

41+ " style=\"fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:40;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1\""

42+ " d=\"M 20.504,50.94931 460.42533,518.14486 266.47603,515.61948 366.48114,719.16522 274.05218,770.68296 172.53185,559.56112 20.504,716.13476 Z\" />"

43+ "</svg>";

44+

45+ // NB: Original image dimension is 20x32. Ensure aspect ratio is kept

46+ qimage = QImage((20./32.)*cursorHeight, cursorHeight, QImage::Format_ARGB32);

47+ qimage.fill(Qt::transparent);

48+ QPainter imagePainter(&qimage);

49+

50+ frameWidth = qimage.width();

51+ frameHeight = qimage.height();

52+ requestedHeight = cursorHeight;

53+

54+ QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));

55+ svgRenderer->render(&imagePainter);

56+ delete svgRenderer;

57+}

58+

59+/////

60+// BlankCursorImage

61+

62+

63+BlankCursorImage::BlankCursorImage()

64+{

65+ qimage = QImage(1, 1, QImage::Format_ARGB32);

66+ qimage.fill(Qt::transparent);

67+ frameWidth = qimage.width();

68+ frameHeight = qimage.height();

69+}

70+

71+/////

72+// CustomCursorImage

73+

74+

75+CustomCursorImage::CustomCursorImage(const QCursor &cursor)

76+{

77+ qimage = cursor.pixmap().toImage();

78+ hotspot = cursor.hotSpot();

79+ frameWidth = qimage.width();

80+ frameHeight = qimage.height();

81+}

82+

83+/////

84+// XCursorImage

85+

86+XCursorImage::XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx)

87+{

88+ requestedHeight = preferredCursorHeightPx;

89+

90+ XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),

91+ preferredCursorHeightPx);

92+ if (!xcursorImages || xcursorImages->nimage == 0) {

93+ return;

94+ }

95+

96+ frameCount = xcursorImages->nimage;

97+

98+ for (int i = 0; i < xcursorImages->nimage; ++i) {

99+ XcursorImage *xcursorImage = xcursorImages->images[i];

100+ if (frameWidth < (int)xcursorImage->width) {

101+ frameWidth = xcursorImage->width;

102+ }

103+ if (frameHeight < (int)xcursorImage->height) {

104+ frameHeight = xcursorImage->height;

105+ }

106+ if (i == 0) {

107+ frameDuration = (int)xcursorImage->delay;

108+ } else {

109+ if (frameDuration != (int)xcursorImage->delay) {

110+ qWarning().nospace() << "CursorImageProvider: XCursorImage("<<theme<<","<<file<<") has"

111+ " varying delays in its animation. Animation won't look right.";

112+ }

113+ }

114+ }

115+

116+ {

117+ // Assume that the hotspot position does not animate

118+ XcursorImage *xcursorImage = xcursorImages->images[0];

119+ hotspot.setX(xcursorImage->xhot);

120+ hotspot.setY(xcursorImage->yhot);

121+ }

122+

123+ // Build the sprite as a single row of frames

124+ qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);

125+ qimage.fill(Qt::transparent);

126+

127+ {

128+ QPainter painter(&qimage);

129+

130+ for (int i = 0; i < xcursorImages->nimage; ++i) {

131+ XcursorImage *xcursorImage = xcursorImages->images[i];

132+

133+ auto frameImage = QImage((uchar*)xcursorImage->pixels,

134+ xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);

135+

136+ painter.drawImage(QPoint(i*frameWidth, 0), frameImage);

137+ }

138+ }

139+

140+ XcursorImagesDestroy(xcursorImages);

141+}

142+

143+XCursorImage::~XCursorImage()

144+{

145+}

146+

147+/////

148+// CursorImageProvider

149+

150+CursorImageProvider::CursorImageProvider()

151+ : QQuickImageProvider(QQuickImageProvider::Image)

152+{

153+ if (m_instance) {

154+ qFatal("Cannot have multiple CursorImageProvider instances");

155+ }

156+ m_instance = this;

157+

158+ m_fallbackNames[QStringLiteral("closedhand")].append(QStringLiteral("grabbing"));

159+ m_fallbackNames[QStringLiteral("closedhand")].append(QStringLiteral("dnd-none"));

160+

161+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("dnd-none"));

162+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("grabbing"));

163+ m_fallbackNames[QStringLiteral("dnd-copy")].append(QStringLiteral("closedhand"));

164+

165+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("dnd-none"));

166+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("grabbing"));

167+ m_fallbackNames[QStringLiteral("dnd-move")].append(QStringLiteral("closedhand"));

168+

169+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("dnd-none"));

170+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("grabbing"));

171+ m_fallbackNames[QStringLiteral("dnd-link")].append(QStringLiteral("closedhand"));

172+

173+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("crossed_circle")); // DMZ-White and DMZ-Black themes

174+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));

175+ m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));

176+

177+ m_fallbackNames[QStringLiteral("grabbing")].append(QStringLiteral("closedhand")); // Breeze

178+

179+ m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));

180+ m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));

181+

182+ m_fallbackNames[QStringLiteral("ibeam")].append(QStringLiteral("xterm"));

183+ m_fallbackNames[QStringLiteral("ibeam")].append(QStringLiteral("text"));

184+

185+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("default"));

186+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("top_left_arrow"));

187+ m_fallbackNames[QStringLiteral("left_ptr")].append(QStringLiteral("left_arrow"));

188+

189+ m_fallbackNames[QStringLiteral("left_ptr_watch")].append(QStringLiteral("half-busy"));

190+ m_fallbackNames[QStringLiteral("left_ptr_watch")].append(QStringLiteral("progress"));

191+

192+ m_fallbackNames[QStringLiteral("size_bdiag")].append(QStringLiteral("fd_double_arrow"));

193+ m_fallbackNames[QStringLiteral("size_bdiag")].append(QStringLiteral("nesw-resize"));

194+

195+ m_fallbackNames[QStringLiteral("size_fdiag")].append(QStringLiteral("bd_double_arrow")); // DMZ-White and DMZ-Black themes

196+ m_fallbackNames[QStringLiteral("size_fdiag")].append(QStringLiteral("nwse-resize"));

197+

198+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes

199+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("ew-resize"));

200+ m_fallbackNames[QStringLiteral("size_hor")].append(QStringLiteral("h_double_arrow"));

201+

202+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes

203+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("ns-resize"));

204+ m_fallbackNames[QStringLiteral("size_ver")].append(QStringLiteral("v_double_arrow"));

205+

206+ m_fallbackNames[QStringLiteral("split_h")].append(QStringLiteral("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes

207+ m_fallbackNames[QStringLiteral("split_h")].append(QStringLiteral("col-resize"));

208+

209+ m_fallbackNames[QStringLiteral("split_v")].append(QStringLiteral("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes

210+ m_fallbackNames[QStringLiteral("split_v")].append(QStringLiteral("row-resize"));

211+

212+ m_fallbackNames[QStringLiteral("up_arrow")].append(QStringLiteral("sb_up_arrow")); // DMZ-White and DMZ-Black themes

213+

214+ m_fallbackNames[QStringLiteral("watch")].append(QStringLiteral("wait"));

215+

216+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("left_ptr_help"));

217+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("help"));

218+ m_fallbackNames[QStringLiteral("whats_this")].append(QStringLiteral("question_arrow"));

219+

220+ m_fallbackNames[QStringLiteral("xterm")].append(QStringLiteral("ibeam"));

221+}

222+

223+CursorImageProvider::~CursorImageProvider()

224+{

225+ {

226+ QList< QMap<QString, CursorImage*> > cursorList = m_cursors.values();

227+

228+ for (int i = 0; i < cursorList.count(); ++i) {

229+ QList<CursorImage*> cursorImageList = cursorList[i].values();

230+ for (int j = 0; j < cursorImageList.count(); ++j) {

231+ delete cursorImageList[j];

232+ }

233+ }

234+ }

235+

236+ m_cursors.clear();

237+ m_instance = nullptr;

238+}

239+

240+QImage CursorImageProvider::requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize & /*requestedSize*/)

241+{

242+ CursorImage *cursorImage = fetchCursor(cursorThemeAndNameAndHeight);

243+ size->setWidth(cursorImage->qimage.width());

244+ size->setHeight(cursorImage->qimage.height());

245+

246+ return cursorImage->qimage;

247+}

248+

249+CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndNameAndHeight)

250+{

251+ QString themeName;

252+ QString cursorName;

253+ int cursorHeight;

254+ {

255+ QStringList themeAndNameList = cursorThemeAndNameAndHeight.split('/');

256+ if (themeAndNameList.size() != 3) {

257+ return nullptr;

258+ }

259+ themeName = themeAndNameList[0];

260+ cursorName = themeAndNameList[1];

261+

262+ bool ok;

263+ cursorHeight = themeAndNameList[2].toInt(&ok);

264+ if (!ok) {

265+ cursorHeight = 32;

266+ qWarning().nospace() << "CursorImageProvider: invalid cursor height ("<<themeAndNameList[2]<<")."

267+ " Falling back to "<<cursorHeight<<" pixels";

268+ }

269+ }

270+

271+ return fetchCursor(themeName, cursorName, cursorHeight);

272+}

273+

274+CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight)

275+{

276+ CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName, cursorHeight);

277+

278+ // Try some fallbacks

279+ if (cursorImage->qimage.isNull()) {

280+ if (m_fallbackNames.contains(cursorName)) {

281+ const QStringList &fallbackNames = m_fallbackNames[cursorName];

282+ int i = 0;

283+ while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {

284+ qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);

285+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i), cursorHeight);

286+ ++i;

287+ }

288+ }

289+ }

290+

291+ // if it all fails, there must be at least a left_ptr

292+ if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {

293+ qDebug() << "CursorImageProvider:" << cursorName

294+ << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";

295+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"), cursorHeight);

296+ }

297+

298+ if (cursorImage->qimage.isNull()) {

299+ // finally, go for the built-in cursor

300+ qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";

301+ if (!m_builtInCursorImage || m_builtInCursorImage->requestedHeight != cursorHeight) {

302+ m_builtInCursorImage.reset(new BuiltInCursorImage(cursorHeight));

303+ }

304+ cursorImage = m_builtInCursorImage.data();

305+ }

306+

307+ return cursorImage;

308+}

309+

310+CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight)

311+{

312+ if (cursorName == QLatin1String("blank")) {

313+ return &m_blankCursorImage;

314+ } else if (cursorName.startsWith(QLatin1String("custom"))) {

315+ return m_customCursorImage.data();

316+ } else {

317+ QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

318+

319+ if (!themeCursors.contains(cursorName)) {

320+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName, cursorHeight);

321+ } else if (themeCursors[cursorName]->requestedHeight != cursorHeight) {

322+ delete themeCursors.take(cursorName);

323+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName, cursorHeight);

324+ }

325+

326+ return themeCursors[cursorName];

327+ }

328+}

329+

330+void CursorImageProvider::setCustomCursor(const QCursor &customCursor)

331+{

332+ if (customCursor.pixmap().isNull()) {

333+ m_customCursorImage.reset();

334+ } else {

335+ m_customCursorImage.reset(new CustomCursorImage(customCursor));

336+ }

337+}

plugins/Cursor/CursorImageProvider.hnew file+103

@@ -0,0 +1,103 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * 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+#ifndef CURSORIMAGEPROVIDER_H

18+#define CURSORIMAGEPROVIDER_H

19+

20+#include <QQuickImageProvider>

21+#include <QScopedPointer>

22+

23+// xcursor static lib

24+extern "C"

25+{

26+#include <xcursor.h>

27+}

28+

29+class CursorImage {

30+public:

31+ virtual ~CursorImage() {}

32+

33+ QImage qimage;

34+

35+ // TODO: consider if there's a need to animate the hotspot

36+ // ie, if there's a need to make it an array of points, one for each frame.

37+ // Maybe no single xcursor (or at least the ones we know of or use)

38+ // vary its hotspot position through its animation.

39+ QPoint hotspot;

40+

41+ int frameWidth{0};

42+ int frameHeight{0};

43+ int frameCount{1};

44+ int frameDuration{40};

45+

46+ // Requested height when creating this cursor.

47+ int requestedHeight{0};

48+};

49+

50+class XCursorImage : public CursorImage {

51+public:

52+ XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx);

53+ virtual ~XCursorImage();

54+};

55+

56+class BuiltInCursorImage : public CursorImage {

57+public:

58+ BuiltInCursorImage(int cursorHeight);

59+};

60+

61+class BlankCursorImage : public CursorImage {

62+public:

63+ BlankCursorImage();

64+};

65+

66+class CustomCursorImage : public CursorImage {

67+public:

68+ CustomCursorImage(const QCursor &cursor);

69+};

70+

71+class CursorImageProvider : public QQuickImageProvider

72+{

73+public:

74+ CursorImageProvider();

75+ virtual ~CursorImageProvider();

76+

77+ static CursorImageProvider *instance() { return m_instance; }

78+

79+

80+ QImage requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize &requestedSize) override;

81+

82+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight);

83+

84+ void setCustomCursor(const QCursor &customCursor);

85+

86+private:

87+ CursorImage *fetchCursor(const QString &cursorThemeAndNameAndHeight);

88+ CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight);

89+

90+ // themeName -> (cursorName -> cursorImage)

91+ // TODO: discard old, unused, cursors

92+ QMap<QString, QMap<QString, CursorImage*> > m_cursors;

93+

94+ QScopedPointer<CursorImage> m_builtInCursorImage;

95+ BlankCursorImage m_blankCursorImage;

96+ QScopedPointer<CursorImage> m_customCursorImage;

97+

98+ QMap<QString, QStringList> m_fallbackNames;

99+

100+ static CursorImageProvider *m_instance;

101+};

102+

103+#endif // CURSORIMAGEPROVIDER_H

plugins/Cursor/MousePointer.cppnew file+235

@@ -0,0 +1,235 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * 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 "MousePointer.h"

18+#include "CursorImageProvider.h"

19+

20+// Unity API

21+#include <unity/shell/application/MirPlatformCursor.h>

22+

23+#include <QQuickWindow>

24+#include <QGuiApplication>

25+#include <QtMath>

26+

27+#include <qpa/qwindowsysteminterface.h>

28+

29+MousePointer::MousePointer(QQuickItem *parent)

30+ : MirMousePointerInterface(parent)

31+ , m_cursorName(QStringLiteral("left_ptr"))

32+ , m_themeName(QStringLiteral("default"))

33+{

34+}

35+

36+void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

37+ Qt::KeyboardModifiers modifiers)

38+{

39+ if (!parentItem()) {

40+ return;

41+ }

42+

43+ if (!movement.isNull()) {

44+ Q_EMIT mouseMoved();

45+ }

46+

47+ m_accumulatedMovement += movement;

48+ // don't apply the fractional part

49+ QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));

50+ m_accumulatedMovement -= appliedMovement;

51+

52+ qreal newX = x() + appliedMovement.x();

53+ qreal newY = y() + appliedMovement.y();

54+ const qreal sceneWidth = parentItem()->width();

55+ const qreal sceneHeight = parentItem()->height();

56+

57+ if (newX <= 0 && newY < m_topBoundaryOffset) { // top left corner

58+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-m_topBoundaryOffset, 2));

59+ Q_EMIT pushedTopLeftCorner(qAbs(distance), buttons);

60+ m_pushing = true;

61+ } else if (newX >= sceneWidth-1 && newY < m_topBoundaryOffset) { // top right corner

62+ const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-m_topBoundaryOffset, 2));

63+ Q_EMIT pushedTopRightCorner(qAbs(distance), buttons);

64+ m_pushing = true;

65+ } else if (newX < 0 && newY >= sceneHeight-1) { // bottom left corner

66+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-sceneHeight, 2));

67+ Q_EMIT pushedBottomLeftCorner(qAbs(distance), buttons);

68+ m_pushing = true;

69+ } else if (newX >= sceneWidth-1 && newY >= sceneHeight-1) { // bottom right corner

70+ const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-sceneHeight, 2));

71+ Q_EMIT pushedBottomRightCorner(qAbs(distance), buttons);

72+ m_pushing = true;

73+ } else if (newX < 0) { // left edge

74+ Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);

75+ m_pushing = true;

76+ } else if (newX >= sceneWidth) { // right edge

77+ Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);

78+ m_pushing = true;

79+ } else if (newY < m_topBoundaryOffset) { // top edge

80+ Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);

81+ m_pushing = true;

82+ } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing

83+ if (m_pushing) {

84+ Q_EMIT pushStopped();

85+ m_pushing = false;

86+ }

87+ }

88+

89+ applyItemConfinement(newX, newY);

90+

91+ setX(qBound(0.0, newX, sceneWidth - 1));

92+ setY(qBound(0.0, newY, sceneHeight - 1));

93+

94+ QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));

95+ QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,

96+ buttons, modifiers);

97+}

98+

99+void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)

100+{

101+ Q_ASSERT(parentItem() != nullptr);

102+

103+ if (m_confiningItem.isNull()) {

104+ return;

105+ }

106+

107+ QRectF confiningItemGeometry(0, 0, m_confiningItem->width(), m_confiningItem->height());

108+

109+ QRectF confiningRect = m_confiningItem->mapRectToItem(parentItem(), confiningItemGeometry);

110+

111+ if (newX < confiningRect.x()) {

112+ newX = confiningRect.x();

113+ } else if (newX > confiningRect.right()) {

114+ newX = confiningRect.right();

115+ }

116+

117+ if (newY < confiningRect.y()) {

118+ newY = confiningRect.y();

119+ } else if (newY > confiningRect.bottom()) {

120+ newY = confiningRect.bottom();

121+ }

122+}

123+

124+void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)

125+{

126+ if (!parentItem()) {

127+ return;

128+ }

129+

130+ QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));

131+ QWindowSystemInterface::handleWheelEvent(window(), timestamp, scenePosition /* local */, scenePosition /* global */,

132+ QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);

133+}

134+

135+int MousePointer::topBoundaryOffset() const

136+{

137+ return m_topBoundaryOffset;

138+}

139+

140+void MousePointer::setTopBoundaryOffset(int topBoundaryOffset)

141+{

142+ if (m_topBoundaryOffset == topBoundaryOffset)

143+ return;

144+

145+ m_topBoundaryOffset = topBoundaryOffset;

146+ Q_EMIT topBoundaryOffsetChanged(topBoundaryOffset);

147+}

148+

149+void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)

150+{

151+ if (change == ItemSceneChange) {

152+ registerWindow(value.window);

153+ }

154+}

155+

156+void MousePointer::registerWindow(QWindow *window)

157+{

158+ if (window == m_registeredWindow) {

159+ return;

160+ }

161+

162+ if (m_registeredWindow) {

163+ m_registeredWindow->disconnect(this);

164+ }

165+

166+ m_registeredWindow = window;

167+

168+ if (m_registeredWindow) {

169+ connect(window, &QWindow::screenChanged, this, &MousePointer::registerScreen);

170+ registerScreen(window->screen());

171+ } else {

172+ registerScreen(nullptr);

173+ }

174+}

175+

176+void MousePointer::registerScreen(QScreen *screen)

177+{

178+ if (m_registeredScreen == screen) {

179+ return;

180+ }

181+

182+ if (m_registeredScreen) {

183+ auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

184+ if (previousCursor) {

185+ previousCursor->setMousePointer(nullptr);

186+ } else {

187+ qCritical("QPlatformCursor is not a MirPlatformCursor! Cursor module only works in a Mir server.");

188+ }

189+ }

190+

191+ m_registeredScreen = screen;

192+

193+ if (m_registeredScreen) {

194+ auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

195+ if (cursor) {

196+ cursor->setMousePointer(this);

197+ } else {

198+ qCritical("QPlaformCursor is not a MirPlatformCursor! Cursor module only works in Mir.");

199+ }

200+ }

201+}

202+

203+void MousePointer::setCursorName(const QString &cursorName)

204+{

205+ if (cursorName != m_cursorName) {

206+ m_cursorName = cursorName;

207+ Q_EMIT cursorNameChanged(m_cursorName);

208+ }

209+}

210+

211+void MousePointer::setThemeName(const QString &themeName)

212+{

213+ if (m_themeName != themeName) {

214+ m_themeName = themeName;

215+ Q_EMIT themeNameChanged(m_themeName);

216+ }

217+}

218+

219+void MousePointer::setCustomCursor(const QCursor &customCursor)

220+{

221+ CursorImageProvider::instance()->setCustomCursor(customCursor);

222+}

223+

224+QQuickItem* MousePointer::confiningItem() const

225+{

226+ return m_confiningItem.data();

227+}

228+

229+void MousePointer::setConfiningItem(QQuickItem *item)

230+{

231+ if (item != m_confiningItem) {

232+ m_confiningItem = item;

233+ Q_EMIT confiningItemChanged();

234+ }

235+}

plugins/Cursor/MousePointer.hnew file+92

@@ -0,0 +1,92 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * 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+#ifndef MOUSEPOINTER_H

18+#define MOUSEPOINTER_H

19+

20+// Qt

21+#include <QPointer>

22+#include <QWindow>

23+#include <QScreen>

24+

25+// Unity API

26+#include <unity/shell/application/MirMousePointerInterface.h>

27+

28+class MousePointer : public MirMousePointerInterface {

29+ Q_OBJECT

30+ Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)

31+ Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)

32+public:

33+ MousePointer(QQuickItem *parent = nullptr);

34+

35+ void setCursorName(const QString &qtCursorName) override;

36+ QString cursorName() const override { return m_cursorName; }

37+

38+ void setThemeName(const QString &themeName) override;

39+ QString themeName() const override { return m_themeName; }

40+

41+ void setCustomCursor(const QCursor &) override;

42+

43+ QQuickItem* confiningItem() const;

44+ void setConfiningItem(QQuickItem*);

45+

46+ int topBoundaryOffset() const;

47+ void setTopBoundaryOffset(int topBoundaryOffset);

48+

49+public Q_SLOTS:

50+ void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

51+ Qt::KeyboardModifiers modifiers) override;

52+ void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) override;

53+

54+Q_SIGNALS:

55+ void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);

56+ void pushedRightBoundary(qreal amount, Qt::MouseButtons buttons);

57+ void pushedTopBoundary(qreal amount, Qt::MouseButtons buttons);

58+ void pushedTopLeftCorner(qreal amount, Qt::MouseButtons buttons);

59+ void pushedTopRightCorner(qreal amount, Qt::MouseButtons buttons);

60+ void pushedBottomLeftCorner(qreal amount, Qt::MouseButtons buttons);

61+ void pushedBottomRightCorner(qreal amount, Qt::MouseButtons buttons);

62+ void pushStopped();

63+ void mouseMoved();

64+ void confiningItemChanged();

65+

66+ void topBoundaryOffsetChanged(int topBoundaryOffset);

67+

68+protected:

69+ void itemChange(ItemChange change, const ItemChangeData &value) override;

70+

71+private Q_SLOTS:

72+ void registerScreen(QScreen *screen);

73+

74+private:

75+ void registerWindow(QWindow *window);

76+ void applyItemConfinement(qreal &newX, qreal &newY);

77+

78+ QPointer<QWindow> m_registeredWindow;

79+ QPointer<QScreen> m_registeredScreen;

80+ QString m_cursorName;

81+ QString m_themeName;

82+

83+ // Accumulated, unapplied, mouse movement.

84+ QPointF m_accumulatedMovement;

85+

86+ QPointer<QQuickItem> m_confiningItem;

87+

88+ int m_topBoundaryOffset{0};

89+ bool m_pushing{false};

90+};

91+

92+#endif // MOUSEPOINTER_H

tests/mocks/Unity/DashCommunicator/plugin.cpp → plugins/Cursor/plugin.cpprenamed+21−11

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

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,20 +12,30 @@

12 *

12 *

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

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

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

15− *

16− * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17 */

15 */

18

16

17+// Qt

18+#include <QtQml/qqml.h>

19+#include <QQmlContext>

20+

21+// self

19#include "plugin.h"

22#include "plugin.h"

20−#include "dashcommunicator.h"

21−#include "dashcommunicatorservice.h"

22

23

23−#include <QDBusConnection>

24+// local

24−#include <QtQml/qqml.h>

25+#include "CursorImageInfo.h"

26+#include "CursorImageProvider.h"

27+#include "MousePointer.h"

25

28

26−void DashCommunicatorPlugin::registerTypes(const char *uri)

29+void CursorPlugin::registerTypes(const char *uri)

27{

30{

28− Q_ASSERT(uri == QStringLiteral("Unity.DashCommunicator"));

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

29− qmlRegisterType<DashCommunicatorService>(uri, 0, 1, "DashCommunicatorService");

32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");

30− qmlRegisterType<DashCommunicator>(uri, 0, 1, "DashCommunicator");

33+ qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");

34+}

35+

36+void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

37+{

38+ QQmlExtensionPlugin::initializeEngine(engine, uri);

39+

40+ engine->addImageProvider(QStringLiteral("cursor"), new CursorImageProvider());

31}

41}

plugins/Cursor/plugin.hnew file+33

@@ -0,0 +1,33 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef CURSOR_PLUGIN_H

18+#define CURSOR_PLUGIN_H

19+

20+#include <QtQml/QQmlEngine>

21+#include <QtQml/QQmlExtensionPlugin>

22+

23+class CursorPlugin : public QQmlExtensionPlugin

24+{

25+ Q_OBJECT

26+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

27+

28+public:

29+ void registerTypes(const char *uri) override;

30+ void initializeEngine(QQmlEngine *engine, const char *uri) override;

31+};

32+

33+#endif // CURSOR_PLUGIN_H

plugins/Cursor/qmldirnew file+3

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

1+module Cursor

2+plugin Cursor-qml

3+Cursor 1.1 Cursor.qml

plugins/Dash/CMakeLists.txtdeleted−41

@@ -1,41 +0,0 @@

1−# There's no cmake var for v8 include path :-/

2−# so create one

3−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

4−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")

5− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)

6−else()

7− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

8−endif()

9−

10−include_directories(

11− ${CMAKE_CURRENT_SOURCE_DIR}

12− ${CMAKE_CURRENT_BINARY_DIR}

13− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

14− ${Qt5Quick_INCLUDE_DIRS}

15− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

16− ${Qt5V8_PRIVATE_INCLUDE_DIR}

17−)

18−

19−remove_definitions(-DQT_NO_KEYWORDS)

20−

21−set(QMLPLUGIN_SRC

22− plugin.cpp

23− listviewwithpageheader.cpp

24− abstractdashview.cpp

25− verticaljournal.cpp

26− horizontaljournal.cpp

27− organicgrid.cpp

28− )

29−

30−add_library(Dash-qml MODULE

31− ${QMLPLUGIN_SRC}

32− )

33−

34−target_link_libraries(Dash-qml

35− ${Qt5Gui_LIBRARIES}

36− ${Qt5Quick_LIBRARIES}

37− )

38−

39−qt5_use_modules(Dash-qml Qml Quick)

40−

41−add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)

plugins/Dash/CardAttributes.qmldeleted−71

@@ -1,71 +0,0 @@

1−/*

2− * Copyright 2014 Canonical Ltd.

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

18−import QtQuick.Layouts 1.1

19−import Ubuntu.Components 1.1

20−import Ubuntu.Settings.Components 0.1

21−

22−GridLayout {

23− id: grid

24− anchors {

25− left: parent.left;

26− right: parent.right;

27− }

28− columns: 2 + repeater.count % 2

29− rowSpacing: units.gu(.5)

30− property alias model: repeater.model

31− property color color: Theme.palette.normal.baseText

32− property real fontScale: 1.0

33−

34− Repeater {

35− id: repeater

36− delegate: Row {

37− spacing: units.gu(0.5)

38− readonly property int column: index % grid.columns;

39− Layout.alignment: {

40− if (column == 0) return Qt.AlignLeft;

41− if (column == grid.columns - 1 || index == repeater.count - 1) return Qt.AlignRight;

42− if (column == 1) return Qt.AlignHCenter;

43− }

44− Layout.column: index % grid.columns

45− Layout.row: index / grid.columns

46− Layout.columnSpan: index == repeater.count - 1 && grid.columns == 3 && column == 1 ? 2 : 1

47− Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)

48− Layout.fillWidth: true

49− height: units.gu(2)

50− StatusIcon {

51− id: icon

52− height: units.gu(2)

53− sets: ["actions", "status", "apps"]

54− source: "icon" in modelData && modelData["icon"] || ""

55− color: grid.color

56− }

57− Label {

58− id: label

59− width: parent.width - x

60− anchors.verticalCenter: parent.verticalCenter

61− text: "value" in modelData && modelData["value"] || "";

62− elide: Text.ElideRight

63− maximumLineCount: 1

64− font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light

65− fontSize: "small"

66− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

67− color: grid.color

68− }

69− }

70− }

71−}

plugins/Dash/CardCreator.jsdeleted−676

@@ -1,676 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−.pragma library

18−

19−var kBackgroundLoaderCode = 'Loader {\n\

20− id: backgroundLoader; \n\

21− objectName: "backgroundLoader"; \n\

22− anchors.fill: parent; \n\

23− asynchronous: root.asynchronous; \n\

24− visible: status == Loader.Ready; \n\

25− sourceComponent: UbuntuShape { \n\

26− objectName: "background"; \n\

27− radius: "medium"; \n\

28− color: getColor(0) || "white"; \n\

29− gradientColor: getColor(1) || color; \n\

30− anchors.fill: parent; \n\

31− image: backgroundImage.source ? backgroundImage : null; \n\

32− property real luminance: Style.luminance(color); \n\

33− property Image backgroundImage: Image { \n\

34− objectName: "backgroundImage"; \n\

35− source: { \n\

36− if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\

37− else if (template && typeof template["card-background"] === "string") return template["card-background"]; \n\

38− else return ""; \n\

39− } \n\

40− } \n\

41− function getColor(index) { \n\

42− if (cardData && typeof cardData["background"] === "object" \n\

43− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { \n\

44− return cardData["background"]["elements"][index]; \n\

45− } else if (template && typeof template["card-background"] === "object" \n\

46− && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) { \n\

47− return template["card-background"]["elements"][index]; \n\

48− } else return undefined; \n\

49− } \n\

50− } \n\

51− }\n';

52−

53−// %1 is used as anchors of artShapeHolder

54−// %2 is used as image width

55−// %3 is used as image height

56−var kArtShapeHolderCode = 'Item { \n\

57− id: artShapeHolder; \n\

58− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

59− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

60− anchors { %1 } \n\

61− Loader { \n\

62− id: artShapeLoader; \n\

63− objectName: "artShapeLoader"; \n\

64− active: cardData && cardData["art"] || false; \n\

65− asynchronous: root.asynchronous; \n\

66− visible: status == Loader.Ready; \n\

67− sourceComponent: UbuntuShape { \n\

68− id: artShape; \n\

69− objectName: "artShape"; \n\

70− radius: "medium"; \n\

71− visible: image.status == Image.Ready; \n\

72− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\

73− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\

74− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; } \n\

75− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

76− function updateWidthHeightBindings() { \n\

77− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

78− width = root.fixedArtShapeSize.width; \n\

79− height = root.fixedArtShapeSize.height; \n\

80− } else { \n\

81− width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); \n\

82− height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

83− } \n\

84− } \n\

85− image: CroppedImageMinimumSourceSize { \n\

86− objectName: "artImage"; \n\

87− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

88− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\

89− cache: true; \n\

90− asynchronous: root.asynchronous; \n\

91− visible: false; \n\

92− width: %2; \n\

93− height: %3; \n\

94− } \n\

95− } \n\

96− } \n\

97− }\n';

98−

99−var kOverlayLoaderCode = 'Loader { \n\

100− id: overlayLoader; \n\

101− anchors { \n\

102− left: artShapeHolder.left; \n\

103− right: artShapeHolder.right; \n\

104− bottom: artShapeHolder.bottom; \n\

105− } \n\

106− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\

107− asynchronous: root.asynchronous; \n\

108− visible: showHeader && status == Loader.Ready; \n\

109− sourceComponent: ShaderEffect { \n\

110− id: overlay; \n\

111− height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

112− property real luminance: Style.luminance(overlayColor); \n\

113− property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\

114− property var source: ShaderEffectSource { \n\

115− id: shaderSource; \n\

116− sourceItem: artShapeLoader.item; \n\

117− onVisibleChanged: if (visible) scheduleUpdate(); \n\

118− live: false; \n\

119− sourceRect: Qt.rect(0, artShapeLoader.height - overlay.height, artShapeLoader.width, overlay.height); \n\

120− } \n\

121− vertexShader: " \n\

122− uniform highp mat4 qt_Matrix; \n\

123− attribute highp vec4 qt_Vertex; \n\

124− attribute highp vec2 qt_MultiTexCoord0; \n\

125− varying highp vec2 coord; \n\

126− void main() { \n\

127− coord = qt_MultiTexCoord0; \n\

128− gl_Position = qt_Matrix * qt_Vertex; \n\

129− }"; \n\

130− fragmentShader: " \n\

131− varying highp vec2 coord; \n\

132− uniform sampler2D source; \n\

133− uniform lowp float qt_Opacity; \n\

134− uniform highp vec4 overlayColor; \n\

135− void main() { \n\

136− lowp vec4 tex = texture2D(source, coord); \n\

137− gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; \n\

138− }"; \n\

139− } \n\

140− }\n';

141−

142−// multiple row version of HeaderRowCode

143−function kHeaderRowCodeGenerator() {

144−var kHeaderRowCodeTemplate = 'Row { \n\

145− id: row; \n\

146− objectName: "outerRow"; \n\

147− property real margins: units.gu(1); \n\

148− spacing: margins; \n\

149− height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\

150− anchors { %1 } \n\

151− anchors.right: parent.right; \n\

152− anchors.margins: margins; \n\

153− anchors.rightMargin: 0; \n\

154− data: [ \n\

155− %2 \n\

156− ] \n\

157− }\n';

158− var args = Array.prototype.slice.call(arguments);

159− var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(args.join(',\n'));

160− return code;

161−}

162−

163−// multiple item version of kHeaderContainerCode

164−function kHeaderContainerCodeGenerator() {

165− var headerContainerCodeTemplate = 'Item { \n\

166− id: headerTitleContainer; \n\

167− anchors { %1 } \n\

168− width: parent.width - x; \n\

169− implicitHeight: %2; \n\

170− data: [ \n\

171− %3 \n\

172− ]\n\

173− }\n';

174− var args = Array.prototype.slice.call(arguments);

175− var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));

176− return code;

177−}

178−

179−// %1 is used as anchors of mascotShapeLoader

180−var kMascotShapeLoaderCode = 'Loader { \n\

181− id: mascotShapeLoader; \n\

182− objectName: "mascotShapeLoader"; \n\

183− asynchronous: root.asynchronous; \n\

184− active: mascotImage.status === Image.Ready; \n\

185− visible: showHeader && active && status == Loader.Ready; \n\

186− width: units.gu(6); \n\

187− height: units.gu(5.625); \n\

188− sourceComponent: UbuntuShape { image: mascotImage } \n\

189− anchors { %1 } \n\

190− }\n';

191−

192−// %1 is used as anchors of mascotImage

193−// %2 is used as visible of mascotImage

194−var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\

195− id: mascotImage; \n\

196− objectName: "mascotImage"; \n\

197− anchors { %1 } \n\

198− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

199− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\

200− width: units.gu(6); \n\

201− height: units.gu(5.625); \n\

202− horizontalAlignment: Image.AlignHCenter; \n\

203− verticalAlignment: Image.AlignVCenter; \n\

204− visible: %2; \n\

205− }\n';

206−

207−// %1 is used as anchors of titleLabel

208−// %2 is used as color of titleLabel

209−// %3 is used as extra condition for visible of titleLabel

210−var kTitleLabelCode = 'Label { \n\

211− id: titleLabel; \n\

212− objectName: "titleLabel"; \n\

213− anchors { %1 } \n\

214− elide: Text.ElideRight; \n\

215− fontSize: "small"; \n\

216− wrapMode: Text.Wrap; \n\

217− maximumLineCount: 2; \n\

218− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

219− color: %2; \n\

220− visible: showHeader %3; \n\

221− text: root.title; \n\

222− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\

223− horizontalAlignment: root.titleAlignment; \n\

224− }\n';

225−

226−// %1 is used as extra anchors of emblemIcon

227−// %2 is used as color of emblemIcon

228−var kEmblemIconCode = 'StatusIcon { \n\

229− id: emblemIcon; \n\

230− objectName: "emblemIcon"; \n\

231− anchors { \n\

232− bottom: titleLabel.baseline; \n\

233− right: parent.right; \n\

234− %1

235− } \n\

236− source: cardData && cardData["emblem"] || ""; \n\

237− color: %2; \n\

238− height: source != "" ? titleLabel.font.pixelSize : 0; \n\

239− }\n';

240−

241−// %1 is used as anchors of touchdown effect

242−var kTouchdownCode = 'UbuntuShape { \n\

243− id: touchdown; \n\

244− objectName: "touchdown"; \n\

245− anchors { %1 } \n\

246− visible: root.pressed; \n\

247− radius: "medium"; \n\

248− borderSource: "radius_pressed.sci" \n\

249− }\n';

250−

251−// %1 is used as anchors of subtitleLabel

252−// %2 is used as color of subtitleLabel

253−var kSubtitleLabelCode = 'Label { \n\

254− id: subtitleLabel; \n\

255− objectName: "subtitleLabel"; \n\

256− anchors { %1 } \n\

257− anchors.topMargin: units.dp(2); \n\

258− elide: Text.ElideRight; \n\

259− fontSize: "x-small"; \n\

260− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

261− color: %2; \n\

262− visible: titleLabel.visible && titleLabel.text; \n\

263− text: cardData && cardData["subtitle"] || ""; \n\

264− font.weight: Font.Light; \n\

265− }\n';

266−

267−// %1 is used as anchors of attributesRow

268−// %2 is used as color of attributesRow

269−var kAttributesRowCode = 'CardAttributes { \n\

270− id: attributesRow; \n\

271− objectName: "attributesRow"; \n\

272− anchors { %1 } \n\

273− color: %2; \n\

274− fontScale: root.fontScale; \n\

275− model: cardData && cardData["attributes"]; \n\

276− }\n';

277−

278−// %1 is used as top anchor of summary

279−// %2 is used as topMargin anchor of summary

280−// %3 is used as color of summary

281−var kSummaryLabelCode = 'Label { \n\

282− id: summary; \n\

283− objectName: "summaryLabel"; \n\

284− anchors { \n\

285− top: %1; \n\

286− left: parent.left; \n\

287− right: parent.right; \n\

288− margins: units.gu(1); \n\

289− topMargin: %2; \n\

290− } \n\

291− wrapMode: Text.Wrap; \n\

292− maximumLineCount: 5; \n\

293− elide: Text.ElideRight; \n\

294− text: cardData && cardData["summary"] || ""; \n\

295− height: text ? implicitHeight : 0; \n\

296− fontSize: "small"; \n\

297− color: %3; \n\

298− }\n';

299−

300−function cardString(template, components) {

301− var code;

302− code = 'AbstractButton { \n\

303− id: root; \n\

304− property var template; \n\

305− property var components; \n\

306− property var cardData; \n\

307− property var artShapeBorderSource: undefined; \n\

308− property real fontScale: 1.0; \n\

309− property var scopeStyle: null; \n\

310− property int titleAlignment: Text.AlignLeft; \n\

311− property int fixedHeaderHeight: -1; \n\

312− property size fixedArtShapeSize: Qt.size(-1, -1); \n\

313− readonly property string title: cardData && cardData["title"] || ""; \n\

314− property bool asynchronous: true; \n\

315− property bool showHeader: true; \n\

316− implicitWidth: childrenRect.width; \n\

317− enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true); \n\

318− \n';

319−

320− var hasArt = components["art"] && components["art"]["field"] || false;

321− var hasSummary = components["summary"] || false;

322− var artAndSummary = hasArt && hasSummary;

323− var isHorizontal = template["card-layout"] === "horizontal";

324− var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);

325− var hasTitle = components["title"] || false;

326− var hasMascot = components["mascot"] || false;

327− var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;

328− var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);

329− var hasSubtitle = hasTitle && components["subtitle"] || false;

330− var hasHeaderRow = hasMascot && hasTitle;

331− var hasAttributes = hasTitle && components["attributes"]["field"] || false;

332−

333− if (hasBackground) {

334− code += kBackgroundLoaderCode;

335− }

336−

337− if (hasArt) {

338− code += 'onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } \n';

339− code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';

340−

341− var widthCode, heightCode;

342− var artAnchors;

343− if (isHorizontal) {

344− artAnchors = 'left: parent.left';

345− if (hasMascot || hasTitle) {

346− widthCode = 'height * artShape.aspect'

347− heightCode = 'headerHeight + 2 * units.gu(1)';

348− } else {

349− // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?

350− // So we define a "random" height of the image height + 2 gu for the margins

351− widthCode = 'height * artShape.aspect'

352− heightCode = 'units.gu(7.625)';

353− }

354− } else {

355− artAnchors = 'horizontalCenter: parent.horizontalCenter;';

356− widthCode = 'root.width'

357− heightCode = 'width / artShape.aspect';

358− }

359−

360− code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode);

361− } else {

362− code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'

363− }

364−

365− if (headerAsOverlay) {

366− code += kOverlayLoaderCode;

367− }

368−

369− var headerVerticalAnchors;

370− if (headerAsOverlay) {

371− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\

372− bottomMargin: units.gu(1);\n';

373− } else {

374− if (hasArt) {

375− if (isHorizontal) {

376− headerVerticalAnchors = 'top: artShapeHolder.top; \n\

377− topMargin: units.gu(1);\n';

378− } else {

379− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\

380− topMargin: units.gu(1);\n';

381− }

382− } else {

383− headerVerticalAnchors = 'top: parent.top; \n\

384− topMargin: units.gu(1);\n';

385− }

386− }

387− var headerLeftAnchor;

388− var headerLeftAnchorHasMargin = false;

389− if (isHorizontal && hasArt) {

390− headerLeftAnchor = 'left: artShapeHolder.right; \n\

391− leftMargin: units.gu(1);\n';

392− headerLeftAnchorHasMargin = true;

393− } else {

394− headerLeftAnchor = 'left: parent.left;\n';

395− }

396−

397− var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary;

398−

399− if (hasHeaderRow) {

400− code += 'readonly property int headerHeight: row.height;\n'

401− } else if (hasMascot) {

402− code += 'readonly property int headerHeight: mascotImage.height;\n'

403− } else if (hasAttributes) {

404− if (hasTitle && hasSubtitle) {

405− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'

406− } else if (hasTitle) {

407− code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'

408− } else {

409− code += 'readonly property int headerHeight: attributesRow.height;\n'

410− }

411− } else if (hasSubtitle) {

412− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'

413− } else if (hasTitle) {

414− code += 'readonly property int headerHeight: titleLabel.height;\n'

415− } else {

416− code += 'readonly property int headerHeight: 0;\n'

417− }

418−

419− var mascotShapeCode = '';

420− var mascotCode = '';

421− if (hasMascot) {

422− var useMascotShape = !hasBackground && !headerAsOverlay;

423− var mascotAnchors = '';

424− if (!hasHeaderRow) {

425− mascotAnchors += headerLeftAnchor;

426− mascotAnchors += headerVerticalAnchors;

427− if (!headerLeftAnchorHasMargin) {

428− mascotAnchors += 'leftMargin: units.gu(1);\n'

429− }

430− } else {

431− mascotAnchors = 'verticalCenter: parent.verticalCenter;'

432− }

433−

434− if (useMascotShape) {

435− mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

436− }

437−

438− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';

439− mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

440− }

441−

442− var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';

443−

444− var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

445− var titleSubtitleCode = '';

446− if (hasTitle) {

447− var titleColor;

448− if (headerAsOverlay) {

449− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';

450− } else if (hasSummary) {

451− titleColor = 'summary.color';

452− } else if (hasBackground) {

453− titleColor = summaryColorWithBackground;

454− } else {

455− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

456− }

457−

458− var titleAnchors;

459− var subtitleAnchors;

460− var attributesAnchors;

461− var titleContainerAnchors;

462− var titleRightAnchor;

463−

464− var extraRightAnchor = '';

465− var extraLeftAnchor = '';

466− if (!touchdownOnArtShape) {

467− extraRightAnchor = 'rightMargin: units.gu(1); \n';

468− extraLeftAnchor = 'leftMargin: units.gu(1); \n';

469− } else if (headerAsOverlay && !hasEmblem) {

470− extraRightAnchor = 'rightMargin: units.gu(1); \n';

471− }

472−

473− if (hasMascot) {

474− titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';

475− } else {

476− titleContainerAnchors = 'right: parent.right; ';

477− titleContainerAnchors += headerLeftAnchor;

478− titleContainerAnchors += headerVerticalAnchors;

479− if (!headerLeftAnchorHasMargin) {

480− titleContainerAnchors += extraLeftAnchor;

481− }

482− }

483− if (hasEmblem) {

484− titleRightAnchor = 'right: emblemIcon.left; \n\

485− rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';

486− } else {

487− titleRightAnchor = 'right: parent.right; \n'

488− titleRightAnchor += extraRightAnchor;

489− }

490−

491− if (hasTitleContainer) {

492− // Using headerTitleContainer

493− titleAnchors = titleRightAnchor;

494− titleAnchors += 'left: parent.left; \n\

495− top: parent.top;';

496− subtitleAnchors = 'right: parent.right; \n\

497− left: parent.left; \n';

498− subtitleAnchors += extraRightAnchor;

499− if (hasSubtitle) {

500− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';

501− subtitleAnchors += 'top: titleLabel.bottom;\n';

502− } else {

503− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';

504− }

505− } else if (hasMascot) {

506− // Using row + titleContainer

507− titleAnchors = 'verticalCenter: parent.verticalCenter;\n';

508− } else {

509− if (headerAsOverlay) {

510− // Using anchors to the overlay

511− titleAnchors = titleRightAnchor;

512− titleAnchors += 'left: parent.left; \n\

513− leftMargin: units.gu(1); \n\

514− top: overlayLoader.top; \n\

515− topMargin: units.gu(1);\n';

516− } else {

517− // Using anchors to the mascot/parent

518− titleAnchors = titleRightAnchor;

519− titleAnchors += headerLeftAnchor;

520− titleAnchors += headerVerticalAnchors;

521− if (!headerLeftAnchorHasMargin) {

522− titleAnchors += extraLeftAnchor;

523− }

524− }

525− subtitleAnchors = 'left: titleLabel.left; \n\

526− leftMargin: titleLabel.leftMargin; \n';

527− subtitleAnchors += extraRightAnchor;

528− if (hasEmblem) {

529− // using container

530− subtitleAnchors += 'right: parent.right; \n';

531− } else {

532− subtitleAnchors += 'right: titleLabel.right; \n';

533− }

534−

535− if (hasSubtitle) {

536− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';

537− subtitleAnchors += 'top: titleLabel.bottom;\n';

538− } else {

539− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';

540− }

541− }

542−

543− // code for different elements

544− var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');

545− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra);

546− var subtitleCode;

547− var attributesCode;

548−

549− // code for the title container

550− var containerCode = [];

551− var containerHeight = 'titleLabel.height';

552− containerCode.push(titleCode);

553− if (hasSubtitle) {

554− subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);

555− containerCode.push(subtitleCode);

556− containerHeight += ' + subtitleLabel.height';

557− }

558− if (hasEmblem) {

559− containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));

560− }

561− if (hasAttributes) {

562− attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);

563− containerCode.push(attributesCode);

564− containerHeight += ' + attributesRow.height';

565− }

566−

567− if (hasTitleContainer) {

568− // use container

569− titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);

570− } else {

571− // no container

572− titleSubtitleCode = titleCode;

573− if (hasSubtitle) {

574− titleSubtitleCode += subtitleCode;

575− }

576− if (hasAttributes) {

577− titleSubtitleCode += attributesCode;

578− }

579− }

580− }

581−

582− if (hasHeaderRow) {

583− var rowCode = [mascotCode, titleSubtitleCode];

584− if (mascotShapeCode != '') {

585− rowCode.unshift(mascotShapeCode);

586− }

587− code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)

588− } else {

589− code += mascotShapeCode + mascotCode + titleSubtitleCode;

590− }

591−

592− if (hasSummary) {

593− var summaryTopAnchor;

594− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

595− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

596− else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';

597− else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';

598− else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';

599− else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';

600− else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';

601− else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';

602− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

603− else summaryTopAnchor = 'parent.top';

604−

605− var summaryColor;

606− if (hasBackground) {

607− summaryColor = summaryColorWithBackground;

608− } else {

609− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';

610− }

611−

612− var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');

613−

614− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);

615− }

616−

617− var touchdownAnchors;

618− if (hasBackground) {

619− touchdownAnchors = 'fill: backgroundLoader';

620− } else if (touchdownOnArtShape) {

621− touchdownAnchors = 'fill: artShapeHolder';

622− } else {

623− touchdownAnchors = 'fill: root'

624− }

625− code += kTouchdownCode.arg(touchdownAnchors);

626−

627− var implicitHeight = 'implicitHeight: ';

628− if (hasSummary) {

629− implicitHeight += 'summary.y + summary.height + units.gu(1);\n';

630− } else if (hasHeaderRow) {

631− implicitHeight += 'row.y + row.height + units.gu(1);\n';

632− } else if (hasMascot) {

633− implicitHeight += 'mascotImage.y + mascotImage.height;\n';

634− } else if (hasTitleContainer) {

635− implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';

636− } else if (hasAttributes) {

637− implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';

638− } else if (hasSubtitle) {

639− implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';

640− } else if (hasTitle) {

641− implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';

642− } else if (hasArt) {

643− implicitHeight += 'artShapeHolder.height;\n';

644− } else {

645− implicitHeight = '';

646− }

647−

648− // Close the AbstractButton

649− code += implicitHeight + '}\n';

650−

651− return code;

652−}

653−

654−function createCardComponent(parent, template, components) {

655− var imports = 'import QtQuick 2.2; \n\

656− import Ubuntu.Components 1.1; \n\

657− import Ubuntu.Settings.Components 0.1; \n\

658− import Ubuntu.Connectivity 1.0; \n\

659− import Dash 0.1;\n\

660− import Utils 0.1;\n';

661− var card = cardString(template, components);

662− var code = imports + 'Component {\n' + card + '}\n';

663−

664− try {

665− return Qt.createQmlObject(code, parent, "createCardComponent");

666− } catch (e) {

667− console.error("ERROR: Invalid component created.");

668− console.error("Template:");

669− console.error(JSON.stringify(template));

670− console.error("Components:");

671− console.error(JSON.stringify(components));

672− console.error("Code:");

673− console.error(code);

674− throw e;

675− }

676−}

plugins/Dash/CardCreatorCache.qmldeleted−40

@@ -1,40 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−pragma Singleton

18−import QtQuick 2.2

19−import "CardCreator.js" as CardCreator

20−

21−QtObject {

22− id: root

23−

24− property var cache: new Object();

25−

26− function getCardComponent(template, components) {

27− if (template === undefined || components === undefined)

28− return undefined;

29−

30− var tString = JSON.stringify(template);

31− var cString = JSON.stringify(components);

32− var allString = tString + cString;

33− var component = cache[allString];

34− if (component === undefined) {

35− component = CardCreator.createCardComponent(root, template, components);

36− cache[allString] = component;

37− }

38− return component;

39− }

40−}

plugins/Dash/Dash.qmltypesdeleted−99

@@ -1,99 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Dash 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AbstractDashView"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

15− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

16− Property { name: "columnSpacing"; type: "double" }

17− Property { name: "rowSpacing"; type: "double" }

18− Property { name: "displayMarginBeginning"; type: "double" }

19− Property { name: "displayMarginEnd"; type: "double" }

20− }

21− Component {

22− name: "HorizontalJournal"

23− defaultProperty: "data"

24− prototype: "AbstractDashView"

25− exports: ["Dash/HorizontalJournal 0.1"]

26− exportMetaObjectRevisions: [0]

27− Property { name: "rowHeight"; type: "double" }

28− }

29− Component {

30− name: "ListViewWithPageHeader"

31− defaultProperty: "flickableData"

32− prototype: "QQuickFlickable"

33− exports: ["Dash/ListViewWithPageHeader 0.1"]

34− exportMetaObjectRevisions: [0]

35− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

36− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

37− Property { name: "pageHeader"; type: "QQuickItem"; isPointer: true }

38− Property { name: "sectionDelegate"; type: "QQmlComponent"; isPointer: true }

39− Property { name: "sectionProperty"; type: "string" }

40− Property { name: "forceNoClip"; type: "bool" }

41− Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

42− Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

43− Property { name: "cacheBuffer"; type: "double" }

44− Signal { name: "headerChanged" }

45− Method { name: "positionAtBeginning" }

46− Method { name: "showHeader" }

47− Method { name: "firstCreatedIndex"; type: "int" }

48− Method { name: "createdItemCount"; type: "int" }

49− Method {

50− name: "item"

51− type: "QQuickItem*"

52− Parameter { name: "modelIndex"; type: "int" }

53− }

54− Method {

55− name: "maximizeVisibleArea"

56− type: "bool"

57− Parameter { name: "modelIndex"; type: "int" }

58− }

59− Method {

60− name: "maximizeVisibleArea"

61− type: "bool"

62− Parameter { name: "modelIndex"; type: "int" }

63− Parameter { name: "itemHeight"; type: "int" }

64− }

65− }

66− Component {

67− name: "OrganicGrid"

68− defaultProperty: "data"

69− prototype: "AbstractDashView"

70− exports: ["Dash/OrganicGrid 0.1"]

71− exportMetaObjectRevisions: [0]

72− Property { name: "smallDelegateSize"; type: "QSizeF" }

73− Property { name: "bigDelegateSize"; type: "QSizeF" }

74− }

75− Component {

76− name: "VerticalJournal"

77− defaultProperty: "data"

78− prototype: "AbstractDashView"

79− exports: ["Dash/VerticalJournal 0.1"]

80− exportMetaObjectRevisions: [0]

81− Property { name: "columnWidth"; type: "double" }

82− }

83− Component {

84− prototype: "QObject"

85− name: "CardCreatorCache"

86− exports: ["CardCreatorCache -1.-1"]

87− exportMetaObjectRevisions: [-1]

88− isComposite: true

89− isCreatable: false

90− isSingleton: true

91− Property { name: "cache"; type: "QVariant" }

92− Method {

93− name: "getCardComponent"

94− type: "QVariant"

95− Parameter { name: "template"; type: "QVariant" }

96− Parameter { name: "components"; type: "QVariant" }

97− }

98− }

99−}

plugins/Dash/ScopeStyle.qmldeleted−95

@@ -1,95 +0,0 @@

1−/*

2− * Copyright 2014 Canonical Ltd.

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

18−import Utils 0.1

19−import Ubuntu.Components 1.1

20−

21−/*! \brief Helper for processing scope customization options.

22−

23− It will take the customizations object passed by the scope and

24− process it to provide the scope UI with data such as colors or

25− image paths.

26− */

27−

28−QtObject {

29− /// Style object passed from the scope

30− property var style: Object()

31−

32− /// Color used for text and symbolic icons

33− readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark

34−

35− /// Luminance of the foreground color

36− readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)

37−

38− /// Color used for the overall background

39− readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"

40−

41− /// Luminance of the background color

42− readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)

43−

44− /*! \brief Get the most contrasting available color based on luminance

45− *

46− * If background color is transparent, theme provided colors are taken into account

47− */

48− function getTextColor(luminance) {

49− if (Math.abs(foregroundLuminance - luminance) >

50− Math.abs(d.opaqueBackgroundLuminance - luminance)) {

51− return foreground;

52− } else {

53− return d.opaqueBackground;

54− }

55− }

56−

57− /// Source of the logo image for the header

58− readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""

59−

60− /// Background style for the header

61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#f5f5f5"

62−

63− /// Foreground color for the header

64− readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground

65−

66− /// Color of the header divider

67− readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"

68−

69− /// Background style for the navigation

70− readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"

71−

72− /// Color of the primary preview button

73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground

74−

75− //! @cond

76− property var d: QtObject {

77− // FIXME: should be taken from the theme

78− readonly property color defaultLight: "white"

79− readonly property color defaultDark: UbuntuColors.darkGrey

80− readonly property real defaultLightLuminance: Style.luminance(defaultLight)

81− readonly property real defaultDarkLuminance: Style.luminance(defaultDark)

82−

83− readonly property color opaqueBackground: {

84− background.a > 0 ?

85− background :

86− (Math.abs(foregroundLuminance - defaultLightLuminance) >

87− Math.abs(foregroundLuminance - defaultDarkLuminance)) ?

88− defaultLight : defaultDark

89− }

90− readonly property real opaqueBackgroundLuminance: Style.luminance(opaqueBackground)

91−

92− readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }

93− }

94− //! @endcond

95−}

plugins/Dash/abstractdashview.cppdeleted−327

@@ -1,327 +0,0 @@

1−/*

2− * Copyright (C) 2013, 2014 Canonical, Ltd.

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−#include "abstractdashview.h"

18−

19−static const qreal bufferRatio = 0.5;

20−

21−AbstractDashView::AbstractDashView()

22− : m_delegateModel(nullptr)

23− , m_asyncRequestedIndex(-1)

24− , m_columnSpacing(0)

25− , m_rowSpacing(0)

26− , m_displayMarginBeginning(0)

27− , m_displayMarginEnd(0)

28− , m_needsRelayout(false)

29− , m_delegateValidated(false)

30− , m_implicitHeightDirty(false)

31−{

32− connect(this, SIGNAL(widthChanged()), this, SLOT(relayout()));

33− connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));

34−}

35−

36−QAbstractItemModel *AbstractDashView::model() const

37−{

38− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;

39−}

40−

41−void AbstractDashView::setModel(QAbstractItemModel *model)

42−{

43− if (model != this->model()) {

44− if (!m_delegateModel) {

45− createDelegateModel();

46− } else {

47− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

48− }

49− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

50− connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

51−

52− cleanupExistingItems();

53−

54− Q_EMIT modelChanged();

55− polish();

56− }

57−}

58−

59−QQmlComponent *AbstractDashView::delegate() const

60−{

61− return m_delegateModel ? m_delegateModel->delegate() : nullptr;

62−}

63−

64−void AbstractDashView::setDelegate(QQmlComponent *delegate)

65−{

66− if (delegate != this->delegate()) {

67− if (!m_delegateModel) {

68− createDelegateModel();

69− }

70−

71− cleanupExistingItems();

72−

73− m_delegateModel->setDelegate(delegate);

74−

75− Q_EMIT delegateChanged();

76− m_delegateValidated = false;

77− polish();

78− }

79−}

80−

81−qreal AbstractDashView::columnSpacing() const

82−{

83− return m_columnSpacing;

84−}

85−

86−void AbstractDashView::setColumnSpacing(qreal columnSpacing)

87−{

88− if (columnSpacing != m_columnSpacing) {

89− m_columnSpacing = columnSpacing;

90− Q_EMIT columnSpacingChanged();

91−

92− if (isComponentComplete()) {

93− relayout();

94− }

95− }

96−}

97−

98−qreal AbstractDashView::rowSpacing() const

99−{

100− return m_rowSpacing;

101−}

102−

103−void AbstractDashView::setRowSpacing(qreal rowSpacing)

104−{

105− if (rowSpacing != m_rowSpacing) {

106− m_rowSpacing = rowSpacing;

107− Q_EMIT rowSpacingChanged();

108−

109− if (isComponentComplete()) {

110− relayout();

111− }

112− }

113−}

114−

115−qreal AbstractDashView::displayMarginBeginning() const

116−{

117− return m_displayMarginBeginning;

118−}

119−

120−void AbstractDashView::setDisplayMarginBeginning(qreal begin)

121−{

122− if (m_displayMarginBeginning == begin)

123− return;

124− m_displayMarginBeginning = begin;

125− if (isComponentComplete()) {

126− polish();

127− }

128− emit displayMarginBeginningChanged();

129−}

130−

131−qreal AbstractDashView::displayMarginEnd() const

132−{

133− return m_displayMarginEnd;

134−}

135−

136−void AbstractDashView::setDisplayMarginEnd(qreal end)

137−{

138− if (m_displayMarginEnd == end)

139− return;

140− m_displayMarginEnd = end;

141− if (isComponentComplete()) {

142− polish();

143− }

144− emit displayMarginEndChanged();

145−}

146−

147−void AbstractDashView::createDelegateModel()

148−{

149− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

150− connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

151− if (isComponentComplete())

152− m_delegateModel->componentComplete();

153−}

154−

155−void AbstractDashView::refill()

156−{

157− if (!isComponentComplete() || height() < 0) {

158− return;

159− }

160−

161− const qreal from = -m_displayMarginBeginning;

162− const qreal to = height() + m_displayMarginEnd;

163− const qreal buffer = (to - from) * bufferRatio;

164− const qreal bufferFrom = from - buffer;

165− const qreal bufferTo = to + buffer;

166−

167− bool added = addVisibleItems(from, to, false);

168− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

169− added |= addVisibleItems(bufferFrom, bufferTo, true);

170−

171− if (added || removed) {

172− m_implicitHeightDirty = true;

173− polish();

174− }

175−}

176−

177−bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)

178−{

179− if (fillToY <= fillFromY)

180− return false;

181−

182− if (!delegate())

183− return false;

184−

185− if (m_delegateModel->count() == 0)

186− return false;

187−

188− int modelIndex;

189− qreal yPos;

190− findBottomModelIndexToAdd(&modelIndex, &yPos);

191− bool changed = false;

192− while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {

193− if (!createItem(modelIndex, asynchronous))

194− break;

195−

196− changed = true;

197− findBottomModelIndexToAdd(&modelIndex, &yPos);

198− }

199−

200− findTopModelIndexToAdd(&modelIndex, &yPos);

201− while (modelIndex >= 0 && yPos > fillFromY) {

202− if (!createItem(modelIndex, asynchronous))

203− break;

204−

205− changed = true;

206− findTopModelIndexToAdd(&modelIndex, &yPos);

207− }

208−

209− return changed;

210−}

211−

212−QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

213−{

214− if (asynchronous && m_asyncRequestedIndex != -1)

215− return nullptr;

216−

217− m_asyncRequestedIndex = -1;

218− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

219− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

220− if (!item) {

221− if (object) {

222− m_delegateModel->release(object);

223− if (!m_delegateValidated) {

224− m_delegateValidated = true;

225− QObject* delegateObj = delegate();

226− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";

227− }

228− } else {

229− m_asyncRequestedIndex = modelIndex;

230− }

231− return nullptr;

232− } else {

233− addItemToView(modelIndex, item);

234− return item;

235− }

236−}

237−

238−void AbstractDashView::releaseItem(QQuickItem *item)

239−{

240− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

241− if (flags & QQmlDelegateModel::Destroyed) {

242− item->setParentItem(nullptr);

243− }

244−}

245−

246−void AbstractDashView::setImplicitHeightDirty()

247−{

248− m_implicitHeightDirty = true;

249−}

250−

251−void AbstractDashView::itemCreated(int modelIndex, QObject *object)

252−{

253− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

254− if (!item) {

255− qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

256− return;

257− }

258− item->setParentItem(this);

259−

260− // We only need to call createItem if we are here because of an asynchronous generation

261− // otherwise we are in this slot because createItem is creating the item sync

262− // and thus we don't need to call createItem again, nor need to set m_implicitHeightDirty

263− // and call polish because the sync createItem was called from addVisibleItems that

264− // is called from refill that will already do those if an item was added

265− if (modelIndex == m_asyncRequestedIndex) {

266− createItem(modelIndex, false);

267− m_implicitHeightDirty = true;

268− polish();

269− }

270−}

271−

272−void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

273−{

274− if (reset) {

275− cleanupExistingItems();

276− } else {

277− processModelRemoves(changeSet.removes());

278− }

279− polish();

280−}

281−

282−

283−void AbstractDashView::relayout()

284−{

285− m_needsRelayout = true;

286− polish();

287−}

288−

289−void AbstractDashView::onHeightChanged()

290−{

291− polish();

292−}

293−

294−void AbstractDashView::updatePolish()

295−{

296− if (!model())

297− return;

298−

299− if (m_needsRelayout) {

300− doRelayout();

301− m_needsRelayout = false;

302− m_implicitHeightDirty = true;

303− }

304−

305− refill();

306−

307− const qreal from = -m_displayMarginBeginning;

308− const qreal to = height() + m_displayMarginEnd;

309− updateItemCulling(from, to);

310−

311− if (m_implicitHeightDirty) {

312− calculateImplicitHeight();

313− m_implicitHeightDirty = false;

314− }

315−}

316−

317−void AbstractDashView::componentComplete()

318−{

319− if (m_delegateModel)

320− m_delegateModel->componentComplete();

321−

322− QQuickItem::componentComplete();

323−

324− m_needsRelayout = true;

325−

326− polish();

327−}

plugins/Dash/abstractdashview.hdeleted−123

@@ -1,123 +0,0 @@

1−/*

2− * Copyright (C) 2013, 2014 Canonical, Ltd.

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−#ifndef ABSTRACTDASHVIEW_H

18−#define ABSTRACTDASHVIEW_H

19−

20−#include <QQuickItem>

21−

22−class QAbstractItemModel;

23−class QQmlComponent;

24−#pragma GCC diagnostic push

25−#pragma GCC diagnostic ignored "-pedantic"

26−#include <private/qqmldelegatemodel_p.h>

27−#include <qqmlinfo.h>

28−#pragma GCC diagnostic pop

29−

30−class AbstractDashView : public QQuickItem

31−{

32− Q_OBJECT

33−

34− Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)

35− Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

36− Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)

37− Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)

38− Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

39− WRITE setDisplayMarginBeginning

40− NOTIFY displayMarginBeginningChanged)

41− Q_PROPERTY(qreal displayMarginEnd READ displayMarginEnd

42− WRITE setDisplayMarginEnd

43− NOTIFY displayMarginEndChanged)

44−

45−friend class VerticalJournalTest;

46−friend class HorizontalJournalTest;

47−friend class OrganicGridTest;

48−

49−public:

50− AbstractDashView();

51−

52− QAbstractItemModel *model() const;

53− void setModel(QAbstractItemModel *model);

54−

55− QQmlComponent *delegate() const;

56− void setDelegate(QQmlComponent *delegate);

57−

58− qreal columnSpacing() const;

59− void setColumnSpacing(qreal columnSpacing);

60−

61− qreal rowSpacing() const;

62− void setRowSpacing(qreal rowSpacing);

63−

64− qreal displayMarginBeginning() const;

65− void setDisplayMarginBeginning(qreal);

66−

67− qreal displayMarginEnd() const;

68− void setDisplayMarginEnd(qreal);

69−

70−Q_SIGNALS:

71− void modelChanged();

72− void delegateChanged();

73− void columnSpacingChanged();

74− void rowSpacingChanged();

75− void displayMarginBeginningChanged();

76− void displayMarginEndChanged();

77−

78−protected Q_SLOTS:

79− void relayout();

80−

81−protected:

82− void updatePolish() override;

83− void componentComplete() override;

84−

85− void releaseItem(QQuickItem *item);

86− void setImplicitHeightDirty();

87−

88−private Q_SLOTS:

89− void itemCreated(int modelIndex, QObject *object);

90− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

91− void onHeightChanged();

92−

93−private:

94− void createDelegateModel();

95− void refill();

96− bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);

97− QQuickItem *createItem(int modelIndex, bool asynchronous);

98−

99− virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

100− virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

101− virtual void addItemToView(int modelIndex, QQuickItem *item) = 0;

102− virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;

103− virtual void cleanupExistingItems() = 0;

104− virtual void doRelayout() = 0;

105− virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

106− virtual void calculateImplicitHeight() = 0;

107− virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

108−

109− QQmlDelegateModel *m_delegateModel;

110−

111− // Index we are waiting because we requested it asynchronously

112− int m_asyncRequestedIndex;

113−

114− int m_columnSpacing;

115− int m_rowSpacing;

116− qreal m_displayMarginBeginning;

117− qreal m_displayMarginEnd;

118− bool m_needsRelayout;

119− bool m_delegateValidated;

120− bool m_implicitHeightDirty;

121−};

122−

123−#endif

plugins/Dash/horizontaljournal.cppdeleted−242

@@ -1,242 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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− * The implementation is centered around m_visibleItems

19− * that a list for each of the items in the view.

20− * m_firstVisibleIndex is the index of the first item in m_visibleItems

21− * m_lastInRowIndexPosition is a map that contains the x position

22− * of items that are the last ones of a row so we can reconstruct the rows

23− * when building back

24− */

25−

26−#include "horizontaljournal.h"

27−

28−#include <qqmlengine.h>

29−#pragma GCC diagnostic push

30−#pragma GCC diagnostic ignored "-pedantic"

31−#include <private/qqmldelegatemodel_p.h>

32−#include <qqmlinfo.h>

33−#include <private/qquickitem_p.h>

34−#pragma GCC diagnostic pop

35−

36−static const qreal bufferRatio = 0.5;

37−

38−HorizontalJournal::HorizontalJournal()

39− : m_firstVisibleIndex(-1)

40− , m_rowHeight(0)

41−{

42−}

43−

44−qreal HorizontalJournal::rowHeight() const

45−{

46− return m_rowHeight;

47−}

48−

49−void HorizontalJournal::setRowHeight(qreal rowHeight)

50−{

51− if (rowHeight != m_rowHeight) {

52− m_rowHeight = rowHeight;

53− Q_EMIT rowHeightChanged();

54−

55− if (isComponentComplete()) {

56− Q_FOREACH(QQuickItem *item, m_visibleItems) {

57− item->setHeight(rowHeight);

58− }

59− relayout();

60− }

61− }

62−}

63−

64−void HorizontalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

65−{

66− if (m_visibleItems.isEmpty()) {

67− *modelIndex = 0;

68− *yPos = 0;

69− } else {

70− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();

71− if (m_lastInRowIndexPosition.contains(*modelIndex - 1)) {

72− *yPos = m_visibleItems.last()->y() + m_rowHeight + rowSpacing();

73− } else {

74− *yPos = m_visibleItems.last()->y();

75− }

76− }

77−}

78−

79−void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

80−{

81− if (m_visibleItems.isEmpty()) {

82− *modelIndex = -1;

83− *yPos = INT_MIN;

84− } else {

85− *modelIndex = m_firstVisibleIndex - 1;

86− if (m_lastInRowIndexPosition.contains(*modelIndex)) {

87− *yPos = m_visibleItems.first()->y() - rowSpacing() - m_rowHeight;

88− } else {

89− *yPos = m_visibleItems.first()->y();

90− }

91− }

92−}

93−

94−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

95−{

96− bool changed = false;

97−

98− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {

99− releaseItem(m_visibleItems.takeFirst());

100− changed = true;

101− m_firstVisibleIndex++;

102− }

103−

104− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {

105− releaseItem(m_visibleItems.takeLast());

106− changed = true;

107− m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());

108− }

109−

110− if (m_visibleItems.isEmpty()) {

111− m_firstVisibleIndex = -1;

112− }

113−

114− return changed;

115−}

116−

117−void HorizontalJournal::addItemToView(int modelIndex, QQuickItem *item)

118−{

119− if (item->height() != m_rowHeight) {

120− qWarning() << "Item" << modelIndex << "height is not the one that the rowHeight mandates, resetting it";

121− item->setHeight(m_rowHeight);

122− }

123−

124− if (m_visibleItems.isEmpty()) {

125− Q_ASSERT(modelIndex == 0);

126− item->setY(0);

127− item->setX(0);

128− m_visibleItems << item;

129− m_firstVisibleIndex = 0;

130− } else {

131− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count()

132− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {

133− QQuickItem *lastItem = m_visibleItems.last();

134− if (lastItem->x() + lastItem->width() + columnSpacing() + item->width() <= width()) {

135− // Fits in the row

136− item->setY(lastItem->y());

137− item->setX(lastItem->x() + lastItem->width() + columnSpacing());

138− } else {

139− // Starts a new row

140− item->setY(lastItem->y() + m_rowHeight + rowSpacing());

141− item->setX(0);

142− m_lastInRowIndexPosition[modelIndex - 1] = lastItem->x();

143− }

144− m_visibleItems << item;

145− } else if (modelIndex == m_firstVisibleIndex - 1) {

146− QQuickItem *firstItem = m_visibleItems.first();

147− if (m_lastInRowIndexPosition.contains(modelIndex)) {

148− // It is the last item of its row, so start a new one since we're going back

149− item->setY(firstItem->y() - rowSpacing() - m_rowHeight);

150− item->setX(m_lastInRowIndexPosition[modelIndex]);

151− } else {

152− item->setY(firstItem->y());

153− item->setX(firstItem->x() - columnSpacing() - item->width());

154− }

155− m_firstVisibleIndex = modelIndex;

156− m_visibleItems.prepend(item);

157− } else {

158− qWarning() << "HorizontalJournal::addItemToView - Got unexpected modelIndex"

159− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

160− }

161− }

162−}

163−

164−void HorizontalJournal::cleanupExistingItems()

165−{

166− // Cleanup the existing items

167− Q_FOREACH(QQuickItem *item, m_visibleItems)

168− releaseItem(item);

169− m_visibleItems.clear();

170− m_lastInRowIndexPosition.clear();

171− m_firstVisibleIndex = -1;

172− setImplicitHeightDirty();

173−}

174−

175−void HorizontalJournal::calculateImplicitHeight()

176−{

177− if (m_firstVisibleIndex >= 0) {

178− const int nIndexes = m_firstVisibleIndex + m_visibleItems.count();

179− const double bottomMostY = m_visibleItems.last()->y() + m_rowHeight;

180− const double averageHeight = bottomMostY / nIndexes;

181− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - nIndexes));

182− } else {

183− setImplicitHeight(0);

184− }

185−}

186−

187−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

188−{

189− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

190− for (int i = remove.count - 1; i >= 0; --i) {

191− const int indexToRemove = remove.index + i;

192− // We only support removing from the end so

193− // any of the last items of a column has to be indexToRemove

194− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

195− if (indexToRemove == lastIndex) {

196− releaseItem(m_visibleItems.takeLast());

197− m_lastInRowIndexPosition.remove(indexToRemove);

198− } else {

199− if (indexToRemove < lastIndex) {

200− qFatal("HorizontalJournal only supports removal from the end of the model");

201− } else {

202− setImplicitHeightDirty();

203− }

204− }

205− }

206− }

207− if (m_visibleItems.isEmpty()) {

208− m_firstVisibleIndex = -1;

209− }

210−}

211−

212−

213−void HorizontalJournal::doRelayout()

214−{

215− // If m_firstVisibleIndex is not 0 we need to drop all the delegates

216− // since we can't consistently relayout without the first item being there

217−

218− if (m_firstVisibleIndex == 0) {

219− int i = 0;

220− const QList<QQuickItem*> allItems = m_visibleItems;

221− m_visibleItems.clear();

222− m_lastInRowIndexPosition.clear();

223− Q_FOREACH(QQuickItem *item, allItems) {

224− addItemToView(i, item);

225− ++i;

226− }

227− } else {

228− Q_FOREACH(QQuickItem *item, m_visibleItems) {

229− releaseItem(item);

230− }

231− m_visibleItems.clear();

232− m_lastInRowIndexPosition.clear();

233− m_firstVisibleIndex = -1;

234− }

235−}

236−

237−void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

238−{

239− Q_FOREACH(QQuickItem *item, m_visibleItems) {

240− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);

241− }

242−}

plugins/Dash/horizontaljournal.hdeleted−63

@@ -1,63 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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−#ifndef HORIZONTALJOURNAL_H

18−#define HORIZONTALJOURNAL_H

19−

20−#include "abstractdashview.h"

21−

22− /** A horizontal journal is a view that creates delegates

23− * based on a model and layouts them one after the other

24− * in the same row until there is no more free space for the next item

25− * and so that item is layouted in the next row

26− *

27− * All delegates are forced to rowHeight if they don't have it.

28− */

29− class HorizontalJournal : public AbstractDashView

30−{

31− Q_OBJECT

32−

33− Q_PROPERTY(qreal rowHeight READ rowHeight WRITE setRowHeight NOTIFY rowHeightChanged)

34−

35−friend class HorizontalJournalTest;

36−

37−public:

38− HorizontalJournal();

39−

40− qreal rowHeight() const;

41− void setRowHeight(qreal rowHeight);

42−

43−Q_SIGNALS:

44− void rowHeightChanged();

45−

46−private:

47− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

48− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

49− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

50− void addItemToView(int modelIndex, QQuickItem *item) override;

51− void cleanupExistingItems() override;

52− void calculateImplicitHeight() override;

53− void doRelayout() override;

54− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

56−

57− int m_firstVisibleIndex;

58− QList<QQuickItem*> m_visibleItems;

59− QMap<int, double> m_lastInRowIndexPosition;

60− int m_rowHeight;

61−};

62−

63−#endif

plugins/Dash/listviewwithpageheader.cppdeleted−1337

@@ -1,1337 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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− * Some documentation on how this thing works:

19− *

20− * A flickable has two very important concepts that define the top and

21− * height of the flickable area.

22− * The top is returned in minYExtent()

23− * The height is set using setContentHeight()

24− * By changing those two values we can make the list grow up or down

25− * as needed. e.g. if we are in the middle of the list

26− * and something that is above the viewport grows, since we do not

27− * want to change the viewport because of that we just adjust the

28− * minYExtent so that the list grows up.

29− *

30− * The implementation on the list relies on the delegateModel doing

31− * most of the instantiation work. You call createItem() when you

32− * need to create an item asking for it async or not. If returns null

33− * it means the item will be created async and the model will call the

34− * itemCreated slot with the item.

35− *

36− * updatePolish is the central point of dispatch for the work of the

37− * class. It is called by the scene graph just before drawing the class.

38− * In it we:

39− * * Make sure all items are positioned correctly

40− * * Add/Remove items if needed

41− * * Update the content height if it was dirty

42− *

43− * m_visibleItems contains all the items we have created at the moment.

44− * Actually not all of them are visible since it includes the ones

45− * in the cache area we create asynchronously to help performance.

46− * The first item in m_visibleItems has the m_firstVisibleIndex in

47− * the model. If you actually want to know what is the first

48− * item in the viewport you have to find the first non culled element

49− * in m_visibleItems

50− *

51− * All the items (except the header) are childs of m_clipItem which

52− * is a child of the contentItem() of the flickable (The contentItem()

53− * is what actually 'moves' in a a flickable). This way

54− * we can implement the clipping needed so we can have the header

55− * shown in the middle of the list over the items without the items

56− * leaking under the header in case it is transparent.

57− *

58− * The first item of m_visibleItems is the one that defines the

59− * positions of all the rest of items (see updatePolish()) and

60− * this is why sometimes we move it even if it's not the item

61− * that has triggered the function (i.e. in itemGeometryChanged())

62− *

63− * m_visibleItems is a list of ListItem. Each ListItem

64− * will contain a item and potentially a sectionItem. The sectionItem

65− * is only there when the list is using sectionDelegate+sectionProperty

66− * and this is the first item of the section. Each ListItem is vertically

67− * layouted with the sectionItem first and then the item.

68− *

69− * For sectioning we also have a section item alone (m_topSectionItem)

70− * that is used for the cases we need to show the sticky section item at

71− * the top of the view.

72− *

73− * Each delegate item has a context property called heightToClip that is

74− * used to communicate to the delegate implementation in case it has to

75− * clip itself because of overlapping with the top sticky section item.

76− * This is an implementation decision since it has been agreed it

77− * is easier to implement the clipping in QML with this info than to

78− * do it at the C++ level.

79− *

80− * Note that minYExtent and height are not always totally accurate, since

81− * we don't have the items created we can't guess their heights

82− * so we can only guarantee the values are correct when the first/last

83− * items of the list are visible, otherwise we just live with good enough

84− * values that make the list scrollable

85− *

86− * There are a few things that are not really implemented or tested properly

87− * which we don't use at the moment like changing the model, changing

88− * the section delegate, having a section delegate that changes its size, etc.

89− * The known missing features are marked with TODOs along the code.

90− */

91−

92−#include "listviewwithpageheader.h"

93−

94−#include <QCoreApplication>

95−#include <QDebug>

96−#include <qqmlinfo.h>

97−#include <qqmlengine.h>

98−#pragma GCC diagnostic push

99−#pragma GCC diagnostic ignored "-pedantic"

100−#include <private/qqmldelegatemodel_p.h>

101−#include <private/qqmlglobal_p.h>

102−#include <private/qquickitem_p.h>

103−#include <private/qquickanimation_p.h>

104−#pragma GCC diagnostic pop

105−// #include <private/qquickrectangle_p.h>

106−

107−qreal ListViewWithPageHeader::ListItem::height() const

108−{

109− return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);

110−}

111−

112−qreal ListViewWithPageHeader::ListItem::y() const

113−{

114− return m_item->y() - (m_sectionItem ? m_sectionItem->height() : 0);

115−}

116−

117−void ListViewWithPageHeader::ListItem::setY(qreal newY)

118−{

119− if (m_sectionItem) {

120− m_sectionItem->setY(newY);

121− m_item->setY(newY + m_sectionItem->height());

122− } else {

123− m_item->setY(newY);

124− }

125−}

126−

127−bool ListViewWithPageHeader::ListItem::culled() const

128−{

129− return QQuickItemPrivate::get(m_item)->culled;

130−}

131−

132−void ListViewWithPageHeader::ListItem::setCulled(bool culled)

133−{

134− QQuickItemPrivate::get(m_item)->setCulled(culled);

135− if (m_sectionItem)

136− QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);

137−}

138−

139−void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)

140−{

141− m_sectionItem = sectionItem;

142−}

143−

144−ListViewWithPageHeader::ListViewWithPageHeader()

145− : m_delegateModel(nullptr)

146− , m_asyncRequestedIndex(-1)

147− , m_delegateValidated(false)

148− , m_firstVisibleIndex(-1)

149− , m_minYExtent(0)

150− , m_contentHeightDirty(false)

151− , m_headerItem(nullptr)

152− , m_previousContentY(0)

153− , m_headerItemShownHeight(0)

154− , m_sectionDelegate(nullptr)

155− , m_topSectionItem(nullptr)

156− , m_forceNoClip(false)

157− , m_inLayout(false)

158− , m_inContentHeightKeepHeaderShown(false)

159− , m_cacheBuffer(0)

160−{

161− m_clipItem = new QQuickItem(contentItem());

162−// m_clipItem = new QQuickRectangle(contentItem());

163−// ((QQuickRectangle*)m_clipItem)->setColor(Qt::gray);

164−

165− m_contentYAnimation = new QQuickNumberAnimation(this);

166− m_contentYAnimation->setEasing(QEasingCurve::OutQuad);

167− m_contentYAnimation->setProperty("contentY");

168− m_contentYAnimation->setDuration(200);

169− m_contentYAnimation->setTargetObject(this);

170−

171− connect(this, SIGNAL(contentWidthChanged()), this, SLOT(onContentWidthChanged()));

172− connect(this, SIGNAL(contentHeightChanged()), this, SLOT(onContentHeightChanged()));

173− connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));

174− connect(m_contentYAnimation, SIGNAL(runningChanged(bool)), this, SLOT(contentYAnimationRunningChanged(bool)));

175−

176− setFlickableDirection(VerticalFlick);

177−}

178−

179−ListViewWithPageHeader::~ListViewWithPageHeader()

180−{

181−}

182−

183−QAbstractItemModel *ListViewWithPageHeader::model() const

184−{

185− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;

186−}

187−

188−void ListViewWithPageHeader::setModel(QAbstractItemModel *model)

189−{

190− if (model != this->model()) {

191− if (!m_delegateModel) {

192− createDelegateModel();

193− } else {

194− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

195− }

196− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

197− connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

198− Q_EMIT modelChanged();

199− polish();

200− // TODO?

201−// Q_EMIT contentHeightChanged();

202−// Q_EMIT contentYChanged();

203− }

204−}

205−

206−QQmlComponent *ListViewWithPageHeader::delegate() const

207−{

208− return m_delegateModel ? m_delegateModel->delegate() : nullptr;

209−}

210−

211−void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)

212−{

213− if (delegate != this->delegate()) {

214− if (!m_delegateModel) {

215− createDelegateModel();

216− }

217−

218− // Cleanup the existing items

219− Q_FOREACH(ListItem *item, m_visibleItems)

220− releaseItem(item);

221− m_visibleItems.clear();

222− m_firstVisibleIndex = -1;

223− adjustMinYExtent();

224− setContentY(0);

225− m_clipItem->setY(0);

226− if (m_topSectionItem) {

227− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

228− }

229−

230− m_delegateModel->setDelegate(delegate);

231−

232− Q_EMIT delegateChanged();

233− m_delegateValidated = false;

234− m_contentHeightDirty = true;

235− polish();

236− }

237−}

238−

239−QQuickItem *ListViewWithPageHeader::header() const

240−{

241− return m_headerItem;

242−}

243−

244−void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)

245−{

246− if (m_headerItem != headerItem) {

247− qreal oldHeaderHeight = 0;

248− qreal oldHeaderY = 0;

249− if (m_headerItem) {

250− oldHeaderHeight = m_headerItem->height();

251− oldHeaderY = m_headerItem->y();

252− m_headerItem->setParentItem(nullptr);

253− }

254− m_headerItem = headerItem;

255− if (m_headerItem) {

256− m_headerItem->setParentItem(contentItem());

257− m_headerItem->setZ(1);

258− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();

259− QQuickItemPrivate::get(m_headerItem)->addItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);

260− }

261− qreal newHeaderHeight = m_headerItem ? m_headerItem->height() : 0;

262− if (!m_visibleItems.isEmpty() && newHeaderHeight != oldHeaderHeight) {

263− headerHeightChanged(newHeaderHeight, oldHeaderHeight, oldHeaderY);

264− polish();

265− m_contentHeightDirty = true;

266− }

267− Q_EMIT headerChanged();

268− }

269−}

270−

271−QQmlComponent *ListViewWithPageHeader::sectionDelegate() const

272−{

273− return m_sectionDelegate;

274−}

275−

276−void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

277−{

278− if (delegate != m_sectionDelegate) {

279− // TODO clean existing sections

280−

281− m_sectionDelegate = delegate;

282−

283− m_topSectionItem = getSectionItem(QString());

284− m_topSectionItem->setZ(3);

285− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

286− connect(m_topSectionItem, SIGNAL(heightChanged()), SIGNAL(stickyHeaderHeightChanged()));

287−

288− // TODO create sections for existing items

289−

290− Q_EMIT sectionDelegateChanged();

291− Q_EMIT stickyHeaderHeightChanged();

292− }

293−}

294−

295−QString ListViewWithPageHeader::sectionProperty() const

296−{

297− return m_sectionProperty;

298−}

299−

300−void ListViewWithPageHeader::setSectionProperty(const QString &property)

301−{

302− if (property != m_sectionProperty) {

303− m_sectionProperty = property;

304−

305− updateWatchedRoles();

306−

307− // TODO recreate sections

308−

309− Q_EMIT sectionPropertyChanged();

310− }

311−}

312−

313−bool ListViewWithPageHeader::forceNoClip() const

314−{

315− return m_forceNoClip;

316−}

317−

318−void ListViewWithPageHeader::setForceNoClip(bool noClip)

319−{

320− if (noClip != m_forceNoClip) {

321− m_forceNoClip = noClip;

322− updateClipItem();

323− Q_EMIT forceNoClipChanged();

324− }

325−}

326−

327−int ListViewWithPageHeader::stickyHeaderHeight() const

328−{

329− return m_topSectionItem ? m_topSectionItem->height() : 0;

330−}

331−

332−qreal ListViewWithPageHeader::headerItemShownHeight() const

333−{

334− return m_headerItemShownHeight;

335−}

336−

337−qreal ListViewWithPageHeader::cacheBuffer() const

338−{

339− return m_cacheBuffer;

340−}

341−

342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)

343−{

344− if (cacheBuffer != m_cacheBuffer) {

345− m_cacheBuffer = cacheBuffer;

346− Q_EMIT cacheBufferChanged();

347− polish();

348− }

349−}

350−

351−void ListViewWithPageHeader::positionAtBeginning()

352−{

353− if (m_delegateModel->count() <= 0)

354− return;

355−

356− qreal headerHeight = (m_headerItem ? m_headerItem->height() : 0);

357− if (m_firstVisibleIndex != 0) {

358− // TODO This could be optimized by trying to reuse the interesection

359− // of items that may end up intersecting between the existing

360− // m_visibleItems and the items we are creating in the next loop

361− Q_FOREACH(ListItem *item, m_visibleItems)

362− releaseItem(item);

363− m_visibleItems.clear();

364− m_firstVisibleIndex = -1;

365−

366− // Create the item 0, it will be already correctly positioned at createItem()

367− m_clipItem->setY(0);

368− ListItem *item = createItem(0, false);

369− // Create the subsequent items

370− int modelIndex = 1;

371− qreal pos = item->y() + item->height();

372− const qreal bufferTo = height() + m_cacheBuffer;

373− while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {

374− if (!(item = createItem(modelIndex, false)))

375− break;

376− pos += item->height();

377− ++modelIndex;

378− }

379−

380− m_previousContentY = m_visibleItems.first()->y() - headerHeight;

381− }

382− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);

383− if (m_headerItem) {

384− // TODO This should not be needed and the code that adjust the m_headerItem position

385− // in viewportMoved() should be enough but in some cases we have not found a way to reproduce

386− // yet the code of viewportMoved() fails so here we make sure that at least if we are calling

387− // positionAtBeginning the header item will be correctly positioned

388− m_headerItem->setY(-m_minYExtent);

389− }

390−}

391−

392−static inline bool uFuzzyCompare(qreal r1, qreal r2)

393−{

394− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));

395−}

396−

397−void ListViewWithPageHeader::showHeader()

398−{

399− if (!m_headerItem)

400− return;

401−

402− const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);

403− if (!uFuzzyCompare(to, contentY())) {

404− const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();

405− if (headerShownByItsOwn && m_headerItemShownHeight == 0) {

406− // We are not clipping since we are just at the top of the viewport

407− // but because of the showHeader animation we will need to, so

408− // enable the clipping without logically moving the items

409− m_headerItemShownHeight = m_headerItem->y() + m_headerItem->height() - contentY();

410− if (!m_visibleItems.isEmpty()) {

411− updateClipItem();

412− ListItem *firstItem = m_visibleItems.first();

413− firstItem->setY(firstItem->y() - m_headerItemShownHeight);

414− layout();

415− }

416− Q_EMIT headerItemShownHeightChanged();

417− }

418− m_contentYAnimation->setTo(to);

419− contentYAnimationType = ContentYAnimationShowHeader;

420− m_contentYAnimation->start();

421− }

422−}

423−

424−int ListViewWithPageHeader::firstCreatedIndex() const

425−{

426− return m_firstVisibleIndex;

427−}

428−

429−int ListViewWithPageHeader::createdItemCount() const

430−{

431− return m_visibleItems.count();

432−}

433−

434−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const

435−{

436− ListItem *item = itemAtIndex(modelIndex);

437− if (item)

438− return item->m_item;

439− else

440− return nullptr;

441−}

442−

443−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

444−{

445− ListItem *listItem = itemAtIndex(modelIndex);

446− if (listItem) {

447− return maximizeVisibleArea(listItem, listItem->height());

448− }

449−

450− return false;

451−}

452−

453−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)

454−{

455− if (itemHeight < 0)

456− return false;

457−

458− ListItem *listItem = itemAtIndex(modelIndex);

459− if (listItem) {

460− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));

461− }

462−

463− return false;

464−}

465−

466−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)

467−{

468− if (listItem) {

469− layout();

470− const auto listItemY = m_clipItem->y() + listItem->y();

471− if (listItemY > contentY() && listItemY + listItemHeight > contentY() + height()) {

472− // we can scroll the list up to show more stuff

473− const auto to = qMin(listItemY, listItemY + listItemHeight - height());

474− m_contentYAnimation->setTo(to);

475− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

476− m_contentYAnimation->start();

477− } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||

478− (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))

479− {

480− // we can scroll the list down to show more stuff

481− auto realVisibleListItemY = listItemY;

482− if (m_topSectionItem) {

483− // If we are showing the top section sticky item and this item doesn't have a section

484− // item we have to make sure to scroll it a bit more so that it is not underlapping

485− // the top section sticky item

486− bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;

487− if (topSectionShown && !listItem->sectionItem()) {

488− realVisibleListItemY -= m_topSectionItem->height();

489− }

490− }

491− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());

492− m_contentYAnimation->setTo(to);

493− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

494− m_contentYAnimation->start();

495− }

496− return true;

497− }

498− return false;

499−}

500−

501−qreal ListViewWithPageHeader::minYExtent() const

502−{

503−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;

504− return m_minYExtent;

505−}

506−

507−void ListViewWithPageHeader::componentComplete()

508−{

509− if (m_delegateModel)

510− m_delegateModel->componentComplete();

511−

512− QQuickFlickable::componentComplete();

513−

514− polish();

515−}

516−

517−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

518−{

519− // Check we are not being taken down and don't paint anything

520− // TODO Check if we still need this in 5.2

521− // For reproduction just inifnite loop testDash or testDashContent

522− if (!QQmlEngine::contextForObject(this)->parentContext())

523− return;

524−

525− QQuickFlickable::viewportMoved(orient);

526−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();

527− const qreal diff = m_previousContentY - contentY();

528− adjustHeader(diff);

529− m_previousContentY = contentY();

530− layout();

531− polish();

532−}

533−

534−void ListViewWithPageHeader::adjustHeader(qreal diff)

535−{

536− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

537− if (m_headerItem) {

538− const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

539− if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {

540− m_headerItem->setHeight(m_headerItem->implicitHeight());

541− // We are going down (but it's not because of the rebound at the end)

542− // (but the header was not shown by it's own position)

543− // or the header is partially shown and we are not doing a maximizeVisibleArea either

544− const bool scrolledUp = m_previousContentY > contentY();

545− const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());

546− const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();

547− const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

548−

549− if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {

550− m_headerItemShownHeight = 0;

551− m_headerItem->setY(-m_minYExtent);

552− } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

553− if (maximizeVisibleAreaRunning && diff > 0) {

554− // If we are maximizing and the header was shown, make sure we hide it

555− m_headerItemShownHeight -= diff;

556− } else {

557− m_headerItemShownHeight += diff;

558− }

559− if (uFuzzyCompare(contentY(), -m_minYExtent)) {

560− m_headerItemShownHeight = 0;

561− } else {

562− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

563− }

564− if (m_headerItemShownHeight > 0) {

565− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {

566− m_headerItem->setY(contentY());

567− m_headerItemShownHeight = m_headerItem->height();

568− } else {

569− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

570− }

571− } else {

572− m_headerItem->setY(-m_minYExtent);

573− }

574− }

575− Q_EMIT headerItemShownHeightChanged();

576− } else {

577− // Stick the header item to the top when dragging down

578− m_headerItem->setY(contentY());

579− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

580− }

581− // We will be changing the clip item, need to accomadate for it

582− // otherwise we move the firstItem down/up twice (unless the

583− // show header animation is running, where we want to keep the viewport stable)

584− if (!showHeaderAnimationRunning) {

585− diff += oldHeaderItemShownHeight - m_headerItemShownHeight;

586− } else {

587− diff = -diff;

588− }

589− }

590− if (!m_visibleItems.isEmpty()) {

591− updateClipItem();

592− ListItem *firstItem = m_visibleItems.first();

593− firstItem->setY(firstItem->y() + diff);

594− if (showHeaderAnimationRunning) {

595− adjustMinYExtent();

596− }

597− }

598−}

599−

600−void ListViewWithPageHeader::createDelegateModel()

601−{

602− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

603− connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

604− if (isComponentComplete())

605− m_delegateModel->componentComplete();

606− updateWatchedRoles();

607−}

608−

609−void ListViewWithPageHeader::refill()

610−{

611− if (m_inLayout) {

612− return;

613− }

614− if (!isComponentComplete()) {

615− return;

616− }

617−

618− const qreal from = contentY();

619− const qreal to = from + height();

620− const qreal bufferFrom = from - m_cacheBuffer;

621− const qreal bufferTo = to + m_cacheBuffer;

622−

623− bool added = addVisibleItems(from, to, false);

624− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

625− added |= addVisibleItems(bufferFrom, bufferTo, true);

626−

627− if (added || removed) {

628− m_contentHeightDirty = true;

629− }

630−}

631−

632−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

633−{

634− if (!delegate())

635− return false;

636−

637− if (m_delegateModel->count() == 0)

638− return false;

639−

640− ListItem *item;

641−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;

642−

643− int modelIndex = 0;

644− qreal pos = 0;

645− if (!m_visibleItems.isEmpty()) {

646− modelIndex = m_firstVisibleIndex + m_visibleItems.count();

647− item = m_visibleItems.last();

648− pos = item->y() + item->height() + m_clipItem->y();

649− }

650− bool changed = false;

651−// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;

652− while (modelIndex < m_delegateModel->count() && pos <= fillTo) {

653−// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;

654− if (!(item = createItem(modelIndex, asynchronous)))

655− break;

656− pos += item->height();

657− ++modelIndex;

658− changed = true;

659− }

660−

661− modelIndex = 0;

662− pos = 0;

663− if (!m_visibleItems.isEmpty()) {

664− modelIndex = m_firstVisibleIndex - 1;

665− item = m_visibleItems.first();

666− pos = item->y() + m_clipItem->y();

667− }

668− while (modelIndex >= 0 && pos > fillFrom) {

669−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;

670− if (!(item = createItem(modelIndex, asynchronous)))

671− break;

672− pos -= item->height();

673− --modelIndex;

674− changed = true;

675− }

676−

677− return changed;

678−}

679−

680−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

681−{

682− QQuickItem *item = listItem->m_item;

683− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

684− if (flags & QQmlDelegateModel::Destroyed) {

685− item->setParentItem(nullptr);

686− }

687− listItem->sectionItem()->deleteLater();

688− delete listItem;

689−}

690−

691−void ListViewWithPageHeader::releaseItem(ListItem *listItem)

692−{

693− QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(listItem->m_item);

694− itemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

695− m_itemsToRelease << listItem;

696−}

697−

698−void ListViewWithPageHeader::updateWatchedRoles()

699−{

700− if (m_delegateModel) {

701− QList<QByteArray> roles;

702− if (!m_sectionProperty.isEmpty())

703− roles << m_sectionProperty.toUtf8();

704− m_delegateModel->setWatchedRoles(roles);

705− }

706−}

707−

708−QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)

709−{

710− if (!m_sectionDelegate)

711− return nullptr;

712−

713− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

714−

715− if (modelIndex > 0) {

716− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);

717− if (section == prevSection)

718− return nullptr;

719− }

720− if (modelIndex + 1 < model()->rowCount() && !alreadyInserted) {

721− // Already inserted items can't steal next section header

722− const QString nextSection = m_delegateModel->stringValue(modelIndex + 1, m_sectionProperty);

723− if (section == nextSection) {

724− // Steal the section header

725− ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems

726− if (nextItem) {

727− QQuickItem *sectionItem = nextItem->sectionItem();

728− nextItem->setSectionItem(nullptr);

729− return sectionItem;

730− }

731− }

732− }

733−

734− return getSectionItem(section);

735−}

736−

737−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText)

738−{

739− QQuickItem *sectionItem = nullptr;

740−

741− QQmlContext *creationContext = m_sectionDelegate->creationContext();

742− QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));

743− context->setContextProperty(QLatin1String("section"), sectionText);

744− context->setContextProperty(QLatin1String("delegateIndex"), -1);

745− QObject *nobj = m_sectionDelegate->beginCreate(context);

746− if (nobj) {

747− QQml_setParent_noEvent(context, nobj);

748− sectionItem = qobject_cast<QQuickItem *>(nobj);

749− if (!sectionItem) {

750− delete nobj;

751− } else {

752− sectionItem->setZ(2);

753− QQml_setParent_noEvent(sectionItem, m_clipItem);

754− sectionItem->setParentItem(m_clipItem);

755− }

756− } else {

757− delete context;

758− }

759− m_sectionDelegate->completeCreate();

760−

761− // TODO attach to sectionItem so we can accomodate to it changing its height

762−

763− return sectionItem;

764−}

765−

766−bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

767−{

768−// qDebug() << "ListViewWithPageHeader::removeNonVisibleItems" << bufferFrom << bufferTo;

769− // Do not remove items if we are overshooting up or down, since we'll come back

770− // to the "stable" position and delete/create items without any reason

771− if (contentY() < -m_minYExtent) {

772− return false;

773− } else if (contentY() + height() > contentHeight()) {

774− return false;

775− }

776− bool changed = false;

777−

778− bool foundVisible = false;

779− int i = 0;

780− int removedItems = 0;

781− const auto oldFirstVisibleIndex = m_firstVisibleIndex;

782− while (i < m_visibleItems.count()) {

783− ListItem *item = m_visibleItems[i];

784− const qreal pos = item->y() + m_clipItem->y();

785−// qDebug() << i << pos << (pos + item->height()) << bufferFrom << bufferTo;

786− if (pos + item->height() < bufferFrom || pos > bufferTo) {

787−// qDebug() << "Releasing" << i << (pos + item->height() < bufferFrom) << pos + item->height() << bufferFrom << (pos > bufferTo) << pos << bufferTo;

788− releaseItem(item);

789− m_visibleItems.removeAt(i);

790− changed = true;

791− ++removedItems;

792− } else {

793− if (!foundVisible) {

794− foundVisible = true;

795− const int itemIndex = m_firstVisibleIndex + removedItems + i;

796− m_firstVisibleIndex = itemIndex;

797− }

798− ++i;

799− }

800− }

801− if (!foundVisible) {

802− m_firstVisibleIndex = -1;

803− }

804− if (m_firstVisibleIndex != oldFirstVisibleIndex) {

805− adjustMinYExtent();

806− }

807−

808− return changed;

809−}

810−

811−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)

812−{

813−// qDebug() << "CREATE ITEM" << modelIndex;

814− if (asynchronous && m_asyncRequestedIndex != -1)

815− return nullptr;

816−

817− m_asyncRequestedIndex = -1;

818− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

819− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

820− if (!item) {

821− if (object) {

822− m_delegateModel->release(object);

823− if (!m_delegateValidated) {

824− m_delegateValidated = true;

825− QObject* delegateObj = delegate();

826− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";

827− }

828− } else {

829− m_asyncRequestedIndex = modelIndex;

830− }

831− return 0;

832− } else {

833−// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

834− ListItem *listItem = new ListItem;

835− listItem->m_item = item;

836− listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));

837− QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

838− ListItem *prevItem = itemAtIndex(modelIndex - 1);

839− bool lostItem = false; // Is an item that we requested async but because of model changes

840− // it is no longer attached to any of the existing items (has no prev nor next item)

841− // nor is the first item

842− if (prevItem) {

843− listItem->setY(prevItem->y() + prevItem->height());

844− } else {

845− ListItem *currItem = itemAtIndex(modelIndex);

846− if (currItem) {

847− // There's something already in m_visibleItems at out index, meaning this is an insert, so attach to its top

848− listItem->setY(currItem->y() - listItem->height());

849− } else {

850− ListItem *nextItem = itemAtIndex(modelIndex + 1);

851− if (nextItem) {

852− listItem->setY(nextItem->y() - listItem->height());

853− } else if (modelIndex == 0) {

854− listItem->setY(-m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0));

855− } else if (!m_visibleItems.isEmpty()) {

856− lostItem = true;

857− }

858− }

859− }

860− if (lostItem) {

861− listItem->setCulled(true);

862− releaseItem(listItem);

863− listItem = nullptr;

864− } else {

865− listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());

866− if (m_visibleItems.isEmpty()) {

867− m_visibleItems << listItem;

868− } else {

869− m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);

870− }

871− if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {

872− m_firstVisibleIndex = modelIndex;

873− polish();

874− }

875− if (listItem->sectionItem()) {

876− QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();

877− context->setContextProperty(QLatin1String("delegateIndex"), modelIndex);

878− }

879− adjustMinYExtent();

880− m_contentHeightDirty = true;

881− }

882− return listItem;

883− }

884−}

885−

886−void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

887−{

888− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

889− if (!item) {

890− qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

891− return;

892− }

893−// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

894− // Check we are not being taken down and don't paint anything

895− // TODO Check if we still need this in 5.2

896− // For reproduction just inifnite loop testDash or testDashContent

897− if (!QQmlEngine::contextForObject(this)->parentContext())

898− return;

899−

900− item->setParentItem(m_clipItem);

901− QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();

902− context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);

903− context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

904− if (modelIndex == m_asyncRequestedIndex) {

905− createItem(modelIndex, false);

906− refill();

907− }

908−}

909−

910−void ListViewWithPageHeader::updateClipItem()

911−{

912− m_clipItem->setHeight(height() - m_headerItemShownHeight);

913− m_clipItem->setY(contentY() + m_headerItemShownHeight);

914− m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);

915−}

916−

917−void ListViewWithPageHeader::onContentHeightChanged()

918−{

919− updateClipItem();

920−}

921−

922−void ListViewWithPageHeader::onContentWidthChanged()

923−{

924− m_clipItem->setWidth(contentItem()->width());

925−}

926−

927−void ListViewWithPageHeader::onHeightChanged()

928−{

929− polish();

930−}

931−

932−

933−void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

934−{

935− // TODO Do something with reset

936−// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

937− const auto oldFirstVisibleIndex = m_firstVisibleIndex;

938−

939− Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {

940−// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

941− if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

942− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

943− // If all the items we are removing are either not created or culled

944− // we have to grow down to avoid viewport changing

945− bool growDown = true;

946− for (int i = 0; growDown && i < remove.count; ++i) {

947− const int modelIndex = remove.index + i;

948− ListItem *item = itemAtIndex(modelIndex);

949− if (item && !item->culled()) {

950− growDown = false;

951− }

952− }

953− for (int i = remove.count - 1; i >= 0; --i) {

954− const int visibleIndex = remove.index + i - m_firstVisibleIndex;

955− if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {

956− ListItem *item = m_visibleItems[visibleIndex];

957− // Pass the section item down if needed

958− if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {

959− ListItem *nextItem = m_visibleItems[visibleIndex + 1];

960− if (!nextItem->sectionItem()) {

961− nextItem->setSectionItem(item->sectionItem());

962− item->setSectionItem(nullptr);

963− }

964− }

965− releaseItem(item);

966− m_visibleItems.removeAt(visibleIndex);

967− }

968− }

969− if (growDown) {

970− adjustMinYExtent();

971− } else if (remove.index <= m_firstVisibleIndex) {

972− if (!m_visibleItems.isEmpty()) {

973− // We removed the first item that is the one that positions the rest

974− // position the new first item correctly

975− m_visibleItems.first()->setY(oldFirstValidIndexPos);

976− } else {

977− m_firstVisibleIndex = -1;

978− }

979− }

980− } else if (remove.index + remove.count <= m_firstVisibleIndex) {

981− m_firstVisibleIndex -= remove.count;

982− }

983− for (int i = remove.count - 1; i >= 0; --i) {

984− const int modelIndex = remove.index + i;

985− if (modelIndex == m_asyncRequestedIndex) {

986− m_asyncRequestedIndex = -1;

987− } else if (modelIndex < m_asyncRequestedIndex) {

988− m_asyncRequestedIndex--;

989− }

990− }

991− }

992−

993− Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {

994−// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

995− const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

996− const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

997− if (insertingInValidIndexes || firstItemWithViewOnTop)

998− {

999− // If the items we are adding won't be really visible

1000− // we grow up instead of down to not change the viewport

1001− bool growUp = false;

1002− if (!firstItemWithViewOnTop) {

1003− for (int i = 0; i < m_visibleItems.count(); ++i) {

1004− if (!m_visibleItems[i]->culled()) {

1005− if (insert.index <= m_firstVisibleIndex + i) {

1006− growUp = true;

1007− }

1008− break;

1009− }

1010− }

1011− }

1012−

1013− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

1014− for (int i = insert.count - 1; i >= 0; --i) {

1015− const int modelIndex = insert.index + i;

1016− ListItem *item = createItem(modelIndex, false);

1017− if (growUp) {

1018− ListItem *firstItem = m_visibleItems.first();

1019− firstItem->setY(firstItem->y() - item->height());

1020− }

1021− // Adding an item may break a "same section" chain, so check

1022− // if we need adding a new section item

1023− if (m_sectionDelegate) {

1024− ListItem *nextItem = itemAtIndex(modelIndex + 1);

1025− if (nextItem && !nextItem->sectionItem()) {

1026− nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));

1027− if (growUp && nextItem->sectionItem()) {

1028− ListItem *firstItem = m_visibleItems.first();

1029− firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());

1030− }

1031− }

1032− }

1033− }

1034− if (firstItemWithViewOnTop) {

1035− ListItem *firstItem = m_visibleItems.first();

1036− firstItem->setY(oldFirstValidIndexPos);

1037− }

1038− adjustMinYExtent();

1039− } else if (insert.index <= m_firstVisibleIndex) {

1040− m_firstVisibleIndex += insert.count;

1041− }

1042−

1043− for (int i = insert.count - 1; i >= 0; --i) {

1044− const int modelIndex = insert.index + i;

1045− if (modelIndex <= m_asyncRequestedIndex) {

1046− m_asyncRequestedIndex++;

1047− }

1048− }

1049− }

1050−

1051− Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1052−// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1053− for (int i = change.index; i < change.count; ++i) {

1054− ListItem *item = itemAtIndex(i);

1055− if (item && item->sectionItem()) {

1056− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

1057− const QString sectionText = m_delegateModel->stringValue(i, m_sectionProperty);

1058− context->setContextProperty(QLatin1String("section"), sectionText);

1059− }

1060− }

1061− }

1062−

1063− if (m_firstVisibleIndex != oldFirstVisibleIndex) {

1064− adjustMinYExtent();

1065− }

1066−

1067− for (int i = 0; i < m_visibleItems.count(); ++i) {

1068− ListItem *item = m_visibleItems[i];

1069− if (item->sectionItem()) {

1070− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

1071− context->setContextProperty(QLatin1String("delegateIndex"), m_firstVisibleIndex + i);

1072− }

1073− }

1074−

1075− layout();

1076− polish();

1077− m_contentHeightDirty = true;

1078−}

1079−

1080−void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)

1081−{

1082− setInteractive(!running);

1083− if (!running) {

1084− m_contentHeightDirty = true;

1085− polish();

1086− }

1087−}

1088−

1089−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)

1090−{

1091− const qreal heightDiff = newGeometry.height() - oldGeometry.height();

1092− if (heightDiff != 0) {

1093− if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY() && !m_visibleItems.isEmpty()) {

1094− ListItem *firstItem = m_visibleItems.first();

1095− firstItem->setY(firstItem->y() - heightDiff);

1096− adjustMinYExtent();

1097− layout();

1098− }

1099− refill();

1100− adjustMinYExtent();

1101− polish();

1102− m_contentHeightDirty = true;

1103− }

1104−}

1105−

1106−void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)

1107−{

1108− if (item == m_headerItem) {

1109− const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;

1110− if (diff != 0) {

1111− adjustHeader(diff);

1112− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();

1113− layout();

1114− polish();

1115− m_contentHeightDirty = true;

1116− }

1117− }

1118−}

1119−

1120−void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)

1121−{

1122− const qreal heightDiff = newHeaderHeight - oldHeaderHeight;

1123− if (m_headerItemShownHeight > 0) {

1124− // If the header is shown because of the clip

1125− // Change its size

1126− m_headerItemShownHeight += heightDiff;

1127− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);

1128− updateClipItem();

1129− adjustMinYExtent();

1130− Q_EMIT headerItemShownHeightChanged();

1131− } else {

1132− if (oldHeaderY + oldHeaderHeight > contentY()) {

1133− // If the header is shown because its position

1134− // Change its size

1135− ListItem *firstItem = m_visibleItems.first();

1136− firstItem->setY(firstItem->y() + heightDiff);

1137− layout();

1138− } else {

1139− // If the header is not on screen, just change the start of the list

1140− // so the viewport is not changed

1141− adjustMinYExtent();

1142− }

1143− }

1144−}

1145−

1146−

1147−void ListViewWithPageHeader::adjustMinYExtent()

1148−{

1149− if (m_visibleItems.isEmpty()) {

1150− m_minYExtent = 0;

1151− } else {

1152− qreal nonCreatedHeight = 0;

1153− if (m_firstVisibleIndex != 0) {

1154− // Calculate the average height of items to estimate the position of the list start

1155− const int visibleItems = m_visibleItems.count();

1156− qreal visibleItemsHeight = 0;

1157− Q_FOREACH(ListItem *item, m_visibleItems) {

1158− visibleItemsHeight += item->height();

1159− }

1160− nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1161−// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1162− }

1163− const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1164− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1165− if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1166− m_minYExtent = 0;

1167− m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1168− }

1169− }

1170−}

1171−

1172−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const

1173−{

1174− const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;

1175− if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())

1176− return m_visibleItems[visibleIndexedModelIndex];

1177−

1178− return nullptr;

1179−}

1180−

1181−void ListViewWithPageHeader::layout()

1182−{

1183− if (m_inLayout)

1184− return;

1185−

1186− m_inLayout = true;

1187− if (!m_visibleItems.isEmpty()) {

1188− const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;

1189− const qreal visibleTo = contentY() + height() - m_clipItem->y();

1190−

1191− qreal pos = m_visibleItems.first()->y();

1192−

1193−// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();

1194− int firstReallyVisibleItem = -1;

1195− int modelIndex = m_firstVisibleIndex;

1196− Q_FOREACH(ListItem *item, m_visibleItems) {

1197− const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;

1198− item->setCulled(cull);

1199− item->setY(pos);

1200− if (!cull && firstReallyVisibleItem == -1) {

1201− firstReallyVisibleItem = modelIndex;

1202− if (m_topSectionItem) {

1203− // Positing the top section sticky item is a two step process

1204− // First we set it either we cull it (because it doesn't need to be sticked to the top)

1205− // or stick it to the top

1206− // Then after the loop we'll make sure that if there's another section just below it

1207− // pushed the sticky section up to make it disappear

1208− const qreal topSectionStickPos = m_headerItemShownHeight + contentY() - m_clipItem->y();

1209− bool showStickySectionItem;

1210− // We need to show the "top section sticky item" when the position at the "top" of the

1211− // viewport is bigger than the start of the position of the first visible item

1212− // i.e. the first visible item starts before the viewport, or when the first

1213− // visible item starts just at the viewport start and it does not have its own section item

1214− if (topSectionStickPos > pos) {

1215− showStickySectionItem = true;

1216− } else if (topSectionStickPos == pos) {

1217− showStickySectionItem = !item->sectionItem();

1218− } else {

1219− showStickySectionItem = false;

1220− }

1221− if (!showStickySectionItem) {

1222− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

1223− if (item->sectionItem()) {

1224− // This seems it should happen since why would we cull the top section

1225− // if the first visible item has no section header? This only happens briefly

1226− // when increasing the height of a list that is at the bottom, the m_topSectionItem

1227− // gets shown shortly in the next polish call

1228− QQuickItemPrivate::get(item->sectionItem())->setCulled(false);

1229− }

1230− } else {

1231− // Update the top sticky section header

1232− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

1233− QQmlContext *context = QQmlEngine::contextForObject(m_topSectionItem)->parentContext();

1234− context->setContextProperty(QLatin1String("section"), section);

1235−

1236− QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);

1237− m_topSectionItem->setY(topSectionStickPos);

1238− int delegateIndex = modelIndex;

1239− // Look for the first index with this section text

1240− while (delegateIndex > 0) {

1241− const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty);

1242− if (prevSection != section)

1243− break;

1244− delegateIndex--;

1245− }

1246− context->setContextProperty(QLatin1String("delegateIndex"), delegateIndex);

1247− if (item->sectionItem()) {

1248− QQuickItemPrivate::get(item->sectionItem())->setCulled(true);

1249− }

1250− }

1251− }

1252− }

1253− QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();

1254− const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);

1255− if (!cull && pos < clipFrom) {

1256− context->setContextProperty(QLatin1String("heightToClip"), clipFrom - pos);

1257− } else {

1258− context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

1259− }

1260−// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;

1261− pos += item->height();

1262− ++modelIndex;

1263− }

1264−

1265− // Second step of section sticky item positioning

1266− // Look at the next section header, check if it's pushing up the sticky one

1267− if (m_topSectionItem) {

1268− if (firstReallyVisibleItem >= 0) {

1269− for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {

1270− ListItem *item = m_visibleItems[i];

1271− if (item->sectionItem()) {

1272− if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {

1273− m_topSectionItem->setY(item->y() - m_topSectionItem->height());

1274− }

1275− break;

1276− }

1277− }

1278− }

1279− }

1280− }

1281− m_inLayout = false;

1282−}

1283−

1284−void ListViewWithPageHeader::updatePolish()

1285−{

1286− // Check we are not being taken down and don't paint anything

1287− // TODO Check if we still need this in 5.2

1288− // For reproduction just inifnite loop testDash or testDashContent

1289− if (!QQmlEngine::contextForObject(this)->parentContext())

1290− return;

1291−

1292− Q_FOREACH(ListItem *item, m_itemsToRelease)

1293− reallyReleaseItem(item);

1294− m_itemsToRelease.clear();

1295−

1296− if (!model())

1297− return;

1298−

1299− layout();

1300−

1301− refill();

1302−

1303− if (m_contentHeightDirty) {

1304− qreal contentHeight;

1305− if (m_visibleItems.isEmpty()) {

1306− contentHeight = m_headerItem ? m_headerItem->height() : 0;

1307− } else {

1308− const int modelCount = model()->rowCount();

1309− const int visibleItems = m_visibleItems.count();

1310− const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;

1311− qreal nonCreatedHeight = 0;

1312− if (lastValidIndex != modelCount - 1) {

1313− const int visibleItems = m_visibleItems.count();

1314− qreal visibleItemsHeight = 0;

1315− Q_FOREACH(ListItem *item, m_visibleItems) {

1316− visibleItemsHeight += item->height();

1317− }

1318− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);

1319− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;

1320− }

1321− ListItem *item = m_visibleItems.last();

1322− contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();

1323− if (m_firstVisibleIndex != 0) {

1324− // Make sure that if we are shrinking we tell the view we still fit

1325− m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));

1326− }

1327− }

1328−

1329− m_contentHeightDirty = false;

1330− adjustMinYExtent();

1331− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1332− setContentHeight(contentHeight);

1333− m_inContentHeightKeepHeaderShown = false;

1334− }

1335−}

1336−

1337−#include "moc_listviewwithpageheader.cpp"

plugins/Dash/listviewwithpageheader.hdeleted−215

@@ -1,215 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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−#ifndef LISTVIEWWITHPAGEHEADER_H

18−#define LISTVIEWWITHPAGEHEADER_H

19−

20−#include <private/qquickitemchangelistener_p.h>

21−#include <private/qquickflickable_p.h>

22−

23−class QAbstractItemModel;

24−class QQuickNumberAnimation;

25−class QQmlChangeSet;

26−class QQmlDelegateModel;

27−

28−

29−/**

30− Note for users of this class

31−

32− ListViewWithPageHeader already loads delegates async when appropiate so if

33− your delegate uses a Loader you should not enable the asynchronous feature since

34− that will need to introduce sizing problems

35−

36− With the double async it may happen what while we are scrolling down

37− we reach to a point where given the size of the just created delegate with loader not yet loaded (which will be very close to 0)

38− we are already "at the end" of the list, but then a few milliseconds later the loader finishes loading and we could

39− have kept scrolling. This is specially visible at the end of the list where you realize

40− that scrolling ended a bit before the end of the list but the speed of the flicking was good

41− to reach the end

42−

43− By not having the second async we get a better sizing when the delegate is created and things work better

44−*/

45−

46−class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeListener

47−{

48− Q_OBJECT

49− Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)

50− Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

51− Q_PROPERTY(QQuickItem *pageHeader READ header WRITE setHeader NOTIFY headerChanged)

52− Q_PROPERTY(QQmlComponent *sectionDelegate READ sectionDelegate WRITE setSectionDelegate NOTIFY sectionDelegateChanged)

53− Q_PROPERTY(QString sectionProperty READ sectionProperty WRITE setSectionProperty NOTIFY sectionPropertyChanged)

54− Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)

55− Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

56− Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

58−

59− friend class ListViewWithPageHeaderTest;

60− friend class ListViewWithPageHeaderTestSection;

61− friend class ListViewWithPageHeaderTestExternalModel;

62−

63−public:

64− ListViewWithPageHeader();

65− ~ListViewWithPageHeader();

66−

67− QAbstractItemModel *model() const;

68− void setModel(QAbstractItemModel *model);

69−

70− QQmlComponent *delegate() const;

71− void setDelegate(QQmlComponent *delegate);

72−

73− QQuickItem *header() const;

74− void setHeader(QQuickItem *header);

75−

76− QQmlComponent *sectionDelegate() const;

77− void setSectionDelegate(QQmlComponent *delegate);

78−

79− QString sectionProperty() const;

80− void setSectionProperty(const QString &property);

81−

82− bool forceNoClip() const;

83− void setForceNoClip(bool noClip);

84−

85− int stickyHeaderHeight() const;

86− qreal headerItemShownHeight() const;

87−

88− qreal cacheBuffer() const;

89− void setCacheBuffer(qreal cacheBuffer);

90−

91− Q_INVOKABLE void positionAtBeginning();

92− Q_INVOKABLE void showHeader();

93− Q_INVOKABLE int firstCreatedIndex() const;

94− Q_INVOKABLE int createdItemCount() const;

95− Q_INVOKABLE QQuickItem *item(int modelIndex) const;

96−

97− // The index has to be created for this to try to do something

98− // Created items are those visible and the precached ones

99− // Returns if the item existed or not

100− Q_INVOKABLE bool maximizeVisibleArea(int modelIndex);

101− Q_INVOKABLE bool maximizeVisibleArea(int modelIndex, int itemHeight);

102−

103−Q_SIGNALS:

104− void modelChanged();

105− void delegateChanged();

106− void headerChanged();

107− void sectionDelegateChanged();

108− void sectionPropertyChanged();

109− void forceNoClipChanged();

110− void stickyHeaderHeightChanged();

111− void headerItemShownHeightChanged();

112− void cacheBufferChanged();

113−

114−protected:

115− void componentComplete() override;

116− void viewportMoved(Qt::Orientations orient) override;

117− qreal minYExtent() const override;

118− void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;

119− void itemImplicitHeightChanged(QQuickItem *item) override;

120− void updatePolish() override;

121−

122−private Q_SLOTS:

123− void itemCreated(int modelIndex, QObject *object);

124− void onContentHeightChanged();

125− void onContentWidthChanged();

126− void onHeightChanged();

127− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

128− void contentYAnimationRunningChanged(bool running);

129−

130−private:

131− class ListItem

132− {

133− public:

134− qreal height() const;

135−

136− qreal y() const;

137− void setY(qreal newY);

138−

139− bool culled() const;

140− void setCulled(bool culled);

141−

142− QQuickItem *sectionItem() const { return m_sectionItem; }

143− void setSectionItem(QQuickItem *sectionItem);

144−

145− QQuickItem *m_item;

146− private:

147− QQuickItem *m_sectionItem;

148− };

149−

150− bool maximizeVisibleArea(ListItem *listItem, int listItemHeight);

151−

152− void createDelegateModel();

153−

154− void layout();

155− void refill();

156− bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);

157− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);

158− ListItem *createItem(int modelIndex, bool asynchronous);

159−

160− void adjustHeader(qreal diff);

161− void adjustMinYExtent();

162− void updateClipItem();

163− void headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY);

164− ListItem *itemAtIndex(int modelIndex) const; // Returns the item at modelIndex if has been created

165− void releaseItem(ListItem *item);

166− void reallyReleaseItem(ListItem *item);

167− void updateWatchedRoles();

168− QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

169− QQuickItem *getSectionItem(const QString &sectionText);

170−

171− QQmlDelegateModel *m_delegateModel;

172−

173− // Index we are waiting because we requested it asynchronously

174− int m_asyncRequestedIndex;

175−

176− // Used to only give a warning once if the delegate does not return objects

177− bool m_delegateValidated;

178−

179− // Visible indexes, [0] is m_firstValidIndex, [0+1] is m_firstValidIndex +1, ...

180− QList<ListItem *> m_visibleItems;

181− int m_firstVisibleIndex;

182−

183− qreal m_minYExtent;

184−

185− QQuickItem *m_clipItem;

186−

187− // If any of the heights has changed

188− // or new items have been added/removed

189− bool m_contentHeightDirty;

190−

191− QQuickItem *m_headerItem;

192− qreal m_previousContentY;

193− qreal m_previousHeaderImplicitHeight;

194− qreal m_headerItemShownHeight; // The height of header shown when the header is shown outside its topmost position

195− // i.e. it's being shown after dragging down in the middle of the list

196− enum ContentYAnimationType { ContentYAnimationShowHeader, ContentYAnimationMaximizeVisibleArea };

197− ContentYAnimationType contentYAnimationType;

198− QQuickNumberAnimation *m_contentYAnimation;

199−

200− QQmlComponent *m_sectionDelegate;

201− QString m_sectionProperty;

202− QQuickItem *m_topSectionItem;

203−

204− bool m_forceNoClip;

205− bool m_inLayout;

206− bool m_inContentHeightKeepHeaderShown;

207− qreal m_cacheBuffer;

208−

209− // Qt 5.0 doesn't like releasing the items just after itemCreated

210− // so we delay the releasing until the next updatePolish

211− QList<ListItem *> m_itemsToRelease;

212−};

213−

214−

215−#endif

plugins/Dash/organicgrid.cppdeleted−260

@@ -1,260 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#include "organicgrid.h"

18−

19−#pragma GCC diagnostic push

20−#pragma GCC diagnostic ignored "-pedantic"

21−#include <private/qquickitem_p.h>

22−#pragma GCC diagnostic pop

23−

24−static const qreal bufferRatio = 0.5;

25−

26−OrganicGrid::OrganicGrid()

27− : m_firstVisibleIndex(-1)

28− , m_numberOfModulesPerRow(-1)

29−{

30−}

31−

32−QSizeF OrganicGrid::smallDelegateSize() const

33−{

34− return m_smallDelegateSize;

35−}

36−

37−void OrganicGrid::setSmallDelegateSize(const QSizeF &size)

38−{

39− if (m_smallDelegateSize != size) {

40− m_smallDelegateSize = size;

41− Q_EMIT smallDelegateSizeChanged();

42−

43− if (isComponentComplete()) {

44− relayout();

45− }

46− }

47−}

48−

49−QSizeF OrganicGrid::bigDelegateSize() const

50−{

51− return m_bigDelegateSize;

52−}

53−

54−void OrganicGrid::setBigDelegateSize(const QSizeF &size)

55−{

56− if (m_bigDelegateSize != size) {

57− m_bigDelegateSize = size;

58− Q_EMIT bigDelegateSizeChanged();

59−

60− if (isComponentComplete()) {

61− relayout();

62− }

63− }

64−}

65−

66−QPointF OrganicGrid::positionForIndex(int modelIndex) const

67−{

68− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();

69− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();

70− const int itemsPerRow = m_numberOfModulesPerRow * 6;

71− const int rowIndex = floor(modelIndex / itemsPerRow);

72− const int columnIndex = floor((modelIndex - rowIndex * itemsPerRow) / 6);

73−

74− qreal yPos = (moduleHeight + rowSpacing()) * rowIndex;

75− const int moduleIndex = modelIndex % 6;

76− if (moduleIndex == 2) {

77− yPos += m_smallDelegateSize.height() + rowSpacing();

78− } else if (moduleIndex == 3 || moduleIndex == 5) {

79− yPos += m_bigDelegateSize.height() + rowSpacing();

80− }

81−

82− qreal xPos = (moduleWidth + columnSpacing()) * columnIndex;

83− if (moduleIndex == 1) {

84− xPos += m_smallDelegateSize.width() + columnSpacing();

85− } else if (moduleIndex == 3) {

86− xPos += m_bigDelegateSize.width() + columnSpacing();

87− } else if (moduleIndex == 4) {

88− xPos += (m_smallDelegateSize.width() + columnSpacing()) * 2;

89− } else if (moduleIndex == 5) {

90− xPos += m_bigDelegateSize.width() + m_smallDelegateSize.width() + columnSpacing() * 2;

91− }

92−

93− return QPointF(xPos, yPos);

94−}

95−

96−QSizeF OrganicGrid::sizeForIndex(int modelIndex) const

97−{

98− const int moduleIndex = modelIndex % 6;

99− if (moduleIndex == 0 || moduleIndex == 1 || moduleIndex == 3 || moduleIndex == 5) {

100− return m_smallDelegateSize;

101− } else {

102− return m_bigDelegateSize;

103− }

104−}

105−

106−void OrganicGrid::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

107−{

108− if (m_visibleItems.isEmpty()) {

109− *modelIndex = 0;

110− *yPos = 0;

111− } else {

112− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();

113− // We create stuff in a 6-module basis, so always return back

114− // the y position of the first item

115− const int firstModuleIndex = ((*modelIndex) / 6) * 6;

116− *yPos = positionForIndex(firstModuleIndex).y();

117− }

118−}

119−

120−void OrganicGrid::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

121−{

122− if (m_visibleItems.isEmpty()) {

123− *modelIndex = 0;

124− *yPos = 0;

125− } else {

126− *modelIndex = m_firstVisibleIndex - 1;

127− // We create stuff in a 6-module basis, so always return back

128− // the y position of the last item bottom

129− const int lastModuleIndex = ((*modelIndex) / 6) * 6 + 5;

130− *yPos = positionForIndex(lastModuleIndex).y();

131− *yPos += sizeForIndex(lastModuleIndex).height();

132− }

133−}

134−

135−void OrganicGrid::addItemToView(int modelIndex, QQuickItem *item)

136−{

137− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count() or the first

138− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {

139− m_visibleItems << item;

140− } else if (modelIndex == m_firstVisibleIndex - 1) {

141− m_firstVisibleIndex = modelIndex;

142− m_visibleItems.prepend(item);

143− } else if (modelIndex == 0) {

144− m_firstVisibleIndex = 0;

145− m_visibleItems << item;

146− } else {

147− qWarning() << "OrganicGrid::addItemToView - Got unexpected modelIndex"

148− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

149− return;

150− }

151−

152− const QPointF pos = positionForIndex(modelIndex);

153− item->setPosition(pos);

154−

155− item->setSize(sizeForIndex(modelIndex));

156−}

157−

158−bool OrganicGrid::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

159−{

160− bool changed = false;

161−

162− // As adding, we also remove in a 6-module basis

163− int lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;

164− bool removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;

165− while (removeIndex && !m_visibleItems.isEmpty()) {

166− releaseItem(m_visibleItems.takeFirst());

167− changed = true;

168− m_firstVisibleIndex++;

169−

170− lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;

171− removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;

172− }

173−

174− int firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;

175− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;

176− while (removeIndex && !m_visibleItems.isEmpty()) {

177− releaseItem(m_visibleItems.takeLast());

178− changed = true;

179−

180− firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;

181− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;

182− }

183−

184− if (m_visibleItems.isEmpty()) {

185− m_firstVisibleIndex = -1;

186− }

187−

188− return changed;

189−}

190−

191−void OrganicGrid::cleanupExistingItems()

192−{

193− Q_FOREACH(QQuickItem *item, m_visibleItems)

194− releaseItem(item);

195− m_visibleItems.clear();

196− m_firstVisibleIndex = -1;

197− setImplicitHeightDirty();

198−}

199−

200−void OrganicGrid::doRelayout()

201−{

202− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();

203− m_numberOfModulesPerRow = floor((width() + columnSpacing()) / (moduleWidth + columnSpacing()));

204− m_numberOfModulesPerRow = qMax(1, m_numberOfModulesPerRow);

205−

206− int i = m_firstVisibleIndex;

207− const QList<QQuickItem*> allItems = m_visibleItems;

208− m_visibleItems.clear();

209− Q_FOREACH(QQuickItem *item, allItems) {

210− addItemToView(i, item);

211− ++i;

212− }

213−}

214−

215−void OrganicGrid::updateItemCulling(qreal visibleFromY, qreal visibleToY)

216−{

217− Q_FOREACH(QQuickItem *item, m_visibleItems) {

218− QQuickItemPrivate::get(item)->setCulled(item->y() + item->height() <= visibleFromY || item->y() >= visibleToY);

219− }

220−}

221−

222−void OrganicGrid::calculateImplicitHeight()

223−{

224− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();

225− const int itemCount = !model() ? 0 : model()->rowCount();

226− const int itemsPerRow = m_numberOfModulesPerRow * 6;

227− const int fullRows = floor(itemCount / itemsPerRow);

228− const qreal fullRowsHeight = fullRows == 0 ? 0 : fullRows * moduleHeight + rowSpacing() * (fullRows - 1);

229−

230− const int remainingItems = itemCount - fullRows * itemsPerRow;

231− if (remainingItems == 0) {

232− setImplicitHeight(fullRowsHeight);

233− } else if (remainingItems <= 2) {

234− setImplicitHeight(fullRowsHeight + m_smallDelegateSize.height() + rowSpacing());

235− } else {

236− setImplicitHeight(fullRowsHeight + rowSpacing() + moduleHeight);

237− }

238−}

239−

240−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

241−{

242− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

243− for (int i = remove.count - 1; i >= 0; --i) {

244− const int indexToRemove = remove.index + i;

245− // We only support removing from the end

246− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

247− if (indexToRemove == lastIndex) {

248− releaseItem(m_visibleItems.takeLast());

249− } else {

250− if (indexToRemove < lastIndex) {

251− qFatal("OrganicGrid only supports removal from the end of the model");

252− }

253− }

254− }

255− }

256− if (m_visibleItems.isEmpty()) {

257− m_firstVisibleIndex = -1;

258− }

259− setImplicitHeightDirty();

260−}

plugins/Dash/organicgrid.hdeleted−91

@@ -1,91 +0,0 @@

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

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−#ifndef ORGANICGRID_H

18−#define ORGANICGRID_H

19−

20−#include "abstractdashview.h"

21−

22− /** An Organic Grid is is a view that creates delegates

23− * based on a model and layouts them in groups of six items (called module).

24− *

25− * In each module there are 4 items that are forced to the small delegate size

26− * and two that are forced to the big delegate size.

27− *

28− * Example:

29− *

30− * +---+ +---+ +-----+

31− * | 1 | | 2 | | |

32− * +---+ +---+ | 5 |

33− * +-----+ | |

34− * | | +-----+

35− * | 3 | +---+ +---+

36− * | | | 4 | | 6 |

37− * +-----+ +---+ +---+

38− *

39− * Modules are positioned one after the other in a grid like fashion, i.e.

40− *

41− * +---+ +---+

42− * | 1 | | 2 |

43− * +---+ +---+

44− * +---+ +---+

45− * | 3 | | 4 |

46− * +---+ +---+

47− */

48−

49−class OrganicGrid : public AbstractDashView

50−{

51− Q_OBJECT

52−

53− Q_PROPERTY(QSizeF smallDelegateSize READ smallDelegateSize WRITE setSmallDelegateSize NOTIFY smallDelegateSizeChanged)

54− Q_PROPERTY(QSizeF bigDelegateSize READ bigDelegateSize WRITE setBigDelegateSize NOTIFY bigDelegateSizeChanged)

55−

56−friend class OrganicGridTest;

57−

58−public:

59− OrganicGrid();

60−

61− QSizeF smallDelegateSize() const;

62− void setSmallDelegateSize(const QSizeF &size);

63−

64− QSizeF bigDelegateSize() const;

65− void setBigDelegateSize(const QSizeF &size);

66−

67−Q_SIGNALS:

68− void smallDelegateSizeChanged();

69− void bigDelegateSizeChanged();

70−private:

71− QPointF positionForIndex(int modelIndex) const;

72− QSizeF sizeForIndex(int modelIndex) const;

73−

74− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

75− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

76− void addItemToView(int modelIndex, QQuickItem *item) override;

77− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

78− void cleanupExistingItems() override;

79− void doRelayout() override;

80− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

81− void calculateImplicitHeight() override;

82− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

83−

84− QSizeF m_smallDelegateSize;

85− QSizeF m_bigDelegateSize;

86− int m_firstVisibleIndex;

87− int m_numberOfModulesPerRow;

88− QList<QQuickItem*> m_visibleItems;

89−};

90−

91−#endif

plugins/Dash/plugin.cppdeleted−35

@@ -1,35 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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 "plugin.h"

19−

20−#include "horizontaljournal.h"

21−#include "listviewwithpageheader.h"

22−#include "organicgrid.h"

23−#include "verticaljournal.h"

24−

25−#include <QAbstractItemModel>

26−

27−void DashPlugin::registerTypes(const char *uri)

28−{

29− Q_ASSERT(uri == QLatin1String("Dash"));

30− qmlRegisterType<QAbstractItemModel>();

31− qmlRegisterType<HorizontalJournal>(uri, 0, 1, "HorizontalJournal");

32− qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

33− qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

34− qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

35−}

plugins/Dash/qmldirdeleted−7

@@ -1,7 +0,0 @@

1−module Dash

2−plugin Dash-qml

3−typeinfo Dash.qmltypes

4−singleton CardCreatorCache 0.1 CardCreatorCache.qml

5−ScopeStyle 0.1 ScopeStyle.qml

6−CardAttributes 0.1 CardAttributes.qml

7−CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml

plugins/Dash/verticaljournal.cppdeleted−273

@@ -1,273 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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− * The implementation is centered around m_columnVisibleItems

19− * that holds a vector of lists. There's a list for each of the

20− * columns the view has. In the list the items of the column are

21− * ordered as they appear topdown in the view. m_indexColumnMap is

22− * used when re-building the list up since given a position

23− * in the middle of the list and the need to create the previous does

24− * not give us enough information to know in which column we have

25− * to position the item so that when we reach the item the view is

26− * correctly layouted at 0 for all the columns

27− */

28−#include "verticaljournal.h"

29−

30−#pragma GCC diagnostic push

31−#pragma GCC diagnostic ignored "-pedantic"

32−#include <private/qquickitem_p.h>

33−#pragma GCC diagnostic pop

34−

35−static const qreal bufferRatio = 0.5;

36−

37−VerticalJournal::VerticalJournal()

38− : m_columnWidth(0)

39−{

40−}

41−

42−qreal VerticalJournal::columnWidth() const

43−{

44− return m_columnWidth;

45−}

46−

47−void VerticalJournal::setColumnWidth(qreal columnWidth)

48−{

49− if (columnWidth != m_columnWidth) {

50− m_columnWidth = columnWidth;

51− Q_EMIT columnWidthChanged();

52−

53− if (isComponentComplete()) {

54− Q_FOREACH(const auto &column, m_columnVisibleItems) {

55− Q_FOREACH(const ViewItem &item, column) {

56− item.m_item->setWidth(columnWidth);

57− }

58− }

59− relayout();

60− }

61− }

62−}

63−

64−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

65−{

66− *modelIndex = 0;

67− *yPos = std::numeric_limits<qreal>::max();

68−

69− Q_FOREACH(const auto &column, m_columnVisibleItems) {

70− if (!column.isEmpty()) {

71− const ViewItem &item = column.last();

72− *yPos = qMin(*yPos, item.y() + item.height() + rowSpacing());

73− *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);

74− } else {

75− *yPos = 0;

76− }

77− }

78−}

79−

80−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

81−{

82− *modelIndex = 0;

83− *yPos = std::numeric_limits<qreal>::lowest();

84− int columnToAddTo = -1;

85−

86− // Find the topmost free column

87− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

88− const auto &column = m_columnVisibleItems[i];

89− if (!column.isEmpty()) {

90− const ViewItem &item = column.first();

91− const auto itemTopPos = item.y() - rowSpacing();

92− if (itemTopPos > *yPos) {

93− *yPos = itemTopPos;

94− *modelIndex = item.m_modelIndex - 1;

95− columnToAddTo = i;

96− }

97− }

98− }

99−

100− if (*modelIndex > 0) {

101− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

102− while (m_indexColumnMap[*modelIndex] != columnToAddTo) {

103− // We found out that we have to add to columnToAddTo

104− // and thought that we had to add *modelIndex, but history tells

105− // it is not correct, so find up from *modelIndex until we found the index

106− // that has to end up in columnToAddTo

107− *modelIndex = *modelIndex - 1;

108− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

109− }

110− }

111−}

112−

113−bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

114−{

115− bool changed = false;

116−

117− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

118− QList<ViewItem> &column = m_columnVisibleItems[i];

119− while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {

120− releaseItem(column.takeFirst().m_item);

121− changed = true;

122− }

123−

124− while (!column.isEmpty() && column.last().y() > bufferToY) {

125− releaseItem(column.takeLast().m_item);

126− changed = true;

127− }

128− }

129−

130− return changed;

131−}

132−

133−void VerticalJournal::addItemToView(int modelIndex, QQuickItem *item)

134−{

135− if (item->width() != m_columnWidth) {

136− qWarning() << "Item" << modelIndex << "width is not the one that the columnWidth mandates, resetting it";

137− item->setWidth(m_columnWidth);

138− }

139−

140− // Check if we add it to the bottom of existing column items

141− const QList<ViewItem> &firstColumn = m_columnVisibleItems[0];

142− qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : -rowSpacing();

143− int columnToAddTo = 0;

144− for (int i = 1; i < m_columnVisibleItems.count(); ++i) {

145− const QList<ViewItem> &column = m_columnVisibleItems[i];

146− const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : -rowSpacing();

147− if (iY < columnToAddY) {

148− columnToAddTo = i;

149− columnToAddY = iY;

150− }

151− }

152−

153− const QList<ViewItem> &columnToAdd = m_columnVisibleItems[columnToAddTo];

154− if (columnToAdd.isEmpty() || columnToAdd.last().m_modelIndex < modelIndex) {

155− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));

156− item->setY(columnToAddY + rowSpacing());

157−

158− m_columnVisibleItems[columnToAddTo] << ViewItem(item, modelIndex);

159− m_indexColumnMap[modelIndex] = columnToAddTo;

160− } else {

161− Q_ASSERT(m_indexColumnMap.contains(modelIndex));

162− columnToAddTo = m_indexColumnMap[modelIndex];

163− columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();

164−

165− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));

166− item->setY(columnToAddY - rowSpacing() - item->height());

167−

168− m_columnVisibleItems[columnToAddTo].prepend(ViewItem(item, modelIndex));

169− }

170−}

171−

172−void VerticalJournal::cleanupExistingItems()

173−{

174− // Cleanup the existing items

175− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

176− QList<ViewItem> &column = m_columnVisibleItems[i];

177− Q_FOREACH(const ViewItem &item, column)

178− releaseItem(item.m_item);

179− column.clear();

180− }

181− m_indexColumnMap.clear();

182− setImplicitHeightDirty();

183−}

184−

185−void VerticalJournal::calculateImplicitHeight()

186−{

187− int lastModelIndex = -1;

188− qreal bottomMostY = 0;

189− Q_FOREACH(const auto &column, m_columnVisibleItems) {

190− if (!column.isEmpty()) {

191− const ViewItem &item = column.last();

192− lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);

193− bottomMostY = qMax(bottomMostY, item.y() + item.height());

194− }

195− }

196− if (lastModelIndex >= 0) {

197− const double averageHeight = bottomMostY / (lastModelIndex + 1);

198− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));

199− } else {

200− setImplicitHeight(0);

201− }

202−}

203−

204−void VerticalJournal::doRelayout()

205−{

206− QList<ViewItem> allItems;

207− Q_FOREACH(const auto &column, m_columnVisibleItems)

208− allItems << column;

209−

210− qSort(allItems);

211−

212− const int nColumns = qMax(1., floor((double)(width() + columnSpacing()) / (m_columnWidth + columnSpacing())));

213− m_columnVisibleItems.resize(nColumns);

214− m_indexColumnMap.clear();

215− for (int i = 0; i < nColumns; ++i)

216− m_columnVisibleItems[i].clear();

217−

218− // If the first of allItems doesn't contain index 0 we need to drop them

219− // all since we can't consistently relayout without the first item being there

220−

221− if (!allItems.isEmpty()) {

222− if (allItems.first().m_modelIndex == 0) {

223− Q_FOREACH(const ViewItem &item, allItems)

224− addItemToView(item.m_modelIndex, item.m_item);

225− } else {

226− Q_FOREACH(const ViewItem &item, allItems)

227− releaseItem(item.m_item);

228− }

229− }

230−}

231−

232−void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

233−{

234− Q_FOREACH(const auto &column, m_columnVisibleItems) {

235− Q_FOREACH(const ViewItem &item, column) {

236− const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;

237− QQuickItemPrivate::get(item.m_item)->setCulled(cull);

238− }

239− }

240−}

241−

242−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

243−{

244− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

245− for (int i = remove.count - 1; i >= 0; --i) {

246− const int indexToRemove = remove.index + i;

247− // Since we only support removing from the end, indexToRemove

248− // must refer to the last item of one of the columns or

249− // be bigger than them (because it's not in the viewport and

250− // thus we have not created a delegate for it)

251− bool found = false;

252− int lastCreatedIndex = INT_MIN;

253− for (int i = 0; !found && i < m_columnVisibleItems.count(); ++i) {

254− QList<ViewItem> &column = m_columnVisibleItems[i];

255− if (!column.isEmpty()) {

256− const int lastColumnIndex = column.last().m_modelIndex;

257− if (lastColumnIndex == indexToRemove) {

258− releaseItem(column.takeLast().m_item);

259− found = true;

260− }

261− lastCreatedIndex = qMax(lastCreatedIndex, lastColumnIndex);

262− }

263− }

264− if (!found) {

265− if (indexToRemove < lastCreatedIndex) {

266− qFatal("VerticalJournal only supports removal from the end of the model");

267− } else {

268− setImplicitHeightDirty();

269− }

270− }

271− }

272− }

273−}

plugins/Dash/verticaljournal.hdeleted−100

@@ -1,100 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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−#ifndef VERTICALJOURNAL_H

18−#define VERTICALJOURNAL_H

19−

20−#include "abstractdashview.h"

21−

22− /** A vertical journal is a view that creates delegates

23− * based on a model and layouts them in columns following

24− * a top-left most position rule.

25− *

26− * The number of columns is calculated using the width of

27− * the view itself, the columnWidth (i.e. the width of each individual delegate)

28− * and the columnSpacing between columns.

29− *

30− * All delegates are forced to columnWidth if they don't have it.

31− *

32− * The first nColumns items are layouted at row 0 from column 0

33− * to column nColumns-1 in order. After that every new item

34− * is positioned in the column which provides the free topmost

35− * position as possible. If more than one column tie in providing

36− * the topmost free position the leftmost column will be used.

37− *

38− * Example:

39− *

40− * +-----+ +-----+ +-----+

41− * | | | 2 | | |

42− * | | | | | |

43− * | 1 | +-----+ | 3 |

44− * | | +-----+ | |

45− * | | | | +-----+

46− * +-----+ | 4 | +-----+

47− * +-----+ | | | 5 |

48− * | 6 | +-----+ | |

49− * | | +-----+

50− * +-----+

51− *

52− */

53−

54−class VerticalJournal : public AbstractDashView

55−{

56− Q_OBJECT

57−

58− Q_PROPERTY(qreal columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged)

59−

60−friend class VerticalJournalTest;

61−

62−public:

63− VerticalJournal();

64−

65− qreal columnWidth() const;

66− void setColumnWidth(qreal columnWidth);

67−

68−Q_SIGNALS:

69− void columnWidthChanged();

70−

71−private:

72− class ViewItem

73− {

74− public:

75− ViewItem(QQuickItem *item, int modelIndex) : m_item(item), m_modelIndex(modelIndex) {}

76− qreal x() const { return m_item->x(); }

77− qreal y() const { return m_item->y(); }

78− qreal height() const { return m_item->height(); }

79− bool operator<(const ViewItem &v) const { return m_modelIndex < v.m_modelIndex; }

80−

81− QQuickItem *m_item;

82− int m_modelIndex;

83− };

84−

85− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

86− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

87− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

88− void addItemToView(int modelIndex, QQuickItem *item) override;

89− void cleanupExistingItems() override;

90− void calculateImplicitHeight() override;

91− void doRelayout() override;

92− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

93− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

94−

95− QVector<QList<ViewItem>> m_columnVisibleItems;

96− QHash<int, int> m_indexColumnMap;

97− int m_columnWidth;

98−};

99−

100−#endif

plugins/GlobalShortcut/CMakeLists.txtnew file+10

@@ -0,0 +1,10 @@

1+set(globalshortcutplugin_SRCS

2+ globalshortcut.cpp

3+ globalshortcutregistry.cpp

4+ plugin.cpp)

5+

6+add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})

7+

8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)

9+

10+add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)

plugins/GlobalShortcut/globalshortcut.cppnew file+91

@@ -0,0 +1,91 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#include "globalshortcut.h"

18+#include "globalshortcutregistry.h"

19+

20+#include <QDebug>

21+#include <QQuickItem>

22+

23+Q_GLOBAL_STATIC(GlobalShortcutRegistry, registry)

24+

25+GlobalShortcut::GlobalShortcut(QQuickItem *parent)

26+ : QQuickItem(parent)

27+{

28+}

29+

30+QVariant GlobalShortcut::shortcut() const

31+{

32+ return m_shortcut;

33+}

34+

35+void GlobalShortcut::setShortcut(const QVariant &shortcut)

36+{

37+ if (m_shortcut == shortcut)

38+ return;

39+

40+ m_shortcut = shortcut;

41+ registry->addShortcut(shortcut, this);

42+ Q_EMIT shortcutChanged(shortcut);

43+}

44+

45+bool GlobalShortcut::isActive() const

46+{

47+ return m_active;

48+}

49+

50+void GlobalShortcut::setActive(bool active)

51+{

52+ if (m_active == active)

53+ return;

54+

55+ m_active = active;

56+ Q_EMIT activeChanged(active);

57+}

58+

59+void GlobalShortcut::componentComplete()

60+{

61+ if (this->window()) {

62+ QMetaObject::invokeMethod(this, "setupFilterOnWindow", Q_ARG(QQuickWindow*, this->window()));

63+ }

64+ connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);

65+}

66+

67+void GlobalShortcut::keyPressEvent(QKeyEvent * event)

68+{

69+ if (!m_active) return;

70+

71+ event->accept();

72+ Q_EMIT triggered(m_shortcut.toString());

73+}

74+

75+void GlobalShortcut::keyReleaseEvent(QKeyEvent * event)

76+{

77+ if (!m_active) return;

78+

79+ event->accept();

80+ Q_EMIT released(m_shortcut.toString());

81+}

82+

83+void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)

84+{

85+ if (!window) {

86+// qWarning() << Q_FUNC_INFO << "Failed to setup filter on window";

87+ return;

88+ }

89+

90+ registry->setupFilterOnWindow((qulonglong) window->winId());

91+}

plugins/GlobalShortcut/globalshortcut.hnew file+81

@@ -0,0 +1,81 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef GLOBALSHORTCUT_H

18+#define GLOBALSHORTCUT_H

19+

20+#include <QVariant>

21+#include <QQuickWindow>

22+#include <QQuickItem>

23+

24+/**

25+ * @brief The GlobalShortcut class

26+ *

27+ * QML component for registering a shortcut; the shortcut itself can be

28+ * specified either as a string ("Ctrl+Alt+L") or as an enum value

29+ * (Qt.ControlModifier|Qt.AltModifier|Qt.Key_L).

30+ *

31+ * When the shortcut is detected, the signal triggered() gets emitted.

32+ */

33+class GlobalShortcut: public QQuickItem

34+{

35+ Q_OBJECT

36+ /**

37+ * The shortcut itself

38+ */

39+ Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged)

40+ /**

41+ * Whether the shortcut is active (true by default)

42+ */

43+ Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)

44+

45+public:

46+ GlobalShortcut(QQuickItem *parent = nullptr);

47+ ~GlobalShortcut() = default;

48+

49+ QVariant shortcut() const;

50+ void setShortcut(const QVariant &shortcut);

51+

52+ bool isActive() const;

53+ void setActive(bool active);

54+

55+protected:

56+ void componentComplete() override;

57+ void keyPressEvent(QKeyEvent * event) override;

58+ void keyReleaseEvent(QKeyEvent * event) override;

59+

60+Q_SIGNALS:

61+ void shortcutChanged(const QVariant &shortcut);

62+ /**

63+ * Emitted when a global keypress of @p shortcut is detected

64+ */

65+ void triggered(const QString &shortcut);

66+ /**

67+ * Emitted when a global keypress of @p shortcut is released

68+ */

69+ void released(const QString &shortcut);

70+ void activeChanged(bool active);

71+

72+private Q_SLOTS:

73+ void setupFilterOnWindow(QQuickWindow* window);

74+

75+private:

76+ QVariant m_shortcut;

77+ bool m_active = true;

78+};

79+

80+

81+#endif // GLOBALSHORTCUT_H

plugins/GlobalShortcut/globalshortcutregistry.cppnew file+125

@@ -0,0 +1,125 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#include <QDebug>

18+#include <QGuiApplication>

19+#include <QKeyEvent>

20+#include <QKeySequence>

21+

22+#include "globalshortcutregistry.h"

23+

24+static qulonglong s_windowId = 0;

25+

26+GlobalShortcutRegistry::GlobalShortcutRegistry(QObject *parent)

27+ : QObject(parent)

28+{

29+}

30+

31+GlobalShortcutList GlobalShortcutRegistry::shortcuts() const

32+{

33+ return m_shortcuts;

34+}

35+

36+bool GlobalShortcutRegistry::hasShortcut(const QVariant &seq) const

37+{

38+ return m_shortcuts.contains(seq);

39+}

40+

41+void GlobalShortcutRegistry::addShortcut(const QVariant &seq, GlobalShortcut *sc)

42+{

43+ if (sc) {

44+ if (!m_shortcuts.contains(seq)) { // create a new entry

45+ m_shortcuts.insert(seq, {sc});

46+ } else { // append to an existing one

47+ auto shortcuts = m_shortcuts[seq];

48+ shortcuts.append(sc);

49+ m_shortcuts.insert(seq, shortcuts);

50+ }

51+

52+ connect(sc, &GlobalShortcut::destroyed, this, &GlobalShortcutRegistry::removeShortcut);

53+ }

54+}

55+

56+void GlobalShortcutRegistry::removeShortcut(QObject *obj)

57+{

58+ QMutableMapIterator<QVariant, QVector<QPointer<GlobalShortcut>>> it(m_shortcuts);

59+ while (it.hasNext()) {

60+ it.next();

61+ GlobalShortcut * scObj = static_cast<GlobalShortcut *>(obj);

62+ if (scObj && it.value().contains(scObj)) {

63+ it.value().removeAll(scObj);

64+ if (it.value().isEmpty()) {

65+ it.remove();

66+ }

67+ }

68+ }

69+}

70+

71+bool GlobalShortcutRegistry::eventFilter(QObject *obj, QEvent *event)

72+{

73+ Q_ASSERT(m_filteredWindow);

74+ Q_ASSERT(obj == static_cast<QObject*>(m_filteredWindow.data()));

75+

76+ if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {

77+

78+ QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);

79+

80+ // Make a copy of the event so we don't alter it for passing on.

81+ QKeyEvent eCopy(keyEvent->type(),

82+ keyEvent->key(),

83+ keyEvent->modifiers(),

84+ keyEvent->text(),

85+ keyEvent->isAutoRepeat(),

86+ keyEvent->count());

87+ eCopy.ignore();

88+

89+ int seq = keyEvent->key() + keyEvent->modifiers();

90+ if (m_shortcuts.contains(seq)) {

91+ const auto shortcuts = m_shortcuts.value(seq);

92+ Q_FOREACH(const auto &shortcut, shortcuts) {

93+ if (shortcut) {

94+ qApp->sendEvent(shortcut, &eCopy);

95+ }

96+ }

97+ }

98+

99+ return eCopy.isAccepted();

100+ }

101+

102+ return QObject::eventFilter(obj, event);

103+}

104+

105+void GlobalShortcutRegistry::setupFilterOnWindow(qulonglong wid)

106+{

107+ if (wid == s_windowId) {

108+ return;

109+ }

110+

111+ if (m_filteredWindow) {

112+ m_filteredWindow->removeEventFilter(this);

113+ m_filteredWindow.clear();

114+ s_windowId = 0;

115+ }

116+

117+ Q_FOREACH(QWindow *window, qApp->allWindows()) {

118+ if (window && window->winId() == wid) {

119+ m_filteredWindow = window;

120+ window->installEventFilter(this);

121+ s_windowId = wid;

122+ break;

123+ }

124+ }

125+}

plugins/GlobalShortcut/globalshortcutregistry.hnew file+70

@@ -0,0 +1,70 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef GLOBALSHORTCUT_REGISTRY_H

18+#define GLOBALSHORTCUT_REGISTRY_H

19+

20+#include <QObject>

21+#include <QVariantList>

22+#include <QPointer>

23+#include <QWindow>

24+

25+#include "globalshortcut.h"

26+

27+typedef QMap<QVariant, QVector<QPointer<GlobalShortcut>>> GlobalShortcutList;

28+

29+/**

30+ * @brief The GlobalShortcutRegistry class

31+ *

32+ * Serves as a central point for shortcut registration.

33+ */

34+class Q_DECL_EXPORT GlobalShortcutRegistry: public QObject

35+{

36+ Q_OBJECT

37+public:

38+ GlobalShortcutRegistry(QObject * parent = nullptr);

39+ ~GlobalShortcutRegistry() = default;

40+

41+ /**

42+ * @return the list of shortcuts currently registered

43+ */

44+ GlobalShortcutList shortcuts() const;

45+ /**

46+ * @return whether shortcut @p seq is currently registered

47+ */

48+ bool hasShortcut(const QVariant &seq) const;

49+ /**

50+ * Adds a shortcut @p seq to the registry

51+ */

52+ void addShortcut(const QVariant &seq, GlobalShortcut * sc);

53+

54+ /**

55+ * Sets up key events filtering on window @p wid

56+ */

57+ void setupFilterOnWindow(qulonglong wid);

58+

59+protected:

60+ bool eventFilter(QObject *obj, QEvent *event) override;

61+

62+private Q_SLOTS:

63+ void removeShortcut(QObject *obj);

64+

65+private:

66+ GlobalShortcutList m_shortcuts;

67+ QPointer<QWindow> m_filteredWindow = nullptr;

68+};

69+

70+#endif

plugins/Ubuntu/Payments/plugin.cpp → plugins/GlobalShortcut/plugin.cpprenamed+5−6

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

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -15,14 +15,13 @@

15 */

15 */

16

16

17#include "plugin.h"

17#include "plugin.h"

18−#include "Payments.h"

18+#include "globalshortcut.h"

19

19

20#include <QtQml>

20#include <QtQml>

21

21

22−

23−void BackendPlugin::registerTypes(const char *uri)

22+void GlobalShortcutPlugin::registerTypes(const char *uri)

24{

23{

25− Q_ASSERT(uri == QLatin1String("Ubuntu.Payments"));

24+ Q_ASSERT(uri == QLatin1String("GlobalShortcut"));

26

25

27− qmlRegisterType<Payments>(uri, 0, 1, "Payments");

26+ qmlRegisterType<GlobalShortcut>(uri, 1, 0, "GlobalShortcut");

28}

27}

plugins/GlobalShortcut/plugin.hnew file+32

@@ -0,0 +1,32 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef GLOBALSHORTCUTPLUGIN_H

18+#define GLOBALSHORTCUTPLUGIN_H

19+

20+#include <QQmlExtensionPlugin>

21+

22+class GlobalShortcutPlugin: public QQmlExtensionPlugin

23+{

24+ Q_OBJECT

25+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)

26+

27+public:

28+ void registerTypes(const char *uri) override;

29+};

30+

31+

32+#endif // GLOBALSHORTCUTPLUGIN_H

plugins/GlobalShortcut/qmldirnew file+2

@@ -0,0 +1,2 @@

1+module GlobalShortcut

2+plugin GlobalShortcut-qml

plugins/Greeter/CMakeLists.txtnew file+6

@@ -0,0 +1,6 @@

1+macro(add_unity8_greeter_plugin PLUGIN VERSION PATH)

2+ export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})

3+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})

4+endmacro()

5+

6+add_subdirectory(Unity)

plugins/Greeter/Unity/CMakeLists.txtnew file+1

@@ -0,0 +1 @@

1+add_subdirectory(Launcher)

plugins/Greeter/Unity/Launcher/CMakeLists.txtnew file+35

@@ -0,0 +1,35 @@

1+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

2+

3+add_definitions(-DSM_BUSNAME=systemBus)

4+

5+include_directories(

6+ ${CMAKE_CURRENT_SOURCE_DIR}

7+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

8+ ${GSETTINGS_QT_INCLUDE_DIRS}

9+ ${libunity8-private_SOURCE_DIR}

10+)

11+

12+set(QMLLAUNCHERPLUGINAS_SRC

13+ plugin.cpp

14+ launchermodelas.cpp

15+ launcheritem.cpp

16+ quicklistmodel.cpp

17+ quicklistentry.cpp

18+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

19+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

20+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

21+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

22+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

23+ )

24+

25+add_library(UnityLauncherAS-qml MODULE

26+ ${QMLLAUNCHERPLUGINAS_SRC}

27+ )

28+

29+target_link_libraries(UnityLauncherAS-qml

30+ unity8-private

31+ ${GSETTINGS_QT_LDFLAGS}

32+ Qt5::DBus Qt5::Qml Qt5::Gui

33+ )

34+

35+add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)

plugins/Greeter/Unity/Launcher/launcheritem.cppnew file+218

@@ -0,0 +1,218 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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 "launcheritem.h"

18+#include "quicklistmodel.h"

19+

20+#include <libintl.h>

21+

22+LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :

23+ LauncherItemInterface(parent),

24+ m_appId(appId),

25+ m_name(name),

26+ m_icon(icon),

27+ m_pinned(false),

28+ m_running(false),

29+ m_recent(false),

30+ m_progress(-1),

31+ m_count(0),

32+ m_countVisible(false),

33+ m_focused(false),

34+ m_alerting(false),

35+ m_surfaceCount(0),

36+ m_quickList(new QuickListModel(this))

37+{

38+ QuickListEntry nameAction;

39+ nameAction.setActionId(QStringLiteral("launch_item"));

40+ nameAction.setText(m_name);

41+ m_quickList->appendAction(nameAction);

42+}

43+

44+QString LauncherItem::appId() const

45+{

46+ return m_appId;

47+}

48+

49+QString LauncherItem::name() const

50+{

51+ return m_name;

52+}

53+

54+void LauncherItem::setName(const QString &name)

55+{

56+ if (m_name != name) {

57+ m_name = name;

58+ QuickListEntry entry;

59+ entry.setActionId(QStringLiteral("launch_item"));

60+ entry.setText(m_name);

61+ m_quickList->updateAction(entry);

62+ Q_EMIT nameChanged(name);

63+ }

64+}

65+

66+QString LauncherItem::icon() const

67+{

68+ return m_icon;

69+}

70+

71+void LauncherItem::setIcon(const QString &icon)

72+{

73+ if (m_icon != icon) {

74+ m_icon = icon;

75+ Q_EMIT iconChanged(icon);

76+ }

77+}

78+

79+QStringList LauncherItem::keywords() const

80+{

81+ return m_keywords;

82+}

83+

84+void LauncherItem::setKeywords(const QStringList &keywords)

85+{

86+ if (m_keywords != keywords) {

87+ m_keywords = keywords;

88+ Q_EMIT keywordsChanged(keywords);

89+ }

90+}

91+

92+uint LauncherItem::popularity() const

93+{

94+ // Not exposing usage order in greeter session at this point.

95+ return 0;

96+}

97+

98+bool LauncherItem::pinned() const

99+{

100+ return m_pinned;

101+}

102+

103+void LauncherItem::setPinned(bool pinned)

104+{

105+ if (m_pinned != pinned) {

106+ m_pinned = pinned;

107+ Q_EMIT pinnedChanged(pinned);

108+ }

109+}

110+

111+bool LauncherItem::running() const

112+{

113+ return m_running;

114+}

115+

116+void LauncherItem::setRunning(bool running)

117+{

118+ if (m_running != running) {

119+ m_running = running;

120+ Q_EMIT runningChanged(running);

121+ }

122+}

123+

124+bool LauncherItem::recent() const

125+{

126+ return m_recent;

127+}

128+

129+void LauncherItem::setRecent(bool recent)

130+{

131+ if (m_recent != recent) {

132+ m_recent = recent;

133+ Q_EMIT recentChanged(recent);

134+ }

135+}

136+

137+int LauncherItem::progress() const

138+{

139+ return m_progress;

140+}

141+

142+void LauncherItem::setProgress(int progress)

143+{

144+ if (m_progress != progress) {

145+ m_progress = progress;

146+ Q_EMIT progressChanged(progress);

147+ }

148+}

149+

150+int LauncherItem::count() const

151+{

152+ return m_count;

153+}

154+

155+void LauncherItem::setCount(int count)

156+{

157+ if (m_count != count) {

158+ m_count = count;

159+ Q_EMIT countChanged(count);

160+ }

161+}

162+

163+bool LauncherItem::countVisible() const

164+{

165+ return m_countVisible;

166+}

167+

168+void LauncherItem::setCountVisible(bool countVisible)

169+{

170+ if (m_countVisible != countVisible) {

171+ m_countVisible = countVisible;

172+ Q_EMIT countVisibleChanged(countVisible);

173+ }

174+}

175+

176+bool LauncherItem::focused() const

177+{

178+ return m_focused;

179+}

180+

181+void LauncherItem::setFocused(bool focused)

182+{

183+ if (m_focused != focused) {

184+ m_focused = focused;

185+ Q_EMIT focusedChanged(focused);

186+ }

187+}

188+

189+bool LauncherItem::alerting() const

190+{

191+ return m_alerting;

192+}

193+

194+void LauncherItem::setAlerting(bool alerting)

195+{

196+ if (m_alerting != alerting) {

197+ m_alerting = alerting;

198+ Q_EMIT alertingChanged(alerting);

199+ }

200+}

201+

202+int LauncherItem::surfaceCount() const

203+{

204+ return m_surfaceCount;

205+}

206+

207+void LauncherItem::setSurfaceCount(int surfaceCount)

208+{

209+ if (m_surfaceCount != surfaceCount) {

210+ m_surfaceCount = surfaceCount;

211+ Q_EMIT surfaceCountChanged(surfaceCount);

212+ }

213+}

214+

215+unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

216+{

217+ return m_quickList;

218+}

plugins/Greeter/Unity/Launcher/launcheritem.hnew file+84

@@ -0,0 +1,84 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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+#ifndef LAUNCHERITEM_H

18+#define LAUNCHERITEM_H

19+

20+#include "quicklistmodel.h"

21+

22+#include <unity/shell/launcher/LauncherItemInterface.h>

23+

24+class QuickListModel;

25+

26+using namespace unity::shell::launcher;

27+

28+class LauncherItem: public LauncherItemInterface

29+{

30+ Q_OBJECT

31+public:

32+ LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);

33+

34+ QString appId() const override;

35+ QString name() const override;

36+ QString icon() const override;

37+ QStringList keywords() const override;

38+ uint popularity() const override;

39+ bool pinned() const override;

40+ bool running() const override;

41+ bool recent() const override;

42+ int progress() const override;

43+ int count() const override;

44+ bool countVisible() const override;

45+ bool focused() const override;

46+ bool alerting() const override;

47+ int surfaceCount() const override;

48+

49+ unity::shell::launcher::QuickListModelInterface *quickList() const override;

50+

51+private:

52+ void setName(const QString &name);

53+ void setIcon(const QString &icon);

54+ void setKeywords(const QStringList &keywords);

55+ void setPinned(bool pinned);

56+ void setRunning(bool running);

57+ void setRecent(bool recent);

58+ void setProgress(int progress);

59+ void setCount(int count);

60+ void setCountVisible(bool countVisible);

61+ void setFocused(bool focused);

62+ void setAlerting(bool alerting);

63+ void setSurfaceCount(int surfaceCount);

64+

65+private:

66+ QString m_appId;

67+ QString m_name;

68+ QString m_icon;

69+ QStringList m_keywords;

70+ bool m_pinned;

71+ bool m_running;

72+ bool m_recent;

73+ int m_progress;

74+ int m_count;

75+ bool m_countVisible;

76+ bool m_focused;

77+ bool m_alerting;

78+ int m_surfaceCount;

79+ QuickListModel *m_quickList;

80+

81+ friend class LauncherModel;

82+};

83+

84+#endif // LAUNCHERITEM_H

plugins/Greeter/Unity/Launcher/launchermodelas.cppnew file+303

@@ -0,0 +1,303 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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 "launchermodelas.h"

18+#include "launcheritem.h"

19+#include "AccountsServiceDBusAdaptor.h"

20+#include <unity/shell/application/ApplicationInfoInterface.h>

21+

22+#include <QDesktopServices>

23+#include <QDebug>

24+#include <QDBusArgument>

25+

26+using namespace unity::shell::application;

27+

28+LauncherModel::LauncherModel(QObject *parent):

29+ LauncherModelInterface(parent),

30+ m_accounts(new AccountsServiceDBusAdaptor(this)),

31+ m_onlyPinned(true)

32+{

33+ connect(m_accounts, &AccountsServiceDBusAdaptor::propertiesChanged, this, &LauncherModel::propertiesChanged);

34+ refresh();

35+}

36+

37+LauncherModel::~LauncherModel()

38+{

39+ while (!m_list.empty()) {

40+ m_list.takeFirst()->deleteLater();

41+ }

42+}

43+

44+int LauncherModel::rowCount(const QModelIndex &parent) const

45+{

46+ Q_UNUSED(parent)

47+ return m_list.count();

48+}

49+

50+QVariant LauncherModel::data(const QModelIndex &index, int role) const

51+{

52+ LauncherItem *item = m_list.at(index.row());

53+ switch(role) {

54+ case RoleAppId:

55+ return item->appId();

56+ case RoleName:

57+ return item->name();

58+ case RoleIcon:

59+ return item->icon();

60+ case RolePinned:

61+ return item->pinned();

62+ case RoleCount:

63+ return item->count();

64+ case RoleCountVisible:

65+ return item->countVisible();

66+ case RoleProgress:

67+ return item->progress();

68+ case RoleFocused:

69+ return item->focused();

70+ case RoleRunning:

71+ return item->running();

72+ case RoleSurfaceCount:

73+ return item->surfaceCount();

74+ }

75+

76+ return QVariant();

77+}

78+

79+unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

80+{

81+ if (index < 0 || index >= m_list.count()) {

82+ return 0;

83+ }

84+ return m_list.at(index);

85+}

86+

87+void LauncherModel::move(int oldIndex, int newIndex)

88+{

89+ Q_UNUSED(oldIndex)

90+ Q_UNUSED(newIndex)

91+ qWarning() << "This is a read only implementation. Cannot move items.";

92+}

93+

94+void LauncherModel::pin(const QString &appId, int index)

95+{

96+ Q_UNUSED(appId)

97+ Q_UNUSED(index)

98+ qWarning() << "This is a read only implementation. Cannot pin items";

99+}

100+

101+void LauncherModel::requestRemove(const QString &appId)

102+{

103+ Q_UNUSED(appId)

104+ qWarning() << "This is a read only implementation. Cannot remove items";

105+}

106+

107+void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)

108+{

109+ int index = findApplication(appId);

110+ if (index < 0) {

111+ return;

112+ }

113+

114+ LauncherItem *item = m_list.at(index);

115+ QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());

116+ if (model) {

117+ QString actionId = model->get(actionIndex).actionId();

118+

119+ // Check if this is one of the launcher actions we handle ourselves

120+ if (actionId == QLatin1String("launch_item")) {

121+ QDesktopServices::openUrl(getUrlForAppId(appId));

122+

123+ // Nope, we don't know this action, let the backend forward it to the application

124+ } else {

125+ // TODO: forward quicklist action to app, possibly via m_dbusIface

126+ }

127+ }

128+}

129+

130+void LauncherModel::setUser(const QString &username)

131+{

132+ if (m_user != username) {

133+ m_user = username;

134+ refresh();

135+ }

136+}

137+

138+QString LauncherModel::getUrlForAppId(const QString &appId) const

139+{

140+ // appId is either an appId or a legacy app name. Let's find out which

141+ if (appId.isEmpty()) {

142+ return QString();

143+ }

144+

145+ if (!appId.contains('_')) {

146+ return "application:///" + appId + ".desktop";

147+ }

148+

149+ QStringList parts = appId.split('_');

150+ QString package = parts.value(0);

151+ QString app = parts.value(1, QStringLiteral("first-listed-app"));

152+ return "appid://" + package + "/" + app + "/current-user-version";

153+}

154+

155+ApplicationManagerInterface *LauncherModel::applicationManager() const

156+{

157+ return nullptr;

158+}

159+

160+void LauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager)

161+{

162+ Q_UNUSED(appManager)

163+ qWarning() << "This plugin syncs all its states from AccountsService. Not using ApplicationManager.";

164+ return;

165+}

166+

167+bool LauncherModel::onlyPinned() const

168+{

169+ return m_onlyPinned;

170+}

171+

172+void LauncherModel::setOnlyPinned(bool onlyPinned)

173+{

174+ if (m_onlyPinned != onlyPinned) {

175+ m_onlyPinned = onlyPinned;

176+ Q_EMIT onlyPinnedChanged();

177+ refresh();

178+ }

179+}

180+

181+int LauncherModel::findApplication(const QString &appId)

182+{

183+ for (int i = 0; i < m_list.count(); ++i) {

184+ LauncherItem *item = m_list.at(i);

185+ if (item->appId() == appId) {

186+ return i;

187+ }

188+ }

189+ return -1;

190+}

191+

192+void LauncherModel::refresh()

193+{

194+ if (!m_accounts || m_user.isEmpty()) {

195+ refreshWithItems(QList<QVariantMap>());

196+ } else {

197+ QDBusPendingCall pendingCall = m_accounts->getUserPropertyAsync(m_user, QStringLiteral("com.canonical.unity.AccountsService"), QStringLiteral("LauncherItems"));

198+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);

199+ connect(watcher, &QDBusPendingCallWatcher::finished,

200+ this, [this](QDBusPendingCallWatcher* watcher) {

201+

202+ QDBusPendingReply<QVariant> reply = *watcher;

203+ watcher->deleteLater();

204+ if (reply.isError()) {

205+ qWarning() << "Failed to refresh LauncherItems" << reply.error().message();

206+ return;

207+ }

208+

209+ refreshWithItems(qdbus_cast<QList<QVariantMap>>(reply.value().value<QDBusArgument>()));

210+ });

211+ }

212+}

213+

214+void LauncherModel::refreshWithItems(const QList<QVariantMap> &items)

215+{

216+ // First walk through all the existing items and see if we need to remove something

217+ QList<LauncherItem*> toBeRemoved;

218+

219+ Q_FOREACH (LauncherItem* item, m_list) {

220+ bool found = false;

221+ Q_FOREACH(const QVariant &asItem, items) {

222+ QVariantMap cachedMap = asItem.toMap();

223+ if (cachedMap.value(QStringLiteral("id")).toString() == item->appId()) {

224+ // Only keep and update it if we either show unpinned or it is pinned

225+ if (!m_onlyPinned || cachedMap.value(QStringLiteral("pinned")).toBool()) {

226+ found = true;

227+ item->setName(cachedMap.value(QStringLiteral("name")).toString());

228+ item->setIcon(cachedMap.value(QStringLiteral("icon")).toString());

229+ item->setCount(cachedMap.value(QStringLiteral("count")).toInt());

230+ item->setCountVisible(cachedMap.value(QStringLiteral("countVisible")).toBool());

231+ item->setProgress(cachedMap.value(QStringLiteral("progress")).toInt());

232+ item->setRunning(cachedMap.value(QStringLiteral("running")).toBool());

233+

234+ int idx = m_list.indexOf(item);

235+ Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleCount, RoleCountVisible, RoleRunning, RoleProgress});

236+ }

237+ break;

238+ }

239+ }

240+ if (!found) {

241+ toBeRemoved.append(item);

242+ }

243+ }

244+

245+ Q_FOREACH (LauncherItem* item, toBeRemoved) {

246+ int idx = m_list.indexOf(item);

247+ beginRemoveRows(QModelIndex(), idx, idx);

248+ m_list.takeAt(idx)->deleteLater();

249+ endRemoveRows();

250+ }

251+

252+ // Now walk through list and see if we need to add something

253+ int skipped = 0;

254+ for (int asIndex = 0; asIndex < items.count(); ++asIndex) {

255+ QVariant entry = items.at(asIndex);

256+

257+ if (m_onlyPinned && !entry.toMap().value(QStringLiteral("pinned")).toBool()) {

258+ // Skipping it as we only show pinned and it is not

259+ skipped++;

260+ continue;

261+ }

262+ int newPosition = asIndex - skipped;

263+

264+ int itemIndex = -1;

265+ for (int i = 0; i < m_list.count(); ++i) {

266+ if (m_list.at(i)->appId() == entry.toMap().value(QStringLiteral("id")).toString()) {

267+ itemIndex = i;

268+ break;

269+ }

270+ }

271+

272+ if (itemIndex == -1) {

273+ QVariantMap cachedMap = entry.toMap();

274+ // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.

275+ LauncherItem *item = new LauncherItem(cachedMap.value(QStringLiteral("id")).toString(),

276+ cachedMap.value(QStringLiteral("name")).toString(),

277+ cachedMap.value(QStringLiteral("icon")).toString(),

278+ this);

279+ item->setPinned(true);

280+ item->setCount(cachedMap.value(QStringLiteral("count")).toInt());

281+ item->setCountVisible(cachedMap.value(QStringLiteral("countVisible")).toBool());

282+ item->setProgress(cachedMap.value(QStringLiteral("progress")).toInt());

283+ item->setRunning(cachedMap.value(QStringLiteral("running")).toBool());

284+ beginInsertRows(QModelIndex(), newPosition, newPosition);

285+ m_list.insert(newPosition, item);

286+ endInsertRows();

287+ } else if (itemIndex != newPosition) {

288+ // The item is already there, but it is in a different place than in the settings.

289+ // Move it to the addedIndex

290+ beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), newPosition);

291+ m_list.move(itemIndex, newPosition);

292+ endMoveRows();

293+ }

294+ }

295+}

296+

297+void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

298+{

299+ if (user != m_user || interface != QLatin1String("com.canonical.unity.AccountsService") || !changed.contains(QStringLiteral("LauncherItems"))) {

300+ return;

301+ }

302+ refresh();

303+}

plugins/Greeter/Unity/Launcher/launchermodelas.hnew file+77

@@ -0,0 +1,77 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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+#ifndef LAUNCHERMODEL_H

18+#define LAUNCHERMODEL_H

19+

20+#include <unity/shell/launcher/LauncherModelInterface.h>

21+#include <unity/shell/application/ApplicationManagerInterface.h>

22+

23+#include <QAbstractListModel>

24+

25+class LauncherItem;

26+class GSettings;

27+class AccountsServiceDBusAdaptor;

28+

29+using namespace unity::shell::launcher;

30+using namespace unity::shell::application;

31+

32+class LauncherModel: public LauncherModelInterface

33+{

34+ Q_OBJECT

35+

36+public:

37+ LauncherModel(QObject *parent = 0);

38+ ~LauncherModel();

39+

40+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

41+

42+ QVariant data(const QModelIndex &index, int role) const override;

43+

44+ Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

45+ Q_INVOKABLE void move(int oldIndex, int newIndex) override;

46+ Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

47+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;

48+ Q_INVOKABLE void setUser(const QString &username) override;

49+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

50+

51+ unity::shell::application::ApplicationManagerInterface* applicationManager() const override;

52+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager) override;

53+

54+ bool onlyPinned() const override;

55+ void setOnlyPinned(bool onlyPinned) override;

56+

57+ int findApplication(const QString &appId);

58+

59+public Q_SLOTS:

60+ void requestRemove(const QString &appId) override;

61+ Q_INVOKABLE void refresh();

62+

63+private Q_SLOTS:

64+ void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

65+

66+private:

67+ void refreshWithItems(const QList<QVariantMap> &items);

68+

69+ QString m_user;

70+ QList<LauncherItem*> m_list;

71+ AccountsServiceDBusAdaptor *m_accounts;

72+ bool m_onlyPinned;

73+

74+ friend class LauncherModelASTest;

75+};

76+

77+#endif // LAUNCHERMODEL_H

plugins/Greeter/Unity/Launcher/plugin.cppnew file+46

@@ -0,0 +1,46 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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+// Qt

18+#include <QtQml/qqml.h>

19+

20+// self

21+#include "plugin.h"

22+

23+// local

24+#include "launchermodelas.h"

25+#include "launcheritem.h"

26+

27+

28+using namespace unity::shell::launcher;

29+

30+static QObject* modelProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

31+{

32+ return new LauncherModel();

33+}

34+

35+void UnityLauncherPlugin::registerTypes(const char *uri)

36+{

37+ Q_ASSERT(uri == QLatin1String("Unity.Launcher"));

38+

39+ qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", QStringLiteral("Abstract Interface. Cannot be instantiated."));

40+ qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", QStringLiteral("Abstract Interface. Cannot be instantiated."));

41+ qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListInterface", QStringLiteral("Abstract Interface. Cannot be instantiated."));

42+

43+ qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);

44+ qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", QStringLiteral("Can't create new Launcher Items in QML. Get them from the LauncherModel."));

45+ qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", QStringLiteral("Can't create a QuickListModel in QML. Get them from the LauncherItems."));

46+}

tests/mocks/Unity/fake_unity_plugin.h → plugins/Greeter/Unity/Launcher/plugin.hrenamed+6−8

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2014-2015 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,23 +12,21 @@

12 *

12 *

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

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

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

15− *

16− * Author: Nick Dedekind <nick.dedekind@canonical.com>

17 */

15 */

18

16

19−#ifndef FAKE_UNITY_PLUGIN_H

17+#ifndef UNITY_LAUNCHER_PLUGIN_H

20−#define FAKE_UNITY_PLUGIN_H

18+#define UNITY_LAUNCHER_PLUGIN_H

21

19

22−// Qt

20+#include <QtQml/QQmlEngine>

23#include <QtQml/QQmlExtensionPlugin>

21#include <QtQml/QQmlExtensionPlugin>

24

22

25−class FakeUnityPlugin : public QQmlExtensionPlugin

23+class UnityLauncherPlugin : public QQmlExtensionPlugin

26{

24{

27 Q_OBJECT

25 Q_OBJECT

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

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

29

27

30public:

28public:

31− void registerTypes(const char *uri);

29+ void registerTypes(const char *uri) override;

32};

30};

33

31

34#endif

32#endif

plugins/Greeter/Unity/Launcher/qmldirnew file+3

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

1+module Unity.Launcher

2+plugin UnityLauncherAS-qml

3+typeinfo Launcher.qmltypes

tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp → plugins/Greeter/Unity/Launcher/quicklistentry.cpprenamed+28−18

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

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

1+/* Copyright (C) 2014-2015 Canonical, Ltd.

3 *

2 *

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

3 * 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

4 * it under the terms of the GNU General Public License as published by

@@ -12,35 +11,46 @@

12 *

11 *

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

12 * 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/>.

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

14 */

18

15

19−#include "../Greeter.h"

16+#include "quicklistentry.h"

20−#include "../GreeterPrivate.h"

17+

18+QuickListEntry::QuickListEntry()

19+{

20+

21+}

22+

23+QString QuickListEntry::actionId() const

24+{

25+ return m_actionId;

26+}

21

27

22−namespace QLightDM

28+void QuickListEntry::setActionId(const QString &actionId)

23{

29{

30+ m_actionId = actionId;

31+}

24

32

25−GreeterPrivate::GreeterPrivate(Greeter* parent)

33+QString QuickListEntry::text() const

26− : authenticated(false),

27− authenticationUser(),

28− q_ptr(parent)

29{

34{

35+ return m_text;

30}

36}

31

37

32−void GreeterPrivate::handleAuthenticate()

38+void QuickListEntry::setText(const QString &text)

33{

39{

34− Q_Q(Greeter);

40+ m_text = text;

35− Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);

36}

41}

37

42

38−void GreeterPrivate::handleRespond(const QString &response)

43+QString QuickListEntry::icon() const

39{

44{

40− Q_Q(Greeter);

45+ return m_icon;

46+}

41

47

42− authenticated = (response == "password");

48+void QuickListEntry::setIcon(const QString &icon)

43− q->sendAuthenticationComplete();

49+{

50+ m_icon = icon;

44}

51}

45

52

53+bool QuickListEntry::clickable() const

54+{

55+ return !m_actionId.isEmpty();

46}

56}

libs/UbuntuGestures/DebugHelpers.h → plugins/Greeter/Unity/Launcher/quicklistentry.hrenamed+23−11

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

1−/*

2− * Copyright (C) 2014 Canonical, Ltd.

1+/* Copyright (C) 2014-2015 Canonical, Ltd.

3 *

2 *

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

3 * 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

4 * it under the terms of the GNU General Public License as published by

@@ -14,18 +13,31 @@

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

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

15 */

14 */

16

15

17−#ifndef UBUNTUGESTURES_DEBUG_HELPER_H

16+#ifndef QUICKLISTENTRY_H

18−#define UBUNTUGESTURES_DEBUG_HELPER_H

17+#define QUICKLISTENTRY_H

19

18

20#include <QString>

19#include <QString>

21

20

22−#include "UbuntuGesturesGlobal.h"

21+class QuickListEntry

22+{

23+public:

24+ QuickListEntry();

23

25

24−class QMouseEvent;

26+ QString actionId() const;

25−class QTouchEvent;

27+ void setActionId(const QString &actionId);

26

28

27−UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);

29+ QString text() const;

28−UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);

30+ void setText(const QString &text);

29−UBUNTUGESTURES_EXPORT QString mouseEventToString(const QMouseEvent *ev);

30

31

31−#endif // UBUNTUGESTURES_DEBUG_HELPER_H

32+ QString icon() const;

33+ void setIcon(const QString &icon);

34+

35+ bool clickable() const;

36+

37+private:

38+ QString m_actionId;

39+ QString m_text;

40+ QString m_icon;

41+};

42+

43+#endif // QUICKLISTENTRY

plugins/Greeter/Unity/Launcher/quicklistmodel.cppnew file+72

@@ -0,0 +1,72 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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 "quicklistmodel.h"

18+

19+QuickListModel::QuickListModel(QObject *parent) :

20+ QuickListModelInterface(parent)

21+{

22+

23+}

24+

25+QuickListModel::~QuickListModel()

26+{

27+

28+}

29+

30+void QuickListModel::appendAction(const QuickListEntry &entry)

31+{

32+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

33+ m_list.append(entry);

34+ endInsertRows();

35+}

36+

37+void QuickListModel::updateAction(const QuickListEntry &entry)

38+{

39+ for (int i = 0; i < m_list.count(); ++i) {

40+ if (m_list.at(i).actionId() == entry.actionId()) {

41+ m_list.replace(i, entry);

42+ Q_EMIT dataChanged(index(i), index(i));

43+ return;

44+ }

45+ }

46+}

47+

48+QuickListEntry QuickListModel::get(int index) const

49+{

50+ return m_list.at(index);

51+}

52+

53+int QuickListModel::rowCount(const QModelIndex &index) const

54+{

55+ Q_UNUSED(index)

56+ return m_list.count();

57+}

58+

59+QVariant QuickListModel::data(const QModelIndex &index, int role) const

60+{

61+ switch (role) {

62+ case RoleLabel:

63+ return m_list.at(index.row()).text();

64+ case RoleIcon:

65+ return m_list.at(index.row()).icon();

66+ case RoleClickable:

67+ return m_list.at(index.row()).clickable();

68+ case RoleIsPrivate:

69+ return false; // The greeter plugin would just not add any private entries

70+ }

71+ return QVariant();

72+}

plugins/Greeter/Unity/Launcher/quicklistmodel.hnew file+55

@@ -0,0 +1,55 @@

1+/*

2+ * Copyright 2014-2015 Canonical Ltd.

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+#ifndef QUICKLISTMODEL_H

18+#define QUICKLISTMODEL_H

19+

20+#include "quicklistentry.h"

21+

22+#include <unity/shell/launcher/QuickListModelInterface.h>

23+

24+using namespace unity::shell::launcher;

25+

26+class QuickListModel: public QuickListModelInterface

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit QuickListModel(QObject *parent = 0);

32+

33+ ~QuickListModel();

34+

35+ void appendAction(const QuickListEntry &entry);

36+

37+ /**

38+ * @brief Update an existing action

39+ * @param entry The new, updated entry

40+ *

41+ * This will only do something if entry.actionId is found in the model.

42+ * To add a new entry, use appendAction().

43+ */

44+ void updateAction(const QuickListEntry &entry);

45+

46+ QuickListEntry get(int index) const;

47+

48+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

49+ QVariant data(const QModelIndex &index, int role) const override;

50+

51+private:

52+ QList<QuickListEntry> m_list;

53+};

54+

55+#endif // QUICKLISTMODEL_H

plugins/HudClient/CMakeLists.txtdeleted−38

@@ -1,38 +0,0 @@

1−find_package(Qt5Core REQUIRED)

2−find_package(Qt5Quick REQUIRED)

3−pkg_search_module(DEE dee-1.0 REQUIRED)

4−pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

5−pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)

6−pkg_search_module(DEEQT libdee-qt5 REQUIRED)

7−pkg_search_module(PULSE libpulse REQUIRED)

8−

9−include_directories(

10− ${CMAKE_CURRENT_BINARY_DIR}

11− ${Qt5Core_INCLUDE_DIRS}

12− ${Qt5Quick_INCLUDE_DIRS}

13− ${DEE_INCLUDE_DIRS}

14− ${DEEQT_INCLUDE_DIRS}

15− ${HUDCLIENT_INCLUDE_DIRS}

16− ${PULSE_INCLUDE_DIRS}

17−)

18−

19−set(HudQML_SOURCES

20− hudclient.cpp

21− hudtoolbarmodel.cpp

22− volumepeakdetector.cpp

23− plugin.cpp

24−)

25−

26−add_library(HudClientQml MODULE ${HudQML_SOURCES})

27−target_link_libraries(HudClientQml

28− ${Qt5Core_LIBRARIES}

29− ${Qt5Quick_LIBRARIES}

30− ${DEEQT_LDFLAGS}

31− ${HUDCLIENT_LDFLAGS}

32− ${GOBJECT_LDFLAGS}

33− ${PULSE_LDFLAGS}

34−)

35−

36−qt5_use_modules(HudClientQml Qml)

37−

38−add_unity8_plugin(HudClient 0.1 HudClient TARGETS HudClientQml)

plugins/HudClient/HudClient.qmltypesdeleted−91

@@ -1,91 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable HudClient 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "DeeListModel"

12− prototype: "QAbstractListModel"

13− Property { name: "name"; type: "string" }

14− Property { name: "synchronized"; type: "bool"; isReadonly: true }

15− Property { name: "count"; type: "int"; isReadonly: true }

16− Signal {

17− name: "nameChanged"

18− Parameter { type: "string" }

19− }

20− Signal {

21− name: "synchronizedChanged"

22− Parameter { type: "bool" }

23− }

24− Signal {

25− name: "roleNamesChanged"

26− Parameter { type: "QHash<int,QByteArray>" }

27− }

28− Method {

29− name: "get"

30− type: "QVariantMap"

31− Parameter { name: "row"; type: "int" }

32− }

33− Method { name: "count"; type: "int" }

34− }

35− Component {

36− name: "HudClient"

37− prototype: "QObject"

38− exports: ["HudClient/HudClient 0.1"]

39− exportMetaObjectRevisions: [0]

40− Property { name: "results"; type: "DeeListModel"; isReadonly: true; isPointer: true }

41− Property { name: "toolBarModel"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }

42− Signal { name: "voiceQueryLoading" }

43− Signal { name: "voiceQueryListening" }

44− Signal { name: "voiceQueryHeardSomething" }

45− Signal { name: "voiceQueryFailed" }

46− Signal {

47− name: "voiceQueryFinished"

48− Parameter { name: "query"; type: "string" }

49− }

50− Signal { name: "commandExecuted" }

51− Signal {

52− name: "showParametrizedAction"

53− Parameter { name: "action"; type: "string" }

54− Parameter { name: "items"; type: "QVariant" }

55− }

56− Method {

57− name: "executeCommand"

58− Parameter { name: "index"; type: "int" }

59− }

60− Method {

61− name: "setQuery"

62− Parameter { name: "new_query"; type: "string" }

63− }

64− Method { name: "startVoiceQuery" }

65− Method {

66− name: "executeParametrizedAction"

67− Parameter { name: "values"; type: "QVariant" }

68− }

69− Method {

70− name: "updateParametrizedAction"

71− Parameter { name: "values"; type: "QVariant" }

72− }

73− Method { name: "cancelParametrizedAction" }

74− Method {

75− name: "executeToolBarAction"

76− Parameter { name: "action"; type: "HudClientQueryToolbarItems" }

77− }

78− }

79− Component {

80− name: "VolumePeakDetector"

81− prototype: "QObject"

82− exports: ["HudClient/VolumePeakDetector 0.1"]

83− exportMetaObjectRevisions: [0]

84− Property { name: "enabled"; type: "bool" }

85− Property { name: "desiredInterval"; type: "int" }

86− Signal {

87− name: "newPeak"

88− Parameter { name: "volume"; type: "float" }

89− }

90− }

91−}

plugins/HudClient/hudclient.cppdeleted−294

@@ -1,294 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

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−#include "hudclient.h"

18−

19−#include "hudtoolbarmodel.h"

20−

21−#include <deelistmodel.h>

22−

23−#include <QDebug>

24−

25−namespace

26−{

27−

28−extern "C"

29−{

30−

31−void loadingCB(GObject* /*src*/, gpointer dst)

32−{

33− static_cast<HudClient*>(dst)->voiceQueryLoading();

34−}

35−

36−void listeningCB(GObject* /*src*/, gpointer dst)

37−{

38− static_cast<HudClient*>(dst)->voiceQueryListening();

39−}

40−

41−void heardSomethingCB(GObject* /*src*/, gpointer dst)

42−{

43− static_cast<HudClient*>(dst)->voiceQueryHeardSomething();

44−}

45−

46−void failedCB(GObject* /*src*/, const gchar * /*reason*/, gpointer dst)

47−{

48− static_cast<HudClient*>(dst)->voiceQueryFailed();

49−}

50−

51−void finishedCB(GObject* /*src*/, const gchar* query, gpointer dst)

52−{

53− static_cast<HudClient*>(dst)->voiceQueryFinished(QString::fromUtf8(query));

54−}

55−

56−void modelReadyCB(GObject* /*src*/, gpointer dst)

57−{

58− static_cast<HudClient*>(dst)->modelReady(true);

59−}

60−

61−void modelReallyReadyCB(GObject* /*src*/, gint /*position*/, gint /*removed*/, gint /*added*/, gpointer dst)

62−{

63− static_cast<HudClient*>(dst)->modelReallyReady(true);

64−}

65−

66−static void modelsChangedCB(GObject* /*src*/, gpointer dst)

67−{

68− static_cast<HudClient*>(dst)->queryModelsChanged();

69−}

70−

71−static void toolBarUpdatedCB(GObject* /*src*/, gpointer dst)

72−{

73− static_cast<HudToolBarModel*>(dst)->updatedByBackend();

74−}

75−

76−} // extern "C"

77−

78−} // namespace

79−

80−HudClient::HudClient()

81−{

82− m_results = new DeeListModel();

83− m_clientQuery = hud_client_query_new("");

84− m_toolBarModel = new HudToolBarModel(m_clientQuery);

85− m_currentActionParam = nullptr;

86− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));

87−

88− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-loading", G_CALLBACK(loadingCB), this);

89− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-listening", G_CALLBACK(listeningCB), this);

90− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-heard-something", G_CALLBACK(heardSomethingCB), this);

91− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-finished", G_CALLBACK(finishedCB), this);

92− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-failed", G_CALLBACK(failedCB), this);

93− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_MODELS_CHANGED, G_CALLBACK(modelsChangedCB), this);

94− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_TOOLBAR_UPDATED, G_CALLBACK(toolBarUpdatedCB), m_toolBarModel);

95−}

96−

97−// Terrible hack to get around GLib. GLib stores function pointers as gpointer, which violates the C and C++ spec

98−// because data and function pointers may have different sizes. gcc rightfully emits a warning. There is no #pragma

99−// in gcc to selectively turn off the warning, however. This hack gets around the problem, by using a union (ick) to

100−// convert between the two types.

101−

102−class ToGPointer

103−{

104−public:

105− ToGPointer(void (*cb)())

106− {

107− u_.cb = cb;

108− }

109−

110− operator gpointer()

111− {

112− return u_.p;

113− }

114−

115−private:

116− union

117− {

118− void (*cb)();

119− gpointer p;

120− } u_;

121−};

122−

123−#define TO_GPOINTER(cb) (ToGPointer(reinterpret_cast<void(*)()>((cb))))

124−

125−HudClient::~HudClient()

126−{

127− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(loadingCB), this);

128− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(listeningCB), this);

129− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(heardSomethingCB), this);

130− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(finishedCB), this);

131− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(toolBarUpdatedCB), m_toolBarModel);

132−

133− delete m_results;

134− delete m_toolBarModel;

135−

136− g_object_unref(m_clientQuery);

137−}

138−

139−void HudClient::setQuery(const QString &new_query)

140−{

141− hud_client_query_set_query(m_clientQuery, new_query.toUtf8().constData());

142−}

143−

144−void HudClient::startVoiceQuery()

145−{

146− hud_client_query_voice_query(m_clientQuery);

147−}

148−

149−void HudClient::executeParametrizedAction(const QVariant &values)

150−{

151− updateParametrizedAction(values);

152− hud_client_param_send_commit(m_currentActionParam);

153− g_object_unref(m_currentActionParam);

154− m_currentActionParam = nullptr;

155− Q_EMIT commandExecuted();

156−}

157−

158−void HudClient::updateParametrizedAction(const QVariant &values)

159−{

160− if (m_currentActionParam != nullptr) {

161− const QVariantMap map = values.value<QVariantMap>();

162− GActionGroup *ag = hud_client_param_get_actions(m_currentActionParam);

163−

164− auto it = map.begin();

165− for ( ; it != map.end(); ++it) {

166− const QString action = it.key();

167− const QVariant value = it.value();

168− const GVariantType *actionType = g_action_group_get_action_parameter_type(ag, action.toUtf8().constData());

169− if (g_variant_type_equal(actionType, G_VARIANT_TYPE_DOUBLE) && value.canConvert(QVariant::Double)) {

170− g_action_group_activate_action(ag, action.toUtf8().constData(), g_variant_new_double(value.toDouble()));

171− } else {

172− qWarning() << "Unsuported action type in HudClient::executeParametrizedAction";

173− }

174− }

175− } else {

176− qWarning() << "Got to HudClient::updateParametrizedAction with no m_currentActionParam";

177− }

178−}

179−

180−void HudClient::cancelParametrizedAction()

181−{

182− if (m_currentActionParam != nullptr) {

183− hud_client_param_send_cancel(m_currentActionParam);

184− g_object_unref(m_currentActionParam);

185− m_currentActionParam = nullptr;

186− }

187−}

188−

189−void HudClient::executeToolBarAction(HudClientQueryToolbarItems action)

190−{

191− hud_client_query_execute_toolbar_item(m_clientQuery, action, /* timestamp */ 0);

192− Q_EMIT commandExecuted();

193−}

194−

195−DeeListModel *HudClient::results() const

196−{

197− return m_results;

198−}

199−

200−QAbstractItemModel *HudClient::toolBarModel() const

201−{

202− return m_toolBarModel;

203−}

204−

205−void HudClient::executeCommand(int index)

206−{

207− m_currentActionIndex = index;

208− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);

209− DeeModelIter *iter = dee_model_get_iter_at_row(model, index);

210−

211− GVariant *command_key = dee_model_get_value(model, iter, 0);

212− GVariant *is_parametrized = dee_model_get_value(model, iter, 7);

213− if (g_variant_get_boolean(is_parametrized)) {

214− m_currentActionParam = hud_client_query_execute_param_command(m_clientQuery, command_key, /* timestamp */ 0);

215− if (m_currentActionParam != nullptr) {

216− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);

217− if (menuModel == nullptr) {

218− g_signal_connect(m_currentActionParam, HUD_CLIENT_PARAM_SIGNAL_MODEL_READY, G_CALLBACK(modelReadyCB), this);

219− } else {

220− modelReady(false);

221− }

222− } else {

223− qWarning() << "HudClient::executeCommand::Could not get the HudClientParam for parametrized action with index" << index;

224− }

225− } else {

226− hud_client_query_execute_command(m_clientQuery, command_key, /* timestamp */ 0);

227− Q_EMIT commandExecuted();

228− }

229− g_variant_unref(command_key);

230− g_variant_unref(is_parametrized);

231−}

232−

233−void HudClient::modelReady(bool needDisconnect)

234−{

235− if (needDisconnect) {

236− g_signal_handlers_disconnect_by_func(m_currentActionParam, TO_GPOINTER(modelReadyCB), this);

237− }

238− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);

239− if (g_menu_model_get_n_items(menuModel) == 0) {

240− g_signal_connect(menuModel, "items-changed", G_CALLBACK(modelReallyReadyCB), this);

241− } else {

242− modelReallyReady(false);

243− }

244−}

245−

246−static void addAttribute(QVariantMap &properties, GMenuModel *menuModel, int item, const char *attribute) {

247− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, item, attribute, nullptr);

248−

249− if (v == nullptr)

250− return;

251−

252− properties.insert(attribute, DeeListModel::VariantForData(v));

253− g_variant_unref(v);

254−}

255−

256−void HudClient::modelReallyReady(bool needDisconnect)

257−{

258− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);

259− if (needDisconnect) {

260− g_signal_handlers_disconnect_by_func(menuModel, TO_GPOINTER(modelReallyReadyCB), this);

261− }

262−

263− QVariantList items;

264− for (int i = 0; i < g_menu_model_get_n_items(menuModel); i++) {

265− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, i, "parameter-type", G_VARIANT_TYPE_STRING);

266−

267− if (v == nullptr)

268− continue;

269−

270− const QString type = QString::fromUtf8(g_variant_get_string(v, nullptr));

271− if (type == "slider") {

272− const char *sliderAttributes[] = { "label", "min", "max", "step", "value", "live", "action" };

273− QVariantMap properties;

274− properties.insert("parameter-type", "slider");

275− for (uint j = 0; j < sizeof(sliderAttributes)/sizeof(sliderAttributes[0]); ++j) {

276− addAttribute(properties, menuModel, i, sliderAttributes[j]);

277− }

278− items << properties;

279− }

280− g_variant_unref(v);

281− }

282−

283− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);

284− DeeModelIter *iter = dee_model_get_iter_at_row(model, m_currentActionIndex);

285− GVariant *actionTextVariant = dee_model_get_value(model, iter, 1);

286− const QString actionText = QString::fromUtf8(g_variant_get_string(actionTextVariant, nullptr));

287− g_variant_unref(actionTextVariant);

288− Q_EMIT showParametrizedAction(actionText, QVariant::fromValue(items));

289−}

290−

291−void HudClient::queryModelsChanged()

292−{

293− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));

294−}

plugins/HudClient/hudclient.hdeleted−71

@@ -1,71 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

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−#ifndef HUDCLIENT_H

18−#define HUDCLIENT_H

19−

20−#include <QObject>

21−

22−#include <hud-client.h>

23−

24−class DeeListModel;

25−class QAbstractItemModel;

26−

27−class HudClient : public QObject

28−{

29− Q_OBJECT

30− Q_PROPERTY(DeeListModel* results READ results)

31− Q_PROPERTY(QAbstractItemModel* toolBarModel READ toolBarModel)

32−

33−public:

34− HudClient();

35− ~HudClient();

36−

37− DeeListModel *results() const;

38−

39− QAbstractItemModel *toolBarModel() const;

40−

41− Q_INVOKABLE void executeCommand(int index);

42− Q_INVOKABLE void setQuery(const QString &new_query);

43− Q_INVOKABLE void startVoiceQuery();

44− Q_INVOKABLE void executeParametrizedAction(const QVariant &values);

45− Q_INVOKABLE void updateParametrizedAction(const QVariant &values);

46− Q_INVOKABLE void cancelParametrizedAction();

47− Q_INVOKABLE void executeToolBarAction(HudClientQueryToolbarItems action);

48−

49− void modelReady(bool needDisconnect);

50− void modelReallyReady(bool needDisconnect);

51− void queryModelsChanged();

52−

53−Q_SIGNALS:

54− void voiceQueryLoading();

55− void voiceQueryListening();

56− void voiceQueryHeardSomething();

57− void voiceQueryFailed();

58− void voiceQueryFinished(const QString &query);

59− void commandExecuted();

60− void showParametrizedAction(const QString &action, const QVariant &items);

61−

62−private:

63− HudClientQuery *m_clientQuery;

64− DeeListModel *m_results;

65− QAbstractItemModel *m_toolBarModel;

66− int m_currentActionIndex;

67− HudClientParam *m_currentActionParam;

68−};

69−Q_DECLARE_METATYPE(HudClientQueryToolbarItems)

70−

71−#endif

plugins/HudClient/hudtoolbarmodel.cppdeleted−98

@@ -1,98 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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−#include "hudtoolbarmodel.h"

18−

19−#include "hudclient.h"

20−

21−static const int ActionRole = Qt::UserRole;

22−static const int EnabledRole = Qt::UserRole + 1;

23−

24−static QString iconForAction(int action)

25−{

26− switch (action) {

27− case HUD_CLIENT_QUERY_TOOLBAR_UNDO:

28− return "graphics/undo.png";

29− case HUD_CLIENT_QUERY_TOOLBAR_HELP:

30− return "graphics/help.png";

31− case HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN:

32− return "graphics/view-fullscreen.png";

33− case HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES:

34− return "graphics/settings.png";

35− }

36− return QString();

37−}

38−

39−HudToolBarModel::HudToolBarModel(HudClientQuery *query)

40− : m_query(query)

41−{

42− m_actions << HUD_CLIENT_QUERY_TOOLBAR_UNDO

43− << HUD_CLIENT_QUERY_TOOLBAR_HELP

44− << HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN

45− << HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES;

46−}

47−

48−HudToolBarModel::~HudToolBarModel()

49−{

50−}

51−

52−int HudToolBarModel::rowCount(const QModelIndex &parent) const

53−{

54− if (parent.isValid())

55− return 0;

56−

57− return m_actions.count();

58−}

59−

60−QVariant HudToolBarModel::data(const QModelIndex &index, int role) const

61−{

62− const int row = index.row();

63− if (row >= m_actions.count())

64− return QVariant();

65−

66− const HudClientQueryToolbarItems action = m_actions[row];

67−

68− switch (role) {

69− case Qt::DecorationRole:

70− return iconForAction(action);

71− break;

72−

73− case ActionRole:

74− return action;

75− break;

76−

77− case EnabledRole:

78− return hud_client_query_toolbar_item_active(m_query, action);

79− break;

80− }

81− return QVariant();

82−}

83−

84−QHash<int,QByteArray> HudToolBarModel::roleNames() const

85−{

86− static QHash<int,QByteArray> roles;

87− if (roles.isEmpty()) {

88− roles[Qt::DecorationRole] = "iconPath";

89− roles[ActionRole] = "action";

90− roles[EnabledRole] = "enabled";

91− }

92− return roles;

93−}

94−

95−void HudToolBarModel::updatedByBackend()

96−{

97− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << EnabledRole);

98−}

plugins/HudClient/hudtoolbarmodel.hdeleted−44

@@ -1,44 +0,0 @@

1−/*

2− * Copyright (C) 2013 Canonical, Ltd.

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−#ifndef HUDTOOLBARMODEL_H

18−#define HUDTOOLBARMODEL_H

19−

20−#include <QAbstractListModel>

21−

22−#include <hud-client.h>

23−

24−class HudToolBarModel : public QAbstractListModel

25−{

26− Q_OBJECT

27−

28−public:

29− HudToolBarModel(HudClientQuery *query);

30− ~HudToolBarModel();

31−

32− int rowCount(const QModelIndex &parent = QModelIndex()) const;

33− QVariant data(const QModelIndex &parent, int role) const;

34− QHash<int,QByteArray> roleNames() const;

35−

36− void updatedByBackend();

37−

38−private:

39− QList<HudClientQueryToolbarItems> m_actions;

40−

41− HudClientQuery *m_query;

42−};

43−

44−#endif

plugins/HudClient/qmldirdeleted−3

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

1−module HudClient

2−plugin HudClientQml

3−typeinfo HudClient.qmltypes

plugins/HudClient/volumepeakdetector.cppdeleted−223

@@ -1,223 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

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−#include "volumepeakdetector.h"

18−

19−static void stream_read_callback(pa_stream * /*s*/, size_t /*length*/, void *userdata) {

20− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);

21− peakDetector->processData();

22−}

23−

24−static void context_state_callback(pa_context *c, void *userdata) {

25− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);

26−

27− switch (pa_context_get_state(c)) {

28− case PA_CONTEXT_CONNECTING:

29− case PA_CONTEXT_AUTHORIZING:

30− case PA_CONTEXT_SETTING_NAME:

31− break;

32−

33− case PA_CONTEXT_READY:

34− peakDetector->startStream();

35− break;

36−

37− case PA_CONTEXT_TERMINATED:

38− case PA_CONTEXT_FAILED:

39− default:

40− peakDetector->quit();

41− }

42−}

43−

44−PulseAudioVolumePeakDetector::PulseAudioVolumePeakDetector()

45− : m_accumulatedValue(0)

46− , m_nAccumulatedValues(0)

47− , m_accumulatedValuesLimit(1)

48− , m_context(nullptr)

49− , m_mainloop_api(nullptr)

50− , m_stream(nullptr)

51−{

52−}

53−

54−void PulseAudioVolumePeakDetector::start()

55−{

56− pa_mainloop *mainloop = nullptr;

57−

58− /* Set up a new main loop */

59− mainloop = pa_mainloop_new();

60− if (!mainloop)

61− return;

62−

63− m_mainloop_api = pa_mainloop_get_api(mainloop);

64−

65− /* Create a new connection context */

66− m_context = pa_context_new(m_mainloop_api, nullptr);

67− if (!m_context) {

68− goto quit;

69− }

70−

71− pa_context_set_state_callback(m_context, context_state_callback, this);

72−

73− /* Connect the context */

74− if (pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0) {

75− goto quit;

76− }

77−

78− /* Run the main loop */

79− if (pa_mainloop_run(mainloop, nullptr) < 0) {

80− goto quit;

81− }

82−

83−quit:

84− if (m_stream)

85− pa_stream_unref(m_stream);

86−

87− if (m_context)

88− pa_context_unref(m_context);

89−

90− if (mainloop) {

91− pa_signal_done();

92− pa_mainloop_free(mainloop);

93− }

94−

95− QThread::currentThread()->quit();

96−}

97−

98−int PulseAudioVolumePeakDetector::nAccumulatedValuesLimit() const

99−{

100− return m_accumulatedValuesLimit;

101−}

102−

103−void PulseAudioVolumePeakDetector::setNAccumulatedValuesLimit(int limit)

104−{

105− m_accumulatedValuesLimit = limit;

106−}

107−

108−// FIXME 16000 is hardcoded because julius needs it

109−// and the hardware/driver/pulse something gets confused

110−// if we use different rates

111−// We would be happier with a much smaller value like 100

112−static uint voice_needed_rate = 16000;

113−

114−void PulseAudioVolumePeakDetector::startStream()

115−{

116− pa_buffer_attr buffer_attr;

117− pa_proplist *proplist = pa_proplist_new();

118−

119− // FIXME 16000 is hardcoded because julius needs it

120− // and the hardware/driver/pulse something gets confused

121− // if we use different rates

122− // We would be happier with a much smaller value like 100

123− pa_sample_spec sample_spec;

124− sample_spec.format = PA_SAMPLE_FLOAT32;

125− sample_spec.rate = 16000;

126− sample_spec.channels = 1;

127−

128− pa_channel_map channel_map;

129−

130− pa_channel_map_init_extend(&channel_map, sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);

131− pa_proplist_sets(proplist, PA_PROP_MEDIA_NAME, "HUD Peak Detector");

132−

133− m_stream = pa_stream_new_with_proplist(m_context, nullptr, &sample_spec, &channel_map, proplist);

134− if (!m_stream) {

135− pa_proplist_free(proplist);

136− quit();

137− return;

138− }

139− pa_proplist_free(proplist);

140−

141− pa_stream_set_read_callback(m_stream, stream_read_callback, this);

142−

143− memset(&buffer_attr, 0, sizeof(buffer_attr));

144− buffer_attr.maxlength = (uint32_t) -1;

145− buffer_attr.fragsize = sizeof(float);

146−

147− if (pa_stream_connect_record(m_stream, nullptr, &buffer_attr, (pa_stream_flags_t)(PA_STREAM_PEAK_DETECT | PA_STREAM_ADJUST_LATENCY)) < 0) {

148− quit();

149− }

150−}

151−

152−void PulseAudioVolumePeakDetector::processData()

153−{

154− while (pa_stream_readable_size(m_stream) > 0) {

155− const void *data;

156− size_t length;

157−

158− if (pa_stream_peek(m_stream, &data, &length) < 0) {

159− quit();

160− return;

161− }

162−

163− const float *values = (float*)data;

164− for (size_t i = 0; i < length / sizeof(float); ++i) {

165− float value = values[i];

166− if (value < 0) value = 0;

167− if (value > 1) value = 1;

168− m_nAccumulatedValues++;

169− m_accumulatedValue += value;

170− if (m_nAccumulatedValues == m_accumulatedValuesLimit) {

171− Q_EMIT newPeak(m_accumulatedValue / m_nAccumulatedValues);

172− m_nAccumulatedValues = 0;

173− m_accumulatedValue = 0;

174− }

175− }

176−

177− pa_stream_drop(m_stream);

178− }

179−}

180−

181−void PulseAudioVolumePeakDetector::quit()

182−{

183− m_mainloop_api->quit(m_mainloop_api, 0);

184−}

185−

186−

187−/* VolumePeakDetector */

188−

189−VolumePeakDetector::VolumePeakDetector()

190−{

191− QObject::connect(&m_thread, SIGNAL(started()), &m_volumeDetector, SLOT(start()));

192− QObject::connect(&m_volumeDetector, SIGNAL(newPeak(float)), this, SIGNAL(newPeak(float)));

193−

194− m_volumeDetector.moveToThread(&m_thread);

195−}

196−

197−bool VolumePeakDetector::enabled() const

198−{

199− return m_thread.isRunning();

200−}

201−

202−int VolumePeakDetector::desiredInterval() const

203−{

204− return m_volumeDetector.nAccumulatedValuesLimit() * 1000 / voice_needed_rate;

205−}

206−

207−void VolumePeakDetector::setDesiredInterval(int interval)

208−{

209− m_volumeDetector.setNAccumulatedValuesLimit(voice_needed_rate * interval / 1000);

210−}

211−

212−void VolumePeakDetector::setEnabled(int enabled)

213−{

214− if (enabled) {

215− if (!m_thread.isRunning()) {

216− m_thread.start();

217− }

218− } else {

219− if (m_thread.isRunning()) {

220− m_volumeDetector.quit();

221− }

222− }

223−}

plugins/HudClient/volumepeakdetector.hdeleted−78

@@ -1,78 +0,0 @@

1−/*

2− * Copyright (C) 2012, 2013 Canonical, Ltd.

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−#ifndef VOLUMEPEAKDETECTOR_H

18−#define VOLUMEPEAKDETECTOR_H

19−

20−#include <QObject>

21−

22−#include <QThread>

23−

24−#include <pulse/pulseaudio.h>

25−

26−class PulseAudioVolumePeakDetector : public QObject

27−{

28− Q_OBJECT

29−

30−public:

31− PulseAudioVolumePeakDetector();

32−

33− int nAccumulatedValuesLimit() const;

34− void setNAccumulatedValuesLimit(int limit);

35−

36− void startStream();

37− void processData();

38− void quit();

39−

40−public Q_SLOTS:

41− void start();

42−

43−Q_SIGNALS:

44− void newPeak(float value);

45−

46−private:

47− float m_accumulatedValue;

48− int m_nAccumulatedValues;

49− int m_accumulatedValuesLimit;

50− pa_context *m_context;

51− pa_mainloop_api *m_mainloop_api;

52− pa_stream *m_stream;

53−};

54−

55−class VolumePeakDetector : public QObject

56−{

57− Q_OBJECT

58− Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)

59− Q_PROPERTY(int desiredInterval READ desiredInterval WRITE setDesiredInterval)

60−

61−public:

62− VolumePeakDetector();

63−

64− bool enabled() const;

65− void setEnabled(int enabled);

66−

67− int desiredInterval() const;

68− void setDesiredInterval(int interval);

69−

70−Q_SIGNALS:

71− void newPeak(float volume);

72−

73−private:

74− QThread m_thread;

75− PulseAudioVolumePeakDetector m_volumeDetector;

76−};

77−

78−#endif

plugins/LightDM/CMakeLists.txt+8−22

@@ -1,40 +1,26 @@

1−# Dependencies

2−include(FindPkgConfig)

3pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

4−# TODO: Once we split out a separate greeter process, uncomment these lines

2+

5−#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

3+find_package(Qt5Core REQUIRED)

4+find_package(Qt5Quick REQUIRED)

6

5

7include_directories(

6include_directories(

8 ${CMAKE_CURRENT_SOURCE_DIR}

7 ${CMAKE_CURRENT_SOURCE_DIR}

9 ${CMAKE_CURRENT_BINARY_DIR}

8 ${CMAKE_CURRENT_BINARY_DIR}

10 ${CMAKE_SOURCE_DIR}/plugins/Utils

9 ${CMAKE_SOURCE_DIR}/plugins/Utils

11− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

12− #${LIBLIGHTDM_INCLUDE_DIRS}

13 ${libunity8-private_SOURCE_DIR}

10 ${libunity8-private_SOURCE_DIR}

14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

11 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15)

12)

16

13

17set(QMLPLUGIN_SRC

14set(QMLPLUGIN_SRC

18− ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

15+ ../Utils/unitysortfilterproxymodelqml.cpp

19 DBusGreeter.cpp

16 DBusGreeter.cpp

20 DBusGreeterList.cpp

17 DBusGreeterList.cpp

21 Greeter.cpp

18 Greeter.cpp

22 plugin.cpp

19 plugin.cpp

20+ PromptsModel.cpp

21+ SessionsModel.cpp

23 UsersModel.cpp

22 UsersModel.cpp

24 )

23 )

25

24

26−add_library(LightDM-qml MODULE

25+add_subdirectory(FullLightDM)

27− ${QMLPLUGIN_SRC}

26+add_subdirectory(IntegratedLightDM)

28− )

29−

30−target_link_libraries(LightDM-qml

31− MockLightDM-demo

32− unity8-private

33−# TODO: Once we split out a separate greeter process, uncomment these lines

34−# ${LIBLIGHTDM_LDFLAGS}

35− ${LIBUSERMETRICSOUTPUT_LDFLAGS}

36− )

37−

38−qt5_use_modules(LightDM-qml DBus Gui Qml)

39−

40−add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

plugins/LightDM/DBusGreeter.cpp+7−6

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

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2014, 2015 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -21,10 +21,11 @@

21#include <QStringList>

21#include <QStringList>

22

22

23DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)

23DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)

24− : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),

24+ : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

25 m_greeter(greeter)

25 m_greeter(greeter)

26{

26{

27− connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));

27+ connect(m_greeter, &Greeter::isActiveChanged,

28+ this, &DBusGreeter::isActiveChangedHandler);

28}

29}

29

30

30bool DBusGreeter::isActive() const

31bool DBusGreeter::isActive() const

@@ -34,16 +35,16 @@ bool DBusGreeter::isActive() const

34

35

35void DBusGreeter::ShowGreeter()

36void DBusGreeter::ShowGreeter()

36{

37{

37− return Q_EMIT m_greeter->showGreeter();

38+ Q_EMIT m_greeter->showGreeter();

38}

39}

39

40

40void DBusGreeter::HideGreeter()

41void DBusGreeter::HideGreeter()

41{

42{

42− return Q_EMIT m_greeter->hideGreeter();

43+ Q_EMIT m_greeter->hideGreeter();

43}

44}

44

45

45void DBusGreeter::isActiveChangedHandler()

46void DBusGreeter::isActiveChangedHandler()

46{

47{

47− notifyPropertyChanged("IsActive", isActive());

48+ notifyPropertyChanged(QStringLiteral("IsActive"), isActive());

48 Q_EMIT isActiveChanged();

49 Q_EMIT isActiveChanged();

49}

50}

plugins/LightDM/DBusGreeterList.cpp+7−7

@@ -21,11 +21,11 @@

21#include <QStringList>

21#include <QStringList>

22

22

23DBusGreeterList::DBusGreeterList(Greeter *greeter, const QString &path)

23DBusGreeterList::DBusGreeterList(Greeter *greeter, const QString &path)

24− : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),

24+ : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

25 m_greeter(greeter)

25 m_greeter(greeter)

26{

26{

27− connect(m_greeter, SIGNAL(authenticationUserChanged(const QString &)), this, SLOT(authenticationUserChangedHandler(const QString &)));

27+ connect(m_greeter, &Greeter::authenticationUserChanged, this, &DBusGreeterList::authenticationUserChangedHandler);

28− connect(m_greeter, SIGNAL(promptlessChanged()), this, SLOT(promptlessChangedHandler()));

28+ connect(m_greeter, &Greeter::promptlessChanged, this, &DBusGreeterList::promptlessChangedHandler);

29}

29}

30

30

31QString DBusGreeterList::GetActiveEntry() const

31QString DBusGreeterList::GetActiveEntry() const

@@ -43,14 +43,14 @@ bool DBusGreeterList::entryIsLocked() const

43 return !m_greeter->promptless();

43 return !m_greeter->promptless();

44}

44}

45

45

46−void DBusGreeterList::authenticationUserChangedHandler(const QString &user)

46+void DBusGreeterList::authenticationUserChangedHandler()

47{

47{

48− notifyPropertyChanged("ActiveEntry", user);

48+ notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());

49− Q_EMIT EntrySelected(user);

49+ Q_EMIT EntrySelected(m_greeter->authenticationUser());

50}

50}

51

51

52void DBusGreeterList::promptlessChangedHandler()

52void DBusGreeterList::promptlessChangedHandler()

53{

53{

54− notifyPropertyChanged("EntryIsLocked", entryIsLocked());

54+ notifyPropertyChanged(QStringLiteral("EntryIsLocked"), entryIsLocked());

55 Q_EMIT entryIsLockedChanged();

55 Q_EMIT entryIsLockedChanged();

56}

56}

plugins/LightDM/DBusGreeterList.h+1−1

@@ -47,7 +47,7 @@ Q_SIGNALS:

47 void entryIsLockedChanged();

47 void entryIsLockedChanged();

48

48

49private Q_SLOTS:

49private Q_SLOTS:

50− void authenticationUserChangedHandler(const QString &user);

50+ void authenticationUserChangedHandler();

51 void promptlessChangedHandler();

51 void promptlessChangedHandler();

52

52

53private:

53private:

plugins/LightDM/FullLightDM/CMakeLists.txtnew file+32

@@ -0,0 +1,32 @@

1+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)

2+

3+set(PLUGIN_CLASSNAME "FullLightDM")

4+

5+add_definitions(-DFULL_LIGHTDM)

6+

7+include_directories(

8+ ../

9+ ${CMAKE_CURRENT_BINARY_DIR}

10+ )

11+

12+include_directories(

13+ SYSTEM

14+ ${LIBLIGHTDM_INCLUDE_DIRS}

15+ )

16+

17+foreach(source_file ${QMLPLUGIN_SRC})

18+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

19+endforeach()

20+

21+add_library(FullLightDM-qml MODULE

22+ ${RELATIVE_QMLPLUGIN_SRC}

23+ )

24+

25+target_link_libraries(FullLightDM-qml

26+ unity8-private

27+ ${LIBLIGHTDM_LDFLAGS}

28+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

29+ Qt5::DBus Qt5::Gui Qt5::Qml

30+ )

31+

32+add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

plugins/LightDM/FullLightDM/qmldirnew file+3

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

1+module LightDM.FullLightDM

2+plugin FullLightDM-qml

3+typeinfo FullLightDM.qmltypes

plugins/LightDM/Greeter.cpp+162−39

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2017 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -13,35 +13,20 @@

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

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

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

15 *

15 *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

16 */

18

17

19#include "Greeter.h"

18#include "Greeter.h"

19+#include "GreeterPrivate.h"

20+#include <QCoreApplication>

20#include <libintl.h>

21#include <libintl.h>

21−#include <QLightDM/Greeter>

22−

23−class GreeterPrivate

24−{

25−public:

26− explicit GreeterPrivate(Greeter *parent);

27−

28− QLightDM::Greeter *m_greeter;

29− bool m_active;

30− bool wasPrompted;

31− bool promptless;

32−

33−protected:

34− Greeter * const q_ptr;

35−

36−private:

37− Q_DECLARE_PUBLIC(Greeter)

38−};

39

22

23+static Greeter *singleton = nullptr;

40

24

41GreeterPrivate::GreeterPrivate(Greeter* parent)

25GreeterPrivate::GreeterPrivate(Greeter* parent)

42 : m_greeter(new QLightDM::Greeter(parent)),

26 : m_greeter(new QLightDM::Greeter(parent)),

43 m_active(false),

27 m_active(false),

44− wasPrompted(false),

28+ responded(false),

29+ everResponded(false),

45 promptless(false),

30 promptless(false),

46 q_ptr(parent)

31 q_ptr(parent)

47{

32{

@@ -53,16 +38,39 @@ Greeter::Greeter(QObject* parent)

53{

38{

54 Q_D(Greeter);

39 Q_D(Greeter);

55

40

56− connect(d->m_greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),

41+ connect(d->m_greeter, &QLightDM::Greeter::showMessage,

57− this, SLOT(showMessageFilter(QString, QLightDM::Greeter::MessageType)));

42+ this, &Greeter::showMessageFilter);

58− connect(d->m_greeter, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType)),

43+ connect(d->m_greeter, &QLightDM::Greeter::showPrompt,

59− this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));

44+ this, &Greeter::showPromptFilter);

60− connect(d->m_greeter, SIGNAL(authenticationComplete()),

45+ connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,

61− this, SLOT(authenticationCompleteFilter()));

46+ this, &Greeter::authenticationCompleteFilter);

47+

48+ // Don't get stuck waiting for PAM as we shut down.

49+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,

50+ d->m_greeter, &QLightDM::Greeter::cancelAuthentication);

62

51

63 d->m_greeter->connectSync();

52 d->m_greeter->connectSync();

64}

53}

65

54

55+Greeter::~Greeter()

56+{

57+ singleton = nullptr;

58+}

59+

60+Greeter *Greeter::instance()

61+{

62+ if (!singleton) {

63+ singleton = new Greeter;

64+ }

65+ return singleton;

66+}

67+

68+PromptsModel *Greeter::promptsModel()

69+{

70+ Q_D(Greeter);

71+ return &d->prompts;

72+}

73+

66bool Greeter::isActive() const

74bool Greeter::isActive() const

67{

75{

68 Q_D(const Greeter);

76 Q_D(const Greeter);

@@ -87,7 +95,22 @@ bool Greeter::isAuthenticated() const

87QString Greeter::authenticationUser() const

95QString Greeter::authenticationUser() const

88{

96{

89 Q_D(const Greeter);

97 Q_D(const Greeter);

98+ return d->cachedAuthUser;

99+}

100+

101+void Greeter::checkAuthenticationUser()

102+{

103+ Q_D(Greeter);

104+ if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {

90− return d->m_greeter->authenticationUser();

105+ d->cachedAuthUser = d->m_greeter->authenticationUser();

106+ Q_EMIT authenticationUserChanged();

107+ }

108+}

109+

110+QString Greeter::defaultSessionHint() const

111+{

112+ Q_D(const Greeter);

113+ return d->m_greeter->defaultSessionHint();

91}

114}

92

115

93bool Greeter::promptless() const

116bool Greeter::promptless() const

@@ -96,23 +119,68 @@ bool Greeter::promptless() const

96 return d->promptless;

119 return d->promptless;

97}

120}

98

121

122+QString Greeter::selectUser() const

123+{

124+ Q_D(const Greeter);

125+ if (hasGuestAccount() && d->m_greeter->selectGuestHint()) {

126+ return QStringLiteral("*guest");

127+ } else {

128+ return d->m_greeter->selectUserHint();

129+ }

130+}

131+

132+bool Greeter::hasGuestAccount() const

133+{

134+ Q_D(const Greeter);

135+ return d->m_greeter->hasGuestAccountHint();

136+}

137+

138+bool Greeter::showManualLoginHint() const

139+{

140+ Q_D(const Greeter);

141+ return d->m_greeter->showManualLoginHint();

142+}

143+

144+bool Greeter::hideUsersHint() const

145+{

146+ Q_D(const Greeter);

147+ return d->m_greeter->hideUsersHint();

148+}

149+

99void Greeter::authenticate(const QString &username)

150void Greeter::authenticate(const QString &username)

100{

151{

101 Q_D(Greeter);

152 Q_D(Greeter);

102− d->wasPrompted = false;

153+ d->prompts.clear();

154+ d->responded = false;

155+ d->everResponded = false;

103 if (d->promptless) {

156 if (d->promptless) {

104 d->promptless = false;

157 d->promptless = false;

105 Q_EMIT promptlessChanged();

158 Q_EMIT promptlessChanged();

106 }

159 }

107

160

161+ if (authenticationUser() == username) {

162+ d->prompts = d->leftovers;

163+ }

164+ d->leftovers.clear();

165+

166+ if (username == QStringLiteral("*guest")) {

167+ d->m_greeter->authenticateAsGuest();

168+ } else if (username == QStringLiteral("*other")) {

108− d->m_greeter->authenticate(username);

169+ d->m_greeter->authenticate(nullptr);

170+ } else {

171+ d->m_greeter->authenticate(username);

172+ }

173+

174+ Q_EMIT authenticationStarted();

109 Q_EMIT isAuthenticatedChanged();

175 Q_EMIT isAuthenticatedChanged();

110− Q_EMIT authenticationUserChanged(username);

176+ checkAuthenticationUser();

111}

177}

112

178

113void Greeter::respond(const QString &response)

179void Greeter::respond(const QString &response)

114{

180{

115 Q_D(Greeter);

181 Q_D(Greeter);

182+ d->responded = true;

183+ d->everResponded = true;

116 d->m_greeter->respond(response);

184 d->m_greeter->respond(response);

117}

185}

118

186

@@ -125,32 +193,87 @@ bool Greeter::startSessionSync(const QString &session)

125void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)

193void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)

126{

194{

127 Q_D(Greeter);

195 Q_D(Greeter);

128− d->wasPrompted = true;

196+

197+ checkAuthenticationUser(); // may have changed in liblightdm

129

198

130 bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));

199 bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));

200+ bool isSecret = type == QLightDM::Greeter::PromptTypeSecret;

201+

202+ QString trimmedText;

203+ if (!isDefaultPrompt)

204+ trimmedText = text.trimmed();

131

205

132 // Strip prompt of any colons at the end

206 // Strip prompt of any colons at the end

133− QString trimmedText = text.trimmed();

134− if (trimmedText.endsWith(":") || trimmedText.endsWith("：")) {

207+ if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {

135 trimmedText.chop(1);

208 trimmedText.chop(1);

136 }

209 }

137

210

138− Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);

211+ if (trimmedText == "login") {

212+ // 'login' is provided untranslated by LightDM when asking for a manual

213+ // login username.

214+ trimmedText = gettext("Username");

215+ }

216+

217+ if (d->responded) {

218+ d->prompts.clear();

219+ d->responded = false;

220+ }

221+

222+ d->prompts.append(trimmedText, isSecret ? PromptsModel::Secret : PromptsModel::Question);

139}

223}

140

224

141void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)

225void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)

142{

226{

227+ Q_D(Greeter);

228+

229+ checkAuthenticationUser(); // may have changed in liblightdm

230+

143− Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);

231+ bool isError = type == QLightDM::Greeter::MessageTypeError;

232+

233+ if (d->responded) {

234+ d->prompts.clear();

235+ d->responded = false;

236+ }

237+ d->prompts.append(text, isError? PromptsModel::Error : PromptsModel::Message);

144}

238}

145

239

146void Greeter::authenticationCompleteFilter()

240void Greeter::authenticationCompleteFilter()

147{

241{

148 Q_D(Greeter);

242 Q_D(Greeter);

149− if (!d->wasPrompted) {

243+

244+ Q_EMIT isAuthenticatedChanged();

245+

246+ bool automatic = !d->everResponded;

247+ bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;

248+

249+ if (isAuthenticated() && automatic) {

150 d->promptless = true;

250 d->promptless = true;

151 Q_EMIT promptlessChanged();

251 Q_EMIT promptlessChanged();

152 }

252 }

153

253

154− Q_EMIT isAuthenticatedChanged();

254+ if (!isAuthenticated()) {

155− Q_EMIT authenticationComplete();

255+ if (pamHasLeftoverMessages) {

256+ d->leftovers = d->prompts; // Prefer PAM's messages

257+ } else if (automatic) {

258+ d->leftovers.append(gettext("Failed to authenticate"), PromptsModel::Error);

259+ } else {

260+ d->leftovers.append(gettext("Invalid password, please try again"), PromptsModel::Error);

261+ }

262+ } else if (pamHasLeftoverMessages) {

263+ automatic = true; // treat this successful login as automatic, so user sees message

264+ d->leftovers = d->prompts;

265+ }

266+

267+ if (automatic) {

268+ d->prompts = d->leftovers; // OK, we'll just use these now

269+ d->leftovers.clear();

270+ d->prompts.append(isAuthenticated() ? gettext("Log In") : gettext("Retry"),

271+ PromptsModel::Button);

272+ }

273+

274+ if (isAuthenticated()) {

275+ Q_EMIT loginSuccess(automatic);

276+ } else {

277+ Q_EMIT loginError(automatic);

278+ }

156}

279}

plugins/LightDM/Greeter.h+22−12

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

1/*

1/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -13,7 +13,6 @@

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

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

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

15 *

15 *

16− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

16 */

18

17

19/* This class is a really tiny filter around QLightDM::Greeter. There are some

18/* This class is a really tiny filter around QLightDM::Greeter. There are some

@@ -22,13 +21,13 @@

22 such edits in the future, and by inserting ourselves here, we have more

21 such edits in the future, and by inserting ourselves here, we have more

23 control. */

22 control. */

24

23

25−#ifndef UNITY_GREETER_H

24+#pragma once

26−#define UNITY_GREETER_H

27

25

28#include <QLightDM/Greeter>

26#include <QLightDM/Greeter>

29#include <QtCore/QObject>

27#include <QtCore/QObject>

30

28

31class GreeterPrivate;

29class GreeterPrivate;

30+class PromptsModel;

32

31

33class Greeter : public QObject

32class Greeter : public QObject

34{

33{

@@ -37,15 +36,25 @@ class Greeter : public QObject

37 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

36 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

38 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

37 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

39 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

38 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

41

42

42public:

43public:

43− explicit Greeter(QObject* parent=0);

44+ static Greeter *instance();

45+ virtual ~Greeter();

44

46

45 bool isActive() const;

47 bool isActive() const;

46 bool isAuthenticated() const;

48 bool isAuthenticated() const;

47 QString authenticationUser() const;

49 QString authenticationUser() const;

50+ QString defaultSessionHint() const;

48 bool promptless() const;

51 bool promptless() const;

52+ QString selectUser() const;

53+ bool hasGuestAccount() const;

54+ bool showManualLoginHint() const;

55+ bool hideUsersHint() const;

56+

57+ PromptsModel *promptsModel();

49

58

50public Q_SLOTS:

59public Q_SLOTS:

51 void authenticate(const QString &username=QString());

60 void authenticate(const QString &username=QString());

@@ -54,21 +63,23 @@ public Q_SLOTS:

54 void setIsActive(bool isActive);

63 void setIsActive(bool isActive);

55

64

56Q_SIGNALS:

65Q_SIGNALS:

57− void showMessage(const QString &text, bool isError);

58− void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);

59− void authenticationComplete();

60− void authenticationUserChanged(const QString &user);

66+ void authenticationUserChanged();

61 void isActiveChanged();

67 void isActiveChanged();

62 void isAuthenticatedChanged();

68 void isAuthenticatedChanged();

63 void promptlessChanged();

69 void promptlessChanged();

64 void showGreeter();

70 void showGreeter();

65 void hideGreeter();

71 void hideGreeter();

72+ void loginError(bool automatic);

73+ void loginSuccess(bool automatic);

74+ void authenticationStarted(); // useful for testing

66

75

67 // This signal is emitted by external agents like indicators, and the UI

76 // This signal is emitted by external agents like indicators, and the UI

68 // should switch to this user if possible.

77 // should switch to this user if possible.

69 void requestAuthenticationUser(const QString &user);

78 void requestAuthenticationUser(const QString &user);

70

79

71−private:

80+protected:

81+ explicit Greeter(QObject* parent=0);

82+

72 GreeterPrivate * const d_ptr;

83 GreeterPrivate * const d_ptr;

73

84

74 Q_DECLARE_PRIVATE(Greeter)

85 Q_DECLARE_PRIVATE(Greeter)

@@ -77,6 +88,5 @@ private Q_SLOTS:

77 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);

88 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);

78 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);

89 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);

79 void authenticationCompleteFilter();

90 void authenticationCompleteFilter();

91+ void checkAuthenticationUser();

80};

92};

81−

82−#endif

tests/mocks/Unity/Application/SessionManager.h → plugins/LightDM/GreeterPrivate.hrenamed+19−18

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

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015-2017 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -14,31 +14,32 @@

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

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

15 */

15 */

16

16

17−#ifndef SESSIONMANAGER_H

17+#pragma once

18−#define SESSIONMANAGER_H

19

18

19+#include "PromptsModel.h"

20#include <QObject>

20#include <QObject>

21

21

22+namespace QLightDM {

22−class Session;

23+ class Greeter;

24+}

23

25

24−class SessionManager : public QObject

26+class GreeterPrivate

25{

27{

26− Q_OBJECT

27public:

28public:

28− explicit SessionManager(QObject *parent = 0);

29+ explicit GreeterPrivate(Greeter *parent);

29

30

30− static SessionManager *singleton();

31+ QLightDM::Greeter *m_greeter;

32+ bool m_active;

33+ PromptsModel prompts;

34+ PromptsModel leftovers; // prompts to show during next auth for same user

35+ bool responded;

36+ bool everResponded;

37+ bool promptless;

38+ QString cachedAuthUser;

31

39

32− Q_INVOKABLE Session* createSession(const QString& name, const QUrl& screenshot);

40+protected:

33−

41+ Greeter * const q_ptr;

34− void registerSession(Session *session);

35−

36−Q_SIGNALS:

37− void sessionStarting(Session *session);

38− void sessionStopping(Session *session);

39

42

40private:

43private:

41− static SessionManager *the_session_manager;

44+ Q_DECLARE_PUBLIC(Greeter)

42};

45};

43−

44−#endif // SESSIONMANAGER_H

plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+33

@@ -0,0 +1,33 @@

1+set(PLUGIN_CLASSNAME "IntegratedLightDM")

2+

3+add_definitions(-DINTEGRATED_LIGHTDM)

4+

5+foreach(include_directory ${QMLPLUGIN_INCLUDES})

6+ list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})

7+endforeach()

8+

9+include_directories(

10+ . #QLightDM

11+ ${QMLPLUGIN_INCLUDES}

12+ ${libunity8-private_SOURCE_DIR}

13+ ${CMAKE_CURRENT_BINARY_DIR}

14+)

15+

16+foreach(source_file ${QMLPLUGIN_SRC})

17+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

18+endforeach()

19+

20+add_library(IntegratedLightDM-qml MODULE

21+ ${RELATIVE_QMLPLUGIN_SRC}

22+ )

23+

24+target_link_libraries(IntegratedLightDM-qml

25+ integratedLightDM

26+ unity8-private

27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28+ Qt5::DBus Qt5::Gui Qt5::Qml

29+ )

30+

31+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)

32+

33+add_subdirectory(liblightdm)

qml/Dash/ScopeSettings/ScopeSettingNumber.qml → plugins/LightDM/IntegratedLightDM/QLightDM/Greeterrenamed+2−6

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

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -14,8 +14,4 @@

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

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

15 */

15 */

16

16

17−import QtQuick 2.2

17+#include "../liblightdm/Greeter.h"

18−

19−ScopeSettingString {

20− mode: "number"

21−}

plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelnew file+17

@@ -0,0 +1,17 @@

1+/*

2+ * Copyright (C) 2016 Canonical, Ltd.

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+#include "../liblightdm/SessionsModel.h"

plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelnew file+17

@@ -0,0 +1,17 @@

1+/*

2+ * Copyright (C) 2016 Canonical, Ltd.

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+#include "../liblightdm/UsersModel.h"

plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtnew file+54

@@ -0,0 +1,54 @@

1+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2+

3+set(LibLightDM_SOURCES

4+ Greeter.cpp

5+ SessionsModel.cpp

6+ UsersModel.cpp

7+ GreeterPrivate.cpp

8+ SessionsModelPrivate.cpp

9+ UsersModelPrivate.cpp

10+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

11+ ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

12+ )

13+

14+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})

15+add_library(integratedLightDMSession STATIC ${LibLightDM_SOURCES})

16+add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})

17+

18+include_directories(

19+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService

20+ ${CMAKE_CURRENT_BINARY_DIR}

21+ ${GLIB_INCLUDE_DIRS}

22+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

23+)

24+

25+target_link_libraries(integratedLightDM

26+ ${GLIB_LIBRARIES}

27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28+ -lpam

29+ Qt5::Concurrent Qt5::DBus Qt5::Gui

30+)

31+target_link_libraries(integratedLightDMSession

32+ ${GLIB_LIBRARIES}

33+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

34+ -lpam

35+ Qt5::Concurrent Qt5::DBus Qt5::Gui

36+)

37+target_link_libraries(MockLightDM-demo-shared

38+ ${GLIB_LIBRARIES}

39+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

40+ -lpam

41+ Qt5::Concurrent Qt5::DBus Qt5::Gui

42+)

43+

44+set_target_properties(integratedLightDM PROPERTIES

45+ COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")

46+set_target_properties(integratedLightDMSession PROPERTIES

47+ COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")

48+set_target_properties(MockLightDM-demo-shared PROPERTIES

49+ COMPILE_FLAGS "-DSM_BUSNAME=systemBus"

50+ OUTPUT_NAME lightdm-qt5-3)

51+

52+install(TARGETS MockLightDM-demo-shared

53+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo

54+ )

tests/mocks/LightDM/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed+20−16

@@ -16,6 +16,13 @@

16 * Author: Michael Terry <michael.terry@canonical.com>

16 * Author: Michael Terry <michael.terry@canonical.com>

17 */

17 */

18

18

19+

20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

24+

25+

19#include "Greeter.h"

26#include "Greeter.h"

20#include "GreeterPrivate.h"

27#include "GreeterPrivate.h"

21#include <QtCore/QCoreApplication>

28#include <QtCore/QCoreApplication>

@@ -42,18 +49,18 @@ QString Greeter::authenticationUser() const

42

49

43bool Greeter::hasGuestAccountHint() const

50bool Greeter::hasGuestAccountHint() const

44{

51{

45− return true;

52+ return false;

46}

53}

47

54

48QString Greeter::getHint(const QString &name) const

55QString Greeter::getHint(const QString &name) const

49{

56{

50 Q_UNUSED(name)

57 Q_UNUSED(name)

51− return "";

58+ return QLatin1String("");

52}

59}

53

60

54QString Greeter::defaultSessionHint() const

61QString Greeter::defaultSessionHint() const

55{

62{

56− return "ubuntu";

63+ return QStringLiteral("ubuntu");

57}

64}

58

65

59bool Greeter::hideUsersHint() const

66bool Greeter::hideUsersHint() const

@@ -63,22 +70,17 @@ bool Greeter::hideUsersHint() const

63

70

64bool Greeter::showManualLoginHint() const

71bool Greeter::showManualLoginHint() const

65{

72{

66− return true;

73+ return false;

67}

74}

68

75

69bool Greeter::showRemoteLoginHint() const

76bool Greeter::showRemoteLoginHint() const

70−{

71− return true;

72−}

73−

74−bool Greeter::lockHint () const

75{

77{

76 return false;

78 return false;

77}

79}

78

80

79QString Greeter::selectUserHint() const

81QString Greeter::selectUserHint() const

80{

82{

81− return "";

83+ return QLatin1String("");

82}

84}

83

85

84bool Greeter::selectGuestHint() const

86bool Greeter::selectGuestHint() const

@@ -88,7 +90,7 @@ bool Greeter::selectGuestHint() const

88

90

89QString Greeter::autologinUserHint() const

91QString Greeter::autologinUserHint() const

90{

92{

91− return "";

93+ return QLatin1String("");

92}

94}

93

95

94bool Greeter::autologinGuestHint() const

96bool Greeter::autologinGuestHint() const

@@ -108,7 +110,7 @@ bool Greeter::inAuthentication() const

108

110

109QString Greeter::hostname() const

111QString Greeter::hostname() const

110{

112{

111− return "hostname1";

113+ return QStringLiteral("hostname1");

112}

114}

113

115

114bool Greeter::isAuthenticated() const

116bool Greeter::isAuthenticated() const

@@ -128,7 +130,6 @@ void Greeter::authenticate(const QString &username)

128

130

129 d->authenticated = false;

131 d->authenticated = false;

130 d->authenticationUser = username;

132 d->authenticationUser = username;

131− d->twoFactorDone = false;

132 d->handleAuthenticate();

133 d->handleAuthenticate();

133}

134}

134

135

@@ -145,7 +146,10 @@ void Greeter::authenticateRemote(const QString &session, const QString &username

145}

146}

146

147

147void Greeter::cancelAuthentication()

148void Greeter::cancelAuthentication()

148−{}

149+{

150+ Q_D(Greeter);

151+ d->cancelAuthentication();

152+}

149

153

150void Greeter::setLanguage (const QString &language)

154void Greeter::setLanguage (const QString &language)

151{

155{

@@ -167,9 +171,9 @@ void Greeter::respond(const QString &response)

167

171

168void Greeter::sendAuthenticationComplete()

172void Greeter::sendAuthenticationComplete()

169{

173{

170− if (qgetenv("UNITY_TESTING").isEmpty()) {

174+ if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {

171 // simulate PAM's delay

175 // simulate PAM's delay

172− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));

176+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);

173 } else {

177 } else {

174 Q_EMIT authenticationComplete();

178 Q_EMIT authenticationComplete();

175 }

179 }

tests/mocks/LightDM/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed+6−6

@@ -24,6 +24,10 @@

24#include <QtCore/QObject>

24#include <QtCore/QObject>

25#include <QtCore/QVariant>

25#include <QtCore/QVariant>

26

26

27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

27

31

28namespace QLightDM

32namespace QLightDM

29{

33{

@@ -41,22 +45,19 @@ class Q_DECL_EXPORT Greeter : public QObject

41

45

42 Q_PROPERTY(QString hostname READ hostname CONSTANT)

46 Q_PROPERTY(QString hostname READ hostname CONSTANT)

43 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

44− Q_PROPERTY(bool locked READ lockHint CONSTANT)

45−

46− Q_PROPERTY(QString hostname READ hostname CONSTANT)

47−

48− Q_ENUMS(PromptType MessageType)

49

48

50public:

49public:

51 enum PromptType {

50 enum PromptType {

52 PromptTypeQuestion,

51 PromptTypeQuestion,

53 PromptTypeSecret

52 PromptTypeSecret

54 };

53 };

54+ Q_ENUM(PromptType)

55

55

56 enum MessageType {

56 enum MessageType {

57 MessageTypeInfo,

57 MessageTypeInfo,

58 MessageTypeError

58 MessageTypeError

59 };

59 };

60+ Q_ENUM(MessageType)

60

61

61 explicit Greeter(QObject* parent=0);

62 explicit Greeter(QObject* parent=0);

62 virtual ~Greeter();

63 virtual ~Greeter();

@@ -66,7 +67,6 @@ public:

66 bool hideUsersHint() const;

67 bool hideUsersHint() const;

67 bool showManualLoginHint() const;

68 bool showManualLoginHint() const;

68 bool showRemoteLoginHint() const;

69 bool showRemoteLoginHint() const;

69− bool lockHint () const;

70 bool hasGuestAccountHint() const;

70 bool hasGuestAccountHint() const;

71 QString selectUserHint() const;

71 QString selectUserHint() const;

72 bool selectGuestHint() const;

72 bool selectGuestHint() const;

tests/mocks/LightDM/demo/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+47−19

@@ -16,8 +16,8 @@

16 * Author: Michael Terry <michael.terry@canonical.com>

16 * Author: Michael Terry <michael.terry@canonical.com>

17 */

17 */

18

18

19−#include "../Greeter.h"

19+#include "Greeter.h"

20−#include "../GreeterPrivate.h"

20+#include "GreeterPrivate.h"

21#include <QFuture>

21#include <QFuture>

22#include <QFutureInterface>

22#include <QFutureInterface>

23#include <QFutureWatcher>

23#include <QFutureWatcher>

@@ -50,13 +50,13 @@ public:

50 {

50 {

51 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

51 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

52

52

53− connect(&futureWatcher, SIGNAL(finished()),

53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);

54− this, SLOT(finishPam()));

55 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

54 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

56 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

55 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

57 // This next connect is how we pass ResponseFutures between threads

56 // This next connect is how we pass ResponseFutures between threads

58 connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),

57 connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),

59− this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));

58+ this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),

59+ Qt::BlockingQueuedConnection);

60 }

60 }

61

61

62 ~GreeterImpl()

62 ~GreeterImpl()

@@ -68,6 +68,13 @@ public:

68 {

68 {

69 // Clear out any existing PAM interactions first

69 // Clear out any existing PAM interactions first

70 cancelPam();

70 cancelPam();

71+ if (pamHandle != nullptr) {

72+ // While we were cancelling pam above, we processed Qt events.

73+ // Which may have allowed someone to call start() on us again.

74+ // In which case, we'll bail on our current start() call.

75+ // This isn't racy because it's all in the same thread.

76+ return;

77+ }

71

78

72 AppData *appData = new AppData();

79 AppData *appData = new AppData();

73 appData->impl = this;

80 appData->impl = this;

@@ -79,16 +86,16 @@ public:

79

86

80 if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {

87 if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {

81 appData->handle = pamHandle;

88 appData->handle = pamHandle;

82− futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));

89+ futureWatcher.setFuture(QtConcurrent::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));

83 } else {

90 } else {

84 delete appData;

91 delete appData;

85 greeterPrivate->authenticated = false;

92 greeterPrivate->authenticated = false;

86− Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);

93+ Q_EMIT greeter->showMessage(QStringLiteral("Internal error: could not start PAM authentication"), QLightDM::Greeter::MessageTypeError);

87 Q_EMIT greeter->authenticationComplete();

94 Q_EMIT greeter->authenticationComplete();

88 }

95 }

89 }

96 }

90

97

91− static int authenticateWithPam(pam_handle* pamHandle)

98+ static int authenticateWithPam(pam_handle* const& pamHandle)

92 {

99 {

93 int pamStatus = pam_authenticate(pamHandle, 0);

100 int pamStatus = pam_authenticate(pamHandle, 0);

94 if (pamStatus == PAM_SUCCESS) {

101 if (pamStatus == PAM_SUCCESS) {

@@ -199,6 +206,28 @@ public Q_SLOTS:

199 }

206 }

200 }

207 }

201

208

209+ void cancelPam()

210+ {

211+ if (pamHandle != nullptr) {

212+ QFuture<int> pamFuture = futureWatcher.future();

213+ pam_handle *handle = pamHandle;

214+ pamHandle = nullptr; // to disable normal finishPam() handling

215+ pamFuture.cancel();

216+

217+ // Note the empty loop, we just want to clear the futures queue.

218+ // Any further prompts from the pam thread will be immediately

219+ // responded to/dismissed in handlePrompt().

220+ while (respond(QString()));

221+

222+ // Now let signal/slot handling happen so the thread can finish

223+ while (!pamFuture.isFinished()) {

224+ QCoreApplication::processEvents();

225+ }

226+

227+ pam_end(handle, PAM_CONV_ERR);

228+ }

229+ }

230+

202Q_SIGNALS:

231Q_SIGNALS:

203 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);

232 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);

204 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

233 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

@@ -240,17 +269,6 @@ private Q_SLOTS:

240 }

269 }

241

270

242private:

271private:

243− void cancelPam()

244− {

245− // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel

246− if (pamHandle != nullptr) {

247− pam_handle *handle = pamHandle;

248− pamHandle = nullptr; // to disable normal finishPam() handling

249− while (respond(QString())); // clear our local queue of QFutures

250− pam_end(handle, PAM_CONV_ERR);

251− }

252− }

253−

254 Greeter *greeter;

272 Greeter *greeter;

255 GreeterPrivate *greeterPrivate;

273 GreeterPrivate *greeterPrivate;

256 pam_handle* pamHandle;

274 pam_handle* pamHandle;

@@ -266,6 +284,11 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)

266{

284{

267}

285}

268

286

287+GreeterPrivate::~GreeterPrivate()

288+{

289+ delete m_impl;

290+}

291+

269void GreeterPrivate::handleAuthenticate()

292void GreeterPrivate::handleAuthenticate()

270{

293{

271 m_impl->start(authenticationUser);

294 m_impl->start(authenticationUser);

@@ -276,6 +299,11 @@ void GreeterPrivate::handleRespond(const QString &response)

276 m_impl->respond(response);

299 m_impl->respond(response);

277}

300}

278

301

302+void GreeterPrivate::cancelAuthentication()

303+{

304+ m_impl->cancelPam();

305+}

306+

279}

307}

280

308

281#include "GreeterPrivate.moc"

309#include "GreeterPrivate.moc"

tests/mocks/LightDM/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed+2−2

@@ -30,15 +30,15 @@ class GreeterPrivate

30{

30{

31public:

31public:

32 explicit GreeterPrivate(Greeter* parent=0);

32 explicit GreeterPrivate(Greeter* parent=0);

33− virtual ~GreeterPrivate() = default;

33+ virtual ~GreeterPrivate();

34

34

35 // These variables may not be used by all subclasses, that's no problem

35 // These variables may not be used by all subclasses, that's no problem

36 bool authenticated;

36 bool authenticated;

37 QString authenticationUser;

37 QString authenticationUser;

38− bool twoFactorDone;

39

38

40 void handleAuthenticate();

39 void handleAuthenticate();

41 void handleRespond(const QString &response);

40 void handleRespond(const QString &response);

41+ void cancelAuthentication();

42

42

43protected:

43protected:

44 GreeterImpl *m_impl; // if the backend needs more private data

44 GreeterImpl *m_impl; // if the backend needs more private data

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppnew file+87

@@ -0,0 +1,87 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+

19+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

20+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

21+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

22+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

23+

24+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

25+// To use the same method of setting role name that it does, we

26+// set our compatibility to Qt4 here too.

27+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)

28+

29+#include "SessionsModel.h"

30+#include "SessionsModelPrivate.h"

31+#include <QtCore/QDir>

32+#include <QtCore/QString>

33+

34+namespace QLightDM

35+{

36+

37+SessionsModel::SessionsModel(QObject* parent) :

38+ QAbstractListModel(parent),

39+ d_ptr(new SessionsModelPrivate(this))

40+{

41+ m_roleNames = QAbstractListModel::roleNames();

42+ m_roleNames[KeyRole] = "key";

43+ m_roleNames[TypeRole] = "type";

44+}

45+

46+SessionsModel::~SessionsModel()

47+{

48+ delete d_ptr;

49+}

50+

51+QVariant SessionsModel::data(const QModelIndex& index, int role) const

52+{

53+ Q_D(const SessionsModel);

54+

55+ if(!index.isValid()) {

56+ return QVariant();

57+ }

58+

59+ int row = index.row();

60+

61+ switch (role) {

62+ case QLightDM::SessionsModel::KeyRole:

63+ return d->sessionItems[row].key;

64+ case Qt::DisplayRole:

65+ return d->sessionItems[row].name;

66+ default:

67+ return QVariant();

68+ }

69+}

70+

71+QHash<int, QByteArray> SessionsModel::roleNames() const

72+{

73+ return m_roleNames;

74+}

75+

76+int SessionsModel::rowCount(const QModelIndex& parent) const

77+{

78+ Q_D(const SessionsModel);

79+

80+ if (parent.isValid()) {

81+ return 0;

82+ } else { // parent is root

83+ return d->sessionItems.size();

84+ }

85+}

86+

87+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hnew file+72

@@ -0,0 +1,72 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_H

20+

21+#include <QtCore/QAbstractListModel>

22+#include <QtCore/QString>

23+

24+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

25+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

26+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

27+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

28+

29+// This is taken from liblightdm and modified to confirm to our syle conventions

30+namespace QLightDM

31+{

32+class SessionsModelPrivate;

33+

34+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

35+ {

36+ Q_OBJECT

37+

38+ public:

39+

40+ enum SessionModelRoles {

41+ //name is exposed as Qt::DisplayRole

42+ //comment is exposed as Qt::TooltipRole

43+ KeyRole = Qt::UserRole,

44+ IdRole = KeyRole, /** Deprecated */

45+ TypeRole

46+ };

47+ Q_ENUM(SessionModelRoles)

48+

49+ enum SessionType {

50+ LocalSessions,

51+ RemoteSessions

52+ };

53+ Q_ENUM(SessionType)

54+

55+ explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/

56+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

57+ virtual ~SessionsModel();

58+

59+ QHash<int, QByteArray> roleNames() const override;

60+ int rowCount(const QModelIndex& parent) const override;

61+ QVariant data(const QModelIndex& index, int role) const override;

62+

63+ protected:

64+ SessionsModelPrivate* const d_ptr;

65+

66+ private:

67+ QHash<int, QByteArray> m_roleNames;

68+ Q_DECLARE_PRIVATE(SessionsModel)

69+ };

70+}

71+

72+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

tests/mocks/LightDM/single/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpprenamed+13−23

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2015 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -13,34 +13,24 @@

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

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

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

15 *

15 *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

16 */

18

17

19−#include "../Greeter.h"

18+#include "SessionsModelPrivate.h"

20−#include "../GreeterPrivate.h"

21

19

22−namespace QLightDM

20+#include <QDir>

23−{

21+#include <QSettings>

24−

22+#include <QStringList>

25−GreeterPrivate::GreeterPrivate(Greeter* parent)

26− : authenticated(false),

27− authenticationUser(),

28− twoFactorDone(false),

29− q_ptr(parent)

30−{

31−}

32

23

33−void GreeterPrivate::handleAuthenticate()

24+namespace QLightDM

34{

25{

35− Q_Q(Greeter);

36−

37− authenticated = true;

38− Q_EMIT q->authenticationComplete();

39−}

40

26

41−void GreeterPrivate::handleRespond(QString const &response)

27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)

28+ : q_ptr(parent)

42{

29{

43− Q_UNUSED(response)

30+ // Since this model is never visible, as there is only 1 session,

31+ // just use the session name as the key

32+ QString sessionName = qgetenv("XDG_SESSION_DESKTOP");

33+ sessionItems.append({sessionName, "", sessionName, ""});

44}

34}

45

35

46−}

36+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hnew file+54

@@ -0,0 +1,54 @@

1+/*

2+ * Copyright (C) 2015 Canonical, Ltd.

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+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

20+

21+#include <QtCore/QList>

22+#include <QtCore/QString>

23+

24+namespace QLightDM

25+{

26+class SessionsModel;

27+

28+class SessionItem

29+{

30+public:

31+ QString key;

32+ QString type; // unused

33+ QString name;

34+ QString comment; // unused

35+};

36+

37+class SessionsModelPrivate

38+{

39+public:

40+ explicit SessionsModelPrivate(SessionsModel* parent=0);

41+ virtual ~SessionsModelPrivate() = default;

42+

43+ QList<SessionItem> sessionItems;

44+

45+protected:

46+ SessionsModel* const q_ptr;

47+

48+private:

49+ Q_DECLARE_PUBLIC(SessionsModel)

50+};

51+

52+} // namespace QLightDM

53+

54+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

tests/mocks/LightDM/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+14−21

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -16,6 +16,12 @@

16 * Author: Michael Terry <michael.terry@canonical.com>

16 * Author: Michael Terry <michael.terry@canonical.com>

17 */

17 */

18

18

19+

20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

24+

19// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

25// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

20// To use the same method of setting role name that it does, we

26// To use the same method of setting role name that it does, we

21// set our compatibility to Qt4 here too.

27// set our compatibility to Qt4 here too.

@@ -34,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :

34 QAbstractListModel(parent),

40 QAbstractListModel(parent),

35 d_ptr(new UsersModelPrivate(this))

41 d_ptr(new UsersModelPrivate(this))

36{

42{

37− Q_D(UsersModel);

38−

39 // Extend roleNames (we want to keep the "display" role)

43 // Extend roleNames (we want to keep the "display" role)

40 QHash<int, QByteArray> roles = roleNames();

44 QHash<int, QByteArray> roles = roleNames();

41 roles[NameRole] = "name";

45 roles[NameRole] = "name";

@@ -46,26 +50,13 @@ UsersModel::UsersModel(QObject *parent) :

46 roles[SessionRole] = "session";

50 roles[SessionRole] = "session";

47 roles[HasMessagesRole] = "hasMessages";

51 roles[HasMessagesRole] = "hasMessages";

48 roles[ImagePathRole] = "imagePath";

52 roles[ImagePathRole] = "imagePath";

53+ roles[UidRole] = "uid";

49 setRoleNames(roles);

54 setRoleNames(roles);

50

55

51− // Now modify our mock user backgrounds

56+ connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {

52− QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");

57+ QModelIndex index = createIndex(i, 0);

53− QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);

58+ Q_EMIT dataChanged(index, index);

54−

55− for (int i = 0, j = 0; i < d->entries.size(); i++) {

56− Entry &entry = d->entries[i];

57− if (entry.background.isNull() && !backgrounds.isEmpty()) {

58− entry.background = bgdir.filePath(backgrounds[j++]);

59− if (j >= backgrounds.length()) {

60− j = 0;

61− }

62− }

63− }

59+ });

64−}

65−

66−UsersModel::~UsersModel()

67−{

68− delete d_ptr;

69}

60}

70

61

71int UsersModel::rowCount(const QModelIndex &parent) const

62int UsersModel::rowCount(const QModelIndex &parent) const

@@ -109,6 +100,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const

109 return d->entries[row].has_messages;

100 return d->entries[row].has_messages;

110 case UsersModel::ImagePathRole:

101 case UsersModel::ImagePathRole:

111 return "";

102 return "";

103+ case UsersModel::UidRole:

104+ return d->entries[row].uid;

112 default:

105 default:

113 return QVariant();

106 return QVariant();

114 }

107 }

tests/mocks/LightDM/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+10−6

@@ -24,6 +24,10 @@

24#include <QtCore/QSharedDataPointer>

24#include <QtCore/QSharedDataPointer>

25#include <QAbstractListModel>

25#include <QAbstractListModel>

26

26

27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm

30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

27

31

28namespace QLightDM

32namespace QLightDM

29{

33{

@@ -33,11 +37,9 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel

33{

37{

34 Q_OBJECT

38 Q_OBJECT

35

39

36− Q_ENUMS(UserModelRoles)

37−

38public:

40public:

39 explicit UsersModel(QObject *parent = 0);

41 explicit UsersModel(QObject *parent = 0);

40− virtual ~UsersModel();

42+ virtual ~UsersModel() = default;

41

43

42 enum UserModelRoles {NameRole = Qt::UserRole,

44 enum UserModelRoles {NameRole = Qt::UserRole,

43 RealNameRole,

45 RealNameRole,

@@ -46,11 +48,13 @@ public:

46 SessionRole,

48 SessionRole,

47 HasMessagesRole,

49 HasMessagesRole,

48 ImagePathRole,

50 ImagePathRole,

49− BackgroundPathRole

51+ BackgroundPathRole,

52+ UidRole

50 };

53 };

54+ Q_ENUM(UserModelRoles)

51

55

52− int rowCount(const QModelIndex &parent) const;

56+ int rowCount(const QModelIndex &parent) const override;

53− QVariant data(const QModelIndex &index, int role) const;

57+ QVariant data(const QModelIndex &index, int role) const override;

54

58

55private:

59private:

56 UsersModelPrivate * const d_ptr;

60 UsersModelPrivate * const d_ptr;

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cppnew file+94

@@ -0,0 +1,94 @@

1+/*

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

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: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "UsersModelPrivate.h"

20+

21+#include "AccountsServiceDBusAdaptor.h"

22+#include "UsersModel.h"

23+

24+#include <glib.h>

25+#include <QDebug>

26+#include <QDir>

27+#include <QSettings>

28+#include <QStringList>

29+#include <unistd.h>

30+

31+namespace QLightDM

32+{

33+

34+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

35+ : QObject(parent),

36+ q_ptr(parent),

37+ m_service(new AccountsServiceDBusAdaptor(this))

38+{

39+ QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");

40+ QString currentUser = g_get_user_name();

41+ uid_t currentUid = getuid();

42+

43+ if (demoFile.exists()) {

44+ QSettings settings(demoFile.filePath(), QSettings::NativeFormat);

45+ QStringList users = settings.value(QStringLiteral("users"), QStringList() << currentUser).toStringList();

46+

47+ entries.reserve(users.count());

48+ Q_FOREACH(const QString &user, users)

49+ {

50+ QString name = settings.value(user + "/name", user).toString();

51+ entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});

52+ }

53+ } else {

54+ entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});

55+

56+ connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,

57+ this, [this](const QString &user) {

58+ if (user == entries[0].username) {

59+ updateName(true);

60+ }

61+ });

62+ updateName(false);

63+ }

64+}

65+

66+void UsersModelPrivate::updateName(bool async)

67+{

68+ auto pendingReply = m_service->getUserPropertyAsync(entries[0].username,

69+ QStringLiteral("org.freedesktop.Accounts.User"),

70+ QStringLiteral("RealName"));

71+ auto *watcher = new QDBusPendingCallWatcher(pendingReply, this);

72+

73+ connect(watcher, &QDBusPendingCallWatcher::finished,

74+ this, [this](QDBusPendingCallWatcher* watcher) {

75+

76+ QDBusPendingReply<QVariant> reply = *watcher;

77+ watcher->deleteLater();

78+ if (reply.isError()) {

79+ qWarning() << "Failed to get 'RealName' property - " << reply.error().message();

80+ return;

81+ }

82+

83+ const QString realName = reply.value().toString();

84+ if (entries[0].real_name != realName) {

85+ entries[0].real_name = realName;

86+ Q_EMIT dataChanged(0);

87+ }

88+ });

89+ if (!async) {

90+ watcher->waitForFinished();

91+ }

92+}

93+

94+}

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hnew file+72

@@ -0,0 +1,72 @@

1+/*

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

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: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H

20+#define UNITY_MOCK_USERSMODEL_PRIVATE_H

21+

22+#include <QList>

23+#include <QObject>

24+#include <QString>

25+

26+class AccountsServiceDBusAdaptor;

27+

28+namespace QLightDM

29+{

30+class UsersModel;

31+

32+class Entry

33+{

34+public:

35+ QString username;

36+ QString real_name;

37+ QString background;

38+ QString layouts;

39+ bool is_active;

40+ bool has_messages;

41+ QString session;

42+ QString infographic;

43+ uid_t uid;

44+};

45+

46+class UsersModelPrivate : public QObject

47+{

48+ Q_OBJECT

49+

50+public:

51+ explicit UsersModelPrivate(UsersModel *parent = 0);

52+ virtual ~UsersModelPrivate() = default;

53+

54+ QList<Entry> entries;

55+

56+Q_SIGNALS:

57+ void dataChanged(int);

58+

59+protected:

60+ UsersModel * const q_ptr;

61+

62+private:

63+ Q_DECLARE_PUBLIC(UsersModel)

64+

65+ void updateName(bool async);

66+

67+ AccountsServiceDBusAdaptor *m_service;

68+};

69+

70+}

71+

72+#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H

plugins/LightDM/IntegratedLightDM/qmldirnew file+3

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

1+module LightDM.IntegratedLightDM

2+plugin IntegratedLightDM-qml

3+typeinfo IntegratedLightDM.qmltypes

plugins/LightDM/LightDM.qmltypesdeleted−251

@@ -1,251 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable LightDM 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Greeter"

12− prototype: "QObject"

13− exports: ["LightDM/Greeter 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Property { name: "active"; type: "bool" }

18− Property { name: "authenticated"; type: "bool"; isReadonly: true }

19− Property { name: "authenticationUser"; type: "string"; isReadonly: true }

20− Property { name: "promptless"; type: "bool"; isReadonly: true }

21− Signal {

22− name: "showMessage"

23− Parameter { name: "text"; type: "string" }

24− Parameter { name: "isError"; type: "bool" }

25− }

26− Signal {

27− name: "showPrompt"

28− Parameter { name: "text"; type: "string" }

29− Parameter { name: "isSecret"; type: "bool" }

30− Parameter { name: "isDefaultPrompt"; type: "bool" }

31− }

32− Signal { name: "authenticationComplete" }

33− Signal {

34− name: "authenticationUserChanged"

35− Parameter { name: "user"; type: "string" }

36− }

37− Signal { name: "isActiveChanged" }

38− Signal { name: "isAuthenticatedChanged" }

39− Signal { name: "showGreeter" }

40− Signal { name: "hideGreeter" }

41− Signal {

42− name: "requestAuthenticationUser"

43− Parameter { name: "user"; type: "string" }

44− }

45− Method {

46− name: "authenticate"

47− Parameter { name: "username"; type: "string" }

48− }

49− Method { name: "authenticate" }

50− Method {

51− name: "respond"

52− Parameter { name: "response"; type: "string" }

53− }

54− Method {

55− name: "startSessionSync"

56− type: "bool"

57− Parameter { name: "session"; type: "string" }

58− }

59− Method { name: "startSessionSync"; type: "bool" }

60− Method {

61− name: "setIsActive"

62− Parameter { name: "isActive"; type: "bool" }

63− }

64− }

65− Component {

66− name: "QAbstractProxyModel"

67− prototype: "QAbstractItemModel"

68− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }

69− }

70− Component {

71− name: "QLightDM::UsersModel"

72− prototype: "QAbstractListModel"

73− exports: ["LightDM/UserRoles 0.1"]

74− isCreatable: false

75− exportMetaObjectRevisions: [0]

76− Enum {

77− name: "UserModelRoles"

78− values: {

79− "NameRole": 256,

80− "RealNameRole": 257,

81− "LoggedInRole": 258,

82− "BackgroundRole": 259,

83− "SessionRole": 260,

84− "HasMessagesRole": 261,

85− "ImagePathRole": 262,

86− "BackgroundPathRole": 263

87− }

88− }

89− }

90− Component {

91− name: "QSortFilterProxyModel"

92− prototype: "QAbstractProxyModel"

93− Property { name: "filterRegExp"; type: "QRegExp" }

94− Property { name: "filterKeyColumn"; type: "int" }

95− Property { name: "dynamicSortFilter"; type: "bool" }

96− Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }

97− Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }

98− Property { name: "isSortLocaleAware"; type: "bool" }

99− Property { name: "sortRole"; type: "int" }

100− Property { name: "filterRole"; type: "int" }

101− Method {

102− name: "setFilterRegExp"

103− Parameter { name: "pattern"; type: "string" }

104− }

105− Method {

106− name: "setFilterWildcard"

107− Parameter { name: "pattern"; type: "string" }

108− }

109− Method {

110− name: "setFilterFixedString"

111− Parameter { name: "pattern"; type: "string" }

112− }

113− Method { name: "clear" }

114− Method { name: "invalidate" }

115− }

116− Component {

117− name: "QSortFilterProxyModelQML"

118− prototype: "QSortFilterProxyModel"

119− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

120− Property { name: "totalCount"; type: "int"; isReadonly: true }

121− Property { name: "count"; type: "int"; isReadonly: true }

122− Property { name: "invertMatch"; type: "bool" }

123− Signal {

124− name: "invertMatchChanged"

125− Parameter { type: "bool" }

126− }

127− Method {

128− name: "get"

129− type: "QVariantMap"

130− Parameter { name: "row"; type: "int" }

131− }

132− Method {

133− name: "data"

134− type: "QVariant"

135− Parameter { name: "row"; type: "int" }

136− Parameter { name: "role"; type: "int" }

137− }

138− Method { name: "count"; type: "int" }

139− Method {

140− name: "findFirst"

141− type: "int"

142− Parameter { name: "role"; type: "int" }

143− Parameter { name: "value"; type: "QVariant" }

144− }

145− Method {

146− name: "mapRowToSource"

147− type: "int"

148− Parameter { name: "row"; type: "int" }

149− }

150− Method {

151− name: "mapFromSource"

152− type: "int"

153− Parameter { name: "row"; type: "int" }

154− }

155− Method {

156− name: "mapToSource"

157− type: "int"

158− Parameter { name: "row"; type: "int" }

159− }

160− }

161− Component {

162− name: "UserMetricsOutput::ColorTheme"

163− prototype: "QObject"

164− Property { name: "start"; type: "QColor"; isReadonly: true }

165− Property { name: "main"; type: "QColor"; isReadonly: true }

166− Property { name: "end"; type: "QColor"; isReadonly: true }

167− Signal {

168− name: "startChanged"

169− Parameter { name: "color"; type: "QColor" }

170− }

171− Signal {

172− name: "mainChanged"

173− Parameter { name: "color"; type: "QColor" }

174− }

175− Signal {

176− name: "endChanged"

177− Parameter { name: "color"; type: "QColor" }

178− }

179− }

180− Component {

181− name: "UserMetricsOutput::UserMetrics"

182− prototype: "QObject"

183− exports: ["LightDM/Infographic 0.1"]

184− isCreatable: false

185− isSingleton: true

186− exportMetaObjectRevisions: [0]

187− Property { name: "label"; type: "string"; isReadonly: true }

188− Property { name: "username"; type: "string" }

189− Property {

190− name: "firstColor"

191− type: "UserMetricsOutput::ColorTheme"

192− isReadonly: true

193− isPointer: true

194− }

195− Property {

196− name: "secondColor"

197− type: "UserMetricsOutput::ColorTheme"

198− isReadonly: true

199− isPointer: true

200− }

201− Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }

202− Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }

203− Property { name: "currentDay"; type: "int"; isReadonly: true }

204− Signal {

205− name: "labelChanged"

206− Parameter { name: "label"; type: "string" }

207− }

208− Signal {

209− name: "usernameChanged"

210− Parameter { name: "username"; type: "string" }

211− }

212− Signal {

213− name: "firstColorChanged"

214− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }

215− }

216− Signal {

217− name: "firstMonthChanged"

218− Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }

219− }

220− Signal {

221− name: "currentDayChanged"

222− Parameter { name: "currentDay"; type: "int" }

223− }

224− Signal {

225− name: "secondColorChanged"

226− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }

227− }

228− Signal {

229− name: "secondMonthChanged"

230− Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }

231− }

232− Signal { name: "nextDataSource" }

233− Signal { name: "readyForDataChange" }

234− Signal { name: "dataAboutToAppear" }

235− Signal { name: "dataAppeared" }

236− Signal { name: "dataAboutToChange" }

237− Signal { name: "dataChanged" }

238− Signal { name: "dataAboutToDisappear" }

239− Signal { name: "dataDisappeared" }

240− Method { name: "nextDataSourceSlot" }

241− Method { name: "readyForDataChangeSlot" }

242− }

243− Component {

244− name: "UsersModel"

245− prototype: "QSortFilterProxyModelQML"

246− exports: ["LightDM/Users 0.1"]

247− isCreatable: false

248− isSingleton: true

249− exportMetaObjectRevisions: [0]

250− }

251−}

plugins/LightDM/PromptsModel.cppnew file+97

@@ -0,0 +1,97 @@

1+/*

2+ * Copyright (C) 2017 Canonical, Ltd.

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 "PromptsModel.h"

19+

20+PromptsModel::PromptsModel(QObject* parent)

21+ : QAbstractListModel(parent)

22+{

23+ m_roleNames[TypeRole] = "type";

24+ m_roleNames[TextRole] = "text";

25+}

26+

27+PromptsModel& PromptsModel::operator=(const PromptsModel &other)

28+{

29+ beginResetModel();

30+ m_prompts = other.m_prompts;

31+ endResetModel();

32+ Q_EMIT countChanged();

33+ return *this;

34+}

35+

36+int PromptsModel::rowCount(const QModelIndex &parent) const

37+{

38+ if (parent.isValid())

39+ return 0;

40+

41+ return m_prompts.size();

42+}

43+

44+QVariant PromptsModel::data(const QModelIndex &index, int role) const

45+{

46+ if (!index.isValid() || index.column() > 0 || index.row() >= m_prompts.size())

47+ return QVariant();

48+

49+ switch (role) {

50+ case Qt::DisplayRole: // fallthrough

51+ case TextRole: return m_prompts[index.row()].prompt;

52+ case TypeRole: return m_prompts[index.row()].type;

53+ default: return QVariant();

54+ }

55+}

56+

57+QHash<int, QByteArray> PromptsModel::roleNames() const

58+{

59+ return m_roleNames;

60+}

61+

62+void PromptsModel::prepend(const QString &text, PromptType type)

63+{

64+ beginInsertRows(QModelIndex(), 0, 0);

65+ m_prompts.prepend(PromptInfo{text, type});

66+ endInsertRows();

67+

68+ Q_EMIT countChanged();

69+}

70+

71+void PromptsModel::append(const QString &text, PromptType type)

72+{

73+ beginInsertRows(QModelIndex(), m_prompts.size(), m_prompts.size());

74+ m_prompts.append(PromptInfo{text, type});

75+ endInsertRows();

76+

77+ Q_EMIT countChanged();

78+}

79+

80+void PromptsModel::clear()

81+{

82+ beginResetModel();

83+ m_prompts.clear();

84+ endResetModel();

85+

86+ Q_EMIT countChanged();

87+}

88+

89+bool PromptsModel::hasPrompt() const

90+{

91+ Q_FOREACH(const PromptInfo &info, m_prompts) {

92+ if (info.type == PromptType::Secret || info.type == PromptType::Question) {

93+ return true;

94+ }

95+ }

96+ return false;

97+}

plugins/LightDM/PromptsModel.hnew file+70

@@ -0,0 +1,70 @@

1+/*

2+ * Copyright (C) 2017 Canonical, Ltd.

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+#pragma once

19+

20+#include <QAbstractListModel>

21+

22+class PromptsModel : public QAbstractListModel

23+{

24+ Q_OBJECT

25+

26+ Q_PROPERTY(int count READ rowCount NOTIFY countChanged)

27+

28+public:

29+ enum PromptsModelRoles {

30+ TypeRole = Qt::UserRole,

31+ TextRole,

32+ };

33+ Q_ENUM(PromptsModelRoles)

34+

35+ enum PromptType {

36+ Message,

37+ Error,

38+ Secret,

39+ Question,

40+ Button,

41+ };

42+ Q_ENUM(PromptType)

43+

44+ explicit PromptsModel(QObject* parent=0);

45+

46+ PromptsModel& operator=(const PromptsModel &other);

47+

48+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

49+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

50+ QHash<int, QByteArray> roleNames() const override;

51+

52+ Q_INVOKABLE void prepend(const QString &text, PromptType type);

53+ Q_INVOKABLE void append(const QString &text, PromptType type);

54+

55+ void clear();

56+

57+ bool hasPrompt() const;

58+

59+Q_SIGNALS:

60+ void countChanged();

61+

62+private:

63+ struct PromptInfo {

64+ QString prompt;

65+ PromptType type;

66+ };

67+

68+ QList<PromptInfo> m_prompts;

69+ QHash<int, QByteArray> m_roleNames;

70+};

plugins/LightDM/SessionsModel.cppnew file+135

@@ -0,0 +1,135 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

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 "SessionsModel.h"

19+#include <QtCore/QFile>

20+#include <QtCore/QSortFilterProxyModel>

21+

22+QHash<int, QByteArray> SessionsModel::roleNames() const

23+{

24+ return m_roleNames;

25+}

26+

27+int SessionsModel::rowCount(const QModelIndex& parent) const

28+{

29+ return m_model->rowCount(parent);

30+}

31+

32+QList<QUrl> SessionsModel::iconSearchDirectories() const

33+{

34+ return m_iconSearchDirectories;

35+}

36+

37+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)

38+{

39+ // QML gives us a url with file:// prepended which breaks QFile::exists()

40+ // so convert the url to a local file

41+ QList<QUrl> localList = {};

42+ Q_FOREACH(const QUrl& searchDirectory, searchDirectories)

43+ {

44+ localList.append(searchDirectory.toLocalFile());

45+ }

46+ m_iconSearchDirectories = localList;

47+ Q_EMIT iconSearchDirectoriesChanged();

48+}

49+

50+QUrl SessionsModel::iconUrl(const QString sessionKey) const

51+{

52+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)

53+ {

54+ // This is an established icon naming convention

55+ QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

56+ "/custom_" + sessionKey + "_badge.png";

57+ QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

58+ "/" + sessionKey + "_badge.png";

59+

60+ QFile customIconFile(customIconUrl);

61+ QFile iconFile(iconUrl);

62+ if (customIconFile.exists()) {

63+ return QUrl(customIconUrl);

64+ } else if (iconFile.exists()) {

65+ return QUrl(iconUrl);

66+ } else {

67+ // Search the legacy way

68+ QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";

69+ bool iconFound = false;

70+ if (sessionKey == "ubuntu" || sessionKey == "ubuntu-2d") {

71+ path += "ubuntu_badge.png";

72+ iconFound = true;

73+ } else if(

74+ sessionKey == "gnome-classic" ||

75+ sessionKey == "gnome-flashback-compiz" ||

76+ sessionKey == "gnome-flashback-metacity" ||

77+ sessionKey == "gnome-shell" ||

78+ sessionKey == "gnome-wayland" ||

79+ sessionKey == "gnome"

80+ ){

81+ path += "gnome_badge.png";

82+ iconFound = true;

83+ } else if (sessionKey == "plasma") {

84+ path += "kde_badge.png";

85+ iconFound = true;

86+ } else if (sessionKey == "xterm") {

87+ path += "recovery_console_badge.png";

88+ iconFound = true;

89+ } else if (sessionKey == "remote-login") {

90+ path += "remote_login_help.png";

91+ iconFound = true;

92+ }

93+

94+ if (QFile(path).exists() && iconFound) {

95+ return path;

96+ }

97+ }

98+ }

99+

100+ // FIXME make this smarter

101+ return QUrl("./graphics/session_icons/unknown_badge.png");

102+}

103+

104+QVariant SessionsModel::data(const QModelIndex& index, int role) const

105+{

106+ switch (role) {

107+ case SessionsModel::IconRole:

108+ return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());

109+ default:

110+ return m_model->data(index, role);

111+ }

112+}

113+

114+SessionsModel::SessionsModel(QObject* parent)

115+ : UnitySortFilterProxyModelQML(parent)

116+{

117+ // Add a custom IconRole that isn't in either of the lightdm implementations

118+ m_model = new QLightDM::SessionsModel(this);

119+ m_roleNames = m_model->roleNames();

120+ m_roleNames[IconRole] = "icon_url";

121+

122+ // Update search locations to use $SNAP prefix if specified

123+ auto snapRoot = QFile::decodeName(qgetenv("SNAP"));

124+ if (!snapRoot.isEmpty()) {

125+ for (int i = 0; i < m_iconSearchDirectories.size(); i++) {

126+ m_iconSearchDirectories[i] = snapRoot + m_iconSearchDirectories[i].path();

127+ }

128+ }

129+

130+ setModel(m_model);

131+ setSortCaseSensitivity(Qt::CaseInsensitive);

132+ setSortLocaleAware(true);

133+ setSortRole(Qt::DisplayRole);

134+ sort(0);

135+}

plugins/LightDM/SessionsModel.hnew file+66

@@ -0,0 +1,66 @@

1+/*

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

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+#pragma once

19+

20+#include <unitysortfilterproxymodelqml.h>

21+#include <QLightDM/SessionsModel>

22+#include <QtCore/QHash>

23+#include <QtCore/QObject>

24+#include <QtCore/QUrl>

25+

26+class SessionsModel : public UnitySortFilterProxyModelQML

27+{

28+ Q_OBJECT

29+

30+ Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories

31+ WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)

32+

33+Q_SIGNALS:

34+ void iconSearchDirectoriesChanged();

35+

36+public:

37+ enum SessionModelRoles {

38+ /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,

39+ * the _first_ value of this enum MUST be the _last_ value of

40+ * QLightDM::SessionsModel::SessionModelRoles and consquently, this must

41+ * also match the last value in the corresponding enum of the integrated lib

42+ */

43+ TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,

44+ IconRole

45+ };

46+ Q_ENUM(SessionModelRoles)

47+

48+ explicit SessionsModel(QObject* parent=nullptr);

49+

50+ QHash<int, QByteArray> roleNames() const override;

51+ int rowCount(const QModelIndex& parent) const override;

52+ QVariant data(const QModelIndex& index, int role) const override;

53+ QList<QUrl> iconSearchDirectories() const;

54+ Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;

55+

56+ void setIconSearchDirectories(const QList<QUrl> searchDirectories);

57+

58+private:

59+ QLightDM::SessionsModel* m_model;

60+ QHash<int, QByteArray> m_roleNames;

61+ QList<QUrl> m_iconSearchDirectories{

62+ QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),

63+ QUrl("/usr/local/share/unity-greeter"),

64+ QUrl("/usr/share/unity-greeter/")};

65+

66+};

plugins/LightDM/UsersModel.cpp+183−15

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

1/*

1/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013,2015-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,53 +12,204 @@

12 *

12 *

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

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

17+#include "Greeter.h"

19#include "UsersModel.h"

18#include "UsersModel.h"

19+#include <QIdentityProxyModel>

20#include <QLightDM/UsersModel>

20#include <QLightDM/UsersModel>

21−#include <QtCore/QSortFilterProxyModel>

21+

22+#include <libintl.h>

22

23

23// First, we define an internal class that wraps LightDM's UsersModel. This

24// First, we define an internal class that wraps LightDM's UsersModel. This

24// class will modify some of the data coming from LightDM. For example, we

25// class will modify some of the data coming from LightDM. For example, we

25−// modify any empty Real Names into just normal Names.

26+// modify any empty Real Names into just normal Names. We also add optional

27+// rows, depending on configuration.

26// (We can't modify the data directly in UsersModel below because it won't sort

28// (We can't modify the data directly in UsersModel below because it won't sort

27// using the modified data.)

29// using the modified data.)

28−class MangleModel : public QSortFilterProxyModel

30+class MangleModel : public QIdentityProxyModel

29{

31{

30 Q_OBJECT

32 Q_OBJECT

31

33

32public:

34public:

33 explicit MangleModel(QObject* parent=0);

35 explicit MangleModel(QObject* parent=0);

34

36

35− virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

37+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

38+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

39+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

40+

41+private:

42+ struct CustomRow {

43+ QString name;

44+ QString realName;

45+ };

46+

47+ int sourceRowCount() const;

48+

49+ void updateGuestRow();

50+ void updateManualRow();

51+ void updateCustomRows();

52+

53+ void addCustomRow(const CustomRow &newRow);

54+ void removeCustomRow(const QString &rowName);

55+

56+ QList<CustomRow> m_customRows;

57+ bool m_updatingCustomRows;

36};

58};

37

59

38MangleModel::MangleModel(QObject* parent)

60MangleModel::MangleModel(QObject* parent)

39− : QSortFilterProxyModel(parent)

61+ : QIdentityProxyModel(parent)

62+ , m_updatingCustomRows(false)

40{

63{

41 setSourceModel(new QLightDM::UsersModel(this));

64 setSourceModel(new QLightDM::UsersModel(this));

65+

66+ updateCustomRows();

67+

68+ // Would be nice if there were a rowCountChanged signal in the base class.

69+ // We redo all custom rows on any row count change, because (A) some of

70+ // custom rows (manual login) use row count information and (B) when

71+ // testing, we use a modelReset signal as a way to indicate that a custom

72+ // row has been toggled off or on.

73+ connect(this, &QIdentityProxyModel::modelReset,

74+ this, &MangleModel::updateCustomRows);

75+ connect(this, &QIdentityProxyModel::rowsInserted,

76+ this, &MangleModel::updateCustomRows);

77+ connect(this, &QIdentityProxyModel::rowsRemoved,

78+ this, &MangleModel::updateCustomRows);

42}

79}

43

80

44QVariant MangleModel::data(const QModelIndex &index, int role) const

81QVariant MangleModel::data(const QModelIndex &index, int role) const

45{

82{

46− QVariant data = QSortFilterProxyModel::data(index, role);

83+ QVariant variantData;

84+

85+ if (index.row() >= rowCount())

86+ return QVariant();

87+

88+ bool isCustomRow = index.row() >= sourceRowCount();

89+ if (isCustomRow && index.column() == 0) {

90+ int customIndex = index.row() - sourceRowCount();

91+ if (role == QLightDM::UsersModel::NameRole) {

92+ variantData = m_customRows[customIndex].name;

93+ } else if (role == QLightDM::UsersModel::RealNameRole) {

94+ variantData = m_customRows[customIndex].realName;

95+ } else if (role == QLightDM::UsersModel::LoggedInRole) {

96+ variantData = false;

97+ } else if (role == QLightDM::UsersModel::SessionRole) {

98+ variantData = Greeter::instance()->defaultSessionHint();

99+ }

100+ } else {

101+ variantData = QIdentityProxyModel::data(index, role);

102+ }

47

103

48 // If user's real name is empty, switch to unix name

104 // If user's real name is empty, switch to unix name

49− if (role == QLightDM::UsersModel::RealNameRole && data.toString().isEmpty()) {

105+ if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {

50− data = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

106+ variantData = data(index, QLightDM::UsersModel::NameRole);

51− } else if (role == QLightDM::UsersModel::BackgroundPathRole && data.toString().startsWith('#')) {

107+ } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {

52− data = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + data.toString() + "'/></svg>";

108+ const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";

109+ variantData = stringData;

110+ }

111+

112+ // Workaround for liblightdm returning "" when a user has no default session

113+ if (Q_UNLIKELY(role == QLightDM::UsersModel::SessionRole && variantData.toString().isEmpty())) {

114+ variantData = Greeter::instance()->defaultSessionHint();

53 }

115 }

54

116

55− return data;

117+ return variantData;

118+}

119+

120+void MangleModel::addCustomRow(const CustomRow &newRow)

121+{

122+ for (int i = 0; i < m_customRows.size(); i++) {

123+ if (m_customRows[i].name == newRow.name) {

124+ return; // we don't have custom rows that change content yet

125+ }

126+ }

127+

128+ beginInsertRows(QModelIndex(), rowCount(), rowCount());

129+ m_customRows << newRow;

130+ endInsertRows();

131+}

132+

133+void MangleModel::removeCustomRow(const QString &rowName)

134+{

135+ for (int i = 0; i < m_customRows.size(); i++) {

136+ if (m_customRows[i].name == rowName) {

137+ int rowNum = sourceRowCount() + i;

138+ beginRemoveRows(QModelIndex(), rowNum, rowNum);

139+ m_customRows.removeAt(i);

140+ endRemoveRows();

141+ break;

142+ }

143+ }

144+}

145+

146+void MangleModel::updateManualRow()

147+{

148+ bool hasAnotherEntry = sourceRowCount() > 0;

149+ for (int i = 0; !hasAnotherEntry && i < m_customRows.size(); i++) {

150+ if (m_customRows[i].name != QStringLiteral("*other")) {

151+ hasAnotherEntry = true;

152+ }

153+ }

154+

155+ // Show manual login if we are asked to OR if no other entry exists

156+ if (Greeter::instance()->showManualLoginHint() || !hasAnotherEntry)

157+ addCustomRow({QStringLiteral("*other"), gettext("Login")});

158+ else

159+ removeCustomRow(QStringLiteral("*other"));

160+}

161+

162+void MangleModel::updateGuestRow()

163+{

164+ if (Greeter::instance()->hasGuestAccount())

165+ addCustomRow({QStringLiteral("*guest"), gettext("Guest Session")});

166+ else

167+ removeCustomRow(QStringLiteral("*guest"));

168+}

169+

170+void MangleModel::updateCustomRows()

171+{

172+ // We update when rowCount changes, but we also insert/remove rows here.

173+ // So guard this function to avoid recursion.

174+ if (m_updatingCustomRows)

175+ return;

176+

177+ m_updatingCustomRows = true;

178+ updateGuestRow();

179+ updateManualRow();

180+ m_updatingCustomRows = false;

181+}

182+

183+int MangleModel::rowCount(const QModelIndex &parent) const

184+{

185+ if (parent.isValid())

186+ return 0;

187+ else

188+ return sourceRowCount() + m_customRows.size();

189+}

190+

191+int MangleModel::sourceRowCount() const

192+{

193+ return Greeter::instance()->hideUsersHint() ? 0 : sourceModel()->rowCount();

194+}

195+

196+QModelIndex MangleModel::index(int row, int column, const QModelIndex &parent) const

197+{

198+ if (row >= rowCount())

199+ return QModelIndex();

200+

201+ bool isCustomRow = row >= sourceRowCount();

202+ if (isCustomRow && !parent.isValid()) {

203+ return createIndex(row, column);

204+ } else {

205+ return QIdentityProxyModel::index(row, column, parent);

206+ }

56}

207}

57

208

58// **** Now we continue with actual UsersModel class ****

209// **** Now we continue with actual UsersModel class ****

59

210

60UsersModel::UsersModel(QObject* parent)

211UsersModel::UsersModel(QObject* parent)

61− : QSortFilterProxyModelQML(parent)

212+ : UnitySortFilterProxyModelQML(parent)

62{

213{

63 setModel(new MangleModel(this));

214 setModel(new MangleModel(this));

64 setSortCaseSensitivity(Qt::CaseInsensitive);

215 setSortCaseSensitivity(Qt::CaseInsensitive);

@@ -67,4 +218,21 @@ UsersModel::UsersModel(QObject* parent)

67 sort(0);

218 sort(0);

68}

219}

69

220

221+bool UsersModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const

222+{

223+ auto leftName = source_left.data(QLightDM::UsersModel::NameRole);

224+ auto rightName = source_right.data(QLightDM::UsersModel::NameRole);

225+

226+ if (leftName == QStringLiteral("*guest"))

227+ return false;

228+ if (rightName == QStringLiteral("*guest"))

229+ return true;

230+ if (leftName == QStringLiteral("*other"))

231+ return false;

232+ if (rightName == QStringLiteral("*other"))

233+ return true;

234+

235+ return UnitySortFilterProxyModelQML::lessThan(source_left, source_right);

236+}

237+

70#include "UsersModel.moc"

238#include "UsersModel.moc"

plugins/LightDM/UsersModel.h+8−10

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

1/*

1/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012-2013,2015-2016 Canonical, Ltd.

3 *

3 *

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

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

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

@@ -12,26 +12,24 @@

12 *

12 *

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

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19/* This class is a really tiny filter around QLightDM::UsersModel. There are

17/* This class is a really tiny filter around QLightDM::UsersModel. There are

20 some operations that we want to edit a bit for the benefit of Qml.

18 some operations that we want to edit a bit for the benefit of Qml.

21 Specifically, we want to sort users according to realName. */

19 Specifically, we want to sort users according to realName. */

22

20

23−#ifndef UNITY_USERSMODEL_H

21+#pragma once

24−#define UNITY_USERSMODEL_H

25

22

26−#include <qsortfilterproxymodelqml.h>

23+#include <unitysortfilterproxymodelqml.h>

27−#include <QtCore/QObject>

24+#include <QObject>

28

25

29−class UsersModel : public QSortFilterProxyModelQML

26+class UsersModel : public UnitySortFilterProxyModelQML

30{

27{

31 Q_OBJECT

28 Q_OBJECT

32

29

33public:

30public:

34 explicit UsersModel(QObject* parent=0);

31 explicit UsersModel(QObject* parent=0);

35−};

36

32

37−#endif

33+protected:

34+ bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

35+};

plugins/LightDM/plugin.cpp+40−12

This diff is too big to show here.

plugins/LightDM/plugin.h+4−6

This diff is too big to show here.

plugins/LightDM/qmldir+3−3

This diff is too big to show here.

plugins/Lights/CMakeLists.txt+9−4

This diff is too big to show here.

plugins/Lights/HfdLights.cppnew file+62

This diff is too big to show here.

plugins/Lights/HfdLights.hnew file+42

This diff is too big to show here.

plugins/Lights/LegacyLights.cppnew file+91

This diff is too big to show here.

plugins/Lights/LegacyLights.hnew file+45

This diff is too big to show here.

plugins/Lights/Lights.cpp+9−89

This diff is too big to show here.

plugins/Lights/Lights.h+5−9

This diff is too big to show here.

plugins/Lights/Lights.qmltypesdeleted−45

This diff is too big to show here.

plugins/Lights/android-hardware.h−4

This diff is too big to show here.

plugins/Lights/plugin.cpp+20−1

This diff is too big to show here.

plugins/Lights/plugin.h+1−1

This diff is too big to show here.

plugins/Powerd/CMakeLists.txt+4−6

This diff is too big to show here.

plugins/Powerd/Powerd.cpp+17−10

This diff is too big to show here.

plugins/Powerd/Powerd.h+8−2

This diff is too big to show here.

plugins/Powerd/Powerd.qmltypesdeleted−39

This diff is too big to show here.

plugins/Powerd/plugin.h+1−1

This diff is too big to show here.

plugins/ScreenGrabber/CMakeLists.txtdeleted−13

This diff is too big to show here.

plugins/ScreenGrabber/qmldirdeleted−3

This diff is too big to show here.

plugins/ScreenGrabber/screengrabber.cppdeleted−94

This diff is too big to show here.

plugins/ScreenshotDirectory/CMakeLists.txtnew file+9

This diff is too big to show here.

plugins/ScreenGrabber/ScreenGrabber.qmltypes → plugins/ScreenshotDirectory/ScreenGrabber.qmltypesrenamed+1−1

This diff is too big to show here.

plugins/ScreenshotDirectory/ScreenshotDirectory.cppnew file+64

This diff is too big to show here.

plugins/ScreenGrabber/screengrabber.h → plugins/ScreenshotDirectory/ScreenshotDirectory.hrenamed+10−13

This diff is too big to show here.

plugins/ScreenGrabber/plugin.cpp → plugins/ScreenshotDirectory/plugin.cpprenamed+5−7

This diff is too big to show here.

plugins/ScreenGrabber/plugin.h → plugins/ScreenshotDirectory/plugin.hrenamed+6−8

This diff is too big to show here.

plugins/ScreenshotDirectory/qmldirnew file+2

This diff is too big to show here.

plugins/SessionBroadcast/CMakeLists.txt+5−1

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.cpp+40−10

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.h+13−3

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19

This diff is too big to show here.

plugins/SessionBroadcast/plugin.h+1−1

This diff is too big to show here.

plugins/UInput/CMakeLists.txtnew file+7

This diff is too big to show here.

plugins/UInput/plugin.cppnew file+26

This diff is too big to show here.

plugins/Unity/DashCommunicator/plugin.h → plugins/UInput/plugin.hrenamed+5−7

This diff is too big to show here.

plugins/UInput/qmldirnew file+3

This diff is too big to show here.

plugins/UInput/uinput.cppnew file+182

This diff is too big to show here.

plugins/UInput/uinput.hnew file+61

This diff is too big to show here.

plugins/Ubuntu/CMakeLists.txt−2

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+6−3

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+9−8

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+3−2

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp+2−2

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h+82−15

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h+3−6

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/plugin.h+2−2

This diff is too big to show here.

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+1−1

This diff is too big to show here.

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+4−4

This diff is too big to show here.

plugins/Ubuntu/Gestures/CMakeLists.txt+12−7

This diff is too big to show here.

plugins/Ubuntu/Gestures/Damper.hdeleted−87

This diff is too big to show here.

plugins/Ubuntu/Gestures/Direction.cpp+11−4

This diff is too big to show here.

plugins/Ubuntu/Gestures/Direction.h+6−3

This diff is too big to show here.

plugins/Ubuntu/Gestures/DirectionalDragArea.cppdeleted−894

This diff is too big to show here.

plugins/Ubuntu/Gestures/DirectionalDragArea.hdeleted−308

This diff is too big to show here.

plugins/Ubuntu/Gestures/Gestures.qmltypesdeleted−154

This diff is too big to show here.

plugins/Ubuntu/Gestures/MouseEventGenerator.cppnew file+64

This diff is too big to show here.

plugins/Ubuntu/Gestures/MouseEventGenerator.hnew file+48

This diff is too big to show here.

plugins/Ubuntu/Gestures/PressedOutsideNotifier.h+1−1

This diff is too big to show here.

plugins/Ubuntu/Gestures/TimeSource.cppdeleted−49

This diff is too big to show here.

plugins/Ubuntu/Gestures/TimeSource.hdeleted−54

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchDispatcher.cpp+128−54

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchDispatcher.h+19−9

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.cpp+104−65

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.h+22−7

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGestureArea.cppnew file+879

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGestureArea.hnew file+229

This diff is too big to show here.

plugins/Ubuntu/Gestures/plugin.cpp+6−3

This diff is too big to show here.

plugins/Ubuntu/Gestures/plugin.h+1−1

This diff is too big to show here.

plugins/Ubuntu/Payments/CMakeLists.txtdeleted−20

This diff is too big to show here.

plugins/Ubuntu/Payments/Payments.cppdeleted−138

This diff is too big to show here.

plugins/Ubuntu/Payments/Payments.hdeleted−69

This diff is too big to show here.

plugins/Ubuntu/Payments/Payments.qmltypesdeleted−43

This diff is too big to show here.

plugins/Ubuntu/Payments/qmldirdeleted−3

This diff is too big to show here.

plugins/Ubuntu/SystemImage/CMakeLists.txtdeleted−10

This diff is too big to show here.

plugins/Ubuntu/SystemImage/SystemImage.cppdeleted−34

This diff is too big to show here.

plugins/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−19

This diff is too big to show here.

plugins/Ubuntu/SystemImage/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/ApplicationMenu/CMakeLists.txtnew file+19

This diff is too big to show here.

plugins/Unity/ApplicationMenu/applicationmenuregistry.cppnew file+141

This diff is too big to show here.

plugins/Unity/ApplicationMenu/applicationmenuregistry.hnew file+83

This diff is too big to show here.

plugins/Unity/ApplicationMenu/com.ubuntu.MenuRegistrar.xmlnew file+83

This diff is too big to show here.

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cppnew file+44

This diff is too big to show here.

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hnew file+34

This diff is too big to show here.

plugins/Unity/ApplicationMenu/plugin.cppnew file+42

This diff is too big to show here.

plugins/Unity/ApplicationMenu/plugin.hnew file+32

This diff is too big to show here.

plugins/Unity/ApplicationMenu/qmldirnew file+3

This diff is too big to show here.

plugins/Unity/CMakeLists.txt+3−1

This diff is too big to show here.

plugins/Unity/Connectivity/CMakeLists.txt+1−1

This diff is too big to show here.

plugins/Unity/Connectivity/Connectivity.cpp+5−5

This diff is too big to show here.

plugins/Unity/Connectivity/Connectivity.h+1

This diff is too big to show here.

plugins/Unity/Connectivity/Connectivity.qmltypesdeleted−19

This diff is too big to show here.

plugins/Unity/Connectivity/plugin.h+1−1

This diff is too big to show here.

plugins/Unity/DashCommunicator/CMakeLists.txtdeleted−25

This diff is too big to show here.

plugins/Unity/DashCommunicator/DashCommunicator.qmltypesdeleted−47

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashcommunicator.cppdeleted−52

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashcommunicatorservice.cppdeleted−30

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−38

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashconnection.cppdeleted−33

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashconnection.hdeleted−34

This diff is too big to show here.

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppdeleted−35

This diff is too big to show here.

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hdeleted−39

This diff is too big to show here.

plugins/Unity/DashCommunicator/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/Indicators/CMakeLists.txt+12−8

This diff is too big to show here.

plugins/Unity/Indicators/Indicators.qmltypesdeleted−281

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.cppnew file+97

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.hnew file+55

This diff is too big to show here.

plugins/Unity/Indicators/indicator.cpp+27−13

This diff is too big to show here.

plugins/Unity/Indicators/indicator.h+6−2

This diff is too big to show here.

plugins/Unity/Indicators/indicators.h+6−7

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.cpp+47−24

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.h+9−3

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.cpp+50−14

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.h+21−8

This diff is too big to show here.

plugins/Unity/Indicators/menucontentactivator.cpp+4−4

This diff is too big to show here.

plugins/Unity/Indicators/menucontentactivator.h+1−1

This diff is too big to show here.

plugins/Unity/Indicators/modelactionrootstate.cppnew file+204

This diff is too big to show here.

plugins/Unity/Indicators/modelactionrootstate.hnew file+72

This diff is too big to show here.

plugins/Unity/Indicators/modelprinter.cpp+27−12

This diff is too big to show here.

plugins/Unity/Indicators/modelprinter.h+4−3

This diff is too big to show here.

plugins/Unity/Indicators/plugin.cpp+10−10

This diff is too big to show here.

plugins/Unity/Indicators/plugin.h+1−1

This diff is too big to show here.

plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+84−151

This diff is too big to show here.

plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.hrenamed+19−34

This diff is too big to show here.

plugins/Unity/Indicators/sharedunitymenumodel.cpp+4

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelcache.cpp+8−11

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelcache.h+2−2

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelstack.cpp+4−4

This diff is too big to show here.

plugins/Unity/Indicators/visibleindicatorsmodel.cppdeleted−90

This diff is too big to show here.

plugins/Unity/Indicators/visibleindicatorsmodel.hdeleted−56

This diff is too big to show here.

plugins/Unity/InputInfo/CMakeLists.txtnew file+38

This diff is too big to show here.

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cppnew file+296

This diff is too big to show here.

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.hnew file+96

This diff is too big to show here.

plugins/Unity/InputInfo/plugin.cppnew file+32

This diff is too big to show here.

plugins/Unity/InputInfo/plugin.hnew file+30

This diff is too big to show here.

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cppnew file+196

This diff is too big to show here.

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.hnew file+102

This diff is too big to show here.

plugins/Unity/InputInfo/qinputinfo.cppnew file+270

This diff is too big to show here.

plugins/Unity/InputInfo/qinputinfo.hnew file+142

This diff is too big to show here.

plugins/Unity/InputInfo/qmldirnew file+3

This diff is too big to show here.

plugins/Unity/Launcher/CMakeLists.txt+20−7

This diff is too big to show here.

plugins/Unity/Launcher/Launcher.qmltypesdeleted−179

This diff is too big to show here.

plugins/Unity/Launcher/appdrawermodel.cppnew file+192

This diff is too big to show here.

plugins/Unity/Launcher/appdrawermodel.hnew file+64

This diff is too big to show here.

plugins/Unity/Launcher/asadapter.cppnew file+67

This diff is too big to show here.

plugins/Unity/Launcher/asadapter.hnew file+46

This diff is too big to show here.

plugins/Unity/Launcher/dbusinterface.cpp+64−37

This diff is too big to show here.

plugins/Unity/Launcher/dbusinterface.h+3−1

This diff is too big to show here.

plugins/Unity/Launcher/desktopfilehandler.cppdeleted−151

This diff is too big to show here.

plugins/Unity/Launcher/desktopfilehandler.hdeleted−56

This diff is too big to show here.

plugins/Unity/Launcher/gsettings.cpp+22−12

This diff is too big to show here.

plugins/Unity/Launcher/gsettings.h+1

This diff is too big to show here.

plugins/Unity/Launcher/launcheritem.cpp+102−6

This diff is too big to show here.

plugins/Unity/Launcher/launcheritem.h+16−1

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.cpp+224−72

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.h+25−21

This diff is too big to show here.

plugins/Unity/Launcher/plugin.cpp+7−6

This diff is too big to show here.

plugins/Unity/Launcher/plugin.h+1−1

This diff is too big to show here.

plugins/Unity/Launcher/quicklistentry.cpp+28−2

This diff is too big to show here.

plugins/Unity/Launcher/quicklistentry.h+11−1

This diff is too big to show here.

plugins/Unity/Launcher/quicklistmodel.cpp+23−1

This diff is too big to show here.

plugins/Unity/Launcher/quicklistmodel.h+6−3

This diff is too big to show here.

plugins/Unity/Launcher/ualwrapper.cppnew file+74

This diff is too big to show here.

plugins/Unity/Launcher/ualwrapper.hnew file+36

This diff is too big to show here.

plugins/Unity/Launcher/xdgwatcher.cppnew file+129

This diff is too big to show here.

plugins/Unity/Launcher/xdgwatcher.hnew file+46

This diff is too big to show here.

plugins/Unity/Platform/CMakeLists.txtnew file+11

This diff is too big to show here.

plugins/Unity/Platform/platform.cppnew file+66

This diff is too big to show here.

plugins/Unity/Platform/platform.hnew file+64

This diff is too big to show here.

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp → plugins/Unity/Platform/plugin.cpprenamed+7−13

This diff is too big to show here.

plugins/HudClient/plugin.h → plugins/Unity/Platform/plugin.hrenamed+8−7

This diff is too big to show here.

plugins/Unity/Platform/qmldirnew file+2

This diff is too big to show here.

plugins/Unity/Session/CMakeLists.txt+6−5

This diff is too big to show here.

plugins/Unity/Session/Session.qmltypesdeleted−47

This diff is too big to show here.

plugins/Unity/Session/dbusunitysessionservice.cpp+597−23

This diff is too big to show here.

plugins/Unity/Session/dbusunitysessionservice.h+255−17

This diff is too big to show here.

plugins/Unity/Session/plugin.cpp+4

This diff is too big to show here.

plugins/Unity/Session/plugin.h+1−1

This diff is too big to show here.

plugins/Utils/CMakeLists.txt+31−13

This diff is too big to show here.

plugins/Utils/EdgeBarrierSettings.qmlnew file+66

This diff is too big to show here.

plugins/Utils/ElapsedTimer.hnew file+51

This diff is too big to show here.

plugins/Utils/Timer.cppnew file+62

This diff is too big to show here.

plugins/Utils/Timer.hnew file+78

This diff is too big to show here.

plugins/Utils/URLDispatcher.cppnew file+80

This diff is too big to show here.

plugins/Utils/URLDispatcher.hnew file+47

This diff is too big to show here.

plugins/Utils/Utils.qmltypesdeleted−156

This diff is too big to show here.

plugins/Utils/WindowInputMonitor.cppnew file+126

This diff is too big to show here.

plugins/Utils/WindowInputMonitor.hnew file+97

This diff is too big to show here.

plugins/Utils/activefocuslogger.cppnew file+61

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_Damper.cpp → plugins/Utils/activefocuslogger.hrenamed+15−18

This diff is too big to show here.

plugins/Utils/appdrawerproxymodel.cppnew file+189

This diff is too big to show here.

plugins/Utils/appdrawerproxymodel.hnew file+87

This diff is too big to show here.

plugins/Utils/applicationsfiltermodel.cppnew file+101

This diff is too big to show here.

plugins/Utils/applicationsfiltermodel.hnew file+69

This diff is too big to show here.

plugins/Utils/constants.cppnew file+32

This diff is too big to show here.

plugins/Utils/constants.hnew file+43

This diff is too big to show here.

plugins/Utils/deviceconfigparser.cppnew file+176

This diff is too big to show here.

plugins/Utils/deviceconfigparser.hnew file+66

This diff is too big to show here.

plugins/Utils/easingcurve.cpp+1−1

This diff is too big to show here.

plugins/Utils/easingcurve.h+3−4

This diff is too big to show here.

plugins/Utils/expressionfiltermodel.cppnew file+49

This diff is too big to show here.

plugins/Utils/expressionfiltermodel.hnew file+42

This diff is too big to show here.

plugins/Utils/globalfunctions.cppnew file+58

This diff is too big to show here.

plugins/Utils/globalfunctions.hnew file+44

This diff is too big to show here.

plugins/Utils/inputeventgenerator.cppnew file+34

This diff is too big to show here.

plugins/Utils/inputeventgenerator.hnew file+40

This diff is too big to show here.

plugins/Utils/inputwatcher.cppnew file+118

This diff is too big to show here.

plugins/Utils/inputwatcher.hnew file+58

This diff is too big to show here.

plugins/Utils/plugin.cpp+58−19

This diff is too big to show here.

plugins/Utils/plugin.h+1−2

This diff is too big to show here.

plugins/Utils/qlimitproxymodelqml.cpp+15−15

This diff is too big to show here.

plugins/Utils/qlimitproxymodelqml.h+2−2

This diff is too big to show here.

plugins/Utils/qmldir+1

This diff is too big to show here.

plugins/Utils/quicklistproxymodel.cppnew file+72

This diff is too big to show here.

plugins/Utils/quicklistproxymodel.hnew file+52

This diff is too big to show here.

plugins/Utils/qvariantlistmodel.h+6−6

This diff is too big to show here.

plugins/Utils/relativetimeformatter.cppdeleted−260

This diff is too big to show here.

plugins/Utils/relativetimeformatter.hdeleted−34

This diff is too big to show here.

plugins/Utils/tabfocusfence.cppnew file+72

This diff is too big to show here.

plugins/Utils/tabfocusfence.hnew file+38

This diff is too big to show here.

plugins/Utils/timeformatter.cppdeleted−206

This diff is too big to show here.

plugins/Utils/timeformatter.hdeleted−68

This diff is too big to show here.

plugins/Utils/timezoneFormatter.cppnew file+45

This diff is too big to show here.

plugins/Utils/timezoneFormatter.hnew file+33

This diff is too big to show here.

plugins/Utils/unitysortfilterproxymodelqml.cppnew file+167

This diff is too big to show here.

plugins/Utils/unitysortfilterproxymodelqml.hnew file+68

This diff is too big to show here.

plugins/Utils/windowkeysfilter.cpp → plugins/Utils/windowinputfilter.cpprenamed+18−6

This diff is too big to show here.

plugins/Utils/windowkeysfilter.h → plugins/Utils/windowinputfilter.hrenamed+15−8

This diff is too big to show here.

plugins/Utils/windowstatestorage.cppnew file+383

This diff is too big to show here.

plugins/Utils/windowstatestorage.hnew file+74

This diff is too big to show here.

plugins/WindowManager/AvailableDesktopArea.cppnew file+50

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashcommunicator.h → plugins/WindowManager/AvailableDesktopArea.hrenamed+14−21

This diff is too big to show here.

plugins/WindowManager/CMakeLists.txtnew file+26

This diff is too big to show here.

plugins/WindowManager/InputMethodManager.cppnew file+56

This diff is too big to show here.

plugins/WindowManager/InputMethodManager.hnew file+55

This diff is too big to show here.

plugins/WindowManager/TopLevelWindowModel.cppnew file+782

This diff is too big to show here.

plugins/WindowManager/TopLevelWindowModel.hnew file+308

This diff is too big to show here.

plugins/WindowManager/Window.cppnew file+277

This diff is too big to show here.

plugins/WindowManager/Window.hnew file+176

This diff is too big to show here.

libs/UbuntuGestures/UbuntuGesturesGlobal.h → plugins/WindowManager/WindowManagerGlobal.hrenamed+4−4

This diff is too big to show here.

plugins/WindowManager/WindowManagerPlugin.cppnew file+44

This diff is too big to show here.

plugins/WindowManager/WindowManagerPlugin.hnew file+32

This diff is too big to show here.

plugins/WindowManager/WindowMargins.cppnew file+74

This diff is too big to show here.

plugins/WindowManager/WindowMargins.hnew file+59

This diff is too big to show here.

plugins/WindowManager/qmldirnew file+2

This diff is too big to show here.

plugins/Wizard/50-com.canonical.unity.wizard.pklanew file+6

This diff is too big to show here.

plugins/Wizard/CMakeLists.txtnew file+23

This diff is too big to show here.

plugins/Wizard/Changelog.cppnew file+58

This diff is too big to show here.

plugins/Wizard/Changelog.hnew file+52

This diff is too big to show here.

plugins/Wizard/LocalePlugin.cppnew file+291

This diff is too big to show here.

plugins/Wizard/LocalePlugin.hnew file+58

This diff is too big to show here.

plugins/Wizard/PageList.cppnew file+127

This diff is too big to show here.

plugins/Wizard/PageList.hnew file+53

This diff is too big to show here.

plugins/Wizard/Status.cppnew file+143

This diff is too big to show here.

plugins/Wizard/Status.hnew file+60

This diff is too big to show here.

plugins/Wizard/System.cppnew file+182

This diff is too big to show here.

plugins/Wizard/System.hnew file+75

This diff is too big to show here.

plugins/Wizard/Unity/Application/CMakeLists.txtnew file+3

This diff is too big to show here.

qml/Panel/PanelBackground.qml → plugins/Wizard/Unity/Application/OSKController.qmlrenamed+2−3

This diff is too big to show here.

plugins/Wizard/Unity/Application/qmldirnew file+2

This diff is too big to show here.

plugins/Wizard/Unity/CMakeLists.txtnew file+1

This diff is too big to show here.

plugins/Wizard/Utils/CMakeLists.txtnew file+27

This diff is too big to show here.

plugins/Wizard/Utils/plugin.cppnew file+41

This diff is too big to show here.

plugins/Dash/plugin.h → plugins/Wizard/Utils/plugin.hrenamed+4−4

This diff is too big to show here.

plugins/Wizard/Utils/qmldirnew file+2

This diff is too big to show here.

plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Wizard/Utils/qsortfilterproxymodelqml.cpprenamed+7−7

This diff is too big to show here.

plugins/Utils/qsortfilterproxymodelqml.h → plugins/Wizard/Utils/qsortfilterproxymodelqml.hrenamed

The content is the same.

plugins/Wizard/keyboardLayoutsModel.cppnew file+163

This diff is too big to show here.

plugins/Wizard/keyboardLayoutsModel.hnew file+66

This diff is too big to show here.

plugins/Wizard/main.cppnew file+93

This diff is too big to show here.

plugins/Wizard/plugin.cppnew file+38

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/plugin.h → plugins/Wizard/plugin.hrenamed+7−7

This diff is too big to show here.

plugins/Wizard/qmldirnew file+2

This diff is too big to show here.

plugins/Wizard/timezonemodel.cppnew file+244

This diff is too big to show here.

plugins/Wizard/timezonemodel.hnew file+80

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard-cleanup.confnew file+20

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard-set-lang.confnew file+30

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard.confnew file+75

This diff is too big to show here.

po/aa.ponew file+880

This diff is too big to show here.

po/am.po+1266−233

This diff is too big to show here.

po/ar.po+1146−248

This diff is too big to show here.

po/ast.po+1275−244

This diff is too big to show here.

po/az.po+812−217

This diff is too big to show here.

po/be.po+1132−240

This diff is too big to show here.

po/bg.po+702−187

This diff is too big to show here.

po/bn.ponew file+1062

This diff is too big to show here.

po/br.po+1197−232

This diff is too big to show here.

po/bs.po+968−183

This diff is too big to show here.

po/ca.po+1317−247

This diff is too big to show here.

po/ca@valencia.po+986−241

This diff is too big to show here.

po/ce.ponew file+816

This diff is too big to show here.

po/ckb.po+691−181

This diff is too big to show here.

po/co.ponew file+1061

This diff is too big to show here.

po/cs.po+1208−236

This diff is too big to show here.

po/cy.ponew file+1165

This diff is too big to show here.

po/da.po+1072−219

This diff is too big to show here.

po/de.po+1319−242

This diff is too big to show here.

po/el.po+1195−226

This diff is too big to show here.

po/en_AU.po+1313−238

This diff is too big to show here.

po/en_GB.po+1267−237

This diff is too big to show here.

po/en_US.ponew file+814

This diff is too big to show here.

po/eo.po+739−175

This diff is too big to show here.

po/es.po+1305−245

This diff is too big to show here.

po/et.ponew file+816

This diff is too big to show here.

po/eu.po+1099−231

This diff is too big to show here.

po/fa.po+1325−240

This diff is too big to show here.

po/fi.po+1296−235

This diff is too big to show here.

po/fo.po+734−184

This diff is too big to show here.

po/fr.po+1342−257

This diff is too big to show here.

po/ga.ponew file+1109

This diff is too big to show here.

po/gd.po+1321−250

This diff is too big to show here.

po/gl.po+1305−244

This diff is too big to show here.

po/gu.ponew file+814

This diff is too big to show here.

po/gv.ponew file+918

This diff is too big to show here.

po/he.po+962−234

This diff is too big to show here.

po/hi.po+665−175

This diff is too big to show here.

po/hr.po+1262−241

This diff is too big to show here.

po/hu.po+1303−237

This diff is too big to show here.

po/hy.po+817−230

This diff is too big to show here.

po/ia.ponew file+1409

This diff is too big to show here.

po/id.po+829−181

This diff is too big to show here.

po/is.po+849−228

This diff is too big to show here.

po/it.po+1305−235

This diff is too big to show here.

po/ja.po+865−220

This diff is too big to show here.

po/kk.ponew file+841

This diff is too big to show here.

po/km.po+917−224

This diff is too big to show here.

po/kn.po+640−168

This diff is too big to show here.

po/ko.po+1112−233

This diff is too big to show here.

po/ku.po+824−219

This diff is too big to show here.

po/ky.po+640−168

This diff is too big to show here.

po/lo.po+643−169

This diff is too big to show here.

po/lt.po+875−205

This diff is too big to show here.

po/lv.po+1052−214

This diff is too big to show here.

po/ml.po+691−182

This diff is too big to show here.

po/mr.po+677−173

This diff is too big to show here.

po/ms.po+1215−199

This diff is too big to show here.

po/my.po+730−185

This diff is too big to show here.

po/nb.po+1286−237

This diff is too big to show here.

po/ne.ponew file+834

This diff is too big to show here.

po/nl.po+1306−247

This diff is too big to show here.

po/nn.ponew file+816

This diff is too big to show here.

po/oc.ponew file+1276

This diff is too big to show here.

po/or.ponew file+816

This diff is too big to show here.

po/pa.po+978−187

This diff is too big to show here.

po/pl.po+1302−236

This diff is too big to show here.

po/pt.po+1302−242

This diff is too big to show here.

po/pt_BR.po+1092−236

This diff is too big to show here.

po/ro.po+1103−234

This diff is too big to show here.

po/ru.po+1301−241

This diff is too big to show here.

po/sc.ponew file+904

This diff is too big to show here.

po/shn.po+620−164

This diff is too big to show here.

po/si.po+693−168

This diff is too big to show here.

po/sk.ponew file+1352

This diff is too big to show here.

po/sl.po+1261−237

This diff is too big to show here.

po/sq.po+874−187

This diff is too big to show here.

po/sr.po+1280−242

This diff is too big to show here.

po/sv.po+1292−236

This diff is too big to show here.

po/sw.po+910−183

This diff is too big to show here.

po/ta.po+692−183

This diff is too big to show here.

po/te.po+687−178

This diff is too big to show here.

po/th.po+630−173

This diff is too big to show here.

po/tr.po+1300−242

This diff is too big to show here.

po/ug.po+1120−228

This diff is too big to show here.

po/uk.po+1293−242

This diff is too big to show here.

po/unity8.pot+615−160

This diff is too big to show here.

po/update-unity-pot+29−4

This diff is too big to show here.

po/ur.ponew file+819

This diff is too big to show here.

po/uz.ponew file+816

This diff is too big to show here.

po/vi.po+618−162

This diff is too big to show here.

po/wo.ponew file+1232

This diff is too big to show here.

po/xh.po+618−162

This diff is too big to show here.

po/zh_CN.po+1255−235

This diff is too big to show here.

po/zh_HK.po+725−188

This diff is too big to show here.

po/zh_TW.po+1199−231

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenuItemFactory.qmlnew file+135

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenusLimits.qmlnew file+24

This diff is too big to show here.

qml/ApplicationMenus/MenuBar.qmlnew file+513

This diff is too big to show here.

qml/ApplicationMenus/MenuItem.qmlnew file+146

This diff is too big to show here.

qml/ApplicationMenus/MenuNavigator.qmlnew file+101

This diff is too big to show here.

qml/ApplicationMenus/MenuPopup.qmlnew file+510

This diff is too big to show here.

qml/ApplicationMenus/RegisteredApplicationMenuModel.qmlnew file+56

This diff is too big to show here.

qml/ApplicationMenus/qmldirnew file+1

This diff is too big to show here.

qml/CMakeLists.txt+6−4

This diff is too big to show here.

qml/Components/Background.qml+3−3

This diff is too big to show here.

qml/Components/BaseCarouselDelegate.qmldeleted−42

This diff is too big to show here.

qml/Dash/DashApplication.qml → qml/Components/BlurLayer.qmlrenamed+18−9

This diff is too big to show here.

qml/Components/BrightnessControl.qmlnew file+54

This diff is too big to show here.

qml/Components/Carousel.qmldeleted−330

This diff is too big to show here.

qml/Components/Dialogs.qml+226−125

This diff is too big to show here.

qml/Components/DragHandle.qml+72−60

This diff is too big to show here.

qml/Components/DraggingArea.qml+2−2

This diff is too big to show here.

qml/Components/EdgeBarrier.qmlnew file+114

This diff is too big to show here.

qml/Components/EdgeBarrierController.qmlnew file+74

This diff is too big to show here.

qml/Components/EdgeDemo.qmldeleted−241

This diff is too big to show here.

qml/Components/EdgeDemoOverlay.qmldeleted−273

This diff is too big to show here.

qml/Components/EdgeDragArea.qmldeleted−46

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+20−11

This diff is too big to show here.

qml/Components/FadingLabel.qmlnew file+42

This diff is too big to show here.

qml/Components/Flickable.qmlnew file+24

This diff is too big to show here.

qml/Components/FloatingFlickable.qmlnew file+63

This diff is too big to show here.

qml/Components/GridView.qmlnew file+24

This diff is too big to show here.

qml/Panel/Handle.qml → qml/Components/Handle.qmlrenamed+5−4

This diff is too big to show here.

qml/Components/InputMethod.qml+25−59

This diff is too big to show here.

qml/Components/ScreenGrabber.qml → qml/Components/ItemGrabber.qmlrenamed+30−16

This diff is too big to show here.

qml/Components/ItemSnapshot.qmlnew file+45

This diff is too big to show here.

qml/Components/KeyboardShortcutsOverlay.qmlnew file+336

This diff is too big to show here.

qml/Components/KeymapSwitcher.qmlnew file+102

This diff is too big to show here.

qml/Components/LazyImage.qml+29−14

This diff is too big to show here.

qml/Components/ListItems/Header.qmldeleted−64

This diff is too big to show here.

qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.pngdeleted

Binary file not shown.

qml/Components/ListView.qmlnew file+24

This diff is too big to show here.

qml/Components/ListViewOSKScroller.qmlnew file+53

This diff is too big to show here.

qml/Components/Lockscreen.qml+88−95

This diff is too big to show here.

qml/Components/MediaServices/MediaServices.qmlnew file+386

This diff is too big to show here.

qml/Components/MediaServices/MediaServicesControls.qmlnew file+192

This diff is too big to show here.

qml/Components/MediaServices/MediaServicesHeader.qmlnew file+71

This diff is too big to show here.

qml/Components/MediaServices/VideoPlayer.qmlnew file+155

This diff is too big to show here.

qml/Components/MediaServices/VideoPlayerControls.qmlnew file+158

This diff is too big to show here.

qml/Components/ModeSwitchWarningDialog.qmlnew file+101

This diff is too big to show here.

qml/Components/NotificationAudio.qmlnew file+60

This diff is too big to show here.

qml/Components/Orientations.qmlnew file+57

This diff is too big to show here.

qml/Components/PanelState/PanelState.qmlnew file+36

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qml+14−13

This diff is too big to show here.

qml/Components/PhysicalKeysMapper.qmlnew file+163

This diff is too big to show here.

qml/Components/PinLockscreen.qml+179−150

This diff is too big to show here.

qml/Components/PinPadButton.qml+22−6

This diff is too big to show here.

qml/Components/Rating.qml+3−2

This diff is too big to show here.

qml/Components/RatingStyle.qml+5−2

This diff is too big to show here.

qml/Components/ResponsiveFlowView.qmldeleted−74

This diff is too big to show here.

qml/Components/ResponsiveGridView.qmldeleted−99

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qmldeleted−75

This diff is too big to show here.

qml/Components/ScrollCalculator.qml+23−4

This diff is too big to show here.

qml/Components/SearchHistoryModel/SearchHistoryModel.qml+1−1

This diff is too big to show here.

qml/Components/SharingPicker.qmlnew file+102

This diff is too big to show here.

qml/Components/ShellDialog.qmlnew file+68

This diff is too big to show here.

qml/Components/Showable.qml+37−11

This diff is too big to show here.

qml/Components/StandardAnimation.qml+1−1

This diff is too big to show here.

qml/Components/UbuntuShapeForItem.qmldeleted−46

This diff is too big to show here.

qml/Components/VirtualTouchPad.qmlnew file+406

This diff is too big to show here.

qml/Components/VolumeControl.qml+22−6

This diff is too big to show here.

qml/Components/VolumeKeyFilter.qmldeleted−63

This diff is too big to show here.

qml/Components/Wallpaper.qmlnew file+96

This diff is too big to show here.

qml/Components/WallpaperResolver.qmlnew file+60

This diff is too big to show here.

qml/Components/WindowControlButtons.qmlnew file+121

This diff is too big to show here.

qml/Components/WrongPasswordAnimation.qml+1−1

This diff is too big to show here.

qml/Components/ZoomableImage.qml+5−4

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp → qml/Components/flickableUtils.jsrenamed+9−14

This diff is too big to show here.

qml/Components/graphics/close@20.png

Binary file not shown.

qml/Components/graphics/icon_star_empty@20.png

Binary file not shown.

qml/Components/graphics/icon_star_full@20.png

Binary file not shown.

qml/Components/graphics/icon_star_half@20.png

Binary file not shown.

qml/Components/graphics/icon_star_off@20.png

Binary file not shown.

qml/Components/graphics/icon_star_on@20.png

Binary file not shown.

qml/Components/graphics/non-selected@18.png

Binary file not shown.

qml/Components/graphics/window-close.svgnew file+164

This diff is too big to show here.

qml/Components/graphics/window-maximize.svgnew file+164

This diff is too big to show here.

qml/Components/graphics/window-minimize.svgnew file+164

This diff is too big to show here.

qml/Components/graphics/window-window.svgnew file+41

This diff is too big to show here.

qml/Dash/CardCarousel.qmldeleted−77

This diff is too big to show here.

qml/Dash/CardGrid.qmldeleted−83

This diff is too big to show here.

qml/Dash/CardHorizontalList.qmldeleted−62

This diff is too big to show here.

qml/Dash/CardTool.qmldeleted−236

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qmldeleted−87

This diff is too big to show here.

qml/Dash/Dash.qmldeleted−393

This diff is too big to show here.

qml/Dash/DashBackground.qmldeleted−24

This diff is too big to show here.

qml/Dash/DashCategoryBase.qmldeleted−62

This diff is too big to show here.

qml/Dash/DashContent.qmldeleted−206

This diff is too big to show here.

qml/Dash/DashContentTabBarStyle.qmldeleted−24

This diff is too big to show here.

qml/Dash/DashNavigation.qmldeleted−113

This diff is too big to show here.

qml/Dash/DashNavigationButton.qmldeleted−226

This diff is too big to show here.

qml/Dash/DashNavigationList.qmldeleted−210

This diff is too big to show here.

qml/Dash/DashRenderer.qmldeleted−57

This diff is too big to show here.

qml/Dash/GenericScopeView.qmldeleted−672

This diff is too big to show here.

qml/Dash/PageHeader.qmldeleted−429

This diff is too big to show here.

qml/Dash/PreviewListView.qmldeleted−121

This diff is too big to show here.

qml/Dash/Previews/Preview.qmldeleted−102

This diff is too big to show here.

qml/Dash/Previews/PreviewActionCombo.qmldeleted−68

This diff is too big to show here.

qml/Dash/Previews/PreviewActions.qmldeleted−70

This diff is too big to show here.

qml/Dash/Previews/PreviewAudioPlayback.qmldeleted−205

This diff is too big to show here.

qml/Dash/Previews/PreviewExpandable.qmldeleted−102

This diff is too big to show here.

qml/Dash/Previews/PreviewHeader.qmldeleted−134

This diff is too big to show here.

qml/Dash/Previews/PreviewImageGallery.qmldeleted−114

This diff is too big to show here.

qml/Dash/Previews/PreviewOverlay.qmldeleted−115

This diff is too big to show here.

qml/Dash/Previews/PreviewPayments.qmldeleted−83

This diff is too big to show here.

qml/Dash/Previews/PreviewProgress.qmldeleted−71

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingDisplay.qmldeleted−102

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingInput.qmldeleted−173

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qmldeleted−80

This diff is too big to show here.

qml/Dash/Previews/PreviewTextSummary.qmldeleted−73

This diff is too big to show here.

qml/Dash/Previews/PreviewVideoPlayback.qmldeleted−74

This diff is too big to show here.

qml/Dash/Previews/PreviewWidget.qmldeleted−45

This diff is too big to show here.

qml/Dash/Previews/PreviewWidgetFactory.qmldeleted−81

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qmldeleted−71

This diff is too big to show here.

qml/Dash/Previews/graphics/music_progress_bg.pngdeleted

Binary file not shown.

qml/Dash/ScopeListView.qmldeleted−24

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingBoolean.qmldeleted−61

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingList.qmldeleted−50

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingString.qmldeleted−83

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qmldeleted−57

This diff is too big to show here.

qml/Dash/ScopeSettingsPage.qmldeleted−63

This diff is too big to show here.

qml/Dash/ScopesOverview.qmldeleted−575

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qmldeleted−56

This diff is too big to show here.

qml/Dash/ScopesOverviewFavorites.qmldeleted−73

This diff is too big to show here.

qml/Dash/ScopesOverviewTab.qmldeleted−74

This diff is too big to show here.

qml/Dash/graphics/carousel_dropshadow@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/carousel_dropshadow@27.scideleted−5

This diff is too big to show here.

qml/Dash/graphics/dark_background.jpgdeleted

Binary file not shown.

qml/Dash/graphics/dash_divider_top_darkgrad@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/dash_divider_top_lightgrad@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/header_handlearrow2@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/header_handlearrow@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/icon_clear@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/icon_search_active@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/icon_search_inactive@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/navigation_shadow@18.pngdeleted

Binary file not shown.

qml/Dash/graphics/navigation_shadow_light@18.pngdeleted

Binary file not shown.

qml/Dash/graphics/overview_hint@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/pagination_dot_off@30.pngdeleted

Binary file not shown.

qml/Dash/graphics/pagination_dot_on@30.pngdeleted

Binary file not shown.

qml/Dash/graphics/paper_landscape@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/paper_portrait@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/browser@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/camera@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/dialer@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/facebook@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/map@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/music@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/settings@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/twitter@12.pngdeleted

Binary file not shown.

qml/Dash/graphics/phone/screenshots/vkb_portrait.pngdeleted

Binary file not shown.

qml/Dash/graphics/pixel.pngdeleted

Binary file not shown.

qml/Dash/graphics/play_button@18.pngdeleted

Binary file not shown.

qml/Dash/graphics/play_button_active@18.pngdeleted

Binary file not shown.

qml/Dash/graphics/play_button_active_big@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/play_button_big@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/tabbarchevron@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/tablet/icon_close_preview@20.pngdeleted

Binary file not shown.

qml/Dash/graphics/tooltip_arrow@27.pngdeleted

Binary file not shown.

qml/DeviceConfiguration.qmlnew file+161

This diff is too big to show here.

qml/DisabledScreenNotice.qmlnew file+81

This diff is too big to show here.

qml/Greeter/ButtonPrompt.qmlnew file+51

This diff is too big to show here.

qml/Greeter/Circle.qmlnew file+57

This diff is too big to show here.

qml/Greeter/Clock.qml+13−5

This diff is too big to show here.

qml/Greeter/CoverPage.qmlnew file+271

This diff is too big to show here.

qml/Components/DelayedLockscreen.qml → qml/Greeter/DelayedLockscreen.qmlrenamed+8−14

This diff is too big to show here.

qml/Greeter/Dot.qml+1−1

This diff is too big to show here.

qml/Greeter/FullLightDMImpl.qmlnew file+31

This diff is too big to show here.

qml/Greeter/Greeter.qml+549−133

This diff is too big to show here.

qml/Greeter/GreeterContent.qmldeleted−170

This diff is too big to show here.

qml/Greeter/GreeterPrompt.qmlnew file+127

This diff is too big to show here.

qml/Greeter/GreeterView.qmlnew file+534

This diff is too big to show here.

qml/Greeter/Infographics.qml+78−51

This diff is too big to show here.

qml/Greeter/IntegratedLightDMImpl.qmlnew file+30

This diff is too big to show here.

qml/Greeter/LightDMService.qmlnew file+54

This diff is too big to show here.

qml/Greeter/LoginAreaContainer.qmlnew file+38

This diff is too big to show here.

qml/Greeter/LoginList.qml+169−195

This diff is too big to show here.

qml/Greeter/ObjectPositioner.qml+2−2

This diff is too big to show here.

qml/Greeter/PinPrompt.qmlnew file+184

This diff is too big to show here.

qml/Greeter/PromptList.qmlnew file+151

This diff is too big to show here.

qml/Greeter/SessionIcon.qmlnew file+47

This diff is too big to show here.

qml/Greeter/SessionsList.qmlnew file+205

This diff is too big to show here.

qml/Greeter/ShimGreeter.qmlnew file+47

This diff is too big to show here.

qml/Greeter/TextPrompt.qmlnew file+198

This diff is too big to show here.

qml/Greeter/graphics/dot_empty.png

Binary file not shown.

qml/Greeter/graphics/dot_filled.png

Binary file not shown.

qml/Greeter/graphics/dot_pointer.png

Binary file not shown.

qml/Greeter/graphics/icon_arrow.png

Binary file not shown.

qml/Greeter/graphics/infographic_circle_back.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/gnome_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/kde_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/recovery_console_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/ubuntu_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/unknown_badge.pngnew file

Binary file not shown.

qml/Greeter/qmldirnew file+1

This diff is too big to show here.

qml/Hud/Hud.qmldeleted−496

This diff is too big to show here.

qml/Hud/HudParametrizedActionsPage.qmldeleted−179

This diff is too big to show here.

qml/Hud/Result.qmldeleted−84

This diff is too big to show here.

qml/Hud/ResultList.qmldeleted−106

This diff is too big to show here.

qml/Hud/SearchBar.qmldeleted−100

This diff is too big to show here.

qml/Hud/ShowingAnimation.qmldeleted−54

This diff is too big to show here.

qml/Hud/SliderLabel.qmldeleted−76

This diff is too big to show here.

qml/Hud/SoundAmplitudeDelegate.qmldeleted−52

This diff is too big to show here.

qml/Hud/SoundAmplitudeVisual.qmldeleted−146

This diff is too big to show here.

qml/Hud/graphics/divider@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/divider@20.scideleted−5

This diff is too big to show here.

qml/Hud/graphics/help@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_bg@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlearrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlebar@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_arrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_clear@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_search@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/microphone@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/popup_triangle@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/settings@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/undo@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/view-fullscreen@20.pngdeleted

Binary file not shown.

qml/Launcher/BackgroundBlur.qmlnew file+81

This diff is too big to show here.

qml/Launcher/Drawer.qmlnew file+413

This diff is too big to show here.

qml/Launcher/DrawerGridView.qmlnew file+85

This diff is too big to show here.

qml/Launcher/FoldingLauncherDelegate.qml+2−2

This diff is too big to show here.

qml/Launcher/Launcher.qml+446−69

This diff is too big to show here.

qml/Launcher/LauncherDelegate.qml+159−45

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+504−116

This diff is too big to show here.

qml/Dash/PullToRefreshScopeStyle.qml → qml/Launcher/PullToRefreshScopeStyle.qmlrenamed+4−3

This diff is too big to show here.

qml/Launcher/Tooltip.qmlnew file+72

This diff is too big to show here.

qml/Launcher/graphics/divider-line.png

Binary file not shown.

qml/Launcher/graphics/focused_app_arrow@30.png

Binary file not shown.

qml/Launcher/graphics/home.svgnew file+243

This diff is too big to show here.

qml/Launcher/graphics/home@18.pngdeleted

Binary file not shown.

qml/Launcher/graphics/icon-top-highlight.pngdeleted

Binary file not shown.

qml/Launcher/graphics/progressbar-fill@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/progressbar-fill@30.scideleted−5

This diff is too big to show here.

qml/Launcher/graphics/progressbar-trough@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/progressbar-trough@30.scideleted−5

This diff is too big to show here.

qml/Launcher/graphics/quicklist_tooltip@30.png

Binary file not shown.

qml/Notifications/Notification.qml+235−235

This diff is too big to show here.

qml/Notifications/NotificationButton.qmlnew file+73

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qml+29−15

This diff is too big to show here.

qml/Notifications/Notifications.qml+28−28

This diff is too big to show here.

qml/Notifications/OptionToggle.qmlnew file+125

This diff is too big to show here.

qml/Notifications/ShapedIcon.qml+8−5

This diff is too big to show here.

qml/Notifications/SwipeToAct.qmlnew file+275

This diff is too big to show here.

qml/OrientedShell.qmlnew file+336

This diff is too big to show here.

qml/Panel/ActiveCallHint.qml+5−2

This diff is too big to show here.

qml/Panel/PanelSeparatorLine.qml → qml/Panel/FakePanelMenu.qmlrenamed+8−7

This diff is too big to show here.

qml/Panel/IndicatorPage.qmldeleted−176

This diff is too big to show here.

qml/Panel/Indicators/IndicatorBase.qml+2−3

This diff is too big to show here.

qml/Panel/Indicators/IndicatorDelegate.qml+2−2

This diff is too big to show here.

qml/Panel/IndicatorItem.qml → qml/Panel/Indicators/IndicatorItem.qmlrenamed+83−31

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml → qml/Panel/Indicators/IndicatorMenuItemFactory.qmlrenamed+383−135

This diff is too big to show here.

qml/Panel/Indicators/IndicatorsLight.qml+205−6

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+38−32

This diff is too big to show here.

qml/Panel/Indicators/ModemInfoItem.qmldeleted−111

This diff is too big to show here.

qml/Panel/Indicators/VisibleIndicators.qmldeleted−84

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorRepresentation.qml+47−28

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsClient.qml+11−5

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsList.qml+23−21

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsTree.qml+8−10

This diff is too big to show here.

qml/Panel/MenuContent.qml+15−15

This diff is too big to show here.

qml/Panel/Panel.qml+412−88

This diff is too big to show here.

qml/Panel/IndicatorsBar.qml → qml/Panel/PanelBar.qmlrenamed+102−41

This diff is too big to show here.

qml/Panel/IndicatorItemRow.qml → qml/Panel/PanelItemRow.qmlrenamed+68−95

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml → qml/Panel/PanelMenu.qmlrenamed+149−53

This diff is too big to show here.

qml/Panel/PanelMenuPage.qmlnew file+226

This diff is too big to show here.

qml/Panel/PanelVelocityCalculator.qml+1−1

This diff is too big to show here.

qml/Panel/SearchIndicator.qmldeleted−82

This diff is too big to show here.

qml/Panel/graphics/Battery@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Bluetooth@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Clock@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Location@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Messages@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Network@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Sound@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Sync@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/System@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/Time@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/VerticalDivider@18.pngdeleted

Binary file not shown.

qml/Panel/graphics/handle@12.pngdeleted

Binary file not shown.

qml/Panel/graphics/handle@12.scideleted−5

This diff is too big to show here.

qml/Panel/graphics/rectangular_dropshadow@30.png

Binary file not shown.

qml/Panel/graphics/search@12.pngdeleted

Binary file not shown.

qml/Panel/graphics/time_and_date@18.pngdeleted

Binary file not shown.

qml/Rotation/HalfLoopRotationAnimation.qmlnew file+47

This diff is too big to show here.

qml/Components/Header.qml → qml/Rotation/ImmediateRotationAction.qmlrenamed+15−8

This diff is too big to show here.

qml/Rotation/NinetyRotationAnimation.qmlnew file+88

This diff is too big to show here.

qml/Rotation/RotationStates.qmlnew file+289

This diff is too big to show here.

qml/Rotation/UpdateShellTransformations.qmlnew file+42

This diff is too big to show here.

qml/ScopeTool.qmldeleted−173

This diff is too big to show here.

qml/Shell.qml+695−576

This diff is too big to show here.

qml/Stage/ApplicationWindow.qmlnew file+416

This diff is too big to show here.

qml/Stage/ChildWindow.qmlnew file+203

This diff is too big to show here.

qml/Stage/ChildWindowRepeater.qmlnew file+39

This diff is too big to show here.

qml/Stage/ChildWindowTree.qmlnew file+138

This diff is too big to show here.

qml/Stage/DecoratedWindow.qmlnew file+319

This diff is too big to show here.

qml/Stage/FakeMaximizeDelegate.qmlnew file+233

This diff is too big to show here.

qml/Stages/MainViewStyle.qml → qml/Stage/MainViewStyle.qmlrenamed+35−27

This diff is too big to show here.

qml/Stage/MoveHandler.qmlnew file+201

This diff is too big to show here.

qml/Stage/OrientationChangeAnimation.qmlnew file+265

This diff is too big to show here.

qml/Stage/PromptSurfaceAnimations.qmlnew file+80

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.qml → qml/Stage/ResizeGrip.qmlrenamed+25−22

This diff is too big to show here.

qml/Stage/SideStage.qmlnew file+121

This diff is too big to show here.

qml/Stages/Splash.qml → qml/Stage/Splash.qmlrenamed+33−45

This diff is too big to show here.

qml/Stage/Spread/BezierCurve.qmlnew file+45

This diff is too big to show here.

qml/Stage/Spread/KeySpline.jsnew file+66

This diff is too big to show here.

qml/Stage/Spread/MathUtils.jsnew file+95

This diff is too big to show here.

qml/Stage/Spread/OpacityMask.qmlnew file+82

This diff is too big to show here.

qml/Stage/Spread/Spread.qmlnew file+173

This diff is too big to show here.

qml/Stage/Spread/SpreadDelegateInputArea.qmlnew file+189

This diff is too big to show here.

qml/Stage/Spread/SpreadMaths.qmlnew file+78

This diff is too big to show here.

qml/Stage/Spread/StagedRightEdgeMaths.qmlnew file+174

This diff is too big to show here.

qml/Stage/Spread/WindowedRightEdgeMaths.qmlnew file+96

This diff is too big to show here.

qml/Stage/Spread/cubic-bezier.jsnew file+39

This diff is too big to show here.

qml/Stage/Stage.qmlnew file+2241

This diff is too big to show here.

qml/Stage/StageMaths.qmlnew file+93

This diff is too big to show here.

qml/Stage/StagedFullscreenPolicy.qmlnew file+50

This diff is too big to show here.

qml/Stage/SurfaceContainer.qmlnew file+108

This diff is too big to show here.

qml/Stage/TabletSideStageTouchGesture.qmlnew file+157

This diff is too big to show here.

qml/Stage/WindowControlsOverlay.qmlnew file+254

This diff is too big to show here.

qml/Stage/WindowDecoration.qmlnew file+163

This diff is too big to show here.

qml/Stage/WindowInfoItem.qmlnew file+69

This diff is too big to show here.

qml/Stage/WindowResizeArea.qmlnew file+300

This diff is too big to show here.

qml/Stage/WindowStateSaver.qmlnew file+64

This diff is too big to show here.

qml/Stage/WindowedFullscreenPolicy.qmlnew file+31

This diff is too big to show here.

qml/Stage/graphics/PageHeaderBaseDividerBottom@18.pngnew file

Binary file not shown.

qml/Stage/graphics/PageHeaderBaseDividerLight@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.sci → qml/Stage/graphics/PageHeaderBaseDividerLight@18.scirenamed

The content is the same.

qml/Stage/graphics/arrows-centre.pngnew file

Binary file not shown.

qml/Stage/graphics/arrows.pngnew file

Binary file not shown.

qml/Stage/graphics/sidestage_drag.svgnew file+207

This diff is too big to show here.

qml/Stage/graphics/sidestage_handle@20.pngnew file

Binary file not shown.

qml/Stages/graphics/sidestage_handle@20.sci → qml/Stage/graphics/sidestage_handle@20.scirenamed

The content is the same.

qml/Stage/graphics/sidestage_open.svgnew file+181

This diff is too big to show here.

qml/Stage/graphics/window-close.svgnew file+64

This diff is too big to show here.

qml/Stages/Animations/BaseSessionAnimation.qmldeleted−96

This diff is too big to show here.

qml/Stages/Animations/SwipeFromBottomAnimation.qmldeleted−53

This diff is too big to show here.

qml/Stages/ApplicationWindow.qmldeleted−237

This diff is too big to show here.

qml/Stages/PageHeadStyle.qmldeleted−76

This diff is too big to show here.

qml/Stages/PhoneStage.qmldeleted−503

This diff is too big to show here.

qml/Stages/SessionContainer.qmldeleted−138

This diff is too big to show here.

qml/Stages/SpreadDelegate.qmldeleted−149

This diff is too big to show here.

qml/Stages/SurfaceContainer.qmldeleted−91

This diff is too big to show here.

qml/Stages/TabletStage.qmldeleted−646

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qmldeleted−334

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qmldeleted−398

This diff is too big to show here.

qml/Stages/graphics/PageHeaderBaseDividerBottom@18.pngdeleted

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.pngdeleted

Binary file not shown.

qml/Stages/graphics/background_paper@27.pngdeleted

Binary file not shown.

qml/Stages/graphics/dropshadow2gu@30.pngdeleted

Binary file not shown.

qml/Stages/graphics/sidestage_handle@20.pngdeleted

Binary file not shown.

qml/Tutorial/InactivityTimer.qmlnew file+78

This diff is too big to show here.

qml/Tutorial/Tutorial.qmlnew file+105

This diff is too big to show here.

qml/Tutorial/TutorialContent.qmlnew file+225

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qmlnew file+54

This diff is too big to show here.

qml/Tutorial/TutorialLeftLong.qmlnew file+56

This diff is too big to show here.

qml/Tutorial/TutorialPage.qmlnew file+121

This diff is too big to show here.

qml/Tutorial/TutorialRight.qmlnew file+61

This diff is too big to show here.

qml/Tutorial/TutorialTop.qmlnew file+60

This diff is too big to show here.

qml/Tutorial/graphics/arrow.svgnew file+19

This diff is too big to show here.

qml/Tutorial/graphics/background1.pngnew file

Binary file not shown.

qml/Tutorial/graphics/background2.pngnew file

Binary file not shown.

qml/Wizard/CheckableSetting.qmlnew file+92

This diff is too big to show here.

qml/Wizard/Components/InputMethod.qmlnew file+113

This diff is too big to show here.

qml/Wizard/Page.qmlnew file+340

This diff is too big to show here.

qml/Wizard/Pages.qmlnew file+269

This diff is too big to show here.

qml/Wizard/Pages/10-welcome-update.qmlnew file+137

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qmlnew file+197

This diff is too big to show here.

qml/Wizard/Pages/11-changelog.qmlnew file+95

This diff is too big to show here.

qml/Wizard/Pages/20-keyboard.qmlnew file+161

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qmlnew file+219

This diff is too big to show here.

qml/Wizard/Pages/50-timezone.qmlnew file+278

This diff is too big to show here.

qml/Wizard/Pages/60-account.qmlnew file+76

This diff is too big to show here.

qml/Wizard/Pages/70-passwd-type.qmlnew file+168

This diff is too big to show here.

qml/Wizard/Pages/78-firmware-update.qml.disablednew file+246

This diff is too big to show here.

qml/Wizard/Pages/79-system-update.qmlnew file+148

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qmlnew file+137

This diff is too big to show here.

qml/Wizard/Pages/data/Desktop_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Desktop_splash_screen_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_splash_screen_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Tick@30.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/map.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/pin.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_0.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_13.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.pngnew file

Binary file not shown.

qml/Wizard/Pages/passcode-confirm.qmlnew file+69

This diff is too big to show here.

qml/Wizard/Pages/passcode-desktop.qmlnew file+159

This diff is too big to show here.

qml/Wizard/Pages/passcode-set.qmlnew file+78

This diff is too big to show here.

qml/Wizard/Pages/password-set.qmlnew file+158

This diff is too big to show here.

qml/Wizard/Pages/sim.qmlnew file+108

This diff is too big to show here.

qml/Wizard/PasswordMeter.qmlnew file+108

This diff is too big to show here.

qml/Wizard/StackButton.qmlnew file+42

This diff is too big to show here.

qml/Wizard/Wizard.qmlnew file+58

This diff is too big to show here.

qml/Wizard/WizardItemSelector.qmlnew file+129

This diff is too big to show here.

qml/Wizard/WizardTextField.qmlnew file+25

This diff is too big to show here.

qml/graphics/12_10_background_wide@12.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/browser@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/calendar@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/camera@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/contacts-app@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/dash@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/dialer-app@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/evernote@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/facebook@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/gallery@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/gmail@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/map@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/messages-app@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/notepad@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/pinterest@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/soundcloud@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/system-settings@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/twitter@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/weather@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/wikipedia@18.pngdeleted

Binary file not shown.

qml/graphics/applicationIcons/youtube@18.pngdeleted

Binary file not shown.

qml/graphics/avatars/amanda@12.pngdeleted

Binary file not shown.

qml/graphics/avatars/anna_olsson@12.pngdeleted

Binary file not shown.

qml/graphics/avatars/funky@12.pngdeleted

Binary file not shown.

qml/graphics/clock@18.pngdeleted

Binary file not shown.

qml/graphics/dropshadow2gu@30.pngnew file

Binary file not shown.

qml/Stages/graphics/dropshadow2gu@30.sci → qml/graphics/dropshadow2gu@30.scirenamed

The content is the same.

qml/graphics/dropshadow_left@20.png

Binary file not shown.

qml/graphics/dropshadow_right@20.png

Binary file not shown.

qml/graphics/phone_background.jpgdeleted

Binary file not shown.

qml/graphics/tablet_background.jpgdeleted

Binary file not shown.

run.shdeleted−93

This diff is too big to show here.

run_on_device.shdeleted−164

This diff is too big to show here.

runtests.sh+4−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/notification.js → src/ApplicationArguments.cpprenamed+6−7

This diff is too big to show here.

src/ApplicationArguments.h+24−11

This diff is too big to show here.

src/CMakeLists.txt+36−17

This diff is too big to show here.

src/CachingNetworkManagerFactory.cpp+4−12

This diff is too big to show here.

src/CachingNetworkManagerFactory.h+3−6

This diff is too big to show here.

src/Dash/CMakeLists.txtdeleted−22

This diff is too big to show here.

src/Dash/main.cppdeleted−121

This diff is too big to show here.

src/DebuggingController.cppnew file+92

This diff is too big to show here.

src/DebuggingController.hnew file+57

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+293−27

This diff is too big to show here.

src/MouseTouchAdaptor.h+31−8

This diff is too big to show here.

src/Panel/CMakeLists.txtdeleted−3

This diff is too big to show here.

src/Panel/Indicators/CMakeLists.txtdeleted−1

This diff is too big to show here.

src/SecondaryWindow.cppnew file+40

This diff is too big to show here.

src/SecondaryWindow.hnew file+30

This diff is too big to show here.

src/ShellApplication.cppnew file+231

This diff is too big to show here.

src/ShellApplication.hnew file+61

This diff is too big to show here.

src/ShellView.cppnew file+85

This diff is too big to show here.

src/ShellView.hnew file+34

This diff is too big to show here.

src/UnityCommandLineParser.cppnew file+130

This diff is too big to show here.

src/UnityCommandLineParser.hnew file+60

This diff is too big to show here.

src/UnixSignalHandler.cppnew file+139

This diff is too big to show here.

src/UnixSignalHandler.hnew file+54

This diff is too big to show here.

src/libunity8-private/CMakeLists.txt+1−1

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.cpp+21−8

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.h+10−6

This diff is too big to show here.

src/libunity8-private/unitydbusobject.cpp+3−3

This diff is too big to show here.

src/libunity8-private/unitydbusvirtualobject.cpp+3−3

This diff is too big to show here.

src/main.cpp+28−130

This diff is too big to show here.

qml/Hud/ToolBar.qml → src/qmldebuggerutils.hrenamed+14−14

This diff is too big to show here.

tests/CMakeLists.txt+146−8

This diff is too big to show here.

tests/autopilot/setup.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/__init__.py+6−2

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/__init__.py+4−4

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+22−15

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/fixture_setup.py+271−6

This diff is too big to show here.

tests/autopilot/unity8/greeter/__init__.pynew file+97

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/__init__.py → tests/autopilot/unity8/greeter/tests/__init__.pyrenamed+8−8

This diff is too big to show here.

tests/autopilot/unity8/greeter/tests/test_args.pynew file+49

This diff is too big to show here.

tests/autopilot/unity8/indicators/__init__.py+203

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/__init__.py+26−1

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_action_latency.pynew file+237

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_display_indicator.pynew file+52

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.py+15−33

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/launcher.py → tests/autopilot/unity8/launcher.pyrenamed+7−6

This diff is too big to show here.

tests/autopilot/unity8/process_helpers.py+16−74

This diff is too big to show here.

tests/autopilot/unity8/sensors.pynew file+93

This diff is too big to show here.

tests/autopilot/unity8/shell/__init__.py+184−39

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/create_interactive_notification.py → tests/autopilot/unity8/shell/create_interactive_notification.pyrenamed+2−4

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators.pynew file+50

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.pydeleted−241

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/greeter.pydeleted−47

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/hud.pydeleted−94

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.pydeleted−179

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.py+35−23

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+64−160

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/disabled_test_hud.pydeleted−225

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.pydeleted−198

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_helpers.pynew file+44

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+26−34

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+80−109

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_rotation.pynew file+113

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_system_integration.py+5−3

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_upstart.py+9−13

This diff is too big to show here.

tests/copyright/CMakeLists.txt+1−1

This diff is too big to show here.

tests/copyright/check_copyright.sh+35−4

This diff is too big to show here.

tests/data/unity/backgrounds/20x30.pngnew file

Binary file not shown.

tests/data/unity/backgrounds/black.pngnew file

Binary file not shown.

tests/data/unity/backgrounds/blue.png

Binary file not shown.

tests/data/unity/backgrounds/red.png

Binary file not shown.

tests/graphics/applicationIcons/browser@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/calendar@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/camera@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/contacts-app@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/dash@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/dialer-app@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/evernote@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/facebook@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/gallery@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/gmail@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/libreoffice@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/map@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/messages-app@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/notepad@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/pinterest@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/soundcloud@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/system-settings@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/twitter@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/weather@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/wikipedia@18.pngnew file

Binary file not shown.

tests/graphics/applicationIcons/youtube@18.pngnew file

Binary file not shown.

tests/graphics/avatars/amanda@12.pngnew file

Binary file not shown.

tests/graphics/avatars/anna_olsson@12.pngnew file

Binary file not shown.

tests/graphics/avatars/funky@12.pngnew file

Binary file not shown.

tests/graphics/clock@18.pngnew file

Binary file not shown.

qml/Dash/graphics/phone/screenshots/gallery@12.png → tests/graphics/screenshots/gallery@12.pngrenamed

Binary file not shown.

tests/imports/CMakeLists.txtnew file+5

This diff is too big to show here.

tests/imports/check_imports.pynew file+183

This diff is too big to show here.

tests/libs/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/libs/UbuntuGestures/CMakeLists.txtdeleted−20

This diff is too big to show here.

tests/libs/UbuntuGestures/tst_TouchRegistry.cppdeleted−803

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+102−6

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+51−10

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypesdeleted−33

This diff is too big to show here.

tests/mocks/AccountsService/CMakeLists.txt+15−2

This diff is too big to show here.

tests/mocks/AccountsService/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Biometryd/CMakeLists.txtnew file+14

This diff is too big to show here.

libs/UbuntuGestures/TouchOwnershipEvent.cpp → tests/mocks/Biometryd/MockBiometryd.cpprenamed+20−12

This diff is too big to show here.

tests/mocks/Biometryd/MockBiometryd.hnew file+50

This diff is too big to show here.

tests/mocks/Biometryd/MockDevice.cppnew file+29

This diff is too big to show here.

tests/mocks/Biometryd/MockDevice.hnew file+40

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp → tests/mocks/Biometryd/MockIdentifier.cpprenamed+6−5

This diff is too big to show here.

plugins/Ubuntu/SystemImage/SystemImage.h → tests/mocks/Biometryd/MockIdentifier.hrenamed+10−12

This diff is too big to show here.

tests/mocks/Biometryd/MockObserver.cppnew file+22

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/MockSystemImage.h → tests/mocks/Biometryd/MockObserver.hrenamed+11−10

This diff is too big to show here.

tests/mocks/Biometryd/MockOperation.cppnew file+56

This diff is too big to show here.

tests/mocks/Biometryd/MockOperation.hnew file+47

This diff is too big to show here.

tests/mocks/Biometryd/plugin.cppnew file+41

This diff is too big to show here.

plugins/Ubuntu/SystemImage/plugin.h → tests/mocks/Biometryd/plugin.hrenamed+5−5

This diff is too big to show here.

tests/mocks/Biometryd/qmldirnew file+3

This diff is too big to show here.

tests/mocks/CMakeLists.txt+25−17

This diff is too big to show here.

tests/mocks/Cursor/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Cursor/Cursor.qmlnew file+34

This diff is too big to show here.

tests/mocks/Cursor/qmldirnew file+2

This diff is too big to show here.

tests/mocks/GSettings.1.0/CMakeLists.txt+1−2

This diff is too big to show here.

tests/mocks/GSettings.1.0/GSettings.qmltypesdeleted−42

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.cpp+335−20

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.h+101−11

This diff is too big to show here.

tests/mocks/GSettings.1.0/plugin.h+1−1

This diff is too big to show here.

tests/mocks/HudClient/CMakeLists.txtdeleted−38

This diff is too big to show here.

tests/mocks/HudClient/HudClient.qmltypesdeleted−113

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.cppdeleted−39

This diff is too big to show here.

tests/mocks/HudClient/fake_libhud_client.cppdeleted−247

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.cppdeleted−93

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.hdeleted−64

This diff is too big to show here.

tests/mocks/HudClient/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/LightDM/CMakeLists.txtdeleted−53

This diff is too big to show here.

tests/mocks/LightDM/LightDM.qmltypesdeleted−251

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/Greeterdeleted−1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/InfographicModeldeleted−1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/UsersModeldeleted−1

This diff is too big to show here.

tests/mocks/LightDM/demo/CMakeLists.txtdeleted−36

This diff is too big to show here.

tests/mocks/LightDM/demo/UsersModelPrivate.cppdeleted−41

This diff is too big to show here.

tests/mocks/LightDM/full/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/LightDM/full/UsersModelPrivate.cppdeleted−52

This diff is too big to show here.

tests/mocks/LightDM/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/mocks/LightDM/single-pin/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/mocks/LightDM/single/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/LightDMController/CMakeLists.txtnew file+14

This diff is too big to show here.

plugins/Unity/DashCommunicator/plugin.cpp → tests/mocks/LightDMController/plugin.cpprenamed+14−10

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.h → tests/mocks/LightDMController/plugin.hrenamed+6−8

This diff is too big to show here.

tests/mocks/LightDMController/qmldirnew file+2

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Lights/Lights.cppnew file+84

This diff is too big to show here.

tests/mocks/Lights/Lights.hnew file+66

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/plugin.cpp → tests/mocks/Lights/plugin.cpprenamed+8−9

This diff is too big to show here.

tests/mocks/Lights/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/Lights/qmldirnew file+3

This diff is too big to show here.

tests/mocks/MeeGo/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/CMakeLists.txtnew file+11

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qmlnew file+53

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.cppnew file+90

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.hnew file+61

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cppnew file+66

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.hnew file+49

This diff is too big to show here.

plugins/Ubuntu/SystemImage/plugin.cpp → tests/mocks/MeeGo/QOfono/plugin.cpprenamed+7−6

This diff is too big to show here.

plugins/Ubuntu/Payments/plugin.h → tests/mocks/MeeGo/QOfono/plugin.hrenamed+4−4

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Powerd/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Powerd/Powerd.cpp+2−2

This diff is too big to show here.

tests/mocks/Powerd/Powerd.h+6−4

This diff is too big to show here.

tests/mocks/Powerd/Powerd.qmltypesdeleted−39

This diff is too big to show here.

tests/mocks/Powerd/plugin.h+1−1

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+3−2

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+27−62

This diff is too big to show here.

tests/mocks/QMenuModel/QMenuModel.qmltypesdeleted−78

This diff is too big to show here.

tests/mocks/QMenuModel/UnityMenuAction.qml+1−1

This diff is too big to show here.

tests/mocks/QMenuModel/actiondata.hnew file+54

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.hnew file+51

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+13

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.h+1−1

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.cpp+78−13

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.h+17−6

This diff is too big to show here.

tests/mocks/QtMultimedia/CMakeLists.txt+9−2

This diff is too big to show here.

tests/mocks/QtMultimedia/QtMultimedia.qmltypesdeleted−62

This diff is too big to show here.

tests/mocks/QtMultimedia/VideoSurface.qmlnew file+111

This diff is too big to show here.

tests/mocks/QtMultimedia/audio.cppdeleted−117

This diff is too big to show here.

tests/mocks/QtMultimedia/audio.hdeleted−90

This diff is too big to show here.

tests/mocks/QtMultimedia/declarativeplaylist.cppnew file+73

This diff is too big to show here.

tests/mocks/QtMultimedia/declarativeplaylist.hnew file+54

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.cppnew file+319

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.hnew file+224

This diff is too big to show here.

tests/mocks/QtMultimedia/plugin.cpp+9−2

This diff is too big to show here.

tests/mocks/QtMultimedia/plugin.h+1−1

This diff is too big to show here.

tests/mocks/QtMultimedia/videooutput.cppnew file+127

This diff is too big to show here.

tests/mocks/QtMultimedia/videooutput.hnew file+52

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.cppnew file+34

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.hnew file+39

This diff is too big to show here.

plugins/HudClient/plugin.cpp → tests/mocks/SessionBroadcast/plugin.cpprenamed+10−15

This diff is too big to show here.

tests/mocks/SessionBroadcast/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/SessionBroadcast/qmldirnew file+2

This diff is too big to show here.

tests/mocks/UInput/CMakeLists.txtnew file+7

This diff is too big to show here.

tests/mocks/UInput/mockuinput.cppnew file+73

This diff is too big to show here.

tests/mocks/UInput/mockuinput.hnew file+63

This diff is too big to show here.

tests/mocks/UInput/plugin.cppnew file+26

This diff is too big to show here.

tests/mocks/UInput/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/UInput/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.cpp+7−1

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.h+7−6

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.cpp+1

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.h+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp+3−1

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h+2−1

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/CMakeLists.txtdeleted−10

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.cppdeleted−94

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.hdeleted−62

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/Payments.qmltypesdeleted−44

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/CMakeLists.txtdeleted−10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−20

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txtnew file+5

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qmlnew file+24

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txtnew file+1

This diff is too big to show here.

qml/Components/Circle.qml → tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qmlrenamed+5−6

This diff is too big to show here.

tests/plugins/Dash/cardcreatortest.qml → tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qmlrenamed+5−10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cppnew file+35

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.hnew file+50

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/plugin.cpp → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpprenamed+3−5

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/plugin.h → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hrenamed+4−4

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txtnew file+1

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSetting.qml → tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qmlrenamed+16−16

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/CMakeLists.txtnew file+1

This diff is too big to show here.

qml/Dash/Previews/PreviewActionButton.qml → tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qmlrenamed+11−8

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallEntry.h+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp+27

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h+22

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/Telephony.qmltypesdeleted−58

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/plugin.h+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/Thumbnailer/Thumbnailer.qmltypesdeleted−17

This diff is too big to show here.

tests/mocks/Ubuntu/Web/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Ubuntu/Web/WebView.qmlnew file+25

This diff is too big to show here.

tests/mocks/Ubuntu/Web/qmldirnew file+4

This diff is too big to show here.

tests/mocks/Unity/Application/Application.qmltypesdeleted−475

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+313−67

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+70−29

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+255−184

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h+45−70

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cppdeleted−75

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationScreenshotProvider.hdeleted−34

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationTestInterface.cppdeleted−117

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationTestInterface.hdeleted−45

This diff is too big to show here.

tests/mocks/Unity/Application/CMakeLists.txt+13−12

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.cppnew file+62

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.hnew file+43

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.cppnew file+559

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.hnew file+237

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+310−96

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.h+72−76

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.qmldeleted−55

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItemModel.hdeleted−35

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.cppnew file+136

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.hnew file+54

This diff is too big to show here.

tests/mocks/Unity/Application/ObjectListModel.h+3−1

This diff is too big to show here.

tests/mocks/Unity/Application/Session.cppdeleted−174

This diff is too big to show here.

tests/mocks/Unity/Application/Session.hdeleted−90

This diff is too big to show here.

tests/mocks/Unity/Application/SessionManager.cppdeleted−55

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.cpp+232−48

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.h+78−19

This diff is too big to show here.

tests/mocks/Unity/Application/UbuntuKeyboardInfo.hdeleted−60

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.cppnew file+58

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.hnew file+37

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.cpp+24−54

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.h+2−2

This diff is too big to show here.

tests/mocks/Unity/Application/resources/Kate.qmlnew file+49

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateDialog.qmlnew file+48

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qml → tests/mocks/Unity/Application/resources/KateMenu.qmlrenamed+20−22

This diff is too big to show here.

tests/mocks/Unity/Application/resources/MirSurfaceItem.qmlnew file+126

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.qml → tests/mocks/Unity/Application/resources/VirtualKeyboard.qmlrenamed+3−2

This diff is too big to show here.

tests/mocks/Unity/Application/resources/screenshots/browser@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/camera@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/dialer@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/facebook@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/gallery@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/gmail-webapp.svgnew file+343

This diff is too big to show here.

tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/map@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/music@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/twitter@12.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/ubuntu-weather-app.svgnew file+201

This diff is too big to show here.

qml/Dash/graphics/phone/screenshots/unity8-dash@12.png → tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.pngrenamed

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.pngnew file

Binary file not shown.

tests/mocks/Unity/Application/resources/surfaces.qrcnew file+23

This diff is too big to show here.

tests/mocks/Unity/Application/resources/vkb_portrait.pngnew file

Binary file not shown.

tests/mocks/Unity/ApplicationMenu/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cppnew file+47

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.hnew file+41

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/plugin.cppnew file+42

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+4−51

This diff is too big to show here.

tests/mocks/Unity/Connectivity/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Unity/Connectivity/Connectivity.qmltypesdeleted−20

This diff is too big to show here.

tests/mocks/Unity/Connectivity/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypesdeleted−46

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicator.cppdeleted−37

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicator.hdeleted−39

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−36

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Unity/Indicators/ActionRootState.qmlnew file+46

This diff is too big to show here.

tests/mocks/Unity/Indicators/CMakeLists.txt+6−5

This diff is too big to show here.

tests/mocks/Unity/Indicators/Indicators.qmltypesdeleted−258

This diff is too big to show here.

tests/mocks/Unity/Indicators/IndicatorsModel.qml+98−15

This diff is too big to show here.

tests/mocks/Unity/Indicators/RootActionState.qml → tests/mocks/Unity/Indicators/ModelActionRootState.qmlrenamed+34−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp+16−4

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h+11−6

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.jsnew file+1328

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeplugin.cpp+2−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeplugin.h+1−1

This diff is too big to show here.

tests/mocks/Unity/Indicators/qmldir+2−1

This diff is too big to show here.

tests/mocks/Unity/InputInfo/CMakeLists.txtnew file+31

This diff is too big to show here.

qml/Panel/Indicators/RoamingIndication.qml → tests/mocks/Unity/InputInfo/mockcontroller.cpprenamed+15−20

This diff is too big to show here.

tests/mocks/Unity/InputInfo/mockcontroller.hnew file+34

This diff is too big to show here.

tests/mocks/Unity/InputInfo/plugin.cppnew file+46

This diff is too big to show here.

tests/mocks/Unity/InputInfo/plugin.hnew file+30

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cppnew file+56

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.hnew file+58

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Unity/Launcher/CMakeLists.txt+6−3

This diff is too big to show here.

tests/mocks/Unity/Launcher/Launcher.qmltypesdeleted−184

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.cppnew file+98

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.hnew file+43

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+63−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h+18−2

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+89−3

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+21−11

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockQuickListModel.cpp+6−2

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockQuickListModel.h+4−2

This diff is too big to show here.

tests/mocks/Unity/Launcher/plugin.cpp+4

This diff is too big to show here.

tests/mocks/Unity/Launcher/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/CMakeLists.txt+16−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cppnew file+74

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.hnew file+53

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.cppnew file+198

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.hnew file+101

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.cppnew file+169

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.hnew file+70

This diff is too big to show here.

tests/mocks/Unity/Notifications/Notifications.qmltypesdeleted−10

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.cppnew file+33

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.hnew file+34

This diff is too big to show here.

tests/mocks/Unity/Notifications/qmldir+2−1

This diff is too big to show here.

tests/mocks/Unity/Platform/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Unity/Platform/MockPlatform.qmlnew file+25

This diff is too big to show here.

tests/mocks/Unity/Platform/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Unity/Screens/CMakeLists.txtnew file+14

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp → tests/mocks/Unity/Screens/plugin.cpprenamed+8−12

This diff is too big to show here.

tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp → tests/mocks/Unity/Screens/plugin.hrenamed+9−12

This diff is too big to show here.

tests/mocks/Unity/Screens/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.cppnew file+71

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.hnew file+82

This diff is too big to show here.

tests/mocks/Unity/Unity.qmltypesdeleted−465

This diff is too big to show here.

tests/mocks/Unity/fake_categories.cppdeleted−157

This diff is too big to show here.

tests/mocks/Unity/fake_categories.hdeleted−55

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.cppdeleted−124

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.hdeleted−61

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.cppdeleted−82

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.hdeleted−52

This diff is too big to show here.

tests/mocks/Unity/fake_previewstack.cppdeleted−68

This diff is too big to show here.

tests/mocks/Unity/fake_previewstack.hdeleted−50

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.cppdeleted−78

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.hdeleted−47

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.cppdeleted−90

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.hdeleted−52

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cppdeleted−317

This diff is too big to show here.

tests/mocks/Unity/fake_scope.hdeleted−109

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cppdeleted−187

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.hdeleted−72

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cppdeleted−283

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.hdeleted−104

This diff is too big to show here.

tests/mocks/Unity/fake_settingsmodel.cppdeleted−95

This diff is too big to show here.

tests/mocks/Unity/fake_settingsmodel.hdeleted−54

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.cppdeleted−56

This diff is too big to show here.

tests/mocks/Unity/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Utils/CMakeLists.txtnew file+61

This diff is too big to show here.

tests/mocks/Utils/EdgeBarrierSettings.qmlnew file+22

This diff is too big to show here.

libs/UbuntuGestures/UnownedTouchEvent.cpp → tests/mocks/Utils/Style.jsrenamed+15−17

This diff is too big to show here.

tests/mocks/LightDM/single/UsersModelPrivate.cpp → tests/mocks/Utils/URLDispatcher.cpprenamed+16−11

This diff is too big to show here.

tests/mocks/Utils/URLDispatcher.hnew file+47

This diff is too big to show here.

tests/mocks/Utils/WindowInputMonitor.qmlnew file+23

This diff is too big to show here.

tests/mocks/Utils/constants.cppnew file+24

This diff is too big to show here.

tests/mocks/Utils/constants.hnew file+43

This diff is too big to show here.

tests/mocks/Utils/plugin.cppnew file+93

This diff is too big to show here.

tests/mocks/Utils/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/Utils/qmldirnew file+6

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.cppnew file+100

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.hnew file+77

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txtnew file+20

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cppnew file+64

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.hnew file+61

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cppnew file+38

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/plugin.h → tests/mocks/Wizard/mockplugin.hrenamed+4−6

This diff is too big to show here.

tests/mocks/Wizard/qmldirnew file+3

This diff is too big to show here.

tests/mocks/data/unity/indicators/com.canonical.indicator.mocknew file+10

This diff is too big to show here.

tests/mocks/indicator-service/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/indicator-service/mock-indicator-service.cnew file+325

This diff is too big to show here.

tests/mocks/liblightdm/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/LightDM/full/GreeterPrivate.cpp → tests/mocks/liblightdm/GreeterPrivate.cpprenamed+40−6

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.hnew file+54

This diff is too big to show here.

tests/mocks/liblightdm/MockController.cppnew file+192

This diff is too big to show here.

tests/mocks/liblightdm/MockController.hnew file+106

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.cppnew file+316

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.hnew file+102

This diff is too big to show here.

tests/mocks/liblightdm/MockSessionsModel.cppnew file+118

This diff is too big to show here.

tests/mocks/liblightdm/MockSessionsModel.hnew file+64

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.cppnew file+220

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.hnew file+61

This diff is too big to show here.

tests/mocks/liblightdm/SessionsModelPrivate.cppnew file+83

This diff is too big to show here.

tests/mocks/liblightdm/SessionsModelPrivate.hnew file+63

This diff is too big to show here.

tests/mocks/liblightdm/UsersModelPrivate.cppnew file+124

This diff is too big to show here.

tests/mocks/LightDM/UsersModelPrivate.h → tests/mocks/liblightdm/UsersModelPrivate.hrenamed+8−3

This diff is too big to show here.

tests/mocks/liblightdm/demo/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/libusermetrics/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/libusermetrics/ColorTheme.cpp+4

This diff is too big to show here.

tests/mocks/libusermetrics/ColorTheme.h+2−1

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.cpp+50−23

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.h+2

This diff is too big to show here.

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.hdeleted−1

This diff is too big to show here.

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.hdeleted−1

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.cpp+28−6

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.h+5

This diff is too big to show here.

tests/plugins/AccountsService/CMakeLists.txt+33−12

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cpp+104−7

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.h+17−3

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.cppnew file+28

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.hnew file+39

This diff is too big to show here.

tests/plugins/AccountsService/client.cpp+303−9

This diff is too big to show here.

tests/plugins/AccountsService/interfaces.xml+50

This diff is too big to show here.

tests/plugins/AccountsService/server.cpp+17−6

This diff is too big to show here.

tests/plugins/AccountsService/types.hnew file+25

This diff is too big to show here.

tests/plugins/CMakeLists.txt+6−1

This diff is too big to show here.

tests/plugins/Cursor/CMakeLists.txtnew file+8

This diff is too big to show here.

tests/mocks/Unity/Application/SessionModel.h → tests/plugins/Cursor/TextEntry.qmlrenamed+18−19

This diff is too big to show here.

tests/plugins/Cursor/tst_Cursor.qmlnew file+151

This diff is too big to show here.

tests/plugins/Dash/CMakeLists.txtdeleted−82

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.resdeleted−91

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.resdeleted−135

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.resdeleted−108

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.resdeleted−113

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.resdeleted−153

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.resdeleted−122

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.resdeleted−148

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.tstdeleted−3

This diff is too big to show here.

tests/plugins/Dash/cardcreatortest.cppdeleted−108

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.cppdeleted−491

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltry.cppdeleted−90

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltry.qmldeleted−120

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cppdeleted−247

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadersectiontest.cppdeleted−2162

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cppdeleted−1950

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.qmldeleted−97

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsection.qmldeleted−107

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qmldeleted−75

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.cppdeleted−534

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.cppdeleted−98

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.qmldeleted−114

This diff is too big to show here.

tests/plugins/Dash/tst_CardAttributes.qml−57

This diff is too big to show here.

tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml−138

This diff is too big to show here.

tests/plugins/Dash/tst_ScopeStyle.qml−188

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.cpp−503

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qml−44

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltry.cpp−90

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltry.qml−121

This diff is too big to show here.

tests/plugins/GlobalShortcut/CMakeLists.txt+19

This diff is too big to show here.

tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp+78

This diff is too big to show here.

tests/plugins/GlobalShortcut/shortcut.qml+39

This diff is too big to show here.

tests/plugins/Greeter/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Greeter/Unity/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+42

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+240

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txt+1−25

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt+157

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/dbus.cpp+30−13

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/greeter.qml+3−3

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/integrated.cpp+88

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/pam.cpp+54

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cpp+175

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+134

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp+168

This diff is too big to show here.

tests/plugins/SessionBroadcast/BroadcastServer.cpp+33

This diff is too big to show here.

tests/plugins/SessionBroadcast/BroadcastServer.h+40

This diff is too big to show here.

tests/plugins/SessionBroadcast/CMakeLists.txt+51

This diff is too big to show here.

tests/plugins/SessionBroadcast/interfaces.xml+18

This diff is too big to show here.

tests/plugins/SessionBroadcast/server.cpp+37

This diff is too big to show here.

tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp+111

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+41−30

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml−86

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+75−6

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+19−2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml−89

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml−90

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.cpp+30

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.h+33

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml−89

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/empty.qml+1−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/touchGateExample.qml+1−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+2−2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp−1262

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml−69

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+131

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml+81

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp+6−6

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml+2−2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp+61−3

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+70−23

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cpp+300

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qml+90

This diff is too big to show here.

tests/plugins/Unity/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Unity/Indicators/CMakeLists.txt+20−17

This diff is too big to show here.

tests/plugins/Unity/Indicators/IndicatorsManagerTest.cpp+32−9

This diff is too big to show here.

tests/plugins/Unity/Indicators/IndicatorsModelTest.cpp+8−7

This diff is too big to show here.

tests/plugins/Unity/Indicators/MenuContentActivatorTest.cpp+4−3

This diff is too big to show here.

tests/plugins/Unity/Indicators/RootActionStateTest.cpp+5−5

This diff is too big to show here.

tests/plugins/Unity/Indicators/SharedUnityMenuModelTest.cpp+3−3

This diff is too big to show here.

tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp+6−13

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+71−26

This diff is too big to show here.

tests/plugins/Unity/Launcher/appdrawermodeltest.cpp+68

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/abs-icon.desktop+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/click-icon.desktop+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/click-icon.svg

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/no-name.desktop+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/rel-icon.desktop+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/rel-icon.svg

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.cpp+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.h+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+420−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/no-icon.desktop−2

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.cpp+58

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.h+55

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.cpp+17−18

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.h+39

This diff is too big to show here.

tests/plugins/Unity/Platform/CMakeLists.txt+30

This diff is too big to show here.

tests/plugins/Unity/Platform/platformtest.cpp+142

This diff is too big to show here.

tests/plugins/Unity/Session/CMakeLists.txt+54−6

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.cpp+29

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.h+38

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.cpp+43

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.h+48

This diff is too big to show here.

tests/plugins/Unity/Session/interfaces.xml+29

This diff is too big to show here.

tests/plugins/Unity/Session/preload.c+43

This diff is too big to show here.

tests/plugins/Unity/Session/server.cpp+50

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cpp+236−12

This diff is too big to show here.

tests/plugins/Utils/CMakeLists.txt+32−23

This diff is too big to show here.

tests/plugins/Utils/DeviceConfigParserTest.cpp+76

This diff is too big to show here.

tests/plugins/Utils/ModelTest.cpp+25−42

This diff is too big to show here.

tests/plugins/Utils/ModelTest.h

This diff is too big to show here.

tests/plugins/Utils/QLimitProxyModelTest.cpp+31−31

This diff is too big to show here.

tests/plugins/Utils/URLDispatcherTest.cpp+78

This diff is too big to show here.

tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp+24−24

This diff is too big to show here.

tests/plugins/Utils/WindowInputMonitorTest.cpp+461

This diff is too big to show here.

tests/plugins/Utils/WindowStateStorageTest.cpp+121

This diff is too big to show here.

tests/plugins/Utils/timeformattertest.cpp−165

This diff is too big to show here.

tests/plugins/Utils/tst_UtilsStyle.qml+1−1

This diff is too big to show here.

tests/plugins/WindowManager/CMakeLists.txt+36

This diff is too big to show here.

tests/plugins/WindowManager/UnityApplicationMocks.h+211

This diff is too big to show here.

tests/plugins/WindowManager/tst_TopLevelWindowModel.cpp+193

This diff is too big to show here.

tests/plugins/Wizard/CMakeLists.txt+24

This diff is too big to show here.

tests/plugins/Wizard/tst_pagelist.cpp+183

This diff is too big to show here.

tests/plugins/Wizard/tst_system.cpp+124

This diff is too big to show here.

tests/qmltests/ApplicationMenuDataLoader.qml+99

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuBar.qml+437

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuPopup.qml+361

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+71−87

This diff is too big to show here.

tests/qmltests/Components/CMakeLists.txt+40−7

This diff is too big to show here.

tests/qmltests/Components/tst_Background.qml+1−1

This diff is too big to show here.

tests/qmltests/Components/tst_Carousel.qml−293

This diff is too big to show here.

tests/qmltests/Components/tst_Dialogs.qml+112

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+65−46

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.qml+76−16

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+69

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BottomEdgeShowable.qml+108

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/LeftEdgeShowable.qml+6−6

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/RightEdgeShowable.qml+108

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/SimpleButton.qml+16−12

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/TopEdgeShowable.qml+13−13

This diff is too big to show here.

tests/qmltests/Components/tst_DraggingArea.qml+7−7

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDemoOverlay.qml−123

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDragEvaluator.cpp+166

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDragEvaluator.qml+27

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage.qml+31−12

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/ImageControls.qml+2−2

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/portrait.png

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/square.png

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/wide.png

This diff is too big to show here.

tests/qmltests/Components/tst_Lockscreen.qml+52−37

This diff is too big to show here.

tests/qmltests/Components/tst_MediaServices.qml+231

This diff is too big to show here.

tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml+75

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+174

This diff is too big to show here.

tests/qmltests/Components/tst_Rating.qml+5−5

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveFlowView.qml−191

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveGridView.qml−193

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml−183

This diff is too big to show here.

tests/qmltests/Components/tst_SharingPicker.qml+73

This diff is too big to show here.

tests/qmltests/Components/tst_Showable.qml+15−2

This diff is too big to show here.

tests/qmltests/Components/tst_VirtualTouchPad.qml+197

This diff is too big to show here.

tests/qmltests/Components/tst_Wallpaper.qml+118

This diff is too big to show here.

tests/qmltests/Components/tst_WallpaperResolver.qml+161

This diff is too big to show here.

tests/qmltests/Components/tst_ZoomableImage.qml+18−8

This diff is too big to show here.

tests/qmltests/Dash/CardHelpers.js−113

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_Preview.qml−106

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewActions.qml−148

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml−179

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml−107

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml−125

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml−107

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewPayments.qml−203

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewProgress.qml−87

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml−125

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml−202

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTable.qml−114

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml−87

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml−61

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml−100

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml−83

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml−62

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml−84

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml−98

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml−88

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml−65

This diff is too big to show here.

tests/qmltests/Dash/artwork/avatar@12.png

This diff is too big to show here.

tests/qmltests/Dash/artwork/background.png

This diff is too big to show here.

tests/qmltests/Dash/artwork/checkers.png

This diff is too big to show here.

tests/qmltests/Dash/artwork/emblem.png

This diff is too big to show here.

tests/qmltests/Dash/artwork/music-player-design.png

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml−609

This diff is too big to show here.

tests/qmltests/Dash/tst_CardBenchmark.qml−97

This diff is too big to show here.

tests/qmltests/Dash/tst_CardTool.qml−369

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml−320

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml−513

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml−641

This diff is too big to show here.

tests/qmltests/Dash/tst_PageHeader.qml−321

This diff is too big to show here.

tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg−60

This diff is too big to show here.

tests/qmltests/Dash/tst_PreviewListView.qml−115

This diff is too big to show here.

tests/qmltests/EdgeBarrierControls.qml+97

This diff is too big to show here.

tests/qmltests/Greeter/TestView.qml+101

This diff is too big to show here.

tests/qmltests/Greeter/tst_Clock.qml+2−2

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml+683

This diff is too big to show here.

tests/qmltests/Greeter/tst_GreeterView.qml+1366

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+81−16

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qml−386

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qml−113

This diff is too big to show here.

tests/qmltests/Hud/tst_Hud.qml−239

This diff is too big to show here.

tests/qmltests/Hud/tst_Result.qml−98

This diff is too big to show here.

tests/qmltests/Launcher/tst_Drawer.qml+520

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+1233−78

This diff is too big to show here.

tests/qmltests/Notifications/Notification.qml+14−9

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+781−563

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+290

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+326

This diff is too big to show here.

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+31−37

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorItem.qml+20−20

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qml+177−111

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+292

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+8−14

This diff is too big to show here.

tests/qmltests/Panel/PanelTest.qml+4−14

This diff is too big to show here.

tests/qmltests/Panel/PanelUI.qml+286

This diff is too big to show here.

tests/qmltests/Panel/tst_ActiveCallHint.qml+32−12

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorPage.qml−151

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+18−6

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+570−179

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelBar.qml+50−34

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelItemRow.qml+44−16

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenu.qml+149−43

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenuPage.qml+200

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelSmallScreen.qml+133

This diff is too big to show here.

tests/qmltests/Panel/tst_SearchIndicator.qml−61

This diff is too big to show here.

tests/qmltests/Stage/ApplicationCheckBox.qml+189

This diff is too big to show here.

tests/qmltests/Stage/SizeHintField.qml+15−9

This diff is too big to show here.

tests/qmltests/Stage/SurfaceManagerControls.qml+32

This diff is too big to show here.

tests/qmltests/Stage/SurfaceManagerField.qml+19−17

This diff is too big to show here.

tests/qmltests/Stage/tst_ApplicationWindow.qml+513

This diff is too big to show here.

tests/qmltests/Stage/tst_DecoratedWindow.qml+267

This diff is too big to show here.

tests/qmltests/Stage/tst_DesktopStage.qml+1085

This diff is too big to show here.

tests/qmltests/Stage/tst_PhoneStage.qml+624

This diff is too big to show here.

tests/qmltests/Stage/tst_QMLTopLevelWindowModel.qml+191

This diff is too big to show here.

tests/qmltests/Stage/tst_Splash.qml+18−4

This diff is too big to show here.

tests/qmltests/Stage/tst_SurfaceContainer.qml+258

This diff is too big to show here.

tests/qmltests/Stage/tst_TabletStage.qml+764

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowDecoration.qml+244

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowResizeArea.qml+465

This diff is too big to show here.

tests/qmltests/Stages/RecursingChildSessionControl.qml−142

This diff is too big to show here.

tests/qmltests/Stages/tst_ApplicationWindow.qml−416

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml−361

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qml−330

This diff is too big to show here.

tests/qmltests/Stages/tst_SpreadDelegate.qml−167

This diff is too big to show here.

tests/qmltests/Stages/tst_SurfaceContainer.qml−164

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+813

This diff is too big to show here.

tests/qmltests/UnityLogo.png

This diff is too big to show here.

tests/qmltests/Wizard/licenses/en_US.html+1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_CA.html+1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_FR.html+1

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+487

This diff is too big to show here.

tests/qmltests/tst_DeviceConfiguration.qml+49

This diff is too big to show here.

tests/qmltests/tst_DisabledScreenNotice.qml+133

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml+1705

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+3003−401

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+343−184

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml−302

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml+1−1

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml+1−1

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/tst_UnityTest.qml+36−8

This diff is too big to show here.

tests/scripts/README+9

This diff is too big to show here.

tests/scripts/alert-launcher-icon.sh+19

This diff is too big to show here.

tests/scripts/get-progress.sh+19

This diff is too big to show here.

tests/scripts/list-launcher-icons.sh+19

This diff is too big to show here.

tests/scripts/set-count-visible.sh+19

This diff is too big to show here.

tests/scripts/set-count.sh+19

This diff is too big to show here.

tests/scripts/set-progress.sh+19

This diff is too big to show here.

tests/uqmlscene/CMakeLists.txt+15−3

This diff is too big to show here.

tests/uqmlscene/main.cpp+26−21

This diff is too big to show here.

tests/utils/modules/Unity/Test/CMakeLists.txt+23−6

This diff is too big to show here.

tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+48

This diff is too big to show here.

tests/utils/modules/Unity/Test/StageTestCase.qml+64

This diff is too big to show here.

tests/utils/modules/Unity/Test/Test.qmltypes−59

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+23−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+7−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+393−128

This diff is too big to show here.

tests/utils/modules/Unity/Test/plugin.cpp+25−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/plugin.h+1−1

This diff is too big to show here.

tests/utils/modules/Unity/Test/qmldir+2

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.cpp+43−27

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.h+3−2

This diff is too big to show here.

tests/whitespace/CMakeLists.txt+1−1

This diff is too big to show here.

tools/CMakeLists.txt+2−11

This diff is too big to show here.

tools/indicatorsclient/CMakeLists.txt+1−3

This diff is too big to show here.

tools/indicatorsclient/indicatorsclient.cpp+18−16

This diff is too big to show here.

tools/indicatorsclient/indicatorsclient.h−2

This diff is too big to show here.

tools/indicatorsclient/main.cpp

This diff is too big to show here.

tools/menutool/CMakeLists.txt+5

This diff is too big to show here.

tools/menutool/README+11

This diff is too big to show here.

tools/menutool/menutool.cpp+62

This diff is too big to show here.

tools/menutool/menutool.qml+118

This diff is too big to show here.

tools/registry-tracker.cpp−144

This diff is too big to show here.

tools/registry-tracker.h−49

This diff is too big to show here.

tools/scopetool.cpp−105

This diff is too big to show here.

tools/unlock-device+16

This diff is too big to show here.