git.iko.soy/unity8

on xenial help sign in

from

swap

toc73a8d38460 ahead, 0 behind

compare

.bazaar/Makefiledeleted−6

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

22/builddir

33# QtCreator project files

44/*.user

5+*.qmlc

6+*.jsc

57# Eclipse project files

68/.project

79/.cproject

810/.settings

911/.pydevproject

12+# KDevelop project Files

13+/.kdev4/

14+/build/

15+/*.kdev4

16+.clickable/

CMakeLists.txt+83−15

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

1313

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

1515

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

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

1717set(CMAKE_AUTOMOC ON)

18+set(CMAKE_AUTORCC ON)

1819

1920# enable QML debugging

2021string(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)

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

4041endif()

4142

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+

4256# Make sure we have all the needed symbols

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

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

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

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

4963

5064include(FindPkgConfig)

51−find_package(Qt5Core 5.2 REQUIRED)

52−find_package(Qt5Qml 5.2 REQUIRED)

53−find_package(Qt5Quick 5.2 REQUIRED)

54−find_package(Qt5Gui 5.2 REQUIRED)

55−find_package(Qt5DBus 5.2 REQUIRED)

56−find_package(Qt5Concurrent 5.2 REQUIRED)

57−find_package(Qt5Sql 5.2 REQUIRED)

65+find_package(Qt5Core 5.6 REQUIRED)

66+find_package(Qt5Qml 5.6 REQUIRED)

67+find_package(Qt5Quick 5.6 REQUIRED)

68+find_package(Qt5Gui 5.6 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

58100

59101# Standard install paths

60102include(GNUInstallDirs)

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

98140# Save a few container detach and conversions

99141add_definitions(-DQT_STRICT_ITERATORS)

100142

101−# Tests

102−include(CTest)

103−enable_testing()

143+# Use the fast string builder

144+add_definitions(-DQT_USE_QSTRINGBUILDER)

104145

105146# Autopilot tests

106147include(autopilot)

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

108149

109150set(SHELL_APP unity8)

110−set(DASH_APP unity8-dash)

111−set(SCOPE_TOOL unity-scope-tool)

151+set(INDICATORS_CLIENT_APP indicators-client)

152+set(GREETER_APP unity8-greeter)

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

112154

113155include_directories(

114156 ${CMAKE_SOURCE_DIR}/include

115157 ${CMAKE_BINARY_DIR}/include

158+ ${APPLICATION_API_INCLUDE_DIRS}

116159)

117160

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+

118177# add subdirectories to build

119178add_subdirectory(include)

120−add_subdirectory(libs)

121179add_subdirectory(src)

122180add_subdirectory(tools)

123181add_subdirectory(qml)

124−add_subdirectory(tests)

182+

183+# Tests

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

185+if (NOT NO_TESTS)

186+ include(CTest)

187+ enable_testing()

188+ add_subdirectory(tests)

189+else()

190+ message(STATUS "Tests disabled")

191+endif()

192+

125193add_subdirectory(plugins)

126194

127195#

CODING+54−63

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

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

1616 $ cd ~/unity8/trunk

1717

18−install dependencies

18+install dependencies and build Unity 8

1919--------------------

20−If its your first time, install build dependencies

2120

2221$ cd ~/unity8/trunk

23−$ ./build.sh --setup

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

22+$ ./build.sh

2923

30−build Unity 8

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

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

25+ build it.

3226

33−$ cd ~/unity8/trunk

34−$ ./build.sh

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

28+ are technically "recommends", not strict dependencies

3529

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

3731directory.

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

4337run the Unity 8 shell

4438---------------------

4539$ cd ~/unity8/trunk

46−$ ./run.sh

40+$ cd builddir

4741

48−Options can be passed to test the lock screen

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

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

43+For example:

44+$ make tryShell

45+$ make tryLauncher

46+$ make tryLockscreen

5047

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

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

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

5349

5450Notes

5551-----

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

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

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

5957 later.

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

6866

6967Running Unity 8 on devices

7068==========================

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

8569

86−$ ./run_on_device.sh

87− this will:

88− - rsync the code to the device

89− - build on the device

90− - replace the running shell

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)

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

71+Go to

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

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

74+for more details on crossbuilder.

11475

76+unity8 will automatically restart on the phone once deployment

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

11578

11679Coding guidelines

11780=================

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

144107

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

146109

147−$ make qmluitests

110+$ make uitests

148111

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

150113

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

158121

159122$ make gdbtestComponentName

160123

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

125+

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

127+

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

162129a given component:

163130

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

186153

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

188155

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

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

190157

191158And then run a single test with

192159

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

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

194161

195162or run them all with

196163

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+22−37

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

11#!/bin/sh

22

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+

319SETUP=false

420CLEAN=false

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

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

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

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

1127 echo "OPTIONS:" >&2

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

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

1429 echo >&2

1530 exit 1

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

2237while [ $# -gt 0 ]

2338do

2439 case "$1" in

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

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

2741 -h|--help) usage;;

2842 --) shift;break;;

@@ -35,31 +49,6 @@ done

3549BUILD_TYPE="debug"

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

3751

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− qtdeclarative5-unity-notifications-plugin \

55− qml-module-ubuntu-connectivity \

56− ubuntu-mobile-icons \

57− ubuntu-system-settings \

58− unity-plugin-scopes \

59− xvfb \

60− || exit 5

61−}

62−

6352mk_build_deps() {

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

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

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

8574 BUILD_COMMAND="make -j$NUM_JOBS"

8675fi

8776

88−if $SETUP; then

89− install_dependencies

90−else

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

92− mkdir -p builddir

93− cd builddir

94− mk_build_deps

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

96− ${BUILD_COMMAND} || exit 7

97−fi

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

78+mkdir -p builddir

79+cd builddir

80+mk_build_deps

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

82+${BUILD_COMMAND} || exit 7

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−178

@@ -1,216 +1,489 @@

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

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

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

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

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

2+# create the corresponding executable target.

3+

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

515#

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

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

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

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

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

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

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

18+

19+function(import_executables)

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

1142#

12−# Two targets will be created:

13−# - testComponentName - Runs the test with qmltestrunner

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

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

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

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

1645#

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

18−# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)

19−# qmltest_DEFAULT_TARGETS

20−# qmltest_DEFAULT_IMPORT_PATHS

21−# qmltest_DEFAULT_PROPERTIES

22−

23−find_program(qmltestrunner_exe qmltestrunner)

46+# This function wraps add_manual_qml_test and add_qml_unittest,

47+# see below for available arguments.

2448

25−if(NOT qmltestrunner_exe)

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

27−endif()

49+function(add_qml_test PATH COMPONENT_NAME)

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

51+ mangle_arguments()

2852

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

53+ add_qml_unittest(${ARGV})

54+ add_manual_qml_test(${ARGV})

55+endfunction()

3056

31−set(test_env LC_ALL=C UNITY_TESTING=1)

3257

33−macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

34− set(options NO_ADD_TEST NO_TARGETS)

35− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

58+# add_qml_test_data(path component_name

59+# [...]

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

3680

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

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

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

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

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

84+ endif()

3985

40− set(qmlscene_TARGET try${COMPONENT_NAME})

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

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

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

4295

43− set(qmlscene_imports "")

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

45− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

46− list(APPEND qmlscene_imports "-I")

47− list(APPEND qmlscene_imports ${IMPORT_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)

96+ if (TEST_DESTINATION)

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

98+ else()

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

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

54101 endif()

55102

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

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

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

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

58126 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})

59142

60− set(qmlscene_command

61− env ${test_env} ${qmltest_ENVIRONMENT}

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

63− ${qmlscene_imports}

143+ add_manual_test(${COMPONENT_NAME} qmlscene

144+ ${ARGN}

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

64146 )

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

66147

67−endmacro(add_manual_qml_test)

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

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)

68177

69−macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)

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

71−endmacro(add_qml_benchmark)

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

179+ mangle_arguments()

72180

73−macro(add_qml_test SUBPATH COMPONENT_NAME)

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

75−endmacro(add_qml_test)

181+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

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

76183

77−macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)

78− set(options NO_ADD_TEST NO_TARGETS)

79− set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

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

80185

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

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

186+ set(qmltest_command

187+ $<TARGET_FILE:${TARGET}>

188+ ${QMLTEST_ARGS}

189+ ${args}

190+ )

83191

84− set(qmltest_TARGET test${COMPONENT_NAME})

85− set(qmltest_gdb_TARGET gdbtest${COMPONENT_NAME})

86− set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})

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

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

193+ COMMAND ${qmltest_command}

194+ ${depends}

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

196+ ${add_test}

197+ ${targets}

198+ )

88199

89− set(qmltestrunner_imports "")

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

91− foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

92− list(APPEND qmltestrunner_imports "-import")

93− list(APPEND qmltestrunner_imports ${IMPORT_PATH})

94− endforeach(IMPORT_PATH)

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

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)

200+ if(TARGET xvfb-run)

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

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

203+ ${depends}

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

205+ TARGETS ${xvfb_targets}

206+ )

100207 endif()

101208

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

103− if(cmake_generator_lower STREQUAL "unix makefiles")

104− set(function_ARGS $(FUNCTION))

105− else()

106− set(function_ARGS "")

209+ if(TARGET gdb)

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

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

212+ ${depends}

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

214+ )

107215 endif()

216+endfunction()

108217

109− if (${ITERATIONS} GREATER 0)

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

111− else()

112− set(ITERATIONS_STRING "")

218+

219+# add_manual_test(target component_name

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

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

113256 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})

114268

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

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

269+ add_custom_target(${TARGET_NAME})

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

117276 endif()

118277

119− set(qmltest_command

120− env ${test_env} ${qmltest_ENVIRONMENT}

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

122− ${qmltestrunner_imports}

123− ${ITERATIONS_STRING}

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

125− -o -,txt

126− ${function_ARGS}

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

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

280+

281+ install(FILES "${filename}"

282+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

283+ GROUP_EXECUTE GROUP_READ

284+ WORLD_EXECUTE WORLD_READ

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

127286 )

128− find_program(DPKG dpkg-architecture)

129− if(DPKG)

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

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

132− endif()

133− set(qmltest_xvfb_command

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

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

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

137− ${qmltestrunner_imports}

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

139− -o -,txt

140− ${function_ARGS}

287+endfunction()

288+

289+

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

291+

292+function(install_test_script TARGET_NAME)

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

294+

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

296+ # installed system.

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

298+ foreach(ONE_ENV ${TEST_ENVIRONMENT})

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

141323 )

142324

143− set(qmltest_gdb_command

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

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

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

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

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"

146366 )

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

147374

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

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

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

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

152−endmacro(add_qml_test_internal)

153−

154−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155− set(testCommand

156− ${ENVVAR}

157− LD_LIBRARY_PATH=${LD_PATH}

158− dbus-launch

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

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

161− -o -,txt)

162−

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

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

165−

166− find_program( HAVE_GCC gcc )

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

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

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

170− endif()

171− set(xvfbtestCommand

172− ${LD_PRELOAD_PATH}

173− ${ENVVAR}

174− LD_LIBRARY_PATH=${LD_PATH}

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

176− dbus-launch

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

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

179− -o -,txt)

180−

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

182− add_dependencies(qmluitests xvfbtest${CLASS_NAME})

183−endmacro(add_binary_qml_test)

184−

185−macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

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

187−

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

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

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

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

192− endif()

193−

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

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

196−

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

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

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

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

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

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

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

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

201379 endif()

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

203−

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

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

206− foreach(TARGET ${qmltest_TARGETS})

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

208− endforeach(TARGET)

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

210− foreach(TARGET ${qmltest_DEFAULT_TARGETS})

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

212− endforeach(TARGET)

380+ endforeach()

381+endfunction()

382+

383+# add_qmltest_target(target_name target

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

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

386+# # ADD_TEST, ENVIRONMENT, DEPENDS and TARGETS

387+# )

388+

389+function(add_qmltest_target TARGET_NAME 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})

213466 endif()

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

467+ endforeach()

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

469+endmacro()

470+

215471

216−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)

1313

1414 add_dependencies(autopilot autopilot-${TEST_NAME})

1515

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−

2416endfunction()

com.canonical.Unity8.gschema.xmldeleted−14

@@ -1,14 +0,0 @@

1−<schemalist>

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

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

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

5− </enum>

6−

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

8− <key enum="usage-mode-enum" name="usage-mode">

9− <default>"Staged"</default>

10− <summary>The usage mode.</summary>

11− <description>The usage mode chosen will affect the Window Management behaviour.</description>

12− </key>

13− </schema>

14−</schemalist>

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

11# generate desktop files

22configure_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)

45

56# install desktop files

67install(FILES

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

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

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

910 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1011 )

1112

12−# install url dispatcher files

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

13+install(FILES

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

11description "File system watcher for unity8"

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

33

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+

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

510start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)

611

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"

22author "Ricardo Mendoza <ricmm@ubuntu.com>"

33

44emits indicator-services-start

5+emits indicator-services-end

56

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

78stop on desktop-end

89

910kill timeout 120

1011

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+

1121respawn

1222expect stop

1323

24+# FIXME Create an autopilot test that makes sure start+stop and restart

25+# work fine at least 2 times

26+

1427pre-start script

1528 # Tell unity-mir to raise SIGSTOP after we start

1629 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

1730

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,

21− # 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

24− fi

31+ # Save original value of MIR_SOCKET so that we can restore it when stopped,

32+ # as we modify the variable for future jobs, including ourself.

33+ initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET

2534

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

2742 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'}"

3543 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'}"

3650

3751 # Remove the normal and trusted sockets if still there

3852 if [ -S "$MIR_SERVER_FILE" ]; then

@@ -45,13 +59,41 @@ pre-start script

4559

4660 initctl set-env --global MIR_SERVER_PROMPT_FILE=1

4761

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

4986end script

5087

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

5293

5394post-stop script

5495 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

55− initctl unset-env --global UNITY_MIR_SOCKET

5696 initctl unset-env --global MIR_SERVER_PROMPT_FILE

97+ initctl emit application-end

98+ initctl emit indicator-services-end

5799end 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+2695−19

@@ -1,3 +1,2674 @@

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+

12672unity8 (8.02+15.04.20150216.1-0ubuntu1) vivid; urgency=medium

22673

32674 [ Andrea Cimitan ]

@@ -1265,7 +3936,7 @@ unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium

12653936 * Re-architecture unity8 to use the QtMirCompositor library so that

12663937 the Qt scenegraph renderer is used as the Mir compositor, and

12673938 application surfaces are added to the QML scene as items.

1268−

3939+

12693940 [ Michael Zanetti ]

12703941 * Port phone right-edge spread code to use QtCompositor

12713942 * Add right-edge spread animation for tablet

@@ -1539,8 +4210,8 @@ unity8 (7.90+14.10.20140703.1-0ubuntu1) utopic; urgency=low

15394210

15404211unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium

15414212

1542− * debian/control:

1543− list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative

4213+ * debian/control:

4214+ list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative

15444215 choice, since provides are not versionned, should restore installability

15454216 on amd64 and i386

15464217

@@ -4642,7 +7313,7 @@ unity8 (7.81.2) saucy; urgency=low

46427313 [ Michał Sawicz ]

46437314 * Fix icons in ApplicationsFilterGrid.qml.

46447315 * Support flipped image in run_on_device.

4645−

7316+

46467317 [ Michael Zanetti ]

46477318 * Don't clear lockscreen when it's fading out.

46487319 * Reworked Launcher folding.

@@ -4727,7 +7398,7 @@ qml-phone-shell (1.79) raring; urgency=low

47277398

47287399 [ Michael Terry ]

47297400 * Make greeter look like the desktop one

4730−

7401+

47317402 [ Gerry Boland ]

47327403 * Fix a bug where a minimized app gets focus after closing another app

47337404 * Applied a workaround to reduce flickering when launching apps

@@ -4743,7 +7414,7 @@ qml-phone-shell (1.79) raring; urgency=low

47437414qml-phone-shell (1.78) raring; urgency=low

47447415

47457416 [ Sergio Schvezov ]

4746− * 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

47477418 the launcher (LP: #1178262).

47487419

47497420 [ Daniel d'Andrada ]

@@ -4785,7 +7456,7 @@ qml-phone-shell (1.77) raring; urgency=low

47857456 [ Mathieu Trudel-Lapierre ]

47867457 * debian/control:

47877458 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.

4788− - 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.

47897460 * debian/copyright: fix syntax.

47907461

47917462 [ Michał Sawicz ]

@@ -4795,7 +7466,7 @@ qml-phone-shell (1.77) raring; urgency=low

47957466 * Renamed Media player files to match with new application name.

47967467

47977468 [ Daniel d'Andrada ]

4798− * New: DirectionalDragArea component. An area that detects axis-aligned

7469+ * New: DirectionalDragArea component. An area that detects axis-aligned

47997470 single-finger drag gestures.

48007471 * Make it possible to send touch events from within QML test code.

48017472

@@ -5232,7 +7903,7 @@ qml-phone-shell (1.39) quantal; urgency=low

52327903

52337904qml-phone-shell (1.38) quantal; urgency=low

52347905

5235− * fix launching of notepad

7906+ * fix launching of notepad

52367907

52377908 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500

52387909

@@ -5245,14 +7916,14 @@ qml-phone-shell (1.37) quantal; urgency=low

52457916

52467917qml-phone-shell (1.36) quantal; urgency=low

52477918

5248− * launch real notepad app

7919+ * launch real notepad app

52497920 * fix launching of mock apps

52507921

52517922 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500

52527923

52537924qml-phone-shell (1.35) quantal; urgency=low

52547925

5255− * integrate ubuntu-browser instead of snowshoe

7926+ * integrate ubuntu-browser instead of snowshoe

52567927

52577928 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500

52587929

@@ -5336,7 +8007,7 @@ qml-phone-shell (1.22) quantal; urgency=low

53368007

53378008qml-phone-shell (1.21) quantal; urgency=low

53388009

5339− * New release with fullscreen launcher fixes

8010+ * New release with fullscreen launcher fixes

53408011

53418012 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000

53428013

@@ -5348,7 +8019,7 @@ qml-phone-shell (1.20) quantal; urgency=low

53488019

53498020qml-phone-shell (1.19) quantal; urgency=low

53508021

5351− * enable multi-threaded render for apps

8022+ * enable multi-threaded render for apps

53528023

53538024 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000

53548025

@@ -5356,7 +8027,7 @@ qml-phone-shell (1.18) quantal; urgency=low

53568027

53578028 [ Bill Filler ]

53588029 * update launcher to use wk2-render (chromeless webkit) for facebook

5359− and twitter

8030+ and twitter

53608031

53618032 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000

53628033

@@ -5368,7 +8039,7 @@ qml-phone-shell (1.17) quantal; urgency=low

53688039

53698040qml-phone-shell (1.16) quantal; urgency=low

53708041

5371− * fix to launch new gallery with correct args

8042+ * fix to launch new gallery with correct args

53728043

53738044 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500

53748045

@@ -5430,7 +8101,7 @@ qml-phone-shell (1.2) quantal; urgency=low

54308101

54318102qml-phone-shell (1.1) quantal; urgency=low

54328103

5433− * comment out console.log() to prevent crash

8104+ * comment out console.log() to prevent crash

54348105

54358106 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100

54368107

@@ -5458,19 +8129,19 @@ qml-phone-shell (0.7) quantal; urgency=low

54588129 * qml-phone-shell.conf: better setup of env vars and launch

54598130 via dbus-luanch to properly setup session bus

54608131 * shellapplication.cpp: don't setup custom env before launching

5461− processes

8132+ processes

54628133

54638134 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200

54648135

54658136qml-phone-shell (0.6) quantal; urgency=low

54668137

5467− * added additional Android env vars to upstart script

8138+ * added additional Android env vars to upstart script

54688139

54698140 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400

54708141

54718142qml-phone-shell (0.5) quantal; urgency=low

54728143

5473− * added support to launch telephony-app

8144+ * added support to launch telephony-app

54748145

54758146 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400

54768147

@@ -5497,3 +8168,8 @@ qml-phone-shell (0.1) quantal; urgency=low

54978168 * Initial release

54988169

54998170 -- 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−157

@@ -2,204 +2,271 @@ Source: unity8

22Section: x11

33Priority: optional

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

5−Build-Depends: cmake,

6− dbus-test-runner,

7− debhelper (>= 9),

8− doxyqml,

9− graphviz,

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

11−# We rely on C++11 features, and to prevent from ABI breaks

12−# in libstdc++ causing us issues, we explicitly select a G++

13−# version. To allow cross-compiling to work, we also must

14−# append :native to g++-4.9 so we don't try to run armhf g++

15−# on an x86 CPU for eaxmple, when cross-compiling.

16− g++-4.9:native,

17− libconnectivity-qt1-dev,

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

19− libgl1-mesa-dri,

20− libgles2-mesa-dev[armhf],

21− libglib2.0-dev,

22− libgsettings-qt-dev,

23− libhardware-dev,

24− libpam0g-dev,

25− libpay2-dev,

26− libpulse-dev,

27− libqmenumodel-dev (>= 0.2.9),

28− libqt5xmlpatterns5-dev,

29− libsystemsettings-dev,

30− libunity-api-dev (>= 7.96),

31− libusermetricsoutput1-dev,

32− libxcb1-dev,

33− pkg-config,

34− python-setuptools,

35− python3-all:any,

36− python3-setuptools,

37− python:any (>= 2.7),

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

39− qml-module-qtquick-layouts,

40− qml-module-qtquick-xmllistmodel,

41− qml-module-qtquick2,

42− qml-module-qtsysteminfo,

43− qml-module-qttest,

44− qt5-default,

45− qtbase5-dev (>= 5.2.1),

46− qtbase5-dev-tools,

47− qtbase5-private-dev (>= 5.2.1),

48− qtdeclarative5-dev (>= 5.2.1),

49− qtdeclarative5-dev-tools,

50− qtdeclarative5-private-dev (>= 5.2.1),

51− qtdeclarative5-qtmultimedia-plugin,

52− qtdeclarative5-ubuntu-settings-components (>= 0.5),

53− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

54− qtdeclarative5-ubuntu-web-plugin,

55− ttf-ubuntu-font-family,

5+Build-Depends:

6+ android-headers,

7+ cmake,

8+ cmake-extras,

9+ dbus-test-runner,

10+ debhelper (>= 9),

11+ dh-apparmor,

12+ doxyqml,

13+ g++:native,

14+ gdb,

15+ graphviz,

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

17+ libandroid-properties-dev,

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

19+ libevdev-dev,

20+ libgeonames-dev (>= 0.2),

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

22+ libgl1-mesa-dri,

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

24+ libglib2.0-dev,

25+ libgnome-desktop-3-dev,

26+ libgsettings-qt-dev,

27+ libhardware-dev,

28+ liblightdm-qt5-3-dev,

29+ libpam0g-dev,

30+ libpulse-dev,

31+ libqmenumodel-dev (>= 0.2.12),

32+ libqt5sql5-sqlite,

33+ libqt5svg5-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,

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

45+ libusermetricsoutput1-dev,

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

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

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

49+ pkg-config,

50+ python3-all:any,

51+ python3-setuptools,

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

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

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

55+ qml-module-qtqml-statemachine,

56+ qml-module-qtquick-layouts,

57+ qml-module-qtquick-xmllistmodel,

58+ qml-module-qtquick2,

59+ qml-module-qtsysteminfo,

60+ qml-module-qttest,

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

62+ qml-module-ubuntu-layouts,

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

64+ qml-module-ubuntu-test,

65+ qtbase5-dev (>= 5.6),

66+ qtbase5-dev-tools,

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

68+ qtdbustest-runner,

69+ qtdeclarative5-dev (>= 5.6),

70+ qtdeclarative5-dev-tools,

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

72+ qtdeclarative5-ubuntu-content1,

73+ ttf-ubuntu-font-family,

74+ ubports-wallpapers,

75+ xvfb,

5676Standards-Version: 3.9.4

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

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

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

60−# and sync up the code again.

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

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

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

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

79+XS-Testsuite: autopkgtest

6380X-Ubuntu-Use-Langpack: yes

6481

6582Package: indicators-client

66−Architecture: amd64 armhf i386

67−Depends: qmenumodel-qml (>= 0.2.9),

68− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

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

70− ${misc:Depends},

71− ${shlibs:Depends},

83+Architecture: any

84+Depends:

85+ qmenumodel-qml (>= 0.2.11),

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

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

88+ ${misc:Depends},

89+ ${shlibs:Depends},

7290Description: Indicators client test application

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

7492

75−Package: unity-scope-tool

93+Package: unity8-greeter

7694Architecture: any

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

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

79− ${misc:Depends},

80− ${shlibs:Depends},

81−Description: Development tool for Unity scopes

82− This package contains the development tool for new generation Unity scopes, based

83− on Unity8.

95+Depends:

96+ unity-system-compositor,

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

98+ ${misc:Depends},

99+ ${shlibs:Depends},

100+Recommends:

101+ lightdm,

102+Provides:

103+ lightdm-greeter,

104+Description: The Unity8 Greeter

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

84106

85107Package: unity8

86108Architecture: any

87−Provides: indicator-renderer,

88−Depends: gsettings-desktop-schemas,

89− libcap2-bin,

90− libglib2.0-bin,

91− qmenumodel-qml (>= 0.2.9),

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

93− qml-module-qtquick-xmllistmodel,

94− qml-module-qtsysteminfo,

95− qtdeclarative5-gsettings1.0,

96− qtdeclarative5-qtmir-plugin (>= 0.4.4),

97− qtdeclarative5-ubuntu-telephony0.1,

98− qtdeclarative5-ubuntu-web-plugin,

99− ubuntu-system-settings,

100− unity-launcher-impl-4,

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

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

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

104− ${misc:Depends},

105− ${shlibs:Depends},

106−Recommends: unity-scope-click,

107− unity-scope-mediascanner2,

108− unity-scope-scopes,

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

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

111− unity8-greeter (<< 7.89),

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

113− unity8-greeter (<< 7.89),

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

109+Provides:

110+ indicator-renderer,

111+Depends:

112+ dmz-cursor-theme,

113+ gsettings-desktop-schemas,

114+ libcap2-bin,

115+ libglib2.0-bin,

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,

121+ qml-module-qtquick-xmllistmodel,

122+ qml-module-qtsysteminfo,

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

124+ qtdeclarative5-ubuntu-telephony0.1,

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

126+ unity-launcher-impl-13,

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

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

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

130+ ${misc:Depends},

131+ ${shlibs:Depends},

132+Recommends:

133+ indicator-keyboard,

134+ indicator-session,

135+ unity-greeter-session-broadcast,

136+Breaks:

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

138+ ubuntu-keyboard (<< 0.100),

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

140+ unity-scope-tool,

141+ unity8-greeter (<< 7.89),

142+Replaces:

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

144+ unity-scope-tool,

145+ unity8-greeter (<< 7.89),

146+Conflicts:

147+ ubuntu-system-settings-wizard,

115148Description: Unity 8 shell

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

117150

118151Package: unity8-common

119152Architecture: all

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

121− qtdeclarative5-ubuntu-settings-components (>= 0.4),

122− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

123− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

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

125− ubuntu-thumbnailer-impl-0,

126− unity-application-impl-4,

127− unity-notifications-impl-3,

128− unity-plugin-scopes | unity-scopes-impl,

129− unity-scopes-impl-6,

130− unity8-fake-env | unity-application-impl,

131− ${misc:Depends},

132−Breaks: unity8 (<< 7.86),

133−Replaces: unity8 (<< 7.86),

153+Depends:

154+ qml-module-qtquick-layouts,

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

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

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

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

159+ qttranslations5-l10n,

160+ ubuntu-thumbnailer-impl-0,

161+ unity-application-impl-27,

162+ unity-notifications-impl-3,

163+ unity8-schemas,

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

165+ ${misc:Depends},

166+Breaks:

167+ unity8 (<< 7.86),

168+Replaces:

169+ unity8 (<< 7.86),

134170Description: Unity 8 shell (common files)

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

136172 .

137− This package contains the QML, graphics and locale files shared between

138− unity8 and unity-scope-tool.

173+ This package contains the QML, graphics and locale files for unity8.

139174

140175Package: unity8-autopilot

141176Architecture: all

142−Depends: gir1.2-glib-2.0,

143− gir1.2-notify-0.7,

144− libautopilot-qt (>= 1.4),

145− libqt5test5,

146− libqt5widgets5,

147− python-autopilot,

148− python-evdev,

149− python-fixtures,

150− python-gi,

151− python-mock,

152− python3-autopilot,

153− python3-evdev,

154− python3-fixtures,

155− python3-gi,

156− ubuntu-ui-toolkit-autopilot,

157− unity-scope-click,

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

159− unity8-fake-env (= ${source:Version}),

160− url-dispatcher-tools,

161− ${misc:Depends},

162− ${python3:Depends},

163− ${python:Depends},

164− ${shlibs:Depends},

177+Depends:

178+ autopilot-qt5 (>= 1.4),

179+ gir1.2-glib-2.0,

180+ gir1.2-notify-0.7,

181+ libqt5test5,

182+ libqt5widgets5,

183+ ofono-phonesim,

184+ python3-autopilot,

185+ python3-evdev,

186+ python3-fixtures,

187+ python3-gi,

188+ qttestability-autopilot (>= 1.4),

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

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

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

192+ url-dispatcher-tools,

193+ xvfb,

194+ ${misc:Depends},

195+ ${python3:Depends},

165196Description: Test package for Unity 8 shell

166197 Autopilot tests for the unity8 package

167198

168−Package: unity8-fake-env

199+Package: unity8-tests

169200Architecture: any

170201Multi-Arch: same

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

172−Depends: ${misc:Depends},

173− ${shlibs:Depends},

174−Provides: unity-application-impl,

175− unity-application-impl-4,

176−Description: Fake environment for running Unity 8 shell

202+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,

212+ ${misc:Depends},

213+ ${shlibs:Depends},

214+Provides:

215+ unity-application-impl,

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,

223+Description: Scripts and mocks for running Unity 8 shell tests

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

178− (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.

179227

180228Package: unity8-private

181229Architecture: any

182230Multi-Arch: same

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

184−Depends: accountsservice-ubuntu-schemas (>= 0.0.3),

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

186− libhardware2,

187− unity-schemas (>= 7.3.1+14.10.20140915),

188− pay-service,

189− ${misc:Depends},

190− ${shlibs:Depends},

191−Provides: unity-launcher-impl,

192− unity-launcher-impl-4,

231+Pre-Depends:

232+ ${misc:Pre-Depends},

233+Depends:

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

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

236+ libhardware2,

237+ qml-module-qtmultimedia,

238+ qtdeclarative5-gsettings1.0,

239+ unity8-schemas,

240+ ${misc:Depends},

241+ ${shlibs:Depends},

242+Provides:

243+ unity-launcher-impl,

244+ unity-launcher-impl-13,

193245Description: Unity 8 private libs

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

195247 .

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

197249 only used by the shell.

198250

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+

199265Package: unity8-doc

200266Section: doc

201267Architecture: all

202268Multi-Arch: foreign

203−Depends: ${misc:Depends},

269+Depends:

270+ ${misc:Depends},

204271Description: Documentation for Unity8

205272 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

6060 packaging of this file. Please review the following information to

6161 ensure the GNU General Public License version 3.0 requirements will be

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

11/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

77#export DH_VERBOSE=1

88export DPKG_GENSYMBOLS_CHECK_LEVEL=4

99export NO_PNG_PKG_MANGLE=1

10+export QT_SELECT=qt5

1011

11−# Explicitly selecting a G{CC,++}-version here to avoid accidental

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

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

1513

16−%:

17− dh $@ --parallel --fail-missing --with python2,python3

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

15+testskip_architectures := arm64 powerpc ppc64el s390x

1816

19−override_dh_auto_clean:

20− dh_auto_clean

21− rm -rf builddir

17+%:

18+ dh $@ --parallel --fail-missing --with python3

2219

2320override_dh_auto_configure:

2421 # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

@@ -27,12 +24,24 @@ override_dh_auto_configure:

2724

2825override_dh_auto_build:

2926 # 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

3140

3241override_dh_install:

3342 # install autopilot tests

3443 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 \

3645 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

3746 done; \

3847 cd $(CURDIR)

@@ -40,8 +49,9 @@ override_dh_install:

4049

4150# use private lib directories

4251override_dh_makeshlibs:

43− dh_makeshlibs -Nunity8-private -Nunity8-fake-env

52+ dh_makeshlibs -Nunity8-private -Nunity8-tests

4453

45−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist

4654override_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−2

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

11usr/share/locale

22usr/share/unity8/Components

3−usr/share/unity8/Dash

43usr/share/unity8/Notifications

54usr/share/unity8/graphics

6−com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/

75var/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/

12usr/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+5−3

@@ -1,16 +1,18 @@

11usr/lib/*/libunity8-private.*

22usr/lib/*/unity8/qml/AccountsService

3−usr/lib/*/unity8/qml/Dash

3+usr/lib/*/unity8/qml/Cursor

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

45usr/lib/*/unity8/qml/Greeter

56usr/lib/*/unity8/qml/LightDM

67usr/lib/*/unity8/qml/Lights

78usr/lib/*/unity8/qml/Powerd

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

810usr/lib/*/unity8/qml/SessionBroadcast

9−usr/lib/*/unity8/qml/ScreenGrabber

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

1012usr/lib/*/unity8/qml/Ubuntu

1113usr/lib/*/unity8/qml/Unity

1214usr/lib/*/unity8/qml/Utils

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

1316usr/lib/*/unity8/qml/Wizard

14−usr/lib/*/unity8/libUbuntuGestures*

1517usr/share/accountsservice/interfaces

1618usr/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+10−6

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

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

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

1+data/devices.conf etc/ubuntu/

2+data/test.sensors etc/ubuntusensors/

33data/unity8-filewatcher.conf usr/share/upstart/sessions/

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

45usr/bin/unity8

5−usr/bin/unity8-dash

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

810usr/share/unity8/Greeter

911usr/share/unity8/Launcher

12+usr/share/unity8/OrientedShell.qml

1013usr/share/unity8/Panel

14+usr/share/unity8/Rotation

1115usr/share/unity8/Shell.qml

12−usr/share/unity8/Stages

16+usr/share/unity8/Stage

1317usr/share/unity8/Tutorial

1418usr/share/unity8/Wizard

15−usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher

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−37

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

11/*

2− * Copyright (C) 2012 Canonical, Ltd.

3− *

4− * Authors:

5− * Ugo Riboni <ugo.riboni@canonical.com>

2+ * Copyright (C) 2012-2016 Canonical, Ltd.

63 *

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

85 * it under the terms of the GNU General Public License as published by

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

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

1815 */

1916

20−#ifndef PATHS_H

21−#define PATHS_H

17+#pragma once

2218

2319// Qt

2420#include <QtCore/QCoreApplication>

@@ -27,32 +23,82 @@

2723#include <QtQml/QQmlEngine>

2824#include <QStandardPaths>

2925

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+

3043inline bool isRunningInstalled() {

31− static bool installed = (QCoreApplication::applicationDirPath() ==

32− QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());

33− return installed;

44+ // Tests don't use the normal binary, so we want to check binary *and*

45+ // the environment. Installed tests have UNITY_TESTING_DATADIR set.

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

3458}

3559

3660inline QString translationDirectory() {

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

3974 } 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";

4187 }

4288}

4389

4490inline QString qmlDirectory() {

4591 if (isRunningInstalled()) {

46− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");

92+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");

4793 } else {

48− return QString("@CMAKE_SOURCE_DIR@/qml/");

94+ return sourceDirectory() + QStringLiteral("/qml");

4995 }

5096}

5197

5298inline QStringList overrideImportPaths() {

5399 QStringList paths;

54100 if (!isRunningInstalled()) {

55− paths << QString("@CMAKE_BINARY_DIR@/plugins");

101+ paths << buildDirectory() + QStringLiteral("/plugins");

56102 }

57103 return paths;

58104}

@@ -60,9 +106,9 @@ inline QStringList overrideImportPaths() {

60106inline QStringList nonMirImportPaths() {

61107 QStringList paths;

62108 if (isRunningInstalled()) {

63− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");

109+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");

64110 } else {

65− paths << QString("@CMAKE_BINARY_DIR@/nonmirplugins");

111+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");

66112 }

67113 return paths;

68114}

@@ -70,44 +116,35 @@ inline QStringList nonMirImportPaths() {

70116inline QStringList fallbackImportPaths() {

71117 QStringList paths;

72118 if (isRunningInstalled()) {

73− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");

74− paths << QString("@USS_PRIVATE_PLUGINDIR@");

75− paths << QString("@SHELL_PLUGINDIR@");

76− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

119+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");

120+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");

121+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");

122+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

77123 } else {

78− paths << QString("@USS_PRIVATE_PLUGINDIR@");

79− paths << QString("@SHELL_PLUGINDIR@");

80− paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");

124+ paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");

125+ paths << QStringLiteral("@SHELL_PLUGINDIR@");

126+ paths << buildDirectory() + QStringLiteral("/tests/mocks");

81127 }

82128 return paths;

83129}

84130

85131inline QString mockPluginsDir() {

86132 if (isRunningInstalled()) {

87− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

133+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

88134 } else {

89− return QString("@CMAKE_BINARY_DIR@/tests/mocks");

135+ return buildDirectory() + QStringLiteral("/tests/mocks");

90136 }

91137}

92138

93139inline QStringList shellDataDirs() {

94140 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

95− if (!isRunningInstalled()) {

96− if (getenv("UNITY_TEST_ENV")==nullptr) {

97− dirs.prepend("@CMAKE_BINARY_DIR@/share");

98− }

99− }

100− else {

141+ if (isRunningInstalled()) {

101142 // append so by default we use xdg files.

102143 dirs.append(qmlDirectory());

103144 }

104145 return dirs;

105146}

106147

107−inline QString sourceDirectory() {

108− return QString("@CMAKE_SOURCE_DIR@/");

109−}

110−

111148inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

112149{

113150 QStringList importPathList = engine->importPathList();

@@ -136,5 +173,3 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

136173 }

137174 engine->setImportPathList(importPathList);

138175}

139−

140−#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("MouseMove ");

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/DebugHelpers.hdeleted−31

@@ -1,31 +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_DEBUG_HELPER_H

18−#define UBUNTUGESTURES_DEBUG_HELPER_H

19−

20−#include <QString>

21−

22−#include "UbuntuGesturesGlobal.h"

23−

24−class QMouseEvent;

25−class QTouchEvent;

26−

27−UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);

28−UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);

29−UBUNTUGESTURES_EXPORT QString mouseEventToString(const QMouseEvent *ev);

30−

31−#endif // UBUNTUGESTURES_DEBUG_HELPER_H

libs/UbuntuGestures/Pool.hdeleted−132

@@ -1,132 +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− ItemType &getEmptySlot() {

78− Q_ASSERT(m_lastUsedIndex < m_slots.size());

79−

80− // Look for an in-between vacancy first

81− for (int i = 0; i < m_lastUsedIndex; ++i) {

82− ItemType &item = m_slots[i];

83− if (!item.isValid()) {

84− return item;

85− }

86− }

87−

88− ++m_lastUsedIndex;

89− if (m_lastUsedIndex >= m_slots.size()) {

90− m_slots.resize(m_lastUsedIndex + 1);

91− }

92−

93− return m_slots[m_lastUsedIndex];

94− }

95−

96− void freeSlot(Iterator &iterator) {

97− m_slots[iterator.index].reset();

98− if (iterator.index == m_lastUsedIndex) {

99− do {

100− --m_lastUsedIndex;

101− } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());

102− }

103− }

104−

105− // Iterates through all valid items (i.e. the occupied slots)

106− // calling the given function, with the option of ending the loop early.

107− //

108− // bool Func(Iterator& item)

109− //

110− // Returning true means it wants to continue the "for" loop, false

111− // terminates the loop.

112− template<typename Func> void forEach(Func func) {

113− Iterator it;

114− for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {

115− it.item = &m_slots[it.index];

116− if (!it.item->isValid())

117− continue;

118−

119− if (!func(it))

120− break;

121− }

122− }

123−

124− bool isEmpty() const { return m_lastUsedIndex == -1; }

125−

126−

127−private:

128− QVector<ItemType> m_slots;

129− int m_lastUsedIndex;

130−};

131−

132−#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+309−134

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,35 +12,124 @@

1212 *

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#include "AccountsService.h"

2018#include "AccountsServiceDBusAdaptor.h"

2119

20+#include <QDBusInterface>

2221#include <QFile>

2322#include <QStringList>

24−

25−AccountsService::AccountsService(QObject* parent)

26− : QObject(parent),

27− m_service(new AccountsServiceDBusAdaptor(this)),

28− m_user(""),

29− m_demoEdges(false),

30− m_enableLauncherWhileLocked(false),

31− m_enableIndicatorsWhileLocked(false),

32− m_statsWelcomeScreen(false),

33− m_passwordDisplayHint(Keyboard),

34− m_failedLogins(0),

35− m_hereEnabled(false),

36− m_hereLicensePath() // null means not set yet

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+

66+

67+QVariant primaryButtonConverter(const QVariant &value)

3768{

38− connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

39− this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

40− connect(m_service, SIGNAL(maybeChanged(const QString &)),

41− this, SLOT(maybeChanged(const QString &)));

69+ QString stringValue = value.toString();

70+ if (stringValue == QLatin1String("left")) {

71+ return QVariant::fromValue(0);

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+}

4278

43− setUser(qgetenv("USER"));

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

44133}

45134

46135QString AccountsService::user() const

@@ -53,216 +142,302 @@ void AccountsService::setUser(const QString &user)

53142 if (user.isEmpty() || m_user == user)

54143 return;

55144

145+ bool wasEmpty = m_user.isEmpty();

146+

56147 m_user = user;

57148 Q_EMIT userChanged();

58149

59− updateDemoEdges();

60− updateEnableLauncherWhileLocked();

61− updateEnableIndicatorsWhileLocked();

62− updateBackgroundFile();

63− updateStatsWelcomeScreen();

64− updatePasswordDisplayHint();

65− updateFailedLogins();

66− updateHereEnabled();

67− updateHereLicensePath();

150+ // Do the first update synchronously, as a cheap way to block rendering

151+ // until we have the right values on bootup.

152+ refresh(!wasEmpty);

68153}

69154

70155bool AccountsService::demoEdges() const

71156{

72− return m_demoEdges;

157+ auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);

158+ return value.toBool();

73159}

74160

75161void AccountsService::setDemoEdges(bool demoEdges)

76162{

77− m_demoEdges = demoEdges;

78− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

163+ setProperty(IFACE_UNITY, PROP_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();

79184}

80185

81186bool AccountsService::enableLauncherWhileLocked() const

82187{

83− return m_enableLauncherWhileLocked;

188+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);

189+ return value.toBool();

84190}

85191

86192bool AccountsService::enableIndicatorsWhileLocked() const

87193{

88− return m_enableIndicatorsWhileLocked;

194+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED);

195+ return value.toBool();

89196}

90197

91198QString AccountsService::backgroundFile() const

92199{

93− return m_backgroundFile;

200+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE);

201+ return value.toString();

94202}

95203

96204bool AccountsService::statsWelcomeScreen() const

97205{

98− return m_statsWelcomeScreen;

206+ auto value = getProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN);

207+ return value.toBool();

99208}

100209

101210AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

102211{

103− return m_passwordDisplayHint;

212+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT);

213+ return (PasswordDisplayHint)value.toInt();

104214}

105215

106−bool AccountsService::hereEnabled() const

216+QString AccountsService::realName() const

107217{

108− return m_hereEnabled;

218+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);

219+ return value.toString();

109220}

110221

111−void AccountsService::setHereEnabled(bool enabled)

222+void AccountsService::setRealName(const QString &realName)

112223{

113− m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);

224+ setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);

114225}

115226

116−QString AccountsService::hereLicensePath() const

227+QString AccountsService::email() const

117228{

118− return m_hereLicensePath;

229+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);

230+ return value.toString();

119231}

120232

121−bool AccountsService::hereLicensePathValid() const

233+void AccountsService::setEmail(const QString &email)

122234{

123− return !m_hereLicensePath.isNull();

235+ setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);

124236}

125237

126−void AccountsService::updateDemoEdges()

238+QStringList AccountsService::keymaps() const

127239{

128− auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

129− if (m_demoEdges != demoEdges) {

130− m_demoEdges = demoEdges;

131− Q_EMIT demoEdgesChanged();

240+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);

241+ QDBusArgument arg = value.value<QDBusArgument>();

242+ StringMapList maps = qdbus_cast<StringMapList>(arg);

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;

132253 }

254+

255+ return {QStringLiteral("us")};

133256}

134257

135−void AccountsService::updateEnableLauncherWhileLocked()

258+void AccountsService::setKeymaps(const QStringList &keymaps)

136259{

137− auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();

138− if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {

139− m_enableLauncherWhileLocked = enableLauncherWhileLocked;

140− Q_EMIT enableLauncherWhileLockedChanged();

260+ if (keymaps.isEmpty()) {

261+ qWarning() << "Setting empty keymaps is not supported";

262+ return;

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

141270 }

271+

272+ setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));

273+ Q_EMIT keymapsChanged();

142274}

143275

144−void AccountsService::updateEnableIndicatorsWhileLocked()

276+uint AccountsService::failedFingerprintLogins() const

145277{

146− auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();

147− if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {

148− m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;

149− Q_EMIT enableIndicatorsWhileLockedChanged();

150− }

278+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();

151279}

152280

153−void AccountsService::updateBackgroundFile()

281+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)

154282{

155− auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();

156− if (m_backgroundFile != backgroundFile) {

157− m_backgroundFile = backgroundFile;

158− Q_EMIT backgroundFileChanged();

159− }

283+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);

160284}

161285

162−void AccountsService::updateStatsWelcomeScreen()

286+uint AccountsService::failedLogins() const

163287{

164− bool statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();

165− if (m_statsWelcomeScreen != statsWelcomeScreen) {

166− m_statsWelcomeScreen = statsWelcomeScreen;

167− Q_EMIT statsWelcomeScreenChanged();

168− }

288+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

169289}

170290

171−void AccountsService::updatePasswordDisplayHint()

291+void AccountsService::setFailedLogins(uint failedLogins)

172292{

173− PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "PasswordDisplayHint").toInt();

174− if (m_passwordDisplayHint != passwordDisplayHint) {

175− m_passwordDisplayHint = passwordDisplayHint;

176− Q_EMIT passwordDisplayHintChanged();

177− }

293+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, failedLogins);

178294}

179295

180−void AccountsService::updateFailedLogins()

296+// ====================================================

297+// Everything below this line is generic helper methods

298+// ====================================================

299+

300+void AccountsService::emitChangedForProperty(const QString &interface, const QString &property)

181301{

182− uint failedLogins = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins").toUInt();

183− if (m_failedLogins != failedLogins) {

184− m_failedLogins = failedLogins;

185− Q_EMIT failedLoginsChanged();

302+ QString signalName = m_properties[interface][property].signal;

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

186317 }

187318}

188319

189−void AccountsService::updateHereEnabled()

320+void AccountsService::updateCache(const QString &interface, const QString &property, const QVariant &value)

190321{

191− bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();

192− if (m_hereEnabled != hereEnabled) {

193− m_hereEnabled = hereEnabled;

194− Q_EMIT hereEnabledChanged();

322+ PropertyInfo &info = m_properties[interface][property];

323+

324+ if (info.proxyInterface) {

325+ QVariant finalValue;

326+ if (info.proxyConverter) {

327+ finalValue = info.proxyConverter(value);

328+ } else {

329+ finalValue = value;

330+ }

331+ info.proxyInterface->asyncCall(info.proxyMethod, finalValue);

332+ return; // don't bother saving a copy

333+ }

334+

335+ if (info.value != value) {

336+ info.value = value;

337+ emitChangedForProperty(interface, property);

195338 }

196339}

197340

198−void AccountsService::updateHereLicensePath()

341+void AccountsService::updateProperty(const QString &interface, const QString &property)

199342{

200− QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();

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;

356+ }

201357

202− if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))

203− hereLicensePath = "";

358+ updateCache(interface, property, reply.value());

359+ });

360+}

204361

205− if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {

206− m_hereLicensePath = hereLicensePath;

207− Q_EMIT hereLicensePathChanged();

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;

376+ }

377+

378+ auto valueHash = reply.value();

379+ auto i = valueHash.constBegin();

380+ while (i != valueHash.constEnd()) {

381+ updateCache(interface, i.key(), i.value());

382+ ++i;

383+ }

384+ });

385+ if (!async) {

386+ watcher->waitForFinished();

208387 }

209388}

210389

211−uint AccountsService::failedLogins() const

390+void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter)

212391{

213− return m_failedLogins;

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;

214397}

215398

216−void AccountsService::setFailedLogins(uint failedLogins)

399+void AccountsService::registerProperty(const QString &interface, const QString &property, const QString &signal)

217400{

218− m_failedLogins = failedLogins;

219− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);

401+ m_properties[interface][property] = PropertyInfo();

402+ m_properties[interface][property].signal = signal;

220403}

221404

222−void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

405+void AccountsService::onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

223406{

224407 if (m_user != user) {

225408 return;

226409 }

227410

228− if (interface == "com.canonical.unity.AccountsService") {

229− if (changed.contains("demo-edges")) {

230− updateDemoEdges();

231− }

232− } else if (interface == "com.canonical.unity.AccountsService.Private") {

233− if (changed.contains("FailedLogins")) {

234− updateFailedLogins();

235− }

236− } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {

237− if (changed.contains("StatsWelcomeScreen")) {

238− updateStatsWelcomeScreen();

239− }

240− } else if (interface == "com.ubuntu.AccountsService.SecurityPrivacy") {

241− if (changed.contains("PasswordDisplayHint")) {

242− updatePasswordDisplayHint();

243− }

244− if (changed.contains("EnableLauncherWhileLocked")) {

245− updateEnableLauncherWhileLocked();

246− }

247− if (changed.contains("EnableIndicatorsWhileLocked")) {

248− updateEnableIndicatorsWhileLocked();

249− }

250− } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {

251− if (changed.contains("LicenseAccepted")) {

252− updateHereEnabled();

253− }

254− if (changed.contains("LicenseBasePath")) {

255− updateHereLicensePath();

411+ auto propHash = m_properties.value(interface);

412+ auto i = propHash.constBegin();

413+ while (i != propHash.constEnd()) {

414+ if (changed.contains(i.key())) {

415+ updateProperty(interface, i.key());

256416 }

417+ ++i;

257418 }

258419}

259420

260−void AccountsService::maybeChanged(const QString &user)

421+void AccountsService::onMaybeChanged(const QString &user)

261422{

262423 if (m_user != user) {

263424 return;

264425 }

265426

266− // Standard properties might have changed

267− updateBackgroundFile();

427+ // Any of the standard properties might have changed!

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+ }

268443}

plugins/AccountsService/AccountsService.h+64−41

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,22 +12,23 @@

1212 *

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#ifndef UNITY_ACCOUNTSSERVICE_H

2018#define UNITY_ACCOUNTSSERVICE_H

2119

20+#include <QHash>

2221#include <QObject>

2322#include <QString>

23+#include <QStringList>

24+#include <QVariant>

2425

2526class AccountsServiceDBusAdaptor;

27+class QDBusInterface;

2628

2729class AccountsService: public QObject

2830{

2931 Q_OBJECT

30− Q_ENUMS(PasswordDisplayHint)

3132 Q_PROPERTY (QString user

3233 READ user

3334 WRITE setUser

@@ -36,6 +37,12 @@ class AccountsService: public QObject

3637 READ demoEdges

3738 WRITE setDemoEdges

3839 NOTIFY demoEdgesChanged)

40+ Q_PROPERTY (QStringList demoEdgesCompleted

41+ READ demoEdgesCompleted

42+ NOTIFY demoEdgesCompletedChanged)

43+ Q_PROPERTY (bool enableFingerprintIdentification

44+ READ enableFingerprintIdentification

45+ NOTIFY enableFingerprintIdentificationChanged)

3946 Q_PROPERTY (bool enableLauncherWhileLocked

4047 READ enableLauncherWhileLocked

4148 NOTIFY enableLauncherWhileLockedChanged)

@@ -55,29 +62,31 @@ class AccountsService: public QObject

5562 READ failedLogins

5663 WRITE setFailedLogins

5764 NOTIFY failedLoginsChanged)

58− Q_PROPERTY(bool hereEnabled

59− READ hereEnabled

60− WRITE setHereEnabled

61− NOTIFY hereEnabledChanged)

62− Q_PROPERTY(QString hereLicensePath

63− READ hereLicensePath

64− NOTIFY hereLicensePathChanged)

65− Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that

66− READ hereLicensePathValid

67− NOTIFY hereLicensePathChanged)

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)

6872

6973public:

7074 enum PasswordDisplayHint {

7175 Keyboard,

7276 Numeric,

7377 };

78+ Q_ENUM(PasswordDisplayHint)

7479

75− explicit AccountsService(QObject *parent = 0);

80+ explicit AccountsService(QObject *parent = 0, const QString & user = QString());

81+ ~AccountsService() = default;

7682

7783 QString user() const;

7884 void setUser(const QString &user);

7985 bool demoEdges() const;

8086 void setDemoEdges(bool demoEdges);

87+ QStringList demoEdgesCompleted() const;

88+ Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);

89+ bool enableFingerprintIdentification() const;

8190 bool enableLauncherWhileLocked() const;

8291 bool enableIndicatorsWhileLocked() const;

8392 QString backgroundFile() const;

@@ -85,49 +94,63 @@ public:

8594 PasswordDisplayHint passwordDisplayHint() const;

8695 uint failedLogins() const;

8796 void setFailedLogins(uint failedLogins);

88− bool hereEnabled() const;

89− void setHereEnabled(bool enabled);

90− QString hereLicensePath() const;

91− bool hereLicensePathValid() const;

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

92105

93106Q_SIGNALS:

94107 void userChanged();

95108 void demoEdgesChanged();

109+ void demoEdgesCompletedChanged();

110+ void enableFingerprintIdentificationChanged();

96111 void enableLauncherWhileLockedChanged();

97112 void enableIndicatorsWhileLockedChanged();

98113 void backgroundFileChanged();

99114 void statsWelcomeScreenChanged();

100115 void passwordDisplayHintChanged();

101116 void failedLoginsChanged();

102− void hereEnabledChanged();

103− void hereLicensePathChanged();

117+ void failedFingerprintLoginsChanged();

118+ void realNameChanged();

119+ void emailChanged();

120+ void keymapsChanged();

104121

105122private Q_SLOTS:

106− void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

107− void maybeChanged(const QString &user);

123+ void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

124+ void onMaybeChanged(const QString &user);

108125

109126private:

110− void updateDemoEdges();

111− void updateEnableLauncherWhileLocked();

112− void updateEnableIndicatorsWhileLocked();

113− void updateBackgroundFile();

114− void updateStatsWelcomeScreen();

115− void updatePasswordDisplayHint();

116− void updateFailedLogins();

117− void updateHereEnabled();

118− void updateHereLicensePath();

127+ typedef QVariant (*ProxyConverter)(const QVariant &);

128+

129+ void refresh(bool async);

130+ void registerProperty(const QString &interface, const QString &property, const QString &signal);

131+ void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter = nullptr);

132+

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

119136

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;

120151 AccountsServiceDBusAdaptor *m_service;

152+ QDBusInterface *m_unityInput;

121153 QString m_user;

122− bool m_demoEdges;

123− bool m_enableLauncherWhileLocked;

124− bool m_enableIndicatorsWhileLocked;

125− QString m_backgroundFile;

126− bool m_statsWelcomeScreen;

127− PasswordDisplayHint m_passwordDisplayHint;

128− uint m_failedLogins;

129− bool m_hereEnabled;

130− QString m_hereLicensePath;

131154};

132155

133156#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+49−32

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,8 +12,6 @@

1212 *

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#include "AccountsServiceDBusAdaptor.h"

@@ -21,49 +19,58 @@

2119#include <QDBusConnectionInterface>

2220#include <QDBusMessage>

2321#include <QDBusVariant>

22+#include <QDebug>

2423

2524AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

2625 : QObject(parent),

2726 m_accountsManager(nullptr),

28− m_users()

27+ m_ignoreNextChanged(false)

2928{

3029 QDBusConnection connection = QDBusConnection::SM_BUSNAME();

3130 QDBusConnectionInterface *interface = connection.interface();

32− interface->startService("org.freedesktop.Accounts");

33− m_accountsManager = new QDBusInterface("org.freedesktop.Accounts",

34− "/org/freedesktop/Accounts",

35− "org.freedesktop.Accounts",

36− connection, this);

31+ interface->startService(QStringLiteral("org.freedesktop.Accounts"));

32+ m_accountsManager = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),

33+ QStringLiteral("/org/freedesktop/Accounts"),

34+ QStringLiteral("org.freedesktop.Accounts"),

35+ connection, this);

3736}

3837

39−QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)

38+QDBusPendingReply<QVariantMap> AccountsServiceDBusAdaptor::getAllPropertiesAsync(const QString &user, const QString &interface)

4039{

4140 QDBusInterface *iface = getUserInterface(user);

4241 if (iface != nullptr && iface->isValid()) {

43− QDBusMessage answer = iface->call("Get", interface, property);

44− if (answer.type() == QDBusMessage::ReplyMessage) {

45− return answer.arguments()[0].value<QDBusVariant>().variant();

46− }

42+ return iface->asyncCall(QStringLiteral("GetAll"), interface);

4743 }

48− return QVariant();

44+ return QDBusPendingReply<QVariantMap>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

4945}

5046

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)

5248{

5349 QDBusInterface *iface = getUserInterface(user);

5450 if (iface != nullptr && iface->isValid()) {

55− // The value needs to be carefully wrapped

56− iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

51+ return iface->asyncCall(QStringLiteral("Get"), interface, property);

5752 }

53+ return QDBusPendingReply<QVariant>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

5854}

5955

60−void AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)

56+QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)

6157{

6258 QDBusInterface *iface = getUserInterface(user);

6359 if (iface != nullptr && iface->isValid()) {

64− // The value needs to be carefully wrapped

65− iface->asyncCall("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

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+ }

6672 }

73+ return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

6774}

6875

6976void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

@@ -75,14 +82,22 @@ void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface,

7582 combined.removeDuplicates();

7683

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

7890}

7991

8092void AccountsServiceDBusAdaptor::maybeChangedSlot()

8193{

82− Q_EMIT maybeChanged(getUserForPath(message().path()));

94+ if (!m_ignoreNextChanged) {

95+ Q_EMIT maybeChanged(getUserForPath(message().path()));

96+ }

97+ m_ignoreNextChanged = false;

8398}

8499

85−QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

100+QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path) const

86101{

87102 QMap<QString, QDBusInterface *>::const_iterator i;

88103 for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {

@@ -97,13 +112,13 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

97112{

98113 QDBusInterface *iface = m_users.value(user);

99114 if (iface == nullptr && m_accountsManager->isValid()) {

100− QDBusMessage answer = m_accountsManager->call("FindUserByName", user);

101− if (answer.type() == QDBusMessage::ReplyMessage) {

102− QString path = answer.arguments()[0].value<QDBusObjectPath>().path();

115+ QDBusReply<QDBusObjectPath> answer = m_accountsManager->call(QStringLiteral("FindUserByName"), user);

116+ if (answer.isValid()) {

117+ const QString path = answer.value().path();

103118

104− iface = new QDBusInterface("org.freedesktop.Accounts",

119+ iface = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),

105120 path,

106− "org.freedesktop.DBus.Properties",

121+ QStringLiteral("org.freedesktop.DBus.Properties"),

107122 m_accountsManager->connection(), this);

108123

109124 // With its own pre-defined properties, AccountsService is oddly

@@ -113,8 +128,8 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

113128 iface->connection().connect(

114129 iface->service(),

115130 path,

116− "org.freedesktop.Accounts.User",

117− "Changed",

131+ QStringLiteral("org.freedesktop.Accounts.User"),

132+ QStringLiteral("Changed"),

118133 this,

119134 SLOT(maybeChangedSlot()));

120135

@@ -123,12 +138,14 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

123138 iface->connection().connect(

124139 iface->service(),

125140 path,

126− "org.freedesktop.DBus.Properties",

127− "PropertiesChanged",

141+ QStringLiteral("org.freedesktop.DBus.Properties"),

142+ QStringLiteral("PropertiesChanged"),

128143 this,

129144 SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));

130145

131146 m_users.insert(user, iface);

147+ } else {

148+ qWarning() << "Couldn't get user interface" << answer.error().name() << answer.error().message();

132149 }

133150 }

134151 return iface;

plugins/AccountsService/AccountsServiceDBusAdaptor.h+9−17

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,8 +12,6 @@

1212 *

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

@@ -22,6 +20,7 @@

2220#include <QDBusArgument>

2321#include <QDBusContext>

2422#include <QDBusInterface>

23+#include <QDBusPendingReply>

2524#include <QMap>

2625#include <QObject>

2726#include <QString>

@@ -32,20 +31,11 @@ class AccountsServiceDBusAdaptor: public QObject, public QDBusContext

3231

3332public:

3433 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

34+ ~AccountsServiceDBusAdaptor() = default;

3535

36− Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);

37−

38− template <typename T>

39− inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {

40− QVariant variant = getUserProperty(user, interface, property);

41− if (variant.isValid() && variant.canConvert<QDBusArgument>()) {

42− return qdbus_cast<T>(variant.value<QDBusArgument>());

43− }

44− return T();

45− }

46−

47− Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);

48− Q_INVOKABLE void setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

36+ QDBusPendingReply<QVariantMap> getAllPropertiesAsync(const QString &user, const QString &interface);

37+ QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);

38+ QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

4939

5040Q_SIGNALS:

5141 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -57,10 +47,12 @@ private Q_SLOTS:

5747

5848private:

5949 QDBusInterface *getUserInterface(const QString &user);

60− QString getUserForPath(const QString &path);

50+ QString getUserForPath(const QString &path) const;

6151

6252 QDBusInterface *m_accountsManager;

6353 QMap<QString, QDBusInterface *> m_users;

54+

55+ bool m_ignoreNextChanged;

6456};

6557

6658#endif

plugins/AccountsService/CMakeLists.txt+5−1

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

11add_definitions(-DSM_BUSNAME=systemBus)

2+include_directories(${GLIB_INCLUDE_DIRS})

23

34add_library(AccountsService-qml MODULE

45 AccountsService.cpp

@@ -6,7 +7,10 @@ add_library(AccountsService-qml MODULE

67 plugin.cpp

78 )

89

9−qt5_use_modules(AccountsService-qml DBus Qml)

10+target_link_libraries(AccountsService-qml

11+ Qt5::DBus Qt5::Qml

12+ ${GLIB_LIBRARIES}

13+ )

1014

1115add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)

1216

plugins/AccountsService/com.canonical.unity.AccountsService.xml+15

@@ -9,11 +9,22 @@

99 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"

1010 value="com.ubuntu.AccountsService.GreeterChangeAny"/>

1111

12+ <!-- Marks that V1 (pre-8.21) edge demos have been run. Legacy value. -->

1213 <!-- Should have been named DemoEdges, sorry folks. -mterry -->

1314 <property name="demo-edges" type="b" access="readwrite">

1415 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>

1516 </property>

1617

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+

1728 <property name="LauncherItems" type="aa{sv}" access="readwrite">

1829 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>

1930 </property>

@@ -42,5 +53,9 @@

4253 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

4354 </property>

4455

56+ <property name="FailedFingerprintLogins" type="u" access="readwrite">

57+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

58+ </property>

59+

4560 </interface>

4661</node>

plugins/AccountsService/plugin.h+1−1

@@ -28,7 +28,7 @@ class AccountsServicePlugin : public QQmlExtensionPlugin

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

2929

3030public:

31− void registerTypes(const char *uri);

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

3232};

3333

3434#endif

plugins/CMakeLists.txt+6−3

@@ -1,4 +1,4 @@

1−include(QmlPlugins)

1+find_package(QmlPlugins)

22

33# Set up and install a plugin for unity8.

44#

@@ -12,14 +12,17 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)

1212endmacro()

1313

1414add_subdirectory(AccountsService)

15+add_subdirectory(Cursor)

16+add_subdirectory(GlobalShortcut)

1517add_subdirectory(Greeter)

1618add_subdirectory(LightDM)

1719add_subdirectory(Lights)

18−add_subdirectory(Dash)

1920add_subdirectory(Powerd)

21+add_subdirectory(ScreenshotDirectory)

2022add_subdirectory(SessionBroadcast)

21−add_subdirectory(ScreenGrabber)

2223add_subdirectory(Ubuntu)

24+add_subdirectory(UInput)

2325add_subdirectory(Unity)

2426add_subdirectory(Utils)

27+add_subdirectory(WindowManager)

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,20 +12,30 @@

1212 *

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

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

15− *

16− * Authors: Michael Zanetti <michael.zanetti@canonical.com>

1715 */

1816

17+// Qt

18+#include <QtQml/qqml.h>

19+#include <QQmlContext>

20+

21+// self

1922#include "plugin.h"

20−#include "dashcommunicator.h"

21−#include "dashcommunicatorservice.h"

2223

23−#include <QDBusConnection>

24−#include <QtQml/qqml.h>

24+// local

25+#include "CursorImageInfo.h"

26+#include "CursorImageProvider.h"

27+#include "MousePointer.h"

2528

26−void DashCommunicatorPlugin::registerTypes(const char *uri)

29+void CursorPlugin::registerTypes(const char *uri)

2730{

28− Q_ASSERT(uri == QStringLiteral("Unity.DashCommunicator"));

29− qmlRegisterType<DashCommunicatorService>(uri, 0, 1, "DashCommunicatorService");

30− qmlRegisterType<DashCommunicator>(uri, 0, 1, "DashCommunicator");

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

32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");

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

3141}

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−42

@@ -1,42 +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_PRIVATE_INCLUDE_DIRS}

15− ${Qt5V8_PRIVATE_INCLUDE_DIR}

16−)

17−

18−remove_definitions(-DQT_NO_KEYWORDS)

19−

20−set(QMLPLUGIN_SRC

21− plugin.cpp

22− listviewwithpageheader.cpp

23− abstractdashview.cpp

24− verticaljournal.cpp

25− horizontaljournal.cpp

26− organicgrid.cpp

27− croppedimagesizer.cpp

28− croppedimagesizerasyncworker.cpp

29− )

30−

31−add_library(Dash-qml MODULE

32− ${QMLPLUGIN_SRC}

33− )

34−

35−target_link_libraries(Dash-qml

36− ${Qt5Gui_LIBRARIES}

37− ${Qt5Quick_LIBRARIES}

38− )

39−

40−qt5_use_modules(Dash-qml Qml Quick Concurrent)

41−

42−add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)

plugins/Dash/CardAttributes.qmldeleted−69

@@ -1,69 +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−

21−GridLayout {

22− id: grid

23− anchors {

24− left: parent.left;

25− right: parent.right;

26− }

27− columns: 2 + repeater.count % 2

28− rowSpacing: units.gu(.5)

29− property alias model: repeater.model

30− property color color: Theme.palette.normal.baseText

31− property real fontScale: 1.0

32−

33− Repeater {

34− id: repeater

35− delegate: Row {

36− spacing: units.gu(0.5)

37− readonly property int column: index % grid.columns;

38− Layout.alignment: {

39− if (column == 0) return Qt.AlignLeft;

40− if (column == grid.columns - 1 || index == repeater.count - 1) return Qt.AlignRight;

41− if (column == 1) return Qt.AlignHCenter;

42− }

43− Layout.column: index % grid.columns

44− Layout.row: index / grid.columns

45− Layout.columnSpan: index == repeater.count - 1 && grid.columns == 3 && column == 1 ? 2 : 1

46− Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)

47− Layout.fillWidth: true

48− height: units.gu(2)

49− Icon {

50− id: icon

51− height: units.gu(2)

52− source: "icon" in modelData && modelData["icon"] || ""

53− color: grid.color

54− }

55− Label {

56− id: label

57− width: parent.width - x

58− anchors.verticalCenter: parent.verticalCenter

59− text: "value" in modelData && modelData["value"] || "";

60− elide: Text.ElideRight

61− maximumLineCount: 1

62− font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light

63− fontSize: "small"

64− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

65− color: grid.color

66− }

67− }

68− }

69−}

plugins/Dash/CardCreator.jsdeleted−675

@@ -1,675 +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− CroppedImageMinimumSourceSize { \n\

86− id: artImage; \n\

87− objectName: "artImage"; \n\

88− source: cardData && cardData["art"] || ""; \n\

89− asynchronous: root.asynchronous; \n\

90− visible: false; \n\

91− width: %2; \n\

92− height: %3; \n\

93− } \n\

94− image: artImage.image; \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.image.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.image } \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− source: cardData && cardData["mascot"] || ""; \n\

199− width: units.gu(6); \n\

200− height: units.gu(5.625); \n\

201− horizontalAlignment: Image.AlignHCenter; \n\

202− verticalAlignment: Image.AlignVCenter; \n\

203− visible: %2; \n\

204− }\n';

205−

206−// %1 is used as anchors of titleLabel

207−// %2 is used as color of titleLabel

208−// %3 is used as extra condition for visible of titleLabel

209−var kTitleLabelCode = 'Label { \n\

210− id: titleLabel; \n\

211− objectName: "titleLabel"; \n\

212− anchors { %1 } \n\

213− elide: Text.ElideRight; \n\

214− fontSize: "small"; \n\

215− wrapMode: Text.Wrap; \n\

216− maximumLineCount: 2; \n\

217− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

218− color: %2; \n\

219− visible: showHeader %3; \n\

220− text: root.title; \n\

221− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\

222− horizontalAlignment: root.titleAlignment; \n\

223− }\n';

224−

225−// %1 is used as extra anchors of emblemIcon

226−// %2 is used as color of emblemIcon

227−var kEmblemIconCode = 'Icon { \n\

228− id: emblemIcon; \n\

229− objectName: "emblemIcon"; \n\

230− anchors { \n\

231− bottom: titleLabel.baseline; \n\

232− right: parent.right; \n\

233− %1

234− } \n\

235− source: cardData && cardData["emblem"] || ""; \n\

236− color: %2; \n\

237− height: source != "" ? titleLabel.font.pixelSize : 0; \n\

238− }\n';

239−

240−// %1 is used as anchors of touchdown effect

241−var kTouchdownCode = 'UbuntuShape { \n\

242− id: touchdown; \n\

243− objectName: "touchdown"; \n\

244− anchors { %1 } \n\

245− visible: root.pressed; \n\

246− radius: "medium"; \n\

247− borderSource: "radius_pressed.sci" \n\

248− }\n';

249−

250−// %1 is used as anchors of subtitleLabel

251−// %2 is used as color of subtitleLabel

252−var kSubtitleLabelCode = 'Label { \n\

253− id: subtitleLabel; \n\

254− objectName: "subtitleLabel"; \n\

255− anchors { %1 } \n\

256− anchors.topMargin: units.dp(2); \n\

257− elide: Text.ElideRight; \n\

258− fontSize: "x-small"; \n\

259− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

260− color: %2; \n\

261− visible: titleLabel.visible && titleLabel.text; \n\

262− text: cardData && cardData["subtitle"] || ""; \n\

263− font.weight: Font.Light; \n\

264− }\n';

265−

266−// %1 is used as anchors of attributesRow

267−// %2 is used as color of attributesRow

268−var kAttributesRowCode = 'CardAttributes { \n\

269− id: attributesRow; \n\

270− objectName: "attributesRow"; \n\

271− anchors { %1 } \n\

272− color: %2; \n\

273− fontScale: root.fontScale; \n\

274− model: cardData && cardData["attributes"]; \n\

275− }\n';

276−

277−// %1 is used as top anchor of summary

278−// %2 is used as topMargin anchor of summary

279−// %3 is used as color of summary

280−var kSummaryLabelCode = 'Label { \n\

281− id: summary; \n\

282− objectName: "summaryLabel"; \n\

283− anchors { \n\

284− top: %1; \n\

285− left: parent.left; \n\

286− right: parent.right; \n\

287− margins: units.gu(1); \n\

288− topMargin: %2; \n\

289− } \n\

290− wrapMode: Text.Wrap; \n\

291− maximumLineCount: 5; \n\

292− elide: Text.ElideRight; \n\

293− text: cardData && cardData["summary"] || ""; \n\

294− height: text ? implicitHeight : 0; \n\

295− fontSize: "small"; \n\

296− color: %3; \n\

297− }\n';

298−

299−function cardString(template, components) {

300− var code;

301− code = 'AbstractButton { \n\

302− id: root; \n\

303− property var template; \n\

304− property var components; \n\

305− property var cardData; \n\

306− property var artShapeBorderSource: undefined; \n\

307− property real fontScale: 1.0; \n\

308− property var scopeStyle: null; \n\

309− property int titleAlignment: Text.AlignLeft; \n\

310− property int fixedHeaderHeight: -1; \n\

311− property size fixedArtShapeSize: Qt.size(-1, -1); \n\

312− readonly property string title: cardData && cardData["title"] || ""; \n\

313− property bool asynchronous: true; \n\

314− property bool showHeader: true; \n\

315− implicitWidth: childrenRect.width; \n\

316− enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true); \n\

317− \n';

318−

319− var hasArt = components["art"] && components["art"]["field"] || false;

320− var hasSummary = components["summary"] || false;

321− var artAndSummary = hasArt && hasSummary;

322− var isHorizontal = template["card-layout"] === "horizontal";

323− var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||

324− (hasSummary && (template["card-background"] || components["background"]));

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

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 Dash 0.1;\n\

659− import Utils 0.1;\n';

660− var card = cardString(template, components);

661− var code = imports + 'Component {\n' + card + '}\n';

662−

663− try {

664− return Qt.createQmlObject(code, parent, "createCardComponent");

665− } catch (e) {

666− console.error("ERROR: Invalid component created.");

667− console.error("Template:");

668− console.error(JSON.stringify(template));

669− console.error("Components:");

670− console.error(JSON.stringify(components));

671− console.error("Code:");

672− console.error(code);

673− throw e;

674− }

675−}

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/CroppedImageMinimumSourceSize.qmldeleted−44

@@ -1,44 +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−import QtQuick 2.3

18−import Dash 0.1

19−

20−Item {

21− id: root

22−

23− property string source

24− property alias image: innerImage

25− property alias asynchronous: innerImage.asynchronous

26− property alias verticalAlignment: innerImage.verticalAlignment

27− property alias horizontalAlignment: innerImage.horizontalAlignment

28− property alias fillMode: innerImage.fillMode

29−

30− CroppedImageSizer {

31− id: sizer

32− source: root.source

33− width: root.width

34− height: root.height

35− }

36−

37− Image {

38− id: innerImage

39− anchors.fill: parent

40− fillMode: Image.PreserveAspectCrop

41− sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize

42− source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source

43− }

44−}

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"] : UbuntuColors.orange

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−346

@@ -1,346 +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−AbstractDashView::AbstractDashView()

20− : m_delegateModel(nullptr)

21− , m_asyncRequestedIndex(-1)

22− , m_columnSpacing(0)

23− , m_rowSpacing(0)

24− , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4

25− , m_displayMarginBeginning(0)

26− , m_displayMarginEnd(0)

27− , m_needsRelayout(false)

28− , m_delegateValidated(false)

29− , m_implicitHeightDirty(false)

30−{

31− connect(this, SIGNAL(widthChanged()), this, SLOT(relayout()));

32− connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));

33−}

34−

35−QAbstractItemModel *AbstractDashView::model() const

36−{

37− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;

38−}

39−

40−void AbstractDashView::setModel(QAbstractItemModel *model)

41−{

42− if (model != this->model()) {

43− if (!m_delegateModel) {

44− createDelegateModel();

45− } else {

46− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

47− }

48− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

49− connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

50−

51− cleanupExistingItems();

52−

53− Q_EMIT modelChanged();

54− polish();

55− }

56−}

57−

58−QQmlComponent *AbstractDashView::delegate() const

59−{

60− return m_delegateModel ? m_delegateModel->delegate() : nullptr;

61−}

62−

63−void AbstractDashView::setDelegate(QQmlComponent *delegate)

64−{

65− if (delegate != this->delegate()) {

66− if (!m_delegateModel) {

67− createDelegateModel();

68− }

69−

70− cleanupExistingItems();

71−

72− m_delegateModel->setDelegate(delegate);

73−

74− Q_EMIT delegateChanged();

75− m_delegateValidated = false;

76− polish();

77− }

78−}

79−

80−qreal AbstractDashView::columnSpacing() const

81−{

82− return m_columnSpacing;

83−}

84−

85−void AbstractDashView::setColumnSpacing(qreal columnSpacing)

86−{

87− if (columnSpacing != m_columnSpacing) {

88− m_columnSpacing = columnSpacing;

89− Q_EMIT columnSpacingChanged();

90−

91− if (isComponentComplete()) {

92− relayout();

93− }

94− }

95−}

96−

97−qreal AbstractDashView::rowSpacing() const

98−{

99− return m_rowSpacing;

100−}

101−

102−void AbstractDashView::setRowSpacing(qreal rowSpacing)

103−{

104− if (rowSpacing != m_rowSpacing) {

105− m_rowSpacing = rowSpacing;

106− Q_EMIT rowSpacingChanged();

107−

108− if (isComponentComplete()) {

109− relayout();

110− }

111− }

112−}

113−

114−int AbstractDashView::cacheBuffer() const

115−{

116− return m_buffer;

117−}

118−

119−void AbstractDashView::setCacheBuffer(int buffer)

120−{

121− if (buffer < 0) {

122− qmlInfo(this) << "Cannot set a negative cache buffer";

123− return;

124− }

125−

126− if (m_buffer != buffer) {

127− m_buffer = buffer;

128− if (isComponentComplete()) {

129− polish();

130− }

131− emit cacheBufferChanged();

132− }

133−}

134−

135−qreal AbstractDashView::displayMarginBeginning() const

136−{

137− return m_displayMarginBeginning;

138−}

139−

140−void AbstractDashView::setDisplayMarginBeginning(qreal begin)

141−{

142− if (m_displayMarginBeginning == begin)

143− return;

144− m_displayMarginBeginning = begin;

145− if (isComponentComplete()) {

146− polish();

147− }

148− emit displayMarginBeginningChanged();

149−}

150−

151−qreal AbstractDashView::displayMarginEnd() const

152−{

153− return m_displayMarginEnd;

154−}

155−

156−void AbstractDashView::setDisplayMarginEnd(qreal end)

157−{

158− if (m_displayMarginEnd == end)

159− return;

160− m_displayMarginEnd = end;

161− if (isComponentComplete()) {

162− polish();

163− }

164− emit displayMarginEndChanged();

165−}

166−

167−void AbstractDashView::createDelegateModel()

168−{

169− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

170− connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

171− if (isComponentComplete())

172− m_delegateModel->componentComplete();

173−}

174−

175−void AbstractDashView::refill()

176−{

177− if (!isComponentComplete() || height() < 0) {

178− return;

179− }

180−

181− const qreal from = -m_displayMarginBeginning;

182− const qreal to = height() + m_displayMarginEnd;

183− const qreal bufferFrom = from - m_buffer;

184− const qreal bufferTo = to + m_buffer;

185−

186− bool added = addVisibleItems(from, to, false);

187− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

188− added |= addVisibleItems(bufferFrom, bufferTo, true);

189−

190− if (added || removed) {

191− m_implicitHeightDirty = true;

192− polish();

193− }

194−}

195−

196−bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)

197−{

198− if (fillToY <= fillFromY)

199− return false;

200−

201− if (!delegate())

202− return false;

203−

204− if (m_delegateModel->count() == 0)

205− return false;

206−

207− int modelIndex;

208− qreal yPos;

209− findBottomModelIndexToAdd(&modelIndex, &yPos);

210− bool changed = false;

211− while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {

212− if (!createItem(modelIndex, asynchronous))

213− break;

214−

215− changed = true;

216− findBottomModelIndexToAdd(&modelIndex, &yPos);

217− }

218−

219− findTopModelIndexToAdd(&modelIndex, &yPos);

220− while (modelIndex >= 0 && yPos > fillFromY) {

221− if (!createItem(modelIndex, asynchronous))

222− break;

223−

224− changed = true;

225− findTopModelIndexToAdd(&modelIndex, &yPos);

226− }

227−

228− return changed;

229−}

230−

231−QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

232−{

233− if (asynchronous && m_asyncRequestedIndex != -1)

234− return nullptr;

235−

236− m_asyncRequestedIndex = -1;

237− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

238− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

239− if (!item) {

240− if (object) {

241− m_delegateModel->release(object);

242− if (!m_delegateValidated) {

243− m_delegateValidated = true;

244− QObject* delegateObj = delegate();

245− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";

246− }

247− } else {

248− m_asyncRequestedIndex = modelIndex;

249− }

250− return nullptr;

251− } else {

252− addItemToView(modelIndex, item);

253− return item;

254− }

255−}

256−

257−void AbstractDashView::releaseItem(QQuickItem *item)

258−{

259− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

260− if (flags & QQmlDelegateModel::Destroyed) {

261− item->setParentItem(nullptr);

262− }

263−}

264−

265−void AbstractDashView::setImplicitHeightDirty()

266−{

267− m_implicitHeightDirty = true;

268−}

269−

270−void AbstractDashView::itemCreated(int modelIndex, QObject *object)

271−{

272− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

273− if (!item) {

274− qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

275− return;

276− }

277− item->setParentItem(this);

278−

279− // We only need to call createItem if we are here because of an asynchronous generation

280− // otherwise we are in this slot because createItem is creating the item sync

281− // and thus we don't need to call createItem again, nor need to set m_implicitHeightDirty

282− // and call polish because the sync createItem was called from addVisibleItems that

283− // is called from refill that will already do those if an item was added

284− if (modelIndex == m_asyncRequestedIndex) {

285− createItem(modelIndex, false);

286− m_implicitHeightDirty = true;

287− polish();

288− }

289−}

290−

291−void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

292−{

293− if (reset) {

294− cleanupExistingItems();

295− } else {

296− processModelRemoves(changeSet.removes());

297− }

298− polish();

299−}

300−

301−

302−void AbstractDashView::relayout()

303−{

304− m_needsRelayout = true;

305− polish();

306−}

307−

308−void AbstractDashView::onHeightChanged()

309−{

310− polish();

311−}

312−

313−void AbstractDashView::updatePolish()

314−{

315− if (!model())

316− return;

317−

318− if (m_needsRelayout) {

319− doRelayout();

320− m_needsRelayout = false;

321− m_implicitHeightDirty = true;

322− }

323−

324− refill();

325−

326− const qreal from = -m_displayMarginBeginning;

327− const qreal to = height() + m_displayMarginEnd;

328− updateItemCulling(from, to);

329−

330− if (m_implicitHeightDirty) {

331− calculateImplicitHeight();

332− m_implicitHeightDirty = false;

333− }

334−}

335−

336−void AbstractDashView::componentComplete()

337−{

338− if (m_delegateModel)

339− m_delegateModel->componentComplete();

340−

341− QQuickItem::componentComplete();

342−

343− m_needsRelayout = true;

344−

345− polish();

346−}

plugins/Dash/abstractdashview.hdeleted−133

@@ -1,133 +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(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

39− Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

40− WRITE setDisplayMarginBeginning

41− NOTIFY displayMarginBeginningChanged)

42− Q_PROPERTY(qreal displayMarginEnd READ displayMarginEnd

43− WRITE setDisplayMarginEnd

44− NOTIFY displayMarginEndChanged)

45−

46−friend class VerticalJournalTest;

47−friend class HorizontalJournalTest;

48−friend class OrganicGridTest;

49−

50−public:

51− AbstractDashView();

52−

53− QAbstractItemModel *model() const;

54− void setModel(QAbstractItemModel *model);

55−

56− QQmlComponent *delegate() const;

57− void setDelegate(QQmlComponent *delegate);

58−

59− qreal columnSpacing() const;

60− void setColumnSpacing(qreal columnSpacing);

61−

62− qreal rowSpacing() const;

63− void setRowSpacing(qreal rowSpacing);

64−

65− int cacheBuffer() const;

66− void setCacheBuffer(int);

67−

68− qreal displayMarginBeginning() const;

69− void setDisplayMarginBeginning(qreal);

70−

71− qreal displayMarginEnd() const;

72− void setDisplayMarginEnd(qreal);

73−

74−Q_SIGNALS:

75− void modelChanged();

76− void delegateChanged();

77− void columnSpacingChanged();

78− void rowSpacingChanged();

79− void cacheBufferChanged();

80− void displayMarginBeginningChanged();

81− void displayMarginEndChanged();

82−

83−protected Q_SLOTS:

84− void relayout();

85−

86−protected:

87− void updatePolish() override;

88− void componentComplete() override;

89−

90− void releaseItem(QQuickItem *item);

91− void setImplicitHeightDirty();

92−

93−private Q_SLOTS:

94− void itemCreated(int modelIndex, QObject *object);

95− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

96− void onHeightChanged();

97−

98−private:

99− void createDelegateModel();

100− void refill();

101− bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);

102− QQuickItem *createItem(int modelIndex, bool asynchronous);

103−

104− virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

105− virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

106− virtual void addItemToView(int modelIndex, QQuickItem *item) = 0;

107− virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;

108− virtual void cleanupExistingItems() = 0;

109− virtual void doRelayout() = 0;

110− virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

111− virtual void calculateImplicitHeight() = 0;

112−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

113− virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

114−#else

115− virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;

116−#endif

117−

118− QQmlDelegateModel *m_delegateModel;

119−

120− // Index we are waiting because we requested it asynchronously

121− int m_asyncRequestedIndex;

122−

123− int m_columnSpacing;

124− int m_rowSpacing;

125− int m_buffer;

126− qreal m_displayMarginBeginning;

127− qreal m_displayMarginEnd;

128− bool m_needsRelayout;

129− bool m_delegateValidated;

130− bool m_implicitHeightDirty;

131−};

132−

133−#endif

plugins/Dash/croppedimagesizer.cppdeleted−136

@@ -1,136 +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 "croppedimagesizer.h"

18−

19−#include "croppedimagesizerasyncworker.h"

20−

21−#include <QNetworkAccessManager>

22−#include <QNetworkRequest>

23−#include <QQmlEngine>

24−#include <QQuickItem>

25−

26−CroppedImageSizer::CroppedImageSizer()

27− : m_width(0),

28− m_height(0),

29− m_sourceSize(QSize(-1, -1)),

30− m_worker(nullptr)

31−{

32− connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);

33− connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);

34−}

35−

36−CroppedImageSizer::~CroppedImageSizer()

37−{

38− if (m_worker) {

39− m_worker->abort();

40− }

41−}

42−

43−QUrl CroppedImageSizer::source() const

44−{

45− return m_source;

46−}

47−

48−void CroppedImageSizer::setSource(const QUrl &source)

49−{

50− if (source != m_source) {

51− m_source = source;

52− Q_EMIT sourceChanged();

53− }

54−}

55−

56−qreal CroppedImageSizer::width() const

57−{

58− return m_width;

59−}

60−

61−void CroppedImageSizer::setWidth(qreal width)

62−{

63− if (width != m_width) {

64− m_width = width;

65− Q_EMIT inputParamsChanged();

66− }

67−}

68−

69−qreal CroppedImageSizer::height() const

70−{

71− return m_height;

72−}

73−

74−void CroppedImageSizer::setHeight(qreal height)

75−{

76− if (height != m_height) {

77− m_height = height;

78− Q_EMIT inputParamsChanged();

79− }

80−}

81−

82−QSize CroppedImageSizer::sourceSize() const

83−{

84− return m_sourceSize;

85−}

86−

87−void CroppedImageSizer::setSourceSize(const QSize &sourceSize)

88−{

89− if (sourceSize != m_sourceSize) {

90− m_sourceSize = sourceSize;

91− Q_EMIT sourceSizeChanged();

92− }

93−}

94−

95−void CroppedImageSizer::setImageSize(const QSize &imageSize)

96−{

97− m_imageSize = imageSize;

98− m_worker = nullptr;

99− calculateSourceSize();

100−}

101−

102−void CroppedImageSizer::requestImage()

103−{

104− if (m_worker) {

105− m_worker->abort();

106− m_worker = nullptr;

107− }

108−

109− if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {

110− QNetworkRequest request(m_source);

111− QNetworkReply *reply = qmlEngine(this)->networkAccessManager()->get(request);

112− m_worker = new CroppedImageSizerAsyncWorker(this, reply);

113− } else {

114− setSourceSize(QSize(-1, -1));

115− }

116−}

117−

118−void CroppedImageSizer::calculateSourceSize()

119−{

120− if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_worker) {

121− if (!m_imageSize.isEmpty()) {

122− const qreal ar = m_width / m_height;

123− const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();

124− if (ar > ssar) {

125− setSourceSize(QSize(m_width, 0));

126− } else {

127− setSourceSize(QSize(0, m_height));

128− }

129− } else {

130− qWarning() << "Invalid size for " << m_source << m_imageSize;

131− setSourceSize(QSize(0, 0));

132− }

133− } else {

134− setSourceSize(QSize(-1, -1));

135− }

136−}

plugins/Dash/croppedimagesizer.hdeleted−72

@@ -1,72 +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 CROPPEDIMAGESIZER_H

18−#define CROPPEDIMAGESIZER_H

19−

20−#include <QImageReader>

21−#include <QObject>

22−#include <QSize>

23−#include <QUrl>

24−

25−class CroppedImageSizerAsyncWorker;

26−

27−class CroppedImageSizer : public QObject

28−{

29− Q_OBJECT

30−

31− Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)

32− Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)

33− Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)

34− Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)

35−

36−public:

37− CroppedImageSizer();

38− ~CroppedImageSizer();

39−

40− QUrl source() const;

41− void setSource(const QUrl &source);

42−

43− qreal width() const;

44− void setWidth(qreal width);

45−

46− qreal height() const;

47− void setHeight(qreal height);

48−

49− QSize sourceSize() const;

50− void setSourceSize(const QSize &sourceSize);

51−

52− Q_INVOKABLE void setImageSize(const QSize &imageSize);

53−

54−Q_SIGNALS:

55− void inputParamsChanged();

56− void sourceChanged();

57− void sourceSizeChanged();

58−

59−private Q_SLOT:

60− void calculateSourceSize();

61− void requestImage();

62−

63−private:

64− QUrl m_source;

65− qreal m_width;

66− qreal m_height;

67− QSize m_sourceSize;

68− QSize m_imageSize;

69− QPointer<CroppedImageSizerAsyncWorker> m_worker;

70−};

71−

72−#endif

plugins/Dash/croppedimagesizerasyncworker.cppdeleted−74

@@ -1,74 +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 "croppedimagesizerasyncworker.h"

18−

19−#include "croppedimagesizer.h"

20−

21−#include <QNetworkReply>

22−#include <QtConcurrentRun>

23−

24−CroppedImageSizerAsyncWorker::CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply)

25− : m_sizer(sizer),

26− m_reply(reply),

27− m_ignoreAbort(false)

28−{

29− connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizerAsyncWorker::requestFinished);

30−}

31−

32−void CroppedImageSizerAsyncWorker::abort()

33−{

34− // This runs on main thread

35− QMutexLocker locker(&m_mutex);

36− m_sizer = nullptr;

37− // If we already started the future run we can't abort the reply

38− // since we don't know at which stage the future is, just let it finish

39− if (!m_ignoreAbort) {

40− QMetaObject::invokeMethod(m_reply, "abort", Qt::QueuedConnection);

41− }

42−}

43−

44−void CroppedImageSizerAsyncWorker::requestFinished()

45−{

46− // This runs on main thread

47− QMutexLocker locker(&m_mutex);

48− if (m_sizer) {

49− m_ignoreAbort = true;

50− QtConcurrent::run(processRequestFinished, this);

51− } else {

52− // We were aborted delete ourselves

53− m_reply->deleteLater();

54− deleteLater();

55− }

56−}

57−

58−void CroppedImageSizerAsyncWorker::processRequestFinished(CroppedImageSizerAsyncWorker *worker)

59−{

60− // This runs on non main thread

61− // m_reply has finished at this point and is protected against change by m_ignoreAbort

62− QImageReader reader(worker->m_reply);

63− const QSize imageSize = reader.size();

64−

65− worker->m_mutex.lock();

66− if (worker->m_sizer) {

67− QMetaObject::invokeMethod(worker->m_sizer, "setImageSize", Qt::QueuedConnection, Q_ARG(QSize, imageSize));

68− }

69− worker->m_mutex.unlock();

70−

71− // All work is done, delete ourselves

72− worker->m_reply->deleteLater();

73− worker->deleteLater();

74−}

plugins/Dash/horizontaljournal.cppdeleted−246

@@ -1,246 +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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

188−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

189−#else

190−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

191−#endif

192−{

193− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

194− for (int i = remove.count - 1; i >= 0; --i) {

195− const int indexToRemove = remove.index + i;

196− // We only support removing from the end so

197− // any of the last items of a column has to be indexToRemove

198− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

199− if (indexToRemove == lastIndex) {

200− releaseItem(m_visibleItems.takeLast());

201− m_lastInRowIndexPosition.remove(indexToRemove);

202− } else {

203− if (indexToRemove < lastIndex) {

204− qFatal("HorizontalJournal only supports removal from the end of the model");

205− } else {

206− setImplicitHeightDirty();

207− }

208− }

209− }

210− }

211− if (m_visibleItems.isEmpty()) {

212− m_firstVisibleIndex = -1;

213− }

214−}

215−

216−

217−void HorizontalJournal::doRelayout()

218−{

219− // If m_firstVisibleIndex is not 0 we need to drop all the delegates

220− // since we can't consistently relayout without the first item being there

221−

222− if (m_firstVisibleIndex == 0) {

223− int i = 0;

224− const QList<QQuickItem*> allItems = m_visibleItems;

225− m_visibleItems.clear();

226− m_lastInRowIndexPosition.clear();

227− Q_FOREACH(QQuickItem *item, allItems) {

228− addItemToView(i, item);

229− ++i;

230− }

231− } else {

232− Q_FOREACH(QQuickItem *item, m_visibleItems) {

233− releaseItem(item);

234− }

235− m_visibleItems.clear();

236− m_lastInRowIndexPosition.clear();

237− m_firstVisibleIndex = -1;

238− }

239−}

240−

241−void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

242−{

243− Q_FOREACH(QQuickItem *item, m_visibleItems) {

244− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);

245− }

246−}

plugins/Dash/horizontaljournal.hdeleted−67

@@ -1,67 +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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

56− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

57−#else

58− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

59−#endif

60−

61− int m_firstVisibleIndex;

62− QList<QQuickItem*> m_visibleItems;

63− QMap<int, double> m_lastInRowIndexPosition;

64− int m_rowHeight;

65−};

66−

67−#endif

plugins/Dash/listviewwithpageheader.cppdeleted−1342

@@ -1,1342 +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−int ListViewWithPageHeader::cacheBuffer() const

338−{

339− return m_cacheBuffer;

340−}

341−

342−void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)

343−{

344− if (cacheBuffer < 0) {

345− qmlInfo(this) << "Cannot set a negative cache buffer";

346− return;

347− }

348−

349− if (cacheBuffer != m_cacheBuffer) {

350− m_cacheBuffer = cacheBuffer;

351− Q_EMIT cacheBufferChanged();

352− polish();

353− }

354−}

355−

356−void ListViewWithPageHeader::positionAtBeginning()

357−{

358− if (m_delegateModel->count() <= 0)

359− return;

360−

361− qreal headerHeight = (m_headerItem ? m_headerItem->height() : 0);

362− if (m_firstVisibleIndex != 0) {

363− // TODO This could be optimized by trying to reuse the interesection

364− // of items that may end up intersecting between the existing

365− // m_visibleItems and the items we are creating in the next loop

366− Q_FOREACH(ListItem *item, m_visibleItems)

367− releaseItem(item);

368− m_visibleItems.clear();

369− m_firstVisibleIndex = -1;

370−

371− // Create the item 0, it will be already correctly positioned at createItem()

372− m_clipItem->setY(0);

373− ListItem *item = createItem(0, false);

374− // Create the subsequent items

375− int modelIndex = 1;

376− qreal pos = item->y() + item->height();

377− const qreal bufferTo = height() + m_cacheBuffer;

378− while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {

379− if (!(item = createItem(modelIndex, false)))

380− break;

381− pos += item->height();

382− ++modelIndex;

383− }

384−

385− m_previousContentY = m_visibleItems.first()->y() - headerHeight;

386− }

387− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);

388− if (m_headerItem) {

389− // TODO This should not be needed and the code that adjust the m_headerItem position

390− // in viewportMoved() should be enough but in some cases we have not found a way to reproduce

391− // yet the code of viewportMoved() fails so here we make sure that at least if we are calling

392− // positionAtBeginning the header item will be correctly positioned

393− m_headerItem->setY(-m_minYExtent);

394− }

395−}

396−

397−static inline bool uFuzzyCompare(qreal r1, qreal r2)

398−{

399− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));

400−}

401−

402−void ListViewWithPageHeader::showHeader()

403−{

404− if (!m_headerItem)

405− return;

406−

407− const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);

408− if (!uFuzzyCompare(to, contentY())) {

409− const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();

410− if (headerShownByItsOwn && m_headerItemShownHeight == 0) {

411− // We are not clipping since we are just at the top of the viewport

412− // but because of the showHeader animation we will need to, so

413− // enable the clipping without logically moving the items

414− m_headerItemShownHeight = m_headerItem->y() + m_headerItem->height() - contentY();

415− if (!m_visibleItems.isEmpty()) {

416− updateClipItem();

417− ListItem *firstItem = m_visibleItems.first();

418− firstItem->setY(firstItem->y() - m_headerItemShownHeight);

419− layout();

420− }

421− Q_EMIT headerItemShownHeightChanged();

422− }

423− m_contentYAnimation->setTo(to);

424− contentYAnimationType = ContentYAnimationShowHeader;

425− m_contentYAnimation->start();

426− }

427−}

428−

429−int ListViewWithPageHeader::firstCreatedIndex() const

430−{

431− return m_firstVisibleIndex;

432−}

433−

434−int ListViewWithPageHeader::createdItemCount() const

435−{

436− return m_visibleItems.count();

437−}

438−

439−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const

440−{

441− ListItem *item = itemAtIndex(modelIndex);

442− if (item)

443− return item->m_item;

444− else

445− return nullptr;

446−}

447−

448−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

449−{

450− ListItem *listItem = itemAtIndex(modelIndex);

451− if (listItem) {

452− return maximizeVisibleArea(listItem, listItem->height());

453− }

454−

455− return false;

456−}

457−

458−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)

459−{

460− if (itemHeight < 0)

461− return false;

462−

463− ListItem *listItem = itemAtIndex(modelIndex);

464− if (listItem) {

465− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));

466− }

467−

468− return false;

469−}

470−

471−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)

472−{

473− if (listItem) {

474− layout();

475− const auto listItemY = m_clipItem->y() + listItem->y();

476− if (listItemY > contentY() && listItemY + listItemHeight > contentY() + height()) {

477− // we can scroll the list up to show more stuff

478− const auto to = qMin(listItemY, listItemY + listItemHeight - height());

479− m_contentYAnimation->setTo(to);

480− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

481− m_contentYAnimation->start();

482− } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||

483− (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))

484− {

485− // we can scroll the list down to show more stuff

486− auto realVisibleListItemY = listItemY;

487− if (m_topSectionItem) {

488− // If we are showing the top section sticky item and this item doesn't have a section

489− // item we have to make sure to scroll it a bit more so that it is not underlapping

490− // the top section sticky item

491− bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;

492− if (topSectionShown && !listItem->sectionItem()) {

493− realVisibleListItemY -= m_topSectionItem->height();

494− }

495− }

496− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());

497− m_contentYAnimation->setTo(to);

498− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

499− m_contentYAnimation->start();

500− }

501− return true;

502− }

503− return false;

504−}

505−

506−qreal ListViewWithPageHeader::minYExtent() const

507−{

508−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;

509− return m_minYExtent;

510−}

511−

512−void ListViewWithPageHeader::componentComplete()

513−{

514− if (m_delegateModel)

515− m_delegateModel->componentComplete();

516−

517− QQuickFlickable::componentComplete();

518−

519− polish();

520−}

521−

522−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

523−{

524− // Check we are not being taken down and don't paint anything

525− // TODO Check if we still need this in 5.2

526− // For reproduction just inifnite loop testDash or testDashContent

527− if (!QQmlEngine::contextForObject(this)->parentContext())

528− return;

529−

530− QQuickFlickable::viewportMoved(orient);

531−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();

532− const qreal diff = m_previousContentY - contentY();

533− adjustHeader(diff);

534− m_previousContentY = contentY();

535− layout();

536− polish();

537−}

538−

539−void ListViewWithPageHeader::adjustHeader(qreal diff)

540−{

541− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

542− if (m_headerItem) {

543− const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

544− if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {

545− m_headerItem->setHeight(m_headerItem->implicitHeight());

546− // We are going down (but it's not because of the rebound at the end)

547− // (but the header was not shown by it's own position)

548− // or the header is partially shown and we are not doing a maximizeVisibleArea either

549− const bool scrolledUp = m_previousContentY > contentY();

550− const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());

551− const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();

552− const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

553−

554− if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {

555− m_headerItemShownHeight = 0;

556− m_headerItem->setY(-m_minYExtent);

557− } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

558− if (maximizeVisibleAreaRunning && diff > 0) {

559− // If we are maximizing and the header was shown, make sure we hide it

560− m_headerItemShownHeight -= diff;

561− } else {

562− m_headerItemShownHeight += diff;

563− }

564− if (uFuzzyCompare(contentY(), -m_minYExtent)) {

565− m_headerItemShownHeight = 0;

566− } else {

567− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

568− }

569− if (m_headerItemShownHeight > 0) {

570− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {

571− m_headerItem->setY(contentY());

572− m_headerItemShownHeight = m_headerItem->height();

573− } else {

574− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

575− }

576− } else {

577− m_headerItem->setY(-m_minYExtent);

578− }

579− }

580− Q_EMIT headerItemShownHeightChanged();

581− } else {

582− // Stick the header item to the top when dragging down

583− m_headerItem->setY(contentY());

584− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

585− }

586− // We will be changing the clip item, need to accomadate for it

587− // otherwise we move the firstItem down/up twice (unless the

588− // show header animation is running, where we want to keep the viewport stable)

589− if (!showHeaderAnimationRunning) {

590− diff += oldHeaderItemShownHeight - m_headerItemShownHeight;

591− } else {

592− diff = -diff;

593− }

594− }

595− if (!m_visibleItems.isEmpty()) {

596− updateClipItem();

597− ListItem *firstItem = m_visibleItems.first();

598− firstItem->setY(firstItem->y() + diff);

599− if (showHeaderAnimationRunning) {

600− adjustMinYExtent();

601− }

602− }

603−}

604−

605−void ListViewWithPageHeader::createDelegateModel()

606−{

607− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

608− connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

609− if (isComponentComplete())

610− m_delegateModel->componentComplete();

611− updateWatchedRoles();

612−}

613−

614−void ListViewWithPageHeader::refill()

615−{

616− if (m_inLayout) {

617− return;

618− }

619− if (!isComponentComplete()) {

620− return;

621− }

622−

623− const qreal from = contentY();

624− const qreal to = from + height();

625− const qreal bufferFrom = from - m_cacheBuffer;

626− const qreal bufferTo = to + m_cacheBuffer;

627−

628− bool added = addVisibleItems(from, to, false);

629− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

630− added |= addVisibleItems(bufferFrom, bufferTo, true);

631−

632− if (added || removed) {

633− m_contentHeightDirty = true;

634− }

635−}

636−

637−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

638−{

639− if (!delegate())

640− return false;

641−

642− if (m_delegateModel->count() == 0)

643− return false;

644−

645− ListItem *item;

646−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;

647−

648− int modelIndex = 0;

649− qreal pos = 0;

650− if (!m_visibleItems.isEmpty()) {

651− modelIndex = m_firstVisibleIndex + m_visibleItems.count();

652− item = m_visibleItems.last();

653− pos = item->y() + item->height() + m_clipItem->y();

654− }

655− bool changed = false;

656−// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;

657− while (modelIndex < m_delegateModel->count() && pos <= fillTo) {

658−// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;

659− if (!(item = createItem(modelIndex, asynchronous)))

660− break;

661− pos += item->height();

662− ++modelIndex;

663− changed = true;

664− }

665−

666− modelIndex = 0;

667− pos = 0;

668− if (!m_visibleItems.isEmpty()) {

669− modelIndex = m_firstVisibleIndex - 1;

670− item = m_visibleItems.first();

671− pos = item->y() + m_clipItem->y();

672− }

673− while (modelIndex >= 0 && pos > fillFrom) {

674−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;

675− if (!(item = createItem(modelIndex, asynchronous)))

676− break;

677− pos -= item->height();

678− --modelIndex;

679− changed = true;

680− }

681−

682− return changed;

683−}

684−

685−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

686−{

687− QQuickItem *item = listItem->m_item;

688− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

689− if (flags & QQmlDelegateModel::Destroyed) {

690− item->setParentItem(nullptr);

691− }

692− listItem->sectionItem()->deleteLater();

693− delete listItem;

694−}

695−

696−void ListViewWithPageHeader::releaseItem(ListItem *listItem)

697−{

698− QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(listItem->m_item);

699− itemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

700− m_itemsToRelease << listItem;

701−}

702−

703−void ListViewWithPageHeader::updateWatchedRoles()

704−{

705− if (m_delegateModel) {

706− QList<QByteArray> roles;

707− if (!m_sectionProperty.isEmpty())

708− roles << m_sectionProperty.toUtf8();

709− m_delegateModel->setWatchedRoles(roles);

710− }

711−}

712−

713−QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)

714−{

715− if (!m_sectionDelegate)

716− return nullptr;

717−

718− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

719−

720− if (modelIndex > 0) {

721− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);

722− if (section == prevSection)

723− return nullptr;

724− }

725− if (modelIndex + 1 < model()->rowCount() && !alreadyInserted) {

726− // Already inserted items can't steal next section header

727− const QString nextSection = m_delegateModel->stringValue(modelIndex + 1, m_sectionProperty);

728− if (section == nextSection) {

729− // Steal the section header

730− ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems

731− if (nextItem) {

732− QQuickItem *sectionItem = nextItem->sectionItem();

733− nextItem->setSectionItem(nullptr);

734− return sectionItem;

735− }

736− }

737− }

738−

739− return getSectionItem(section);

740−}

741−

742−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText)

743−{

744− QQuickItem *sectionItem = nullptr;

745−

746− QQmlContext *creationContext = m_sectionDelegate->creationContext();

747− QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));

748− context->setContextProperty(QLatin1String("section"), sectionText);

749− context->setContextProperty(QLatin1String("delegateIndex"), -1);

750− QObject *nobj = m_sectionDelegate->beginCreate(context);

751− if (nobj) {

752− QQml_setParent_noEvent(context, nobj);

753− sectionItem = qobject_cast<QQuickItem *>(nobj);

754− if (!sectionItem) {

755− delete nobj;

756− } else {

757− sectionItem->setZ(2);

758− QQml_setParent_noEvent(sectionItem, m_clipItem);

759− sectionItem->setParentItem(m_clipItem);

760− }

761− } else {

762− delete context;

763− }

764− m_sectionDelegate->completeCreate();

765−

766− // TODO attach to sectionItem so we can accomodate to it changing its height

767−

768− return sectionItem;

769−}

770−

771−bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

772−{

773−// qDebug() << "ListViewWithPageHeader::removeNonVisibleItems" << bufferFrom << bufferTo;

774− // Do not remove items if we are overshooting up or down, since we'll come back

775− // to the "stable" position and delete/create items without any reason

776− if (contentY() < -m_minYExtent) {

777− return false;

778− } else if (contentY() + height() > contentHeight()) {

779− return false;

780− }

781− bool changed = false;

782−

783− bool foundVisible = false;

784− int i = 0;

785− int removedItems = 0;

786− const auto oldFirstVisibleIndex = m_firstVisibleIndex;

787− while (i < m_visibleItems.count()) {

788− ListItem *item = m_visibleItems[i];

789− const qreal pos = item->y() + m_clipItem->y();

790−// qDebug() << i << pos << (pos + item->height()) << bufferFrom << bufferTo;

791− if (pos + item->height() < bufferFrom || pos > bufferTo) {

792−// qDebug() << "Releasing" << i << (pos + item->height() < bufferFrom) << pos + item->height() << bufferFrom << (pos > bufferTo) << pos << bufferTo;

793− releaseItem(item);

794− m_visibleItems.removeAt(i);

795− changed = true;

796− ++removedItems;

797− } else {

798− if (!foundVisible) {

799− foundVisible = true;

800− const int itemIndex = m_firstVisibleIndex + removedItems + i;

801− m_firstVisibleIndex = itemIndex;

802− }

803− ++i;

804− }

805− }

806− if (!foundVisible) {

807− m_firstVisibleIndex = -1;

808− }

809− if (m_firstVisibleIndex != oldFirstVisibleIndex) {

810− adjustMinYExtent();

811− }

812−

813− return changed;

814−}

815−

816−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)

817−{

818−// qDebug() << "CREATE ITEM" << modelIndex;

819− if (asynchronous && m_asyncRequestedIndex != -1)

820− return nullptr;

821−

822− m_asyncRequestedIndex = -1;

823− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

824− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

825− if (!item) {

826− if (object) {

827− m_delegateModel->release(object);

828− if (!m_delegateValidated) {

829− m_delegateValidated = true;

830− QObject* delegateObj = delegate();

831− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";

832− }

833− } else {

834− m_asyncRequestedIndex = modelIndex;

835− }

836− return 0;

837− } else {

838−// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

839− ListItem *listItem = new ListItem;

840− listItem->m_item = item;

841− listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));

842− QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

843− ListItem *prevItem = itemAtIndex(modelIndex - 1);

844− bool lostItem = false; // Is an item that we requested async but because of model changes

845− // it is no longer attached to any of the existing items (has no prev nor next item)

846− // nor is the first item

847− if (prevItem) {

848− listItem->setY(prevItem->y() + prevItem->height());

849− } else {

850− ListItem *currItem = itemAtIndex(modelIndex);

851− if (currItem) {

852− // There's something already in m_visibleItems at out index, meaning this is an insert, so attach to its top

853− listItem->setY(currItem->y() - listItem->height());

854− } else {

855− ListItem *nextItem = itemAtIndex(modelIndex + 1);

856− if (nextItem) {

857− listItem->setY(nextItem->y() - listItem->height());

858− } else if (modelIndex == 0) {

859− listItem->setY(-m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0));

860− } else if (!m_visibleItems.isEmpty()) {

861− lostItem = true;

862− }

863− }

864− }

865− if (lostItem) {

866− listItem->setCulled(true);

867− releaseItem(listItem);

868− listItem = nullptr;

869− } else {

870− listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());

871− if (m_visibleItems.isEmpty()) {

872− m_visibleItems << listItem;

873− } else {

874− m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);

875− }

876− if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {

877− m_firstVisibleIndex = modelIndex;

878− polish();

879− }

880− if (listItem->sectionItem()) {

881− QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();

882− context->setContextProperty(QLatin1String("delegateIndex"), modelIndex);

883− }

884− adjustMinYExtent();

885− m_contentHeightDirty = true;

886− }

887− return listItem;

888− }

889−}

890−

891−void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

892−{

893− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

894− if (!item) {

895− qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

896− return;

897− }

898−// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

899− // Check we are not being taken down and don't paint anything

900− // TODO Check if we still need this in 5.2

901− // For reproduction just inifnite loop testDash or testDashContent

902− if (!QQmlEngine::contextForObject(this)->parentContext())

903− return;

904−

905− item->setParentItem(m_clipItem);

906− QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();

907− context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);

908− context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

909− if (modelIndex == m_asyncRequestedIndex) {

910− createItem(modelIndex, false);

911− refill();

912− }

913−}

914−

915−void ListViewWithPageHeader::updateClipItem()

916−{

917− m_clipItem->setHeight(height() - m_headerItemShownHeight);

918− m_clipItem->setY(contentY() + m_headerItemShownHeight);

919− m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);

920−}

921−

922−void ListViewWithPageHeader::onContentHeightChanged()

923−{

924− updateClipItem();

925−}

926−

927−void ListViewWithPageHeader::onContentWidthChanged()

928−{

929− m_clipItem->setWidth(contentItem()->width());

930−}

931−

932−void ListViewWithPageHeader::onHeightChanged()

933−{

934− polish();

935−}

936−

937−

938−void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

939−{

940− // TODO Do something with reset

941−// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

942− const auto oldFirstVisibleIndex = m_firstVisibleIndex;

943−

944− Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {

945−// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

946− if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

947− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

948− // If all the items we are removing are either not created or culled

949− // we have to grow down to avoid viewport changing

950− bool growDown = true;

951− for (int i = 0; growDown && i < remove.count; ++i) {

952− const int modelIndex = remove.index + i;

953− ListItem *item = itemAtIndex(modelIndex);

954− if (item && !item->culled()) {

955− growDown = false;

956− }

957− }

958− for (int i = remove.count - 1; i >= 0; --i) {

959− const int visibleIndex = remove.index + i - m_firstVisibleIndex;

960− if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {

961− ListItem *item = m_visibleItems[visibleIndex];

962− // Pass the section item down if needed

963− if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {

964− ListItem *nextItem = m_visibleItems[visibleIndex + 1];

965− if (!nextItem->sectionItem()) {

966− nextItem->setSectionItem(item->sectionItem());

967− item->setSectionItem(nullptr);

968− }

969− }

970− releaseItem(item);

971− m_visibleItems.removeAt(visibleIndex);

972− }

973− }

974− if (growDown) {

975− adjustMinYExtent();

976− } else if (remove.index <= m_firstVisibleIndex) {

977− if (!m_visibleItems.isEmpty()) {

978− // We removed the first item that is the one that positions the rest

979− // position the new first item correctly

980− m_visibleItems.first()->setY(oldFirstValidIndexPos);

981− } else {

982− m_firstVisibleIndex = -1;

983− }

984− }

985− } else if (remove.index + remove.count <= m_firstVisibleIndex) {

986− m_firstVisibleIndex -= remove.count;

987− }

988− for (int i = remove.count - 1; i >= 0; --i) {

989− const int modelIndex = remove.index + i;

990− if (modelIndex == m_asyncRequestedIndex) {

991− m_asyncRequestedIndex = -1;

992− } else if (modelIndex < m_asyncRequestedIndex) {

993− m_asyncRequestedIndex--;

994− }

995− }

996− }

997−

998− Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {

999−// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

1000− const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

1001− const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

1002− if (insertingInValidIndexes || firstItemWithViewOnTop)

1003− {

1004− // If the items we are adding won't be really visible

1005− // we grow up instead of down to not change the viewport

1006− bool growUp = false;

1007− if (!firstItemWithViewOnTop) {

1008− for (int i = 0; i < m_visibleItems.count(); ++i) {

1009− if (!m_visibleItems[i]->culled()) {

1010− if (insert.index <= m_firstVisibleIndex + i) {

1011− growUp = true;

1012− }

1013− break;

1014− }

1015− }

1016− }

1017−

1018− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

1019− for (int i = insert.count - 1; i >= 0; --i) {

1020− const int modelIndex = insert.index + i;

1021− ListItem *item = createItem(modelIndex, false);

1022− if (growUp) {

1023− ListItem *firstItem = m_visibleItems.first();

1024− firstItem->setY(firstItem->y() - item->height());

1025− }

1026− // Adding an item may break a "same section" chain, so check

1027− // if we need adding a new section item

1028− if (m_sectionDelegate) {

1029− ListItem *nextItem = itemAtIndex(modelIndex + 1);

1030− if (nextItem && !nextItem->sectionItem()) {

1031− nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));

1032− if (growUp && nextItem->sectionItem()) {

1033− ListItem *firstItem = m_visibleItems.first();

1034− firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());

1035− }

1036− }

1037− }

1038− }

1039− if (firstItemWithViewOnTop) {

1040− ListItem *firstItem = m_visibleItems.first();

1041− firstItem->setY(oldFirstValidIndexPos);

1042− }

1043− adjustMinYExtent();

1044− } else if (insert.index <= m_firstVisibleIndex) {

1045− m_firstVisibleIndex += insert.count;

1046− }

1047−

1048− for (int i = insert.count - 1; i >= 0; --i) {

1049− const int modelIndex = insert.index + i;

1050− if (modelIndex <= m_asyncRequestedIndex) {

1051− m_asyncRequestedIndex++;

1052− }

1053− }

1054− }

1055−

1056− Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1057−// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1058− for (int i = change.index; i < change.count; ++i) {

1059− ListItem *item = itemAtIndex(i);

1060− if (item && item->sectionItem()) {

1061− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

1062− const QString sectionText = m_delegateModel->stringValue(i, m_sectionProperty);

1063− context->setContextProperty(QLatin1String("section"), sectionText);

1064− }

1065− }

1066− }

1067−

1068− if (m_firstVisibleIndex != oldFirstVisibleIndex) {

1069− adjustMinYExtent();

1070− }

1071−

1072− for (int i = 0; i < m_visibleItems.count(); ++i) {

1073− ListItem *item = m_visibleItems[i];

1074− if (item->sectionItem()) {

1075− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

1076− context->setContextProperty(QLatin1String("delegateIndex"), m_firstVisibleIndex + i);

1077− }

1078− }

1079−

1080− layout();

1081− polish();

1082− m_contentHeightDirty = true;

1083−}

1084−

1085−void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)

1086−{

1087− setInteractive(!running);

1088− if (!running) {

1089− m_contentHeightDirty = true;

1090− polish();

1091− }

1092−}

1093−

1094−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)

1095−{

1096− const qreal heightDiff = newGeometry.height() - oldGeometry.height();

1097− if (heightDiff != 0) {

1098− if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY() && !m_visibleItems.isEmpty()) {

1099− ListItem *firstItem = m_visibleItems.first();

1100− firstItem->setY(firstItem->y() - heightDiff);

1101− adjustMinYExtent();

1102− layout();

1103− }

1104− refill();

1105− adjustMinYExtent();

1106− polish();

1107− m_contentHeightDirty = true;

1108− }

1109−}

1110−

1111−void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)

1112−{

1113− if (item == m_headerItem) {

1114− const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;

1115− if (diff != 0) {

1116− adjustHeader(diff);

1117− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();

1118− layout();

1119− polish();

1120− m_contentHeightDirty = true;

1121− }

1122− }

1123−}

1124−

1125−void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)

1126−{

1127− const qreal heightDiff = newHeaderHeight - oldHeaderHeight;

1128− if (m_headerItemShownHeight > 0) {

1129− // If the header is shown because of the clip

1130− // Change its size

1131− m_headerItemShownHeight += heightDiff;

1132− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);

1133− updateClipItem();

1134− adjustMinYExtent();

1135− Q_EMIT headerItemShownHeightChanged();

1136− } else {

1137− if (oldHeaderY + oldHeaderHeight > contentY()) {

1138− // If the header is shown because its position

1139− // Change its size

1140− ListItem *firstItem = m_visibleItems.first();

1141− firstItem->setY(firstItem->y() + heightDiff);

1142− layout();

1143− } else {

1144− // If the header is not on screen, just change the start of the list

1145− // so the viewport is not changed

1146− adjustMinYExtent();

1147− }

1148− }

1149−}

1150−

1151−

1152−void ListViewWithPageHeader::adjustMinYExtent()

1153−{

1154− if (m_visibleItems.isEmpty()) {

1155− m_minYExtent = 0;

1156− } else {

1157− qreal nonCreatedHeight = 0;

1158− if (m_firstVisibleIndex != 0) {

1159− // Calculate the average height of items to estimate the position of the list start

1160− const int visibleItems = m_visibleItems.count();

1161− qreal visibleItemsHeight = 0;

1162− Q_FOREACH(ListItem *item, m_visibleItems) {

1163− visibleItemsHeight += item->height();

1164− }

1165− nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1166−// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1167− }

1168− const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1169− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1170− if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1171− m_minYExtent = 0;

1172− m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1173− }

1174− }

1175−}

1176−

1177−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const

1178−{

1179− const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;

1180− if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())

1181− return m_visibleItems[visibleIndexedModelIndex];

1182−

1183− return nullptr;

1184−}

1185−

1186−void ListViewWithPageHeader::layout()

1187−{

1188− if (m_inLayout)

1189− return;

1190−

1191− m_inLayout = true;

1192− if (!m_visibleItems.isEmpty()) {

1193− const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;

1194− const qreal visibleTo = contentY() + height() - m_clipItem->y();

1195−

1196− qreal pos = m_visibleItems.first()->y();

1197−

1198−// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();

1199− int firstReallyVisibleItem = -1;

1200− int modelIndex = m_firstVisibleIndex;

1201− Q_FOREACH(ListItem *item, m_visibleItems) {

1202− const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;

1203− item->setCulled(cull);

1204− item->setY(pos);

1205− if (!cull && firstReallyVisibleItem == -1) {

1206− firstReallyVisibleItem = modelIndex;

1207− if (m_topSectionItem) {

1208− // Positing the top section sticky item is a two step process

1209− // First we set it either we cull it (because it doesn't need to be sticked to the top)

1210− // or stick it to the top

1211− // Then after the loop we'll make sure that if there's another section just below it

1212− // pushed the sticky section up to make it disappear

1213− const qreal topSectionStickPos = m_headerItemShownHeight + contentY() - m_clipItem->y();

1214− bool showStickySectionItem;

1215− // We need to show the "top section sticky item" when the position at the "top" of the

1216− // viewport is bigger than the start of the position of the first visible item

1217− // i.e. the first visible item starts before the viewport, or when the first

1218− // visible item starts just at the viewport start and it does not have its own section item

1219− if (topSectionStickPos > pos) {

1220− showStickySectionItem = true;

1221− } else if (topSectionStickPos == pos) {

1222− showStickySectionItem = !item->sectionItem();

1223− } else {

1224− showStickySectionItem = false;

1225− }

1226− if (!showStickySectionItem) {

1227− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

1228− if (item->sectionItem()) {

1229− // This seems it should happen since why would we cull the top section

1230− // if the first visible item has no section header? This only happens briefly

1231− // when increasing the height of a list that is at the bottom, the m_topSectionItem

1232− // gets shown shortly in the next polish call

1233− QQuickItemPrivate::get(item->sectionItem())->setCulled(false);

1234− }

1235− } else {

1236− // Update the top sticky section header

1237− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

1238− QQmlContext *context = QQmlEngine::contextForObject(m_topSectionItem)->parentContext();

1239− context->setContextProperty(QLatin1String("section"), section);

1240−

1241− QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);

1242− m_topSectionItem->setY(topSectionStickPos);

1243− int delegateIndex = modelIndex;

1244− // Look for the first index with this section text

1245− while (delegateIndex > 0) {

1246− const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty);

1247− if (prevSection != section)

1248− break;

1249− delegateIndex--;

1250− }

1251− context->setContextProperty(QLatin1String("delegateIndex"), delegateIndex);

1252− if (item->sectionItem()) {

1253− QQuickItemPrivate::get(item->sectionItem())->setCulled(true);

1254− }

1255− }

1256− }

1257− }

1258− QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();

1259− const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);

1260− if (!cull && pos < clipFrom) {

1261− context->setContextProperty(QLatin1String("heightToClip"), clipFrom - pos);

1262− } else {

1263− context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

1264− }

1265−// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;

1266− pos += item->height();

1267− ++modelIndex;

1268− }

1269−

1270− // Second step of section sticky item positioning

1271− // Look at the next section header, check if it's pushing up the sticky one

1272− if (m_topSectionItem) {

1273− if (firstReallyVisibleItem >= 0) {

1274− for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {

1275− ListItem *item = m_visibleItems[i];

1276− if (item->sectionItem()) {

1277− if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {

1278− m_topSectionItem->setY(item->y() - m_topSectionItem->height());

1279− }

1280− break;

1281− }

1282− }

1283− }

1284− }

1285− }

1286− m_inLayout = false;

1287−}

1288−

1289−void ListViewWithPageHeader::updatePolish()

1290−{

1291− // Check we are not being taken down and don't paint anything

1292− // TODO Check if we still need this in 5.2

1293− // For reproduction just inifnite loop testDash or testDashContent

1294− if (!QQmlEngine::contextForObject(this)->parentContext())

1295− return;

1296−

1297− Q_FOREACH(ListItem *item, m_itemsToRelease)

1298− reallyReleaseItem(item);

1299− m_itemsToRelease.clear();

1300−

1301− if (!model())

1302− return;

1303−

1304− layout();

1305−

1306− refill();

1307−

1308− if (m_contentHeightDirty) {

1309− qreal contentHeight;

1310− if (m_visibleItems.isEmpty()) {

1311− contentHeight = m_headerItem ? m_headerItem->height() : 0;

1312− } else {

1313− const int modelCount = model()->rowCount();

1314− const int visibleItems = m_visibleItems.count();

1315− const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;

1316− qreal nonCreatedHeight = 0;

1317− if (lastValidIndex != modelCount - 1) {

1318− const int visibleItems = m_visibleItems.count();

1319− qreal visibleItemsHeight = 0;

1320− Q_FOREACH(ListItem *item, m_visibleItems) {

1321− visibleItemsHeight += item->height();

1322− }

1323− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);

1324− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;

1325− }

1326− ListItem *item = m_visibleItems.last();

1327− contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();

1328− if (m_firstVisibleIndex != 0) {

1329− // Make sure that if we are shrinking we tell the view we still fit

1330− m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));

1331− }

1332− }

1333−

1334− m_contentHeightDirty = false;

1335− adjustMinYExtent();

1336− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1337− setContentHeight(contentHeight);

1338− m_inContentHeightKeepHeaderShown = false;

1339− }

1340−}

1341−

1342−#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(int 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− int cacheBuffer() const;

89− void setCacheBuffer(int 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− int 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−264

@@ -1,264 +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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

241−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

242−#else

243−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

244−#endif

245−{

246− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

247− for (int i = remove.count - 1; i >= 0; --i) {

248− const int indexToRemove = remove.index + i;

249− // We only support removing from the end

250− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

251− if (indexToRemove == lastIndex) {

252− releaseItem(m_visibleItems.takeLast());

253− } else {

254− if (indexToRemove < lastIndex) {

255− qFatal("OrganicGrid only supports removal from the end of the model");

256− }

257− }

258− }

259− }

260− if (m_visibleItems.isEmpty()) {

261− m_firstVisibleIndex = -1;

262− }

263− setImplicitHeightDirty();

264−}

plugins/Dash/organicgrid.hdeleted−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−#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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

83− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

84−#else

85− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

86−#endif

87−

88− QSizeF m_smallDelegateSize;

89− QSizeF m_bigDelegateSize;

90− int m_firstVisibleIndex;

91− int m_numberOfModulesPerRow;

92− QList<QQuickItem*> m_visibleItems;

93−};

94−

95−#endif

plugins/Dash/plugin.cppdeleted−37

@@ -1,37 +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 "croppedimagesizer.h"

21−#include "horizontaljournal.h"

22−#include "listviewwithpageheader.h"

23−#include "organicgrid.h"

24−#include "verticaljournal.h"

25−

26−#include <QAbstractItemModel>

27−

28−void DashPlugin::registerTypes(const char *uri)

29−{

30− Q_ASSERT(uri == QLatin1String("Dash"));

31− qmlRegisterType<QAbstractItemModel>();

32− qmlRegisterType<HorizontalJournal>(uri, 0, 1, "HorizontalJournal");

33− qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

34− qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

35− qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

36− qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");

37−}

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−277

@@ -1,277 +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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

243−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

244−#else

245−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

246−#endif

247−{

248− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

249− for (int i = remove.count - 1; i >= 0; --i) {

250− const int indexToRemove = remove.index + i;

251− // Since we only support removing from the end, indexToRemove

252− // must refer to the last item of one of the columns or

253− // be bigger than them (because it's not in the viewport and

254− // thus we have not created a delegate for it)

255− bool found = false;

256− int lastCreatedIndex = INT_MIN;

257− for (int i = 0; !found && i < m_columnVisibleItems.count(); ++i) {

258− QList<ViewItem> &column = m_columnVisibleItems[i];

259− if (!column.isEmpty()) {

260− const int lastColumnIndex = column.last().m_modelIndex;

261− if (lastColumnIndex == indexToRemove) {

262− releaseItem(column.takeLast().m_item);

263− found = true;

264− }

265− lastCreatedIndex = qMax(lastCreatedIndex, lastColumnIndex);

266− }

267− }

268− if (!found) {

269− if (indexToRemove < lastCreatedIndex) {

270− qFatal("VerticalJournal only supports removal from the end of the model");

271− } else {

272− setImplicitHeightDirty();

273− }

274− }

275− }

276− }

277−}

plugins/Dash/verticaljournal.hdeleted−104

@@ -1,104 +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−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))

94− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

95−#else

96− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

97−#endif

98−

99− QVector<QList<ViewItem>> m_columnVisibleItems;

100− QHash<int, int> m_indexColumnMap;

101− int m_columnWidth;

102−};

103−

104−#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

tests/mocks/Ubuntu/Payments/plugin.cpp → plugins/GlobalShortcut/plugin.cpprenamed+5−6

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -15,14 +15,13 @@

1515 */

1616

1717#include "plugin.h"

18−#include "MockPayments.h"

18+#include "globalshortcut.h"

1919

2020#include <QtQml>

2121

22−

23−void BackendPlugin::registerTypes(const char *uri)

22+void GlobalShortcutPlugin::registerTypes(const char *uri)

2423{

25− Q_ASSERT(uri == QLatin1String("Ubuntu.Payments"));

24+ Q_ASSERT(uri == QLatin1String("GlobalShortcut"));

2625

27− qmlRegisterType<MockPayments>(uri, 0, 1, "Payments");

26+ qmlRegisterType<GlobalShortcut>(uri, 1, 0, "GlobalShortcut");

2827}

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/Unity/Launcher/CMakeLists.txt+2−5

@@ -1,6 +1,3 @@

1−include(FindPkgConfig)

2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)

3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

41pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

52

63add_definitions(-DSM_BUSNAME=systemBus)

@@ -19,6 +16,7 @@ set(QMLLAUNCHERPLUGINAS_SRC

1916 quicklistmodel.cpp

2017 quicklistentry.cpp

2118 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

19+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

2220 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

2321 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

2422 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

@@ -31,8 +29,7 @@ add_library(UnityLauncherAS-qml MODULE

3129target_link_libraries(UnityLauncherAS-qml

3230 unity8-private

3331 ${GSETTINGS_QT_LDFLAGS}

32+ Qt5::DBus Qt5::Qml Qt5::Gui

3433 )

3534

36−qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)

37−

3835add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)

plugins/Greeter/Unity/Launcher/Launcher.qmltypesdeleted−179

@@ -1,179 +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 Unity.Launcher 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "LauncherItem"

12− prototype: "unity::shell::launcher::LauncherItemInterface"

13− exports: ["Unity.Launcher/LauncherItem 0.1"]

14− isCreatable: false

15− exportMetaObjectRevisions: [0]

16− }

17− Component {

18− name: "LauncherModel"

19− prototype: "unity::shell::launcher::LauncherModelInterface"

20− exports: ["Unity.Launcher/LauncherModel 0.1"]

21− isCreatable: false

22− isSingleton: true

23− exportMetaObjectRevisions: [0]

24− Method {

25− name: "requestRemove"

26− Parameter { name: "appId"; type: "string" }

27− }

28− Method {

29− name: "get"

30− type: "unity::shell::launcher::LauncherItemInterface*"

31− Parameter { name: "index"; type: "int" }

32− }

33− Method {

34− name: "move"

35− Parameter { name: "oldIndex"; type: "int" }

36− Parameter { name: "newIndex"; type: "int" }

37− }

38− Method {

39− name: "pin"

40− Parameter { name: "appId"; type: "string" }

41− Parameter { name: "index"; type: "int" }

42− }

43− Method {

44− name: "pin"

45− Parameter { name: "appId"; type: "string" }

46− }

47− Method {

48− name: "quickListActionInvoked"

49− Parameter { name: "appId"; type: "string" }

50− Parameter { name: "actionIndex"; type: "int" }

51− }

52− Method {

53− name: "setUser"

54− Parameter { name: "username"; type: "string" }

55− }

56− Method {

57− name: "getUrlForAppId"

58− type: "string"

59− Parameter { name: "appId"; type: "string" }

60− }

61− }

62− Component {

63− name: "QuickListModel"

64− prototype: "unity::shell::launcher::QuickListModelInterface"

65− exports: ["Unity.Launcher/QuickListModel 0.1"]

66− isCreatable: false

67− exportMetaObjectRevisions: [0]

68− }

69− Component {

70− name: "unity::shell::launcher::LauncherItemInterface"

71− prototype: "QObject"

72− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]

73− isCreatable: false

74− exportMetaObjectRevisions: [0]

75− Property { name: "appId"; type: "string"; isReadonly: true }

76− Property { name: "name"; type: "string"; isReadonly: true }

77− Property { name: "icon"; type: "string"; isReadonly: true }

78− Property { name: "pinned"; type: "bool"; isReadonly: true }

79− Property { name: "running"; type: "bool"; isReadonly: true }

80− Property { name: "recent"; type: "bool"; isReadonly: true }

81− Property { name: "progress"; type: "int"; isReadonly: true }

82− Property { name: "count"; type: "int"; isReadonly: true }

83− Property { name: "countVisible"; type: "bool"; isReadonly: true }

84− Property { name: "focused"; type: "bool"; isReadonly: true }

85− Property {

86− name: "quickList"

87− type: "unity::shell::launcher::QuickListModelInterface"

88− isReadonly: true

89− isPointer: true

90− }

91− Signal {

92− name: "nameChanged"

93− Parameter { name: "name"; type: "string" }

94− }

95− Signal {

96− name: "iconChanged"

97− Parameter { name: "icon"; type: "string" }

98− }

99− Signal {

100− name: "pinnedChanged"

101− Parameter { name: "pinned"; type: "bool" }

102− }

103− Signal {

104− name: "runningChanged"

105− Parameter { name: "running"; type: "bool" }

106− }

107− Signal {

108− name: "recentChanged"

109− Parameter { name: "running"; type: "bool" }

110− }

111− Signal {

112− name: "progressChanged"

113− Parameter { name: "progress"; type: "int" }

114− }

115− Signal {

116− name: "countChanged"

117− Parameter { name: "count"; type: "int" }

118− }

119− Signal {

120− name: "countVisibleChanged"

121− Parameter { name: "countVisible"; type: "bool" }

122− }

123− Signal {

124− name: "focusedChanged"

125− Parameter { name: "focused"; type: "bool" }

126− }

127− }

128− Component {

129− name: "unity::shell::launcher::LauncherModelInterface"

130− prototype: "QAbstractListModel"

131− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]

132− isCreatable: false

133− exportMetaObjectRevisions: [0]

134− Property {

135− name: "applicationManager"

136− type: "unity::shell::application::ApplicationManagerInterface"

137− isPointer: true

138− }

139− Method {

140− name: "move"

141− Parameter { name: "oldIndex"; type: "int" }

142− Parameter { name: "newIndex"; type: "int" }

143− }

144− Method {

145− name: "get"

146− type: "unity::shell::launcher::LauncherItemInterface*"

147− Parameter { name: "index"; type: "int" }

148− }

149− Method {

150− name: "pin"

151− Parameter { name: "appId"; type: "string" }

152− Parameter { name: "index"; type: "int" }

153− }

154− Method {

155− name: "pin"

156− Parameter { name: "appId"; type: "string" }

157− }

158− Method {

159− name: "requestRemove"

160− Parameter { name: "appId"; type: "string" }

161− }

162− Method {

163− name: "quickListActionInvoked"

164− Parameter { name: "appId"; type: "string" }

165− Parameter { name: "actionIndex"; type: "int" }

166− }

167− Method {

168− name: "setUser"

169− Parameter { name: "username"; type: "string" }

170− }

171− }

172− Component {

173− name: "unity::shell::launcher::QuickListModelInterface"

174− prototype: "QAbstractListModel"

175− exports: ["Unity.Launcher/QuickListInterface 0.1"]

176− isCreatable: false

177− exportMetaObjectRevisions: [0]

178− }

179−}

plugins/Greeter/Unity/Launcher/launcheritem.cpp+49−2

@@ -31,10 +31,12 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr

3131 m_count(0),

3232 m_countVisible(false),

3333 m_focused(false),

34+ m_alerting(false),

35+ m_surfaceCount(0),

3436 m_quickList(new QuickListModel(this))

3537{

3638 QuickListEntry nameAction;

37− nameAction.setActionId("launch_item");

39+ nameAction.setActionId(QStringLiteral("launch_item"));

3840 nameAction.setText(m_name);

3941 m_quickList->appendAction(nameAction);

4042}

@@ -54,7 +56,7 @@ void LauncherItem::setName(const QString &name)

5456 if (m_name != name) {

5557 m_name = name;

5658 QuickListEntry entry;

57− entry.setActionId("launch_item");

59+ entry.setActionId(QStringLiteral("launch_item"));

5860 entry.setText(m_name);

5961 m_quickList->updateAction(entry);

6062 Q_EMIT nameChanged(name);

@@ -74,6 +76,25 @@ void LauncherItem::setIcon(const QString &icon)

7476 }

7577}

7678

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+

7798bool LauncherItem::pinned() const

7899{

79100 return m_pinned;

@@ -165,6 +186,32 @@ void LauncherItem::setFocused(bool focused)

165186 }

166187}

167188

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+

168215unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

169216{

170217 return m_quickList;

plugins/Greeter/Unity/Launcher/launcheritem.h+10

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

3434 QString appId() const override;

3535 QString name() const override;

3636 QString icon() const override;

37+ QStringList keywords() const override;

38+ uint popularity() const override;

3739 bool pinned() const override;

3840 bool running() const override;

3941 bool recent() const override;

@@ -41,12 +43,15 @@ public:

4143 int count() const override;

4244 bool countVisible() const override;

4345 bool focused() const override;

46+ bool alerting() const override;

47+ int surfaceCount() const override;

4448

4549 unity::shell::launcher::QuickListModelInterface *quickList() const override;

4650

4751private:

4852 void setName(const QString &name);

4953 void setIcon(const QString &icon);

54+ void setKeywords(const QStringList &keywords);

5055 void setPinned(bool pinned);

5156 void setRunning(bool running);

5257 void setRecent(bool recent);

@@ -54,11 +59,14 @@ private:

5459 void setCount(int count);

5560 void setCountVisible(bool countVisible);

5661 void setFocused(bool focused);

62+ void setAlerting(bool alerting);

63+ void setSurfaceCount(int surfaceCount);

5764

5865private:

5966 QString m_appId;

6067 QString m_name;

6168 QString m_icon;

69+ QStringList m_keywords;

6270 bool m_pinned;

6371 bool m_running;

6472 bool m_recent;

@@ -66,6 +74,8 @@ private:

6674 int m_count;

6775 bool m_countVisible;

6876 bool m_focused;

77+ bool m_alerting;

78+ int m_surfaceCount;

6979 QuickListModel *m_quickList;

7080

7181 friend class LauncherModel;

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+48−22

@@ -67,6 +67,10 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

6767 return item->progress();

6868 case RoleFocused:

6969 return item->focused();

70+ case RoleRunning:

71+ return item->running();

72+ case RoleSurfaceCount:

73+ return item->surfaceCount();

7074 }

7175

7276 return QVariant();

@@ -113,7 +117,7 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

113117 QString actionId = model->get(actionIndex).actionId();

114118

115119 // Check if this is one of the launcher actions we handle ourselves

116− if (actionId == "launch_item") {

120+ if (actionId == QLatin1String("launch_item")) {

117121 QDesktopServices::openUrl(getUrlForAppId(appId));

118122

119123 // Nope, we don't know this action, let the backend forward it to the application

@@ -138,13 +142,13 @@ QString LauncherModel::getUrlForAppId(const QString &appId) const

138142 return QString();

139143 }

140144

141− if (!appId.contains("_")) {

145+ if (!appId.contains('_')) {

142146 return "application:///" + appId + ".desktop";

143147 }

144148

145149 QStringList parts = appId.split('_');

146150 QString package = parts.value(0);

147− QString app = parts.value(1, "first-listed-app");

151+ QString app = parts.value(1, QStringLiteral("first-listed-app"));

148152 return "appid://" + package + "/" + app + "/current-user-version";

149153}

150154

@@ -185,31 +189,50 @@ int LauncherModel::findApplication(const QString &appId)

185189 return -1;

186190}

187191

188−typedef QList<QVariantMap> VariantMapList;

189192void LauncherModel::refresh()

190193{

191− QList<QVariantMap> items;

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+ }

192208

193− if (m_accounts && !m_user.isEmpty()) {

194− items = m_accounts->getUserProperty<VariantMapList>(m_user, "com.canonical.unity.AccountsService", "LauncherItems");

209+ refreshWithItems(qdbus_cast<QList<QVariantMap>>(reply.value().value<QDBusArgument>()));

210+ });

195211 }

212+}

196213

214+void LauncherModel::refreshWithItems(const QList<QVariantMap> &items)

215+{

197216 // First walk through all the existing items and see if we need to remove something

198217 QList<LauncherItem*> toBeRemoved;

199218

200219 Q_FOREACH (LauncherItem* item, m_list) {

201220 bool found = false;

202221 Q_FOREACH(const QVariant &asItem, items) {

203− if (asItem.toMap().value("id").toString() == item->appId()) {

222+ QVariantMap cachedMap = asItem.toMap();

223+ if (cachedMap.value(QStringLiteral("id")).toString() == item->appId()) {

204224 // Only keep and update it if we either show unpinned or it is pinned

205− if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {

225+ if (!m_onlyPinned || cachedMap.value(QStringLiteral("pinned")).toBool()) {

206226 found = true;

207− item->setName(asItem.toMap().value("name").toString());

208− item->setIcon(asItem.toMap().value("icon").toString());

209− item->setCount(asItem.toMap().value("count").toInt());

210− item->setCountVisible(asItem.toMap().value("countVisible").toBool());

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+

211234 int idx = m_list.indexOf(item);

212− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);

235+ Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleCount, RoleCountVisible, RoleRunning, RoleProgress});

213236 }

214237 break;

215238 }

@@ -231,7 +254,7 @@ void LauncherModel::refresh()

231254 for (int asIndex = 0; asIndex < items.count(); ++asIndex) {

232255 QVariant entry = items.at(asIndex);

233256

234− if (m_onlyPinned && !entry.toMap().value("pinned").toBool()) {

257+ if (m_onlyPinned && !entry.toMap().value(QStringLiteral("pinned")).toBool()) {

235258 // Skipping it as we only show pinned and it is not

236259 skipped++;

237260 continue;

@@ -240,21 +263,24 @@ void LauncherModel::refresh()

240263

241264 int itemIndex = -1;

242265 for (int i = 0; i < m_list.count(); ++i) {

243− if (m_list.at(i)->appId() == entry.toMap().value("id").toString()) {

266+ if (m_list.at(i)->appId() == entry.toMap().value(QStringLiteral("id")).toString()) {

244267 itemIndex = i;

245268 break;

246269 }

247270 }

248271

249272 if (itemIndex == -1) {

273+ QVariantMap cachedMap = entry.toMap();

250274 // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.

251− LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),

252− entry.toMap().value("name").toString(),

253− entry.toMap().value("icon").toString(),

275+ LauncherItem *item = new LauncherItem(cachedMap.value(QStringLiteral("id")).toString(),

276+ cachedMap.value(QStringLiteral("name")).toString(),

277+ cachedMap.value(QStringLiteral("icon")).toString(),

254278 this);

255279 item->setPinned(true);

256− item->setCount(entry.toMap().value("count").toInt());

257− item->setCountVisible(entry.toMap().value("countVisible").toBool());

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

258284 beginInsertRows(QModelIndex(), newPosition, newPosition);

259285 m_list.insert(newPosition, item);

260286 endInsertRows();

@@ -270,7 +296,7 @@ void LauncherModel::refresh()

270296

271297void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

272298{

273− if (user != m_user || interface != "com.canonical.unity.AccountsService" || !changed.contains("LauncherItems")) {

299+ if (user != m_user || interface != QLatin1String("com.canonical.unity.AccountsService") || !changed.contains(QStringLiteral("LauncherItems"))) {

274300 return;

275301 }

276302 refresh();

plugins/Greeter/Unity/Launcher/launchermodelas.h+11−9

@@ -37,19 +37,19 @@ public:

3737 LauncherModel(QObject *parent = 0);

3838 ~LauncherModel();

3939

40− int rowCount(const QModelIndex &parent = QModelIndex()) const;

40+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

4141

42− QVariant data(const QModelIndex &index, int role) const;

42+ QVariant data(const QModelIndex &index, int role) const override;

4343

44− Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;

45− Q_INVOKABLE void move(int oldIndex, int newIndex);

46− Q_INVOKABLE void pin(const QString &appId, int index = -1);

47− Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

48− Q_INVOKABLE void setUser(const QString &username);

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;

4949 Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

5050

51− unity::shell::application::ApplicationManagerInterface* applicationManager() const;

52− void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

51+ unity::shell::application::ApplicationManagerInterface* applicationManager() const override;

52+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager) override;

5353

5454 bool onlyPinned() const override;

5555 void setOnlyPinned(bool onlyPinned) override;

@@ -64,6 +64,8 @@ private Q_SLOTS:

6464 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

6565

6666private:

67+ void refreshWithItems(const QList<QVariantMap> &items);

68+

6769 QString m_user;

6870 QList<LauncherItem*> m_list;

6971 AccountsServiceDBusAdaptor *m_accounts;

plugins/Greeter/Unity/Launcher/plugin.cpp+5−5

@@ -36,11 +36,11 @@ void UnityLauncherPlugin::registerTypes(const char *uri)

3636{

3737 Q_ASSERT(uri == QLatin1String("Unity.Launcher"));

3838

39− qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");

40− qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");

41− qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListInterface", "Abstract Interface. Cannot be instantiated.");

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

4242

4343 qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);

44− qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");

45− qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", "Can't create a QuickListModel in QML. Get them from the LauncherItems.");

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

4646}

plugins/Greeter/Unity/Launcher/plugin.h+1−1

@@ -26,7 +26,7 @@ class UnityLauncherPlugin : public QQmlExtensionPlugin

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

2727

2828public:

29− void registerTypes(const char *uri);

29+ void registerTypes(const char *uri) override;

3030};

3131

3232#endif

plugins/Greeter/Unity/Launcher/quicklistmodel.cpp+2

@@ -65,6 +65,8 @@ QVariant QuickListModel::data(const QModelIndex &index, int role) const

6565 return m_list.at(index.row()).icon();

6666 case RoleClickable:

6767 return m_list.at(index.row()).clickable();

68+ case RoleIsPrivate:

69+ return false; // The greeter plugin would just not add any private entries

6870 }

6971 return QVariant();

7072}

plugins/Greeter/Unity/Launcher/quicklistmodel.h+2−2

@@ -45,8 +45,8 @@ public:

4545

4646 QuickListEntry get(int index) const;

4747

48− int rowCount(const QModelIndex &parent = QModelIndex()) const;

49− QVariant data(const QModelIndex &index, int role) const;

48+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

49+ QVariant data(const QModelIndex &index, int role) const override;

5050

5151private:

5252 QList<QuickListEntry> m_list;

plugins/LightDM/CMakeLists.txt+7−21

@@ -1,40 +1,26 @@

11pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2−# TODO: Once we split out a separate greeter process, uncomment these lines

3−#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

42

5−add_subdirectory(liblightdm)

3+find_package(Qt5Core REQUIRED)

4+find_package(Qt5Quick REQUIRED)

65

76include_directories(

87 ${CMAKE_CURRENT_SOURCE_DIR}

98 ${CMAKE_CURRENT_BINARY_DIR}

109 ${CMAKE_SOURCE_DIR}/plugins/Utils

11− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM

12− #${LIBLIGHTDM_INCLUDE_DIRS}

1310 ${libunity8-private_SOURCE_DIR}

1411 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

1512)

1613

1714set(QMLPLUGIN_SRC

18− ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

15+ ../Utils/unitysortfilterproxymodelqml.cpp

1916 DBusGreeter.cpp

2017 DBusGreeterList.cpp

2118 Greeter.cpp

2219 plugin.cpp

20+ PromptsModel.cpp

21+ SessionsModel.cpp

2322 UsersModel.cpp

2423 )

2524

26−add_library(LightDM-qml MODULE

27− ${QMLPLUGIN_SRC}

28− )

29−

30−target_link_libraries(LightDM-qml

31− integratedLightDM

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)

25+add_subdirectory(FullLightDM)

26+add_subdirectory(IntegratedLightDM)

plugins/LightDM/DBusGreeter.cpp+7−6

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2014, 2015 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -21,10 +21,11 @@

2121#include <QStringList>

2222

2323DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)

24− : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),

24+ : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

2525 m_greeter(greeter)

2626{

27− connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));

27+ connect(m_greeter, &Greeter::isActiveChanged,

28+ this, &DBusGreeter::isActiveChangedHandler);

2829}

2930

3031bool DBusGreeter::isActive() const

@@ -34,16 +35,16 @@ bool DBusGreeter::isActive() const

3435

3536void DBusGreeter::ShowGreeter()

3637{

37− return Q_EMIT m_greeter->showGreeter();

38+ Q_EMIT m_greeter->showGreeter();

3839}

3940

4041void DBusGreeter::HideGreeter()

4142{

42− return Q_EMIT m_greeter->hideGreeter();

43+ Q_EMIT m_greeter->hideGreeter();

4344}

4445

4546void DBusGreeter::isActiveChangedHandler()

4647{

47− notifyPropertyChanged("IsActive", isActive());

48+ notifyPropertyChanged(QStringLiteral("IsActive"), isActive());

4849 Q_EMIT isActiveChanged();

4950}

plugins/LightDM/DBusGreeterList.cpp+7−7

@@ -21,11 +21,11 @@

2121#include <QStringList>

2222

2323DBusGreeterList::DBusGreeterList(Greeter *greeter, const QString &path)

24− : UnityDBusObject(path, "com.canonical.UnityGreeter", true, greeter),

24+ : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

2525 m_greeter(greeter)

2626{

27− connect(m_greeter, SIGNAL(authenticationUserChanged(const QString &)), this, SLOT(authenticationUserChangedHandler(const QString &)));

28− connect(m_greeter, SIGNAL(promptlessChanged()), this, SLOT(promptlessChangedHandler()));

27+ connect(m_greeter, &Greeter::authenticationUserChanged, this, &DBusGreeterList::authenticationUserChangedHandler);

28+ connect(m_greeter, &Greeter::promptlessChanged, this, &DBusGreeterList::promptlessChangedHandler);

2929}

3030

3131QString DBusGreeterList::GetActiveEntry() const

@@ -43,14 +43,14 @@ bool DBusGreeterList::entryIsLocked() const

4343 return !m_greeter->promptless();

4444}

4545

46−void DBusGreeterList::authenticationUserChangedHandler(const QString &user)

46+void DBusGreeterList::authenticationUserChangedHandler()

4747{

48− notifyPropertyChanged("ActiveEntry", user);

49− Q_EMIT EntrySelected(user);

48+ notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());

49+ Q_EMIT EntrySelected(m_greeter->authenticationUser());

5050}

5151

5252void DBusGreeterList::promptlessChangedHandler()

5353{

54− notifyPropertyChanged("EntryIsLocked", entryIsLocked());

54+ notifyPropertyChanged(QStringLiteral("EntryIsLocked"), entryIsLocked());

5555 Q_EMIT entryIsLockedChanged();

5656}

plugins/LightDM/DBusGreeterList.h+1−1

@@ -47,7 +47,7 @@ Q_SIGNALS:

4747 void entryIsLockedChanged();

4848

4949private Q_SLOTS:

50− void authenticationUserChangedHandler(const QString &user);

50+ void authenticationUserChangedHandler();

5151 void promptlessChangedHandler();

5252

5353private:

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−21

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2017 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -13,17 +13,20 @@

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

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

1515 *

16− * Author: Michael Terry <michael.terry@canonical.com>

1716 */

1817

1918#include "Greeter.h"

2019#include "GreeterPrivate.h"

20+#include <QCoreApplication>

2121#include <libintl.h>

2222

23+static Greeter *singleton = nullptr;

24+

2325GreeterPrivate::GreeterPrivate(Greeter* parent)

2426 : m_greeter(new QLightDM::Greeter(parent)),

2527 m_active(false),

26− wasPrompted(false),

28+ responded(false),

29+ everResponded(false),

2730 promptless(false),

2831 q_ptr(parent)

2932{

@@ -35,16 +38,39 @@ Greeter::Greeter(QObject* parent)

3538{

3639 Q_D(Greeter);

3740

38− connect(d->m_greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),

39− this, SLOT(showMessageFilter(QString, QLightDM::Greeter::MessageType)));

40− connect(d->m_greeter, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType)),

41− this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));

42− connect(d->m_greeter, SIGNAL(authenticationComplete()),

43− this, SLOT(authenticationCompleteFilter()));

41+ connect(d->m_greeter, &QLightDM::Greeter::showMessage,

42+ this, &Greeter::showMessageFilter);

43+ connect(d->m_greeter, &QLightDM::Greeter::showPrompt,

44+ this, &Greeter::showPromptFilter);

45+ connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,

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

4451

4552 d->m_greeter->connectSync();

4653}

4754

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+

4874bool Greeter::isActive() const

4975{

5076 Q_D(const Greeter);

@@ -69,7 +95,22 @@ bool Greeter::isAuthenticated() const

6995QString Greeter::authenticationUser() const

7096{

7197 Q_D(const Greeter);

72− return d->m_greeter->authenticationUser();

98+ return d->cachedAuthUser;

99+}

100+

101+void Greeter::checkAuthenticationUser()

102+{

103+ Q_D(Greeter);

104+ if (d->cachedAuthUser != 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();

73114}

74115

75116bool Greeter::promptless() const

@@ -78,23 +119,68 @@ bool Greeter::promptless() const

78119 return d->promptless;

79120}

80121

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+

81150void Greeter::authenticate(const QString &username)

82151{

83152 Q_D(Greeter);

84− d->wasPrompted = false;

153+ d->prompts.clear();

154+ d->responded = false;

155+ d->everResponded = false;

85156 if (d->promptless) {

86157 d->promptless = false;

87158 Q_EMIT promptlessChanged();

88159 }

89160

90− d->m_greeter->authenticate(username);

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

169+ d->m_greeter->authenticate(nullptr);

170+ } else {

171+ d->m_greeter->authenticate(username);

172+ }

173+

174+ Q_EMIT authenticationStarted();

91175 Q_EMIT isAuthenticatedChanged();

92− Q_EMIT authenticationUserChanged(username);

176+ checkAuthenticationUser();

93177}

94178

95179void Greeter::respond(const QString &response)

96180{

97181 Q_D(Greeter);

182+ d->responded = true;

183+ d->everResponded = true;

98184 d->m_greeter->respond(response);

99185}

100186

@@ -107,32 +193,87 @@ bool Greeter::startSessionSync(const QString &session)

107193void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)

108194{

109195 Q_D(Greeter);

110− d->wasPrompted = true;

196+

197+ checkAuthenticationUser(); // may have changed in liblightdm

111198

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

113205

114206 // Strip prompt of any colons at the end

115− QString trimmedText = text.trimmed();

116− if (trimmedText.endsWith(":") || trimmedText.endsWith("：")) {

207+ if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {

117208 trimmedText.chop(1);

118209 }

119210

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

121223}

122224

123225void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)

124226{

125− Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);

227+ Q_D(Greeter);

228+

229+ checkAuthenticationUser(); // may have changed in liblightdm

230+

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

126238}

127239

128240void Greeter::authenticationCompleteFilter()

129241{

130242 Q_D(Greeter);

131− 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) {

132250 d->promptless = true;

133251 Q_EMIT promptlessChanged();

134252 }

135253

136− Q_EMIT isAuthenticatedChanged();

137− Q_EMIT authenticationComplete();

254+ if (!isAuthenticated()) {

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+ }

138279}

plugins/LightDM/Greeter.h+21−11

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

11/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -13,7 +13,6 @@

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

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

1515 *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1716 */

1817

1918/* This class is a really tiny filter around QLightDM::Greeter. There are some

@@ -22,13 +21,13 @@

2221 such edits in the future, and by inserting ourselves here, we have more

2322 control. */

2423

25−#ifndef UNITY_GREETER_H

26−#define UNITY_GREETER_H

24+#pragma once

2725

2826#include <QLightDM/Greeter>

2927#include <QtCore/QObject>

3028

3129class GreeterPrivate;

30+class PromptsModel;

3231

3332class Greeter : public QObject

3433{

@@ -37,15 +36,25 @@ class Greeter : public QObject

3736 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

3837 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

3938 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

4040 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

4142

4243public:

43− explicit Greeter(QObject* parent=0);

44+ static Greeter *instance();

45+ virtual ~Greeter();

4446

4547 bool isActive() const;

4648 bool isAuthenticated() const;

4749 QString authenticationUser() const;

50+ QString defaultSessionHint() const;

4851 bool promptless() const;

52+ QString selectUser() const;

53+ bool hasGuestAccount() const;

54+ bool showManualLoginHint() const;

55+ bool hideUsersHint() const;

56+

57+ PromptsModel *promptsModel();

4958

5059public Q_SLOTS:

5160 void authenticate(const QString &username=QString());

@@ -54,21 +63,23 @@ public Q_SLOTS:

5463 void setIsActive(bool isActive);

5564

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

6167 void isActiveChanged();

6268 void isAuthenticatedChanged();

6369 void promptlessChanged();

6470 void showGreeter();

6571 void hideGreeter();

72+ void loginError(bool automatic);

73+ void loginSuccess(bool automatic);

74+ void authenticationStarted(); // useful for testing

6675

6776 // This signal is emitted by external agents like indicators, and the UI

6877 // should switch to this user if possible.

6978 void requestAuthenticationUser(const QString &user);

7079

7180protected:

81+ explicit Greeter(QObject* parent=0);

82+

7283 GreeterPrivate * const d_ptr;

7384

7485 Q_DECLARE_PRIVATE(Greeter)

@@ -77,6 +88,5 @@ private Q_SLOTS:

7788 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);

7889 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);

7990 void authenticationCompleteFilter();

91+ void checkAuthenticationUser();

8092};

81−

82−#endif

plugins/LightDM/GreeterPrivate.h+13−7

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2015-2017 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -14,10 +14,14 @@

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

1515 */

1616

17−#ifndef UNITY_GREETER_PRIVATE_H

18−#define UNITY_GREETER_PRIVATE_H

17+#pragma once

1918

20−#include <QLightDM/Greeter>

19+#include "PromptsModel.h"

20+#include <QObject>

21+

22+namespace QLightDM {

23+ class Greeter;

24+}

2125

2226class GreeterPrivate

2327{

@@ -26,8 +30,12 @@ public:

2630

2731 QLightDM::Greeter *m_greeter;

2832 bool m_active;

29− bool wasPrompted;

33+ PromptsModel prompts;

34+ PromptsModel leftovers; // prompts to show during next auth for same user

35+ bool responded;

36+ bool everResponded;

3037 bool promptless;

38+ QString cachedAuthUser;

3139

3240protected:

3341 Greeter * const q_ptr;

@@ -35,5 +43,3 @@ protected:

3543private:

3644 Q_DECLARE_PUBLIC(Greeter)

3745};

38−

39−#endif // UNITY_GREETER_PRIVATE_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)

tests/mocks/LightDM/QLightDM/Greeter → plugins/LightDM/IntegratedLightDM/QLightDM/Greeterrenamed+1−1

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

qml/Panel/PanelBackground.qml → plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelrenamed+2−6

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -14,8 +14,4 @@

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

1515 */

1616

17−import QtQuick 2.0

18−

19−Rectangle {

20− color: "black"

21−}

17+#include "../liblightdm/SessionsModel.h"

tests/mocks/LightDM/QLightDM/UsersModel → plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelrenamed+1−1

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

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

plugins/LightDM/liblightdm/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed+13−15

@@ -49,18 +49,18 @@ QString Greeter::authenticationUser() const

4949

5050bool Greeter::hasGuestAccountHint() const

5151{

52− return true;

52+ return false;

5353}

5454

5555QString Greeter::getHint(const QString &name) const

5656{

5757 Q_UNUSED(name)

58− return "";

58+ return QLatin1String("");

5959}

6060

6161QString Greeter::defaultSessionHint() const

6262{

63− return "ubuntu";

63+ return QStringLiteral("ubuntu");

6464}

6565

6666bool Greeter::hideUsersHint() const

@@ -70,22 +70,17 @@ bool Greeter::hideUsersHint() const

7070

7171bool Greeter::showManualLoginHint() const

7272{

73− return true;

73+ return false;

7474}

7575

7676bool Greeter::showRemoteLoginHint() const

77−{

78− return true;

79−}

80−

81−bool Greeter::lockHint () const

8277{

8378 return false;

8479}

8580

8681QString Greeter::selectUserHint() const

8782{

88− return "";

83+ return QLatin1String("");

8984}

9085

9186bool Greeter::selectGuestHint() const

@@ -95,7 +90,7 @@ bool Greeter::selectGuestHint() const

9590

9691QString Greeter::autologinUserHint() const

9792{

98− return "";

93+ return QLatin1String("");

9994}

10095

10196bool Greeter::autologinGuestHint() const

@@ -115,7 +110,7 @@ bool Greeter::inAuthentication() const

115110

116111QString Greeter::hostname() const

117112{

118− return "hostname1";

113+ return QStringLiteral("hostname1");

119114}

120115

121116bool Greeter::isAuthenticated() const

@@ -151,7 +146,10 @@ void Greeter::authenticateRemote(const QString &session, const QString &username

151146}

152147

153148void Greeter::cancelAuthentication()

154−{}

149+{

150+ Q_D(Greeter);

151+ d->cancelAuthentication();

152+}

155153

156154void Greeter::setLanguage (const QString &language)

157155{

@@ -173,9 +171,9 @@ void Greeter::respond(const QString &response)

173171

174172void Greeter::sendAuthenticationComplete()

175173{

176− if (qgetenv("UNITY_TESTING").isEmpty()) {

174+ if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {

177175 // simulate PAM's delay

178− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));

176+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);

179177 } else {

180178 Q_EMIT authenticationComplete();

181179 }

plugins/LightDM/liblightdm/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed+2−6

@@ -45,22 +45,19 @@ class Q_DECL_EXPORT Greeter : public QObject

4545

4646 Q_PROPERTY(QString hostname READ hostname CONSTANT)

4747 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

48− Q_PROPERTY(bool locked READ lockHint CONSTANT)

49−

50− Q_PROPERTY(QString hostname READ hostname CONSTANT)

51−

52− Q_ENUMS(PromptType MessageType)

5348

5449public:

5550 enum PromptType {

5651 PromptTypeQuestion,

5752 PromptTypeSecret

5853 };

54+ Q_ENUM(PromptType)

5955

6056 enum MessageType {

6157 MessageTypeInfo,

6258 MessageTypeError

6359 };

60+ Q_ENUM(MessageType)

6461

6562 explicit Greeter(QObject* parent=0);

6663 virtual ~Greeter();

@@ -70,7 +67,6 @@ public:

7067 bool hideUsersHint() const;

7168 bool showManualLoginHint() const;

7269 bool showRemoteLoginHint() const;

73− bool lockHint () const;

7470 bool hasGuestAccountHint() const;

7571 QString selectUserHint() const;

7672 bool selectGuestHint() const;

plugins/LightDM/liblightdm/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+45−17

@@ -50,13 +50,13 @@ public:

5050 {

5151 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

5252

53− connect(&futureWatcher, SIGNAL(finished()),

54− this, SLOT(finishPam()));

53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);

5554 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

5655 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

5756 // This next connect is how we pass ResponseFutures between threads

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

6060 }

6161

6262 ~GreeterImpl()

@@ -68,6 +68,13 @@ public:

6868 {

6969 // Clear out any existing PAM interactions first

7070 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+ }

7178

7279 AppData *appData = new AppData();

7380 appData->impl = this;

@@ -79,16 +86,16 @@ public:

7986

8087 if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {

8188 appData->handle = pamHandle;

82− futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));

89+ futureWatcher.setFuture(QtConcurrent::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));

8390 } else {

8491 delete appData;

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

8794 Q_EMIT greeter->authenticationComplete();

8895 }

8996 }

9097

91− static int authenticateWithPam(pam_handle* pamHandle)

98+ static int authenticateWithPam(pam_handle* const& pamHandle)

9299 {

93100 int pamStatus = pam_authenticate(pamHandle, 0);

94101 if (pamStatus == PAM_SUCCESS) {

@@ -199,6 +206,28 @@ public Q_SLOTS:

199206 }

200207 }

201208

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+

202231Q_SIGNALS:

203232 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);

204233 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

@@ -240,17 +269,6 @@ private Q_SLOTS:

240269 }

241270

242271private:

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−

254272 Greeter *greeter;

255273 GreeterPrivate *greeterPrivate;

256274 pam_handle* pamHandle;

@@ -266,6 +284,11 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)

266284{

267285}

268286

287+GreeterPrivate::~GreeterPrivate()

288+{

289+ delete m_impl;

290+}

291+

269292void GreeterPrivate::handleAuthenticate()

270293{

271294 m_impl->start(authenticationUser);

@@ -276,6 +299,11 @@ void GreeterPrivate::handleRespond(const QString &response)

276299 m_impl->respond(response);

277300}

278301

302+void GreeterPrivate::cancelAuthentication()

303+{

304+ m_impl->cancelPam();

305+}

306+

279307}

280308

281309#include "GreeterPrivate.moc"

plugins/LightDM/liblightdm/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed+2−1

@@ -30,7 +30,7 @@ class GreeterPrivate

3030{

3131public:

3232 explicit GreeterPrivate(Greeter* parent=0);

33− virtual ~GreeterPrivate() = default;

33+ virtual ~GreeterPrivate();

3434

3535 // These variables may not be used by all subclasses, that's no problem

3636 bool authenticated;

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

3838

3939 void handleAuthenticate();

4040 void handleRespond(const QString &response);

41+ void cancelAuthentication();

4142

4243protected:

4344 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

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppnew file+36

@@ -0,0 +1,36 @@

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+#include "SessionsModelPrivate.h"

19+

20+#include <QDir>

21+#include <QSettings>

22+#include <QStringList>

23+

24+namespace QLightDM

25+{

26+

27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)

28+ : q_ptr(parent)

29+{

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

34+}

35+

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

plugins/LightDM/liblightdm/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+8−21

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :

4040 QAbstractListModel(parent),

4141 d_ptr(new UsersModelPrivate(this))

4242{

43− Q_D(UsersModel);

44−

4543 // Extend roleNames (we want to keep the "display" role)

4644 QHash<int, QByteArray> roles = roleNames();

4745 roles[NameRole] = "name";

@@ -52,26 +50,13 @@ UsersModel::UsersModel(QObject *parent) :

5250 roles[SessionRole] = "session";

5351 roles[HasMessagesRole] = "hasMessages";

5452 roles[ImagePathRole] = "imagePath";

53+ roles[UidRole] = "uid";

5554 setRoleNames(roles);

5655

57− // Now modify our mock user backgrounds

58− QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");

59− QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);

60−

61− for (int i = 0, j = 0; i < d->entries.size(); i++) {

62− Entry &entry = d->entries[i];

63− if (entry.background.isNull() && !backgrounds.isEmpty()) {

64− entry.background = bgdir.filePath(backgrounds[j++]);

65− if (j >= backgrounds.length()) {

66− j = 0;

67− }

68− }

69− }

70−}

71−

72−UsersModel::~UsersModel()

73−{

74− delete d_ptr;

56+ connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {

57+ QModelIndex index = createIndex(i, 0);

58+ Q_EMIT dataChanged(index, index);

59+ });

7560}

7661

7762int UsersModel::rowCount(const QModelIndex &parent) const

@@ -115,6 +100,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const

115100 return d->entries[row].has_messages;

116101 case UsersModel::ImagePathRole:

117102 return "";

103+ case UsersModel::UidRole:

104+ return d->entries[row].uid;

118105 default:

119106 return QVariant();

120107 }

plugins/LightDM/liblightdm/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+6−6

@@ -37,11 +37,9 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel

3737{

3838 Q_OBJECT

3939

40− Q_ENUMS(UserModelRoles)

41−

4240public:

4341 explicit UsersModel(QObject *parent = 0);

44− virtual ~UsersModel();

42+ virtual ~UsersModel() = default;

4543

4644 enum UserModelRoles {NameRole = Qt::UserRole,

4745 RealNameRole,

@@ -50,11 +48,13 @@ public:

5048 SessionRole,

5149 HasMessagesRole,

5250 ImagePathRole,

53− BackgroundPathRole

51+ BackgroundPathRole,

52+ UidRole

5453 };

54+ Q_ENUM(UserModelRoles)

5555

56− int rowCount(const QModelIndex &parent) const;

57− QVariant data(const QModelIndex &index, int role) const;

56+ int rowCount(const QModelIndex &parent) const override;

57+ QVariant data(const QModelIndex &index, int role) const override;

5858

5959private:

6060 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/liblightdm/UsersModelPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed+17−4

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -19,8 +19,11 @@

1919#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H

2020#define UNITY_MOCK_USERSMODEL_PRIVATE_H

2121

22−#include <QtCore/QList>

23−#include <QtCore/QString>

22+#include <QList>

23+#include <QObject>

24+#include <QString>

25+

26+class AccountsServiceDBusAdaptor;

2427

2528namespace QLightDM

2629{

@@ -37,21 +40,31 @@ public:

3740 bool has_messages;

3841 QString session;

3942 QString infographic;

43+ uid_t uid;

4044};

4145

42−class UsersModelPrivate

46+class UsersModelPrivate : public QObject

4347{

48+ Q_OBJECT

49+

4450public:

4551 explicit UsersModelPrivate(UsersModel *parent = 0);

4652 virtual ~UsersModelPrivate() = default;

4753

4854 QList<Entry> entries;

4955

56+Q_SIGNALS:

57+ void dataChanged(int);

58+

5059protected:

5160 UsersModel * const q_ptr;

5261

5362private:

5463 Q_DECLARE_PUBLIC(UsersModel)

64+

65+ void updateName(bool async);

66+

67+ AccountsServiceDBusAdaptor *m_service;

5568};

5669

5770}

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+182−14

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013,2015-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,47 +12,198 @@

1212 *

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1715 */

1816

17+#include "Greeter.h"

1918#include "UsersModel.h"

19+#include <QIdentityProxyModel>

2020#include <QLightDM/UsersModel>

21−#include <QtCore/QSortFilterProxyModel>

21+

22+#include <libintl.h>

2223

2324// First, we define an internal class that wraps LightDM's UsersModel. This

2425// 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.

2628// (We can't modify the data directly in UsersModel below because it won't sort

2729// using the modified data.)

28−class MangleModel : public QSortFilterProxyModel

30+class MangleModel : public QIdentityProxyModel

2931{

3032 Q_OBJECT

3133

3234public:

3335 explicit MangleModel(QObject* parent=0);

3436

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;

3658};

3759

3860MangleModel::MangleModel(QObject* parent)

39− : QSortFilterProxyModel(parent)

61+ : QIdentityProxyModel(parent)

62+ , m_updatingCustomRows(false)

4063{

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

4279}

4380

4481QVariant MangleModel::data(const QModelIndex &index, int role) const

4582{

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+ }

47103

48104 // If user's real name is empty, switch to unix name

49− if (role == QLightDM::UsersModel::RealNameRole && data.toString().isEmpty()) {

50− data = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

51− } else if (role == QLightDM::UsersModel::BackgroundPathRole && data.toString().startsWith('#')) {

52− data = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + data.toString() + "'/></svg>";

105+ if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {

106+ variantData = data(index, QLightDM::UsersModel::NameRole);

107+ } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {

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

53115 }

54116

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+ }

56207}

57208

58209// **** Now we continue with actual UsersModel class ****

@@ -67,4 +218,21 @@ UsersModel::UsersModel(QObject* parent)

67218 sort(0);

68219}

69220

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+

70238#include "UsersModel.moc"

plugins/LightDM/UsersModel.h+6−8

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

11/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012-2013,2015-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,19 +12,16 @@

1212 *

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917/* This class is a really tiny filter around QLightDM::UsersModel. There are

2018 some operations that we want to edit a bit for the benefit of Qml.

2119 Specifically, we want to sort users according to realName. */

2220

23−#ifndef UNITY_USERSMODEL_H

24−#define UNITY_USERSMODEL_H

21+#pragma once

2522

2623#include <unitysortfilterproxymodelqml.h>

27−#include <QtCore/QObject>

24+#include <QObject>

2825

2926class UsersModel : public UnitySortFilterProxyModelQML

3027{

@@ -32,6 +29,7 @@ class UsersModel : public UnitySortFilterProxyModelQML

3229

3330public:

3431 explicit UsersModel(QObject* parent=0);

35−};

3632

37−#endif

33+protected:

34+ bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

35+};

plugins/LightDM/liblightdm/CMakeLists.txtdeleted−37

@@ -1,37 +0,0 @@

1−pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2−

3−set(LibLightDM_SOURCES

4− Greeter.cpp

5− UsersModel.cpp

6− GreeterPrivate.cpp

7− UsersModelPrivate.cpp

8− ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

9− )

10−

11−add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})

12−add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})

13−

14−include_directories(

15− ${CMAKE_CURRENT_BINARY_DIR}

16− ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

17−)

18−

19−target_link_libraries(integratedLightDM

20− ${LIBUSERMETRICSOUTPUT_LDFLAGS}

21− -lpam

22−)

23−target_link_libraries(MockLightDM-demo-shared

24− ${LIBUSERMETRICSOUTPUT_LDFLAGS}

25− -lpam

26−)

27−

28−qt5_use_modules(integratedLightDM Concurrent Gui)

29−qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)

30−

31−set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)

32−set_target_properties(MockLightDM-demo-shared PROPERTIES

33− OUTPUT_NAME lightdm-qt5-2)

34−

35−install(TARGETS MockLightDM-demo-shared

36− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo

37− )

plugins/LightDM/liblightdm/UsersModelPrivate.cppdeleted−41

@@ -1,41 +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− * Author: Michael Terry <michael.terry@canonical.com>

17− */

18−

19−#include "UsersModelPrivate.h"

20−

21−#include <QDir>

22−#include <QSettings>

23−#include <QStringList>

24−

25−namespace QLightDM

26−{

27−

28−UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

29− : q_ptr(parent)

30−{

31− QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

32− QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();

33−

34− Q_FOREACH(const QString &user, users)

35− {

36− QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();

37− entries.append({user, name, 0, 0, false, false, 0, 0});

38− }

39−}

40−

41−}

plugins/LightDM/plugin.cpp+40−12

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

11/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -13,17 +13,18 @@

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

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

1515 *

16− * Authors: Gerry Boland <gerry.boland@canonical.com>

17− * Michael Terry <michael.terry@canonical.com>

1816 */

1917

2018#include "plugin.h"

2119#include "DBusGreeter.h"

2220#include "DBusGreeterList.h"

2321#include "Greeter.h"

22+#include "PromptsModel.h"

23+#include "SessionsModel.h"

2424#include "UsersModel.h"

2525#include <libusermetricsoutput/ColorTheme.h>

2626#include <libusermetricsoutput/UserMetrics.h>

27+#include <QLightDM/SessionsModel>

2728#include <QLightDM/UsersModel>

2829

2930#include <QAbstractItemModel>

@@ -32,16 +33,31 @@

3233

3334static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

3435{

35− Q_UNUSED(engine)

3636 Q_UNUSED(scriptEngine)

3737

38− Greeter *greeter = new Greeter();

39− new DBusGreeter(greeter, "/");

40− new DBusGreeterList(greeter, "/list");

38+ Greeter *greeter = Greeter::instance();

39+ new DBusGreeter(greeter, QStringLiteral("/"));

40+ new DBusGreeterList(greeter, QStringLiteral("/list"));

41+

42+ engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);

4143

4244 return greeter;

4345}

4446

47+static QObject *prompts_provider(QQmlEngine *engine, QJSEngine *)

48+{

49+ auto model = Greeter::instance()->promptsModel();

50+ engine->setObjectOwnership(model, QQmlEngine::CppOwnership);

51+ return model;

52+}

53+

54+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

55+{

56+ Q_UNUSED(engine)

57+ Q_UNUSED(scriptEngine)

58+ return new SessionsModel();

59+}

60+

4561static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

4662{

4763 Q_UNUSED(engine)

@@ -56,16 +72,28 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine

5672 return UserMetricsOutput::UserMetrics::getInstance();

5773}

5874

59−void LightDMPlugin::registerTypes(const char *uri)

75+void PLUGIN_CLASSNAME::registerTypes(const char *uri)

6076{

6177 qmlRegisterType<QAbstractItemModel>();

6278 qmlRegisterType<UserMetricsOutput::ColorTheme>();

6379

64− Q_ASSERT(uri == QLatin1String("LightDM"));

65− qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

66− qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

80+#if defined INTEGRATED_LIGHTDM

81+ Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));

6782 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

83+#elif defined FULL_LIGHTDM

84+ Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));

85+ qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);

86+#else

87+ #error No library defined in LightDM plugin

88+#endif

89+

90+ qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);

91+

92+ qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

93+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

94+

6895 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

69− qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

96+ qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

97+

7098 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

7199}

plugins/LightDM/plugin.h+4−6

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

11/*

2− * Copyright (C) 2012,2013 Canonical, Ltd.

2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -13,8 +13,6 @@

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

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

1515 *

16− * Authors: Gerry Boland <gerry.boland@canonical.com>

17− * Michael Terry <michael.terry@canonical.com>

1816 */

1917

2018#ifndef LIGHTDM_PLUGIN_H

@@ -23,13 +21,13 @@

2321#include <QtQml/QQmlEngine>

2422#include <QtQml/QQmlExtensionPlugin>

2523

26−class LightDMPlugin : public QQmlExtensionPlugin

24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin

2725{

2826 Q_OBJECT

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

3028

3129public:

32− void registerTypes(const char *uri);

30+ void registerTypes(const char *uri) override;

3331};

3432

35−#endif

33+#endif /* LIGHTDM_PLUGIN_H */

plugins/LightDM/qmldir+3−3

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

1−module LightDM

2−plugin LightDM-qml

3−typeinfo LightDM.qmltypes

1+module IntegratedLightDM

2+plugin IntegratedLightDM-qml

3+typeinfo IntegratedLightDM.qmltypes

plugins/Lights/CMakeLists.txt+9−2

@@ -1,16 +1,23 @@

11pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

34

45include_directories(

6+ SYSTEM

57 ${ANDROID_HEADERS_INCLUDE_DIRS}

68)

79

810add_library(Lights-qml MODULE

911 plugin.cpp

1012 Lights.cpp

13+ LegacyLights.cpp

14+ HfdLights.cpp

1115 )

1216

13−qt5_use_modules(Lights-qml Qml Gui)

14−target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})

17+target_link_libraries(Lights-qml

18+ Qt5::Qml Qt5::Gui Qt5::DBus

19+ ${ANDROID_HARDWARE_LIBRARIES}

20+ ${ANDROID_PROPERTIES_LIBRARIES}

21+ )

1522

1623add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

plugins/Lights/HfdLights.cppnew file+62

@@ -0,0 +1,62 @@

1+/*

2+ * Copyright (C) 2021 UBports Foundation.

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: Florian Leeber <florian@ubports.com>

17+ */

18+

19+#include "HfdLights.h"

20+#include <QtCore/QDebug>

21+#include <QDBusArgument>

22+#include <QDBusConnection>

23+#include <iostream>

24+

25+#define HFD_SERVICE_NAME "com.lomiri.hfd"

26+#define HFD_SERVICE_PATH "/com/lomiri/hfd"

27+#define HFD_SERVICE_INTERFACE "com.lomiri.hfd.Leds"

28+

29+HfdLights::HfdLights(QObject* parent)

30+ : Lights(parent)

31+{

32+ m_hfdInterface = new QDBusInterface(

33+ QStringLiteral(HFD_SERVICE_NAME),

34+ QStringLiteral(HFD_SERVICE_PATH),

35+ QStringLiteral(HFD_SERVICE_INTERFACE),

36+ QDBusConnection::systemBus(),

37+ this

38+ );

39+}

40+

41+bool HfdLights::init()

42+{

43+ // hfd does not need any initalization to be used

44+ return true;

45+}

46+

47+void HfdLights::turnOn()

48+{

49+ m_hfdInterface->call(QStringLiteral("setState"), 0);

50+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)m_color.rgba());

51+ m_hfdInterface->call(QStringLiteral("setOnMs"), m_onMs);

52+ m_hfdInterface->call(QStringLiteral("setOffMs"), m_offMs);

53+ m_hfdInterface->call(QStringLiteral("setState"), 1);

54+}

55+

56+void HfdLights::turnOff()

57+{

58+ m_hfdInterface->call(QStringLiteral("setState"), 0);

59+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)0);

60+ m_hfdInterface->call(QStringLiteral("setOnMs"), 0);

61+ m_hfdInterface->call(QStringLiteral("setOffMs"), 0);

62+}

plugins/Lights/HfdLights.hnew file+42

@@ -0,0 +1,42 @@

1+/*

2+ * Copyright (C) 2021 UBports Foundation.

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: Florian Leeber <florian@ubports.com>

17+ */

18+

19+#ifndef UNITY_HFDLIGHTS_H

20+#define UNITY_HFDLIGHTS_H

21+

22+#include <QtCore/QObject>

23+#include <QDBusInterface>

24+#include "Lights.h"

25+

26+class HfdLights: public Lights

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit HfdLights(QObject *parent = 0);

32+

33+protected:

34+ bool init() override;

35+ void turnOff() override;

36+ void turnOn() override;

37+

38+private:

39+ QDBusInterface* m_hfdInterface;

40+};

41+

42+#endif

plugins/Lights/LegacyLights.cppnew file+91

@@ -0,0 +1,91 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ * Copyright (C) 2021 UBports Foundation.

4+ *

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

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

7+ * the Free Software Foundation; version 3.

8+ *

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

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

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

12+ * GNU General Public License for more details.

13+ *

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

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

16+ *

17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

18+ */

19+

20+#include "LegacyLights.h"

21+#include <QtCore/QDebug>

22+

23+extern "C" {

24+#include "android-hardware.h"

25+#include <string.h>

26+}

27+

28+LegacyLights::~LegacyLights()

29+{

30+ if (m_lightDevice) {

31+ hw_device_t* device = (hw_device_t*) m_lightDevice;

32+ device->close(device);

33+ }

34+}

35+

36+bool LegacyLights::init()

37+{

38+ if (m_lightDevice) {

39+ return true;

40+ }

41+

42+ int err;

43+ hw_module_t* module;

44+

45+ err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);

46+ if (err == 0) {

47+ hw_device_t* device;

48+ err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

49+ if (err == 0) {

50+ m_lightDevice = (light_device_t*)device;

51+ turnOff();

52+ return true;

53+ } else {

54+ qWarning() << "Failed to access notification lights";

55+ }

56+ } else {

57+ qWarning() << "Failed to initialize lights hardware.";

58+ }

59+ return false;

60+}

61+

62+void LegacyLights::turnOn()

63+{

64+ // pulse

65+ light_state_t state;

66+ memset(&state, 0, sizeof(light_state_t));

67+ state.color = m_color.rgba();

68+ state.flashMode = LIGHT_FLASH_TIMED;

69+ state.flashOnMS = m_onMs;

70+ state.flashOffMS = m_offMs;

71+ state.brightnessMode = BRIGHTNESS_MODE_USER;

72+

73+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

74+ qWarning() << "Failed to turn the light off";

75+ }

76+}

77+

78+void LegacyLights::turnOff()

79+{

80+ light_state_t state;

81+ memset(&state, 0, sizeof(light_state_t));

82+ state.color = 0x00000000;

83+ state.flashMode = LIGHT_FLASH_NONE;

84+ state.flashOnMS = 0;

85+ state.flashOffMS = 0;

86+ state.brightnessMode = 0;

87+

88+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

89+ qWarning() << "Failed to turn the light off";

90+ }

91+}

plugins/Lights/LegacyLights.hnew file+45

@@ -0,0 +1,45 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ * Copyright (C) 2021 UBports Foundation.

4+ *

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

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

7+ * the Free Software Foundation; version 3.

8+ *

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

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

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

12+ * GNU General Public License for more details.

13+ *

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

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

16+ *

17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

18+ */

19+

20+#ifndef UNITY_LEGACYLIGHTS_H

21+#define UNITY_LEGACYLIGHTS_H

22+

23+#include <QtCore/QObject>

24+#include "Lights.h"

25+

26+struct light_device_t;

27+

28+class LegacyLights: public Lights

29+{

30+ Q_OBJECT

31+

32+public:

33+ ~LegacyLights();

34+

35+protected:

36+ bool init() override;

37+ void turnOff() override;

38+ void turnOn() override;

39+

40+private:

41+ light_device_t* m_lightDevice;

42+

43+};

44+

45+#endif

plugins/Lights/Lights.cpp+1−66

@@ -26,20 +26,12 @@ extern "C" {

2626

2727Lights::Lights(QObject* parent)

2828 : QObject(parent),

29− m_lightDevice(0),

3029 m_color("blue"),

3130 m_state(Lights::Off),

3231 m_onMs(1000),

3332 m_offMs(3000)

3433{

35−}

3634

37−Lights::~Lights()

38−{

39− if (m_lightDevice) {

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

41− device->close(device);

42− }

4335}

4436

4537void Lights::setState(Lights::State newState)

@@ -71,7 +63,7 @@ void Lights::setColor(const QColor &color)

7163 if (m_color != color) {

7264 m_color = color;

7365 Q_EMIT colorChanged(m_color);

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

66+ // FIXME: update the color if the light is already on

7567 }

7668}

7769

@@ -107,60 +99,3 @@ void Lights::setOffMillisec(int offMs)

10799 // FIXME: update the property if the light is already on

108100 }

109101}

110−

111−bool Lights::init()

112−{

113− if (m_lightDevice) {

114− return true;

115− }

116−

117− int err;

118− hw_module_t* module;

119−

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

121− if (err == 0) {

122− hw_device_t* device;

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

124− if (err == 0) {

125− m_lightDevice = (light_device_t*)device;

126− turnOff();

127− return true;

128− } else {

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

130− }

131− } else {

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

133− }

134− return false;

135−}

136−

137−void Lights::turnOn()

138−{

139− // pulse

140− light_state_t state;

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

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

143− state.flashMode = LIGHT_FLASH_TIMED;

144− state.flashOnMS = m_onMs;

145− state.flashOffMS = m_offMs;

146− state.brightnessMode = BRIGHTNESS_MODE_USER;

147−

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

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

150− }

151−}

152−

153−void Lights::turnOff()

154−{

155− light_state_t state;

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

157− state.color = 0x00000000;

158− state.flashMode = LIGHT_FLASH_NONE;

159− state.flashOnMS = 0;

160− state.flashOffMS = 0;

161− state.brightnessMode = 0;

162−

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

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

165− }

166−}

plugins/Lights/Lights.h+5−9

@@ -22,12 +22,9 @@

2222#include <QtCore/QObject>

2323#include <QtGui/QColor>

2424

25−struct light_device_t;

26−

2725class Lights: public QObject

2826{

2927 Q_OBJECT

30− Q_ENUMS(State)

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

3229 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

3330 Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)

@@ -38,9 +35,9 @@ public:

3835 Off,

3936 On,

4037 };

38+ Q_ENUM(State)

4139

4240 explicit Lights(QObject *parent = 0);

43− ~Lights();

4441

4542 void setState(State newState);

4643 State state() const;

@@ -60,16 +57,15 @@ Q_SIGNALS:

6057 void onMillisecChanged(int onMs);

6158 void offMillisecChanged(int offMs);

6259

63−private:

64− light_device_t* m_lightDevice;

60+protected:

6561 QColor m_color;

6662 State m_state;

6763 int m_onMs;

6864 int m_offMs;

6965

70− bool init();

71− void turnOff();

72− void turnOn();

66+ virtual bool init() = 0;

67+ virtual void turnOff() = 0;

68+ virtual void turnOn() = 0;

7369};

7470

7571#endif

plugins/Lights/Lights.qmltypesdeleted−45

@@ -1,45 +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 Lights 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Lights"

12− prototype: "QObject"

13− exports: ["Lights/Lights 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "State"

19− values: {

20− "Off": 0,

21− "On": 1

22− }

23− }

24− Property { name: "state"; type: "State" }

25− Property { name: "color"; type: "QColor" }

26− Property { name: "onMillisec"; type: "int" }

27− Property { name: "offMillisec"; type: "int" }

28− Signal {

29− name: "stateChanged"

30− Parameter { name: "newState"; type: "State" }

31− }

32− Signal {

33− name: "colorChanged"

34− Parameter { name: "color"; type: "QColor" }

35− }

36− Signal {

37− name: "onMillisecChanged"

38− Parameter { name: "onMs"; type: "int" }

39− }

40− Signal {

41− name: "offMillisecChanged"

42− Parameter { name: "offMs"; type: "int" }

43− }

44− }

45−}

plugins/Lights/android-hardware.h−4

@@ -15,9 +15,5 @@

1515 *

1616 */

1717

18−// The purpose of this header wrapper is just to avoid having warnings being reported on

19−// code from external header files, as we can't do anything about them.

20−#pragma GCC system_header

21−

2218#include <hardware/hardware.h>

2319#include <hardware/lights.h>

plugins/Lights/plugin.cpp+20−1

@@ -18,6 +18,11 @@

1818

1919#include "plugin.h"

2020#include "Lights.h"

21+#include "HfdLights.h"

22+#include "LegacyLights.h"

23+

24+// libandroid-properties

25+#include <hybris/properties/properties.h>

2126

2227#include <QtQml/qqml.h>

2328

@@ -25,7 +30,21 @@ static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

2530{

2631 Q_UNUSED(engine)

2732 Q_UNUSED(scriptEngine)

28− return new Lights();

33+

34+ bool use_hfd = false;

35+ char buffer[PROP_VALUE_MAX];

36+ auto result = property_get("ro.build.version.sdk", buffer, "0");

37+ if (result) {

38+ auto sdkVersion = QString(buffer).toInt();

39+ if (sdkVersion >= 27 || sdkVersion == 0) {

40+ use_hfd = true;

41+ }

42+ }

43+ if (use_hfd) {

44+ return new HfdLights();

45+ } else {

46+ return new LegacyLights();

47+ }

2948}

3049

3150void LightsPlugin::registerTypes(const char *uri)

plugins/Lights/plugin.h+1−1

@@ -28,7 +28,7 @@ class LightsPlugin : public QQmlExtensionPlugin

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

2929

3030public:

31− void registerTypes(const char *uri);

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

3232};

3333

3434#endif

plugins/Powerd/CMakeLists.txt+4−4

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

1−pkg_search_module(GIO REQUIRED gio-2.0)

2−

31include_directories(

42 ${GIO_INCLUDE_DIRS}

53)

@@ -11,7 +9,9 @@ add_library(Powerd-qml MODULE

119 Powerd.cpp

1210 )

1311

14−qt5_use_modules(Powerd-qml DBus Qml)

15−target_link_libraries(Powerd-qml ${GIO_LDFLAGS})

12+target_link_libraries(Powerd-qml

13+ Qt5::DBus Qt5::Qml

14+ ${GIO_LDFLAGS}

15+ )

1616

1717add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)

plugins/Powerd/Powerd.cpp+17−10

@@ -22,19 +22,19 @@

2222void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

2323{

2424 bool value = g_settings_get_boolean(settings, key);

25− unityScreen->asyncCall("userAutobrightnessEnable", QVariant(value));

25+ unityScreen->asyncCall(QStringLiteral("userAutobrightnessEnable"), QVariant(value));

2626}

2727

2828void activityTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

2929{

3030 int value = g_settings_get_uint(settings, key);

31− unityScreen->asyncCall("setInactivityTimeouts", QVariant(value), QVariant(-1));

31+ unityScreen->asyncCall(QStringLiteral("setInactivityTimeouts"), QVariant(value), QVariant(-1));

3232}

3333

3434void dimTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

3535{

3636 int value = g_settings_get_uint(settings, key);

37− unityScreen->asyncCall("setInactivityTimeouts", QVariant(-1), QVariant(value));

37+ unityScreen->asyncCall(QStringLiteral("setInactivityTimeouts"), QVariant(-1), QVariant(value));

3838}

3939

4040Powerd::Powerd(QObject* parent)

@@ -42,15 +42,15 @@ Powerd::Powerd(QObject* parent)

4242 unityScreen(nullptr),

4343 cachedStatus(Status::On)

4444{

45− unityScreen = new QDBusInterface("com.canonical.Unity.Screen",

46− "/com/canonical/Unity/Screen",

47− "com.canonical.Unity.Screen",

45+ unityScreen = new QDBusInterface(QStringLiteral("com.canonical.Unity.Screen"),

46+ QStringLiteral("/com/canonical/Unity/Screen"),

47+ QStringLiteral("com.canonical.Unity.Screen"),

4848 QDBusConnection::SM_BUSNAME(), this);

4949

50− unityScreen->connection().connect("com.canonical.Unity.Screen",

51− "/com/canonical/Unity/Screen",

52− "com.canonical.Unity.Screen",

53− "DisplayPowerStateChange",

50+ unityScreen->connection().connect(QStringLiteral("com.canonical.Unity.Screen"),

51+ QStringLiteral("/com/canonical/Unity/Screen"),

52+ QStringLiteral("com.canonical.Unity.Screen"),

53+ QStringLiteral("DisplayPowerStateChange"),

5454 this,

5555 SLOT(handleDisplayPowerStateChange(int, int)));

5656

@@ -74,6 +74,13 @@ Powerd::Status Powerd::status() const

7474 return cachedStatus;

7575}

7676

77+void Powerd::setStatus(Powerd::Status status, DisplayStateChangeReason reason)

78+{

79+ unityScreen->asyncCall(QStringLiteral("setScreenPowerMode"),

80+ status == Powerd::On ? "on" : "off",

81+ static_cast<qint32>(reason));

82+}

83+

7784void Powerd::handleDisplayPowerStateChange(int status, int reason)

7885{

7986 if (cachedStatus != (Status)status) {

plugins/Powerd/Powerd.h+8−2

@@ -27,8 +27,6 @@

2727class Powerd: public QObject

2828{

2929 Q_OBJECT

30− Q_ENUMS(Status)

31− Q_ENUMS(DisplayStateChangeReason)

3230 Q_PROPERTY(Status status READ status NOTIFY statusChanged)

3331

3432public:

@@ -37,18 +35,26 @@ public:

3735 Inactivity = 1, // Display changed state due to inactivity

3836 PowerKey = 2, // Display changed state due to user pressing power key

3937 Proximity = 3, // Display changed state due to proximity events

38+ Notification = 4, // Display changed state due to user notification

39+ SnapDecision = 5, // Display changed state due to snap decision prompt

40+ CallDone = 6, // Display changed state due to voice call end

4041 };

42+ Q_ENUM(DisplayStateChangeReason)

4143

4244 enum Status {

4345 Off,

4446 On,

4547 };

48+ Q_ENUM(Status)

4649

4750 explicit Powerd(QObject *parent = 0);

4851 ~Powerd();

4952

5053 Status status() const;

5154

55+ // Not exposed via Q_PROPERTY because we need the 'reason' argument too

56+ Q_INVOKABLE void setStatus(Status status, DisplayStateChangeReason reason);

57+

5258Q_SIGNALS:

5359 void statusChanged(DisplayStateChangeReason reason);

5460

plugins/Powerd/Powerd.qmltypesdeleted−39

@@ -1,39 +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 Powerd 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Powerd"

12− prototype: "QObject"

13− exports: ["Powerd/Powerd 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "DisplayStateChangeReason"

19− values: {

20− "Unknown": 0,

21− "Inactivity": 1,

22− "PowerKey": 2,

23− "Proximity": 3

24− }

25− }

26− Enum {

27− name: "Status"

28− values: {

29− "Off": 0,

30− "On": 1

31− }

32− }

33− Property { name: "status"; type: "Status"; isReadonly: true }

34− Signal {

35− name: "statusChanged"

36− Parameter { name: "reason"; type: "DisplayStateChangeReason" }

37− }

38− }

39−}

plugins/Powerd/plugin.h+1−1

@@ -29,7 +29,7 @@ class PowerdPlugin : public QQmlExtensionPlugin

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

3030

3131public:

32− void registerTypes(const char *uri);

32+ void registerTypes(const char *uri) override;

3333};

3434

3535#endif

plugins/ScreenGrabber/CMakeLists.txtdeleted−13

@@ -1,13 +0,0 @@

1−include_directories(

2− ${CMAKE_CURRENT_BINARY_DIR}

3−)

4−

5−set(SCREENGRABBERSOURCES

6− screengrabber.cpp

7− plugin.cpp

8−)

9−

10−add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})

11−qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)

12−

13−add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)

plugins/ScreenGrabber/qmldirdeleted−3

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

1−module ScreenGrabber

2−plugin ScreenGrabber-qml

3−typeinfo ScreenGrabber.qmltypes

plugins/ScreenGrabber/screengrabber.cppdeleted−94

@@ -1,94 +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− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>

17− */

18−

19−#include "screengrabber.h"

20−

21−#include <QDir>

22−#include <QDateTime>

23−#include <QStandardPaths>

24−#include <QtGui/QImage>

25−#include <QtGui/QGuiApplication>

26−#include <QtQuick/QQuickWindow>

27−#include <QtConcurrent/QtConcurrentRun>

28−

29−#include <QDebug>

30−

31−void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)

32−{

33− if (!screenshot.save(filename, format.toLatin1().data(), quality))

34− qWarning() << "ScreenShotter: failed to save snapshot!";

35−}

36−

37−ScreenGrabber::ScreenGrabber(QObject *parent)

38− : QObject(parent),

39− screenshotQuality(0)

40−{

41− QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));

42− screenshotsDir.mkdir("Screenshots");

43− screenshotsDir.cd("Screenshots");

44− if (screenshotsDir.exists())

45− {

46− fileNamePrefix = screenshotsDir.absolutePath();

47− fileNamePrefix.append("/screenshot");

48− }

49− else

50− {

51− qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();

52− }

53−}

54−

55−void ScreenGrabber::captureAndSave()

56−{

57− if (fileNamePrefix.isEmpty())

58− {

59− qWarning() << "ScreenShotter: no directory to save screenshot";

60− return;

61− }

62−

63− const QWindowList windows = QGuiApplication::topLevelWindows();

64− if (windows.empty())

65− {

66− qWarning() << "ScreenShotter: no top level windows found!";

67− return;

68− }

69−

70− QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);

71− if (!main_window)

72− {

73− qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";

74− return;

75− }

76−

77− QImage screenshot = main_window->grabWindow();

78− QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);

79−}

80−

81−QString ScreenGrabber::makeFileName()

82−{

83− QString fileName(fileNamePrefix);

84− fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));

85− fileName.append(".");

86− fileName.append(getFormat());

87− return fileName;

88−}

89−

90−QString ScreenGrabber::getFormat()

91−{

92− //TODO: This should be configurable (perhaps through gsettings?)

93− return "png";

94−}

plugins/ScreenshotDirectory/CMakeLists.txtnew file+9

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

1+set(PLUGIN_SOURCES

2+ ScreenshotDirectory.cpp

3+ plugin.cpp

4+)

5+

6+add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})

7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)

8+

9+add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)

plugins/ScreenGrabber/ScreenGrabber.qmltypes → plugins/ScreenshotDirectory/ScreenGrabber.qmltypesrenamed+1−1

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1

44// It is used for QML tooling purposes only.

55//

66// This file was auto-generated by:

7−// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'

7+// 'qmlplugindump -notrelocatable ScreenGrabber 0.1 plugins'

88

99Module {

1010 Component {

plugins/ScreenshotDirectory/ScreenshotDirectory.cppnew file+64

@@ -0,0 +1,64 @@

1+/*

2+ * Copyright (C) 2014-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 "ScreenshotDirectory.h"

18+

19+#include <QDir>

20+#include <QDateTime>

21+#include <QStandardPaths>

22+#include <QTemporaryDir>

23+

24+#include <QDebug>

25+

26+ScreenshotDirectory::ScreenshotDirectory(QObject *parent)

27+ : QObject(parent)

28+{

29+ QDir screenshotsDir;

30+ if (qEnvironmentVariableIsSet("UNITY_TESTING")) {

31+ QTemporaryDir tDir;

32+ tDir.setAutoRemove(false);

33+ screenshotsDir = tDir.path();

34+ } else {

35+ screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);

36+ }

37+ screenshotsDir.mkpath(QStringLiteral("Screenshots"));

38+ screenshotsDir.cd(QStringLiteral("Screenshots"));

39+ if (screenshotsDir.exists()) {

40+ m_fileNamePrefix = screenshotsDir.absolutePath();

41+ m_fileNamePrefix.append("/screenshot");

42+ } else {

43+ qWarning() << "ScreenshotDirectory: failed to create directory at:" << screenshotsDir.absolutePath();

44+ }

45+}

46+

47+QString ScreenshotDirectory::makeFileName() const

48+{

49+ if (m_fileNamePrefix.isEmpty()) {

50+ return QString();

51+ }

52+

53+ QString fileName(m_fileNamePrefix);

54+ fileName.append(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmsszzz")));

55+ fileName.append(".");

56+ fileName.append(format());

57+ return fileName;

58+}

59+

60+QString ScreenshotDirectory::format() const

61+{

62+ //TODO: This should be configurable (perhaps through gsettings?)

63+ return QStringLiteral("png");

64+}

plugins/ScreenGrabber/screengrabber.h → plugins/ScreenshotDirectory/ScreenshotDirectory.hrenamed+10−13

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2014-2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,31 +12,28 @@

1212 *

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

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

15− *

16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>

1715 */

1816

19−#ifndef SNAPSHOTTER_H

20−#define SNAPSHOTTER_H

17+#ifndef SCREENSHOTDIRECTORY_H

18+#define SCREENSHOTDIRECTORY_H

2119

2220#include <QObject>

2321#include <QString>

2422

25−class ScreenGrabber: public QObject

23+class ScreenshotDirectory: public QObject

2624{

2725 Q_OBJECT

2826

2927public:

30− explicit ScreenGrabber(QObject *parent = 0);

28+ explicit ScreenshotDirectory(QObject *parent = 0);

29+ ~ScreenshotDirectory() = default;

3130

3231public Q_SLOTS:

33− void captureAndSave();

32+ QString makeFileName() const;

3433

3534private:

36− QString makeFileName();

37− QString getFormat();

38− QString fileNamePrefix;

39− int screenshotQuality;

35+ QString format() const;

36+ QString m_fileNamePrefix;

4037};

4138

42−#endif

39+#endif // SCREENSHOTDIRECTORY_H

plugins/ScreenGrabber/plugin.cpp → plugins/ScreenshotDirectory/plugin.cpprenamed+5−7

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2014,2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,17 +12,15 @@

1212 *

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

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

15− *

16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>

1715 */

1816

1917#include "plugin.h"

20−#include "screengrabber.h"

18+#include "ScreenshotDirectory.h"

2119

2220#include <QtQml/qqml.h>

2321

24−void ScreenGrabberPlugin::registerTypes(const char *uri)

22+void ScreenshotDirectoryPlugin::registerTypes(const char *uri)

2523{

26− Q_ASSERT(uri == QLatin1String("ScreenGrabber"));

27− qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");

24+ Q_ASSERT(uri == QLatin1String("ScreenshotDirectory"));

25+ qmlRegisterType<ScreenshotDirectory>(uri, 0, 1, "ScreenshotDirectory");

2826}

plugins/ScreenGrabber/plugin.h → plugins/ScreenshotDirectory/plugin.hrenamed+6−8

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

11/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2014,2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,22 +12,20 @@

1212 *

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

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

15− *

16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>

1715 */

1816

19−#ifndef SCREENGRABBER_PLUGIN_H

20−#define SCREENGRABBER_PLUGIN_H

17+#ifndef SCREENSHOTDIRECTORY_PLUGIN_H

18+#define SCREENSHOTDIRECTORY_PLUGIN_H

2119

2220#include <QtQml/QQmlExtensionPlugin>

2321

24−class ScreenGrabberPlugin : public QQmlExtensionPlugin

22+class ScreenshotDirectoryPlugin : public QQmlExtensionPlugin

2523{

2624 Q_OBJECT

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

2826

2927public:

30− void registerTypes(const char *uri);

28+ void registerTypes(const char *uri) override;

3129};

3230

33−#endif // SCREENGRABBER_PLUGIN_H

31+#endif // SCREENSHOTDIRECTORY_PLUGIN_H

plugins/ScreenshotDirectory/qmldirnew file+2

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

1+module ScreenshotDirectory

2+plugin ScreenshotDirectory-qml

plugins/SessionBroadcast/CMakeLists.txt+5−1

@@ -1,3 +1,4 @@

1+include_directories(${GLIB_INCLUDE_DIRS})

12add_definitions(-DSM_BUSNAME=systemBus)

23

34add_library(SessionBroadcast-qml MODULE

@@ -5,6 +6,9 @@ add_library(SessionBroadcast-qml MODULE

56 plugin.cpp

67 )

78

8−qt5_use_modules(SessionBroadcast-qml DBus Qml)

9+target_link_libraries(SessionBroadcast-qml

10+ Qt5::DBus Qt5::Qml

11+ ${GLIB_LIBRARIES}

12+ )

913

1014add_unity8_plugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)

plugins/SessionBroadcast/SessionBroadcast.cpp+40−10

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013,2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,30 +12,60 @@

1212 *

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

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#include "SessionBroadcast.h"

2018#include <QDBusConnection>

19+#include <QDBusConnectionInterface>

20+#include <QDBusInterface>

21+

22+#include <glib.h>

2123

2224SessionBroadcast::SessionBroadcast(QObject* parent)

2325 : QObject(parent)

2426{

27+ m_username = QString::fromUtf8(g_get_user_name());

28+

2529 auto connection = QDBusConnection::SM_BUSNAME();

30+ auto interface = connection.interface();

31+ interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));

32+

33+ m_broadcaster = new QDBusInterface(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),

34+ QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),

35+ QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),

36+ connection, this);

2637

27− connection.connect("com.canonical.Unity.Greeter.Broadcast",

28− "/com/canonical/Unity/Greeter/Broadcast",

29− "com.canonical.Unity.Greeter.Broadcast",

30− "ShowHome",

31− this,

32− SLOT(onShowHome(const QString &)));

38+ connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),

39+ this, SLOT(onStartUrl(const QString &, const QString &)));

40+

41+ connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),

42+ this, SLOT(onShowHome(const QString &)));

43+}

44+

45+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)

46+{

47+ m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);

48+}

49+

50+void SessionBroadcast::requestHomeShown(const QString &username)

51+{

52+ m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);

53+}

54+

55+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)

56+{

57+ // Since this signal is just used for testing, we don't *really* care if

58+ // username matches, but just in case we do eventually use the signal, we

59+ // should only listen to our own requests.

60+ if (username == m_username) {

61+ Q_EMIT startUrl(url);

62+ }

3363}

3464

3565void SessionBroadcast::onShowHome(const QString &username)

3666{

3767 // Only listen to requests meant for us

38− if (username == qgetenv("USER")) {

68+ if (username == m_username) {

3969 Q_EMIT showHome();

4070 }

4171}

plugins/SessionBroadcast/SessionBroadcast.h+13−3

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

11/*

2− * Copyright (C) 2013 Canonical, Ltd.

2+ * Copyright (C) 2013,2016 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,8 +12,6 @@

1212 *

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

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#ifndef UNITY_SESSIONBROADCAST_H

@@ -31,11 +29,23 @@ class SessionBroadcast: public QObject

3129public:

3230 explicit SessionBroadcast(QObject *parent = 0);

3331

32+ Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);

33+ Q_INVOKABLE void requestHomeShown(const QString &username);

34+

3435Q_SIGNALS:

36+ // This signal isn't actually used by the shell

37+ // (unity-greeter-session-broadcast handles launching an app for us), but

38+ // it's useful for testing the plugin.

39+ void startUrl(const QString &url);

3540 void showHome();

3641

3742private Q_SLOTS:

43+ void onStartUrl(const QString &username, const QString &url);

3844 void onShowHome(const QString &username);

45+

46+private:

47+ QString m_username;

48+ QDBusInterface *m_broadcaster;

3949};

4050

4151#endif

plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19

@@ -1,19 +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 SessionBroadcast 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SessionBroadcast"

12− prototype: "QObject"

13− exports: ["SessionBroadcast/SessionBroadcast 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Signal { name: "showHome" }

18− }

19−}

plugins/SessionBroadcast/plugin.h+1−1

@@ -27,7 +27,7 @@ class SessionBroadcastPlugin : public QQmlExtensionPlugin

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

2828

2929public:

30− void registerTypes(const char *uri);

30+ void registerTypes(const char *uri) override;

3131};

3232

3333#endif

plugins/UInput/CMakeLists.txtnew file+7

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

1+add_library(UInput-qml MODULE

2+ plugin.cpp

3+ uinput.cpp

4+)

5+

6+target_link_libraries(UInput-qml Qt5::Qml)

7+add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)

plugins/UInput/plugin.cppnew file+26

@@ -0,0 +1,26 @@

1+/*

2+ * Copyright (C) 2015 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "plugin.h"

18+#include "uinput.h"

19+

20+#include <QtQml/qqml.h>

21+

22+void UInputPlugin::registerTypes(const char *uri)

23+{

24+ Q_ASSERT(uri == QLatin1String("UInput"));

25+ qmlRegisterType<UInput>(uri, 0, 1, "UInput");

26+}

plugins/Dash/plugin.h → plugins/UInput/plugin.hrenamed+5−6

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

11/*

2− * Copyright (C) 2012 Canonical, Ltd.

2+ * Copyright (C) 2015 Canonical, Ltd.

33 *

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

55 * it under the terms of the GNU General Public License as published by

@@ -12,22 +12,21 @@

1212 *

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

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

15− *

1615 */

1716

18−#ifndef DASH_PLUGIN_H

19−#define DASH_PLUGIN_H

17+#ifndef UINPUT_PLUGIN_H

18+#define UINPUT_PLUGIN_H

2019

2120#include <QtQml/QQmlEngine>

2221#include <QtQml/QQmlExtensionPlugin>

2322

24−class DashPlugin : public QQmlExtensionPlugin

23+class UInputPlugin : public QQmlExtensionPlugin

2524{

2625 Q_OBJECT

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

2827

2928public:

30− void registerTypes(const char *uri);

29+ void registerTypes(const char *uri) override;

3130};

3231

3332#endif

plugins/UInput/qmldirnew file+3

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

1+module UInput

2+plugin UInput-qml

3+typeinfo UInput.qmltypes

plugins/UInput/uinput.cppnew file+182

@@ -0,0 +1,182 @@

1+/*

2+ * Copyright (C) 2015 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "uinput.h"

18+

19+#include <QFile>

20+#include <QDebug>

21+#include <QDateTime>

22+

23+#include <unistd.h>

24+#include <time.h>

25+

26+UInput::UInput(QObject *parent) :

27+ QObject(parent)

28+{

29+ m_devName = QByteArrayLiteral("unity8-simulated-mouse");

30+ m_uinput.setFileName(QStringLiteral("/dev/uinput"));

31+

32+ memset(&m_uinput_mouse_dev, 0, sizeof(m_uinput_mouse_dev));

33+ m_uinput_mouse_dev.id.bustype = BUS_USB;

34+ m_uinput_mouse_dev.id.version = 1;

35+ strncpy(m_uinput_mouse_dev.name, m_devName.constData(), m_devName.length());

36+}

37+

38+UInput::~UInput()

39+{

40+ if (m_mouseCreated) {

41+ removeMouse();

42+ }

43+}

44+

45+void UInput::createMouse()

46+{

47+ if (m_mouseCreated) {

48+ qDebug() << "Already have a virtual device. Not creating another one.";

49+ return;

50+ }

51+

52+ if (!m_uinput.isOpen() && !m_uinput.open(QFile::WriteOnly)) {

53+ return;

54+ }

55+

56+ ioctl(m_uinput.handle(), UI_SET_EVBIT, EV_REL);

57+ ioctl(m_uinput.handle(), UI_SET_RELBIT, REL_X);

58+ ioctl(m_uinput.handle(), UI_SET_RELBIT, REL_Y);

59+ ioctl(m_uinput.handle(), UI_SET_RELBIT, REL_HWHEEL);

60+ ioctl(m_uinput.handle(), UI_SET_RELBIT, REL_WHEEL);

61+

62+ ioctl(m_uinput.handle(), UI_SET_EVBIT, EV_KEY);

63+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_MOUSE);

64+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_LEFT);

65+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_MIDDLE);

66+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_RIGHT);

67+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_FORWARD);

68+ ioctl(m_uinput.handle(), UI_SET_KEYBIT, BTN_BACK);

69+

70+ ioctl(m_uinput.handle(), UI_SET_EVBIT, EV_SYN);

71+

72+ int len = write(m_uinput.handle(), &m_uinput_mouse_dev, sizeof(m_uinput_mouse_dev));

73+ if (len <= 0) {

74+ qWarning() << "Failed to write to uinput. Cannot create virtual uinput mouse.";

75+ return;

76+ }

77+

78+ int err = ioctl(m_uinput.handle(), UI_DEV_CREATE);

79+ if (err != 0) {

80+ qWarning() << "Cannot create virtual uinput device. Create ioctl failed:" << err;

81+ return;

82+ }

83+ m_mouseCreated = true;

84+ qDebug() << "Virtual uinput mouse device created.";

85+}

86+

87+void UInput::removeMouse()

88+{

89+ if (!m_mouseCreated) {

90+ return;

91+ }

92+

93+ if (!m_uinput.isOpen() && !m_uinput.open(QFile::WriteOnly)) {

94+ qWarning() << "cannot open uinput... ";

95+ return;

96+ }

97+

98+ int err = ioctl(m_uinput.handle(), UI_DEV_DESTROY);

99+ if (err != 0) {

100+ qWarning() << "Failed to destroy virtual uinput device. Destroy ioctl failed:" << err;

101+ } else {

102+ qDebug() << "Virtual uinput mouse device removed.";

103+ }

104+ m_uinput.close();

105+ m_mouseCreated = false;

106+}

107+

108+void UInput::moveMouse(int dx, int dy)

109+{

110+ struct input_event event;

111+ memset(&event, 0, sizeof(event));

112+ clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);

113+ event.type = EV_REL;

114+ event.code = REL_X;

115+ event.value = dx;

116+ write(m_uinput.handle(), &event, sizeof(event));

117+

118+ event.code = REL_Y;

119+ event.value = dy;

120+ write(m_uinput.handle(), &event, sizeof(event));

121+

122+ event.type = EV_SYN;

123+ event.code = SYN_REPORT;

124+ event.value = 0;

125+ write(m_uinput.handle(), &event, sizeof(event));

126+}

127+

128+void UInput::pressMouse(Button button)

129+{

130+ injectMouse(button, 1);

131+}

132+

133+void UInput::releaseMouse(Button button)

134+{

135+ injectMouse(button, 0);

136+}

137+

138+void UInput::scrollMouse(int dh, int dv)

139+{

140+ struct input_event event;

141+ memset(&event, 0, sizeof(event));

142+ clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);

143+ event.type = EV_REL;

144+ event.code = REL_HWHEEL;

145+ event.value = dh;

146+ write(m_uinput.handle(), &event, sizeof(event));

147+

148+ event.code = REL_WHEEL;

149+ event.value = dv;

150+ write(m_uinput.handle(), &event, sizeof(event));

151+

152+ event.type = EV_SYN;

153+ event.code = SYN_REPORT;

154+ event.value = 0;

155+ write(m_uinput.handle(), &event, sizeof(event));

156+}

157+

158+void UInput::injectMouse(Button button, int down)

159+{

160+ struct input_event event;

161+ memset(&event, 0, sizeof(event));

162+ clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);

163+ event.type = EV_KEY;

164+ switch (button) {

165+ case ButtonLeft:

166+ event.code = BTN_LEFT;

167+ break;

168+ case ButtonRight:

169+ event.code = BTN_RIGHT;

170+ break;

171+ case ButtonMiddle:

172+ event.code = BTN_MIDDLE;

173+ break;

174+ }

175+ event.value = down;

176+ write(m_uinput.handle(), &event, sizeof(event));

177+

178+ event.type = EV_SYN;

179+ event.code = SYN_REPORT;

180+ event.value = 0;

181+ write(m_uinput.handle(), &event, sizeof(event));

182+}

plugins/UInput/uinput.hnew file+61

@@ -0,0 +1,61 @@

1+/*

2+ * Copyright (C) 2015 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU General Public License version 3, as published

6+ * by the Free Software Foundation.

7+ *

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

9+ * WITHOUT ANY WARRANTY; without even the implied warranties of

10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

11+ * PURPOSE. See the GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+

18+#ifndef UINPUT_H

19+#define UINPUT_H

20+

21+#include <QObject>

22+#include <QFile>

23+

24+#include <linux/uinput.h>

25+

26+

27+class UInput : public QObject

28+{

29+ Q_OBJECT

30+

31+public:

32+ enum Button {

33+ ButtonLeft,

34+ ButtonRight,

35+ ButtonMiddle

36+ };

37+ Q_ENUM(Button)

38+

39+ explicit UInput(QObject *parent = nullptr);

40+ ~UInput();

41+

42+ Q_INVOKABLE void createMouse();

43+ Q_INVOKABLE void removeMouse();

44+

45+ Q_INVOKABLE void moveMouse(int dx, int dy);

46+ Q_INVOKABLE void pressMouse(Button button);

47+ Q_INVOKABLE void releaseMouse(Button button);

48+ Q_INVOKABLE void scrollMouse(int dh, int dv);

49+

50+private:

51+ void injectMouse(Button button, int down);

52+

53+private:

54+ QFile m_uinput;

55+ uinput_user_dev m_uinput_mouse_dev;

56+ QByteArray m_devName;

57+

58+ bool m_mouseCreated = false;

59+};

60+

61+#endif // UINPUT_H

plugins/Ubuntu/CMakeLists.txt−2

@@ -1,4 +1,2 @@

11add_subdirectory(Gestures)

22add_subdirectory(DownloadDaemonListener)

3−add_subdirectory(Payments)

4−add_subdirectory(SystemImage)

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+6−3

@@ -1,7 +1,6 @@

11include_directories(

22 ${CMAKE_CURRENT_SOURCE_DIR}

33 ${CMAKE_CURRENT_BINARY_DIR}

4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

54)

65

76set(DOWNLOADDAEMONLISTENER_SOURCES

@@ -12,6 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES

1211

1312add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})

1413

15−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)

16−

14+pkg_check_modules(DDLADAPTER REQUIRED udm-common)

15+add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})

16+target_link_libraries(DownloadDaemonListener

17+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core

18+ ${DDLADAPTER_LIBRARIES}

19+ )

1720add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)

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+6−3

This diff is too big to show here.

plugins/Ubuntu/Gestures/Direction.h+5−3

This diff is too big to show here.

plugins/Ubuntu/Gestures/DirectionalDragArea.cppdeleted−886

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+89−58

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchDispatcher.h+16−9

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.cpp+104−67

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.h+22−9

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.

tests/mocks/Ubuntu/SystemImage/plugin.h → plugins/Unity/ApplicationMenu/plugin.hrenamed+7−6

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−63

This diff is too big to show here.

plugins/Unity/DashCommunicator/dashconnection.hdeleted−37

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+9−6

This diff is too big to show here.

plugins/Unity/Indicators/Indicators.qmltypesdeleted−292

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.cpp+1−1

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.h+1−1

This diff is too big to show here.

plugins/Unity/Indicators/indicator.cpp+9−10

This diff is too big to show here.

plugins/Unity/Indicators/indicator.h+1−1

This diff is too big to show here.

plugins/Unity/Indicators/indicators.h+5−5

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.cpp+32−23

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.h+3−2

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.cpp+26−13

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.h+15−7

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.cpp+80−5

This diff is too big to show here.

plugins/Unity/Indicators/modelactionrootstate.h+15−4

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

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/rootstateparser.cpp+16−16

This diff is too big to show here.

plugins/Unity/Indicators/rootstateparser.h+1

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/unitymenumodelstack.cpp+4−4

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.

tests/qmltests/Dash/Previews/MockPreviewWidget.qml → plugins/Unity/InputInfo/plugin.hrenamed+13−10

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+19−6

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.cpp+18−11

This diff is too big to show here.

plugins/Unity/Launcher/asadapter.h+4−4

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

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+93−4

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+191−71

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.h+19−20

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.

plugins/Unity/Platform/plugin.cppnew file+27

This diff is too big to show here.

plugins/Ubuntu/SystemImage/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−3

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+250−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+29−9

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.

tests/uqmlscene/ActiveFocusLogger.cpp → plugins/Utils/activefocuslogger.cpprenamed+21−8

This diff is too big to show here.

tests/uqmlscene/ActiveFocusLogger.h → plugins/Utils/activefocuslogger.hrenamed+8−8

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+47−17

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.cpp+6−6

This diff is too big to show here.

plugins/Utils/unitysortfilterproxymodelqml.h+7−2

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.cpp+337−50

This diff is too big to show here.

plugins/Utils/windowstatestorage.h+46−10

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/Unity/DashCommunicator/plugin.h → plugins/WindowManager/WindowManagerPlugin.hrenamed+6−8

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

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.cpp+21−6

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.cpp+112−29

This diff is too big to show here.

plugins/Wizard/System.h+27−2

This diff is too big to show here.

plugins/Wizard/Utils/CMakeLists.txt+1−1

This diff is too big to show here.

plugins/Wizard/Wizard.qmltypesdeleted−36

This diff is too big to show here.

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/plugin.cpp+11−8

This diff is too big to show here.

plugins/Wizard/plugin.h+2−3

This diff is too big to show here.

plugins/Wizard/qmldir−1

This diff is too big to show here.

plugins/Wizard/test.shdeleted−18

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.

po/aa.ponew file+880

This diff is too big to show here.

po/am.po+1165−362

This diff is too big to show here.

po/ar.po+1056−379

This diff is too big to show here.

po/ast.po+1173−376

This diff is too big to show here.

po/az.po+660−289

This diff is too big to show here.

po/be.po+1039−390

This diff is too big to show here.

po/bg.po+569−270

This diff is too big to show here.

po/bn.ponew file+1062

This diff is too big to show here.

po/br.po+1099−369

This diff is too big to show here.

po/bs.po+877−275

This diff is too big to show here.

po/ca.po+1209−375

This diff is too big to show here.

po/ca@valencia.po+843−331

This diff is too big to show here.

po/ce.po+535−250

This diff is too big to show here.

po/ckb.po+557−263

This diff is too big to show here.

po/co.ponew file+1061

This diff is too big to show here.

po/cs.po+1124−368

This diff is too big to show here.

po/cy.ponew file+1165

This diff is too big to show here.

po/da.po+947−315

This diff is too big to show here.

po/de.po+1207−371

This diff is too big to show here.

po/el.po+1093−378

This diff is too big to show here.

po/en_AU.po+1197−361

This diff is too big to show here.

po/en_GB.po+1157−360

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+660−267

This diff is too big to show here.

po/es.po+1199−372

This diff is too big to show here.

po/et.ponew file+816

This diff is too big to show here.

po/eu.po+982−349

This diff is too big to show here.

po/fa.po+1213−369

This diff is too big to show here.

po/fi.po+1192−365

This diff is too big to show here.

po/fo.po+638−280

This diff is too big to show here.

po/fr.po+1231−385

This diff is too big to show here.

po/ga.ponew file+1109

This diff is too big to show here.

po/gd.po+1208−369

This diff is too big to show here.

po/gl.po+1196−369

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+866−368

This diff is too big to show here.

po/hi.po+552−260

This diff is too big to show here.

po/hr.po+1206−371

This diff is too big to show here.

po/hu.po+1196−371

This diff is too big to show here.

po/hy.po+683−309

This diff is too big to show here.

po/ia.ponew file+1409

This diff is too big to show here.

po/id.po+716−310

This diff is too big to show here.

po/is.po+699−309

This diff is too big to show here.

po/it.po+1204−375

This diff is too big to show here.

po/ja.po+729−310

This diff is too big to show here.

po/kk.ponew file+841

This diff is too big to show here.

po/km.po+782−313

This diff is too big to show here.

po/kn.po+543−257

This diff is too big to show here.

po/ko.po+1009−357

This diff is too big to show here.

po/ku.po+673−292

This diff is too big to show here.

po/ky.po+543−257

This diff is too big to show here.

po/lo.po+543−255

This diff is too big to show here.

po/lt.po+784−330

This diff is too big to show here.

po/lv.po+923−301

This diff is too big to show here.

po/ml.po+558−265

This diff is too big to show here.

po/mr.po+557−254

This diff is too big to show here.

po/ms.po+1120−345

This diff is too big to show here.

po/my.po+612−271

This diff is too big to show here.

po/nb.po+1181−365

This diff is too big to show here.

po/ne.ponew file+834

This diff is too big to show here.

po/nl.po+1204−379

This diff is too big to show here.

po/nn.ponew file+816

This diff is too big to show here.

po/oc.po+1088−343

This diff is too big to show here.

po/or.ponew file+816

This diff is too big to show here.

po/pa.po+884−273

This diff is too big to show here.

po/pl.po+1207−377

This diff is too big to show here.

po/pt.po+1203−372

This diff is too big to show here.

po/pt_BR.po+992−363

This diff is too big to show here.

po/ro.po+983−352

This diff is too big to show here.

po/ru.po+1197−378

This diff is too big to show here.

po/sc.ponew file+904

This diff is too big to show here.

po/shn.po+537−252

This diff is too big to show here.

po/si.po+612−258

This diff is too big to show here.

po/sk.ponew file+1352

This diff is too big to show here.

po/sl.po+1159−367

This diff is too big to show here.

po/sq.po+778−280

This diff is too big to show here.

po/sr.po+1175−361

This diff is too big to show here.

po/sv.po+1188−367

This diff is too big to show here.

po/sw.po+824−274

This diff is too big to show here.

po/ta.po+557−264

This diff is too big to show here.

po/te.po+565−263

This diff is too big to show here.

po/th.po+547−261

This diff is too big to show here.

po/tr.po+1194−367

This diff is too big to show here.

po/ug.po+985−320

This diff is too big to show here.

po/uk.po+1189−374

This diff is too big to show here.

po/unity8.pot+532−248

This diff is too big to show here.

po/update-unity-pot+28−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+535−250

This diff is too big to show here.

po/wo.ponew file+1232

This diff is too big to show here.

po/xh.po+535−250

This diff is too big to show here.

po/zh_CN.po+1157−367

This diff is too big to show here.

po/zh_HK.po+584−268

This diff is too big to show here.

po/zh_TW.po+1101−363

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

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.

tests/plugins/Dash/cardcreatortest.qml → qml/Components/BlurLayer.qmlrenamed+17−7

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−334

This diff is too big to show here.

qml/Components/Dialogs.qml+190−79

This diff is too big to show here.

qml/Components/DragHandle.qml+63−59

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/EdgeDragArea.qmldeleted−46

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+19−16

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/Header.qml → qml/Components/GridView.qmlrenamed+8−11

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/Dash/ScopeSettings/ScopeSetting.qml → qml/Components/ItemSnapshot.qmlrenamed+24−16

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+78−100

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.qml+13−6

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qml+12−10

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−148

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/ResponsiveGridView.qmldeleted−99

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qmldeleted−76

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.qml+38−7

This diff is too big to show here.

qml/Components/Showable.qml+24−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.qml+94−33

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.

qml/Components/flickableUtils.jsnew file+28

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−82

This diff is too big to show here.

qml/Dash/CardGrid.qmldeleted−82

This diff is too big to show here.

qml/Dash/CardHorizontalList.qmldeleted−68

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−355

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−217

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−117

This diff is too big to show here.

qml/Dash/DashNavigationButton.qmldeleted−233

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−60

This diff is too big to show here.

qml/Dash/GenericScopeView.qmldeleted−767

This diff is too big to show here.

qml/Dash/PageHeader.qmldeleted−447

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−103

This diff is too big to show here.

qml/Dash/Previews/PreviewActionButton.qmldeleted−27

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−71

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−86

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−72

This diff is too big to show here.

qml/Dash/Previews/graphics/music_progress_bg.pngdeleted

Binary file not shown.

qml/Dash/ScopeListView.qmldeleted−26

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingBoolean.qmldeleted−63

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/ScopesList.qmldeleted−132

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmldeleted−176

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmldeleted−108

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

This diff is too big to show here.

qml/Greeter/CoverPage.qml+79−25

This diff is too big to show here.

qml/Components/DelayedLockscreen.qml → qml/Greeter/DelayedLockscreen.qmlrenamed+8−16

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+372−140

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+49−27

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+149−156

This diff is too big to show here.

qml/Greeter/NarrowView.qmldeleted−168

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/WideView.qmldeleted−129

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/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+413−73

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+480−121

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+188−146

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+9−13

This diff is too big to show here.

qml/Notifications/Notifications.qml+26−22

This diff is too big to show here.

qml/Notifications/OptionToggle.qml+16−14

This diff is too big to show here.

qml/Notifications/ShapedIcon.qml+7−4

This diff is too big to show here.

qml/Notifications/SwipeToAct.qml+213−247

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−187

This diff is too big to show here.

qml/Panel/Indicators/IndicatorBase.qml+1−2

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+82−21

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml → qml/Panel/Indicators/IndicatorMenuItemFactory.qmlrenamed+378−158

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+38−33

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/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+409−102

This diff is too big to show here.

qml/Panel/IndicatorsBar.qml → qml/Panel/PanelBar.qmlrenamed+90−38

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+148−57

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/Rotation/ImmediateRotationAction.qmlnew file+34

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+674−362

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.

qml/Tutorial/Arrow.qml → qml/Stage/ResizeGrip.qmlrenamed+20−30

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−253

This diff is too big to show here.

qml/Stages/DecoratedWindow.qmldeleted−60

This diff is too big to show here.

qml/Stages/DesktopStage.qmldeleted−139

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−517

This diff is too big to show here.

qml/Stages/SessionContainer.qmldeleted−157

This diff is too big to show here.

qml/Stages/SpreadDelegate.qmldeleted−167

This diff is too big to show here.

qml/Stages/SurfaceContainer.qmldeleted−78

This diff is too big to show here.

qml/Stages/TabletStage.qmldeleted−651

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qmldeleted−347

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qmldeleted−398

This diff is too big to show here.

qml/Stages/WindowDecoration.qmldeleted−65

This diff is too big to show here.

qml/Stages/WindowMoveResizeArea.qmldeleted−107

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/Slider.qmldeleted−123

This diff is too big to show here.

qml/Tutorial/Tutorial.qml+37−24

This diff is too big to show here.

qml/Tutorial/TutorialBottom.qmldeleted−104

This diff is too big to show here.

qml/Tutorial/TutorialBottomFinish.qmldeleted−41

This diff is too big to show here.

qml/Tutorial/TutorialContent.qml+170−69

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qml+23−60

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.qml+65−189

This diff is too big to show here.

qml/Tutorial/TutorialRight.qml+32−194

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/Tutorial/graphics/camera.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/chevron.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/dialer.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/facebook.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/gallery.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/tick.pngdeleted

Binary file not shown.

qml/Wizard/CheckableSetting.qml+14−6

This diff is too big to show here.

qml/Wizard/Components/InputMethod.qml+9−9

This diff is too big to show here.

qml/Wizard/Page.qml+279−47

This diff is too big to show here.

qml/Wizard/Pages.qml+172−41

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.qml+149−51

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/20-sim.qmldeleted−73

This diff is too big to show here.

qml/Wizard/Pages/30-passwd-type.qmldeleted−135

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/40-wifi.qmldeleted−219

This diff is too big to show here.

qml/Wizard/Pages/50-location.qmldeleted−150

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/60-reporting.qmldeleted−54

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.qml+98−18

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/meet_ubuntu_simcard@30.pngdeleted

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/here-terms.qmldeleted−121

This diff is too big to show here.

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/passwd-set.qml → qml/Wizard/Pages/passcode-set.qmlrenamed+17−33

This diff is too big to show here.

qml/Wizard/Pages/passwd-confirm.qmldeleted−86

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.qml+9−14

This diff is too big to show here.

qml/Wizard/Wizard.qml+18−15

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.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−70

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/Ubuntu/SystemImage/MockSystemImage.cpp → src/ApplicationArguments.cpprenamed+3−8

This diff is too big to show here.

src/ApplicationArguments.h+24−11

This diff is too big to show here.

src/CMakeLists.txt+33−17

This diff is too big to show here.

src/CachingNetworkManagerFactory.cpp+4−3

This diff is too big to show here.

src/CachingNetworkManagerFactory.h+3−2

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.

qml/Tutorial/Tick.qml → src/SecondaryWindow.hrenamed+13−12

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.h+1−1

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−124

This diff is too big to show here.

src/qmldebuggerutils.hnew file+33

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+21−14

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+239−8

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/greeter.py → tests/autopilot/unity8/greeter/__init__.pyrenamed+41−7

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+94−15

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/__init__.py+12−4

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.py+4−5

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.py+11−16

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+185−27

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−3

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−255

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.pydeleted−170

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/tutorial.pydeleted−74

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.py+2−28

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+55−144

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.pydeleted−161

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+12−17

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+80−58

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_tutorial.pydeleted−57

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+85−25

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+51−30

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.

plugins/Ubuntu/Payments/plugin.cpp → tests/mocks/Biometryd/MockDevice.cpprenamed+10−9

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/Biometryd/MockIdentifier.cppnew file+28

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.

qml/Components/Circle.qml → tests/mocks/Biometryd/MockObserver.cpprenamed+6−6

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.

plugins/Ubuntu/SystemImage/plugin.cpp → tests/mocks/Biometryd/plugin.cpprenamed+14−7

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/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+22−16

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/LightDM/CMakeLists.txtdeleted−52

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/MockGreeter.hdeleted−37

This diff is too big to show here.

tests/mocks/LightDM/MockUsersModel.cppdeleted−39

This diff is too big to show here.

tests/mocks/LightDM/MockUsersModel.hdeleted−37

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/Greeter.cppdeleted−199

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/UsersModel.cppdeleted−134

This diff is too big to show here.

tests/mocks/LightDM/plugin.cppdeleted−68

This diff is too big to show here.

tests/mocks/LightDM/qmldirdeleted−3

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.

plugins/Ubuntu/Payments/plugin.h → tests/mocks/LightDMController/plugin.hrenamed+5−7

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

This diff is too big to show here.

tests/mocks/Lights/Lights.h+1−1

This diff is too big to show here.

tests/mocks/Lights/Lights.qmltypesdeleted−45

This diff is too big to show here.

tests/mocks/Lights/plugin.h+1−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+14−3

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.cpp+41−5

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.h+12−3

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cppnew file+66

This diff is too big to show here.

plugins/Dash/croppedimagesizerasyncworker.h → tests/mocks/MeeGo/QOfono/MockQOfonoManager.hrenamed+21−19

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.cpp+3−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.h+1−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldir−1

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

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+9−9

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.h+3−1

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.h+2−3

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/Ubuntu/SystemImage/plugin.cpp → tests/mocks/SessionBroadcast/SessionBroadcast.cpprenamed+12−12

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.hnew file+39

This diff is too big to show here.

tests/mocks/LightDM/MockGreeter.cpp → tests/mocks/SessionBroadcast/plugin.cpprenamed+10−14

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.h → tests/mocks/SessionBroadcast/plugin.hrenamed+6−8

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/Unity/DashCommunicator/plugin.h → tests/mocks/UInput/plugin.hrenamed+5−7

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+1−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.txt+3

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/MeeGo/QOfono/MockOfonoManager.qml → tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qmlrenamed+6−5

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldirnew file+2

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingNumber.qml → tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qmlrenamed+4−4

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+4−3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+9−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+9−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h+1−1

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.

tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qmlnew file+37

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/Components/ListItems/ThinDivider.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+253−189

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−70

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/mocks/Unity/Application/resources/KateMenu.qmlnew file+41

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−50

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

This diff is too big to show here.

tests/mocks/Unity/Indicators/CMakeLists.txt+6−4

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/ModelActionRootState.qml+34−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp+3−3

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h+5−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

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/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+74−3

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+15−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+1−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cpp+2−2

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.h+4−4

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.cpp+20

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.h+9−2

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.cpp+16−19

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.h+5−7

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.h+1−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−96

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.hdeleted−58

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−52

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.cppdeleted−89

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−312

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−265

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.hdeleted−83

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cppdeleted−350

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.hdeleted−119

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.

qml/Tutorial/TutorialLeftFinish.qml → tests/mocks/Utils/Style.jsrenamed+16−20

This diff is too big to show here.

tests/mocks/Utils/URLDispatcher.cppnew file+38

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/LightDM/plugin.h → tests/mocks/Utils/plugin.hrenamed+5−5

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.txt+9−1

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cpp+28−3

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.h+17−3

This diff is too big to show here.

tests/mocks/Wizard/Wizard.qmltypesdeleted−36

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cpp+11−8

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.h+1−1

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/liblightdm/GreeterPrivate.cpp → tests/mocks/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.h → tests/mocks/liblightdm/GreeterPrivate.hrenamed+1−1

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/LightDM/liblightdm/Greeter.h → tests/mocks/liblightdm/MockGreeter.hrenamed+10−26

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/LightDM/liblightdm/UsersModel.h → tests/mocks/liblightdm/MockUsersModel.hrenamed+13−21

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/LightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/liblightdm/UsersModelPrivate.cpprenamed+43−23

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.h → tests/mocks/liblightdm/UsersModelPrivate.hrenamed+2−1

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

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−83

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−134

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−112

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−147

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/horizontaljournaltest.qmldeleted−44

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.cpp−1950

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.qml−97

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsection.qml−107

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml−75

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.cpp−534

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qml−44

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.cpp−98

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.qml−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_CroppedImageMinimumSourceSize.qml−56

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

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/Unity/Launcher/AccountsServiceDBusAdaptor.cpp−48

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h−53

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+16−30

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+88−17

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txt+1−35

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+28−20

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/greeter.qml+3−8

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/LightDM/usersmodel.cpp−84

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+69−6

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+17−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_Damper.cpp−40

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+5−6

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

This diff is too big to show here.

tests/plugins/Unity/Indicators/IndicatorsModelTest.cpp+2−4

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

This diff is too big to show here.

tests/plugins/Unity/Indicators/SharedUnityMenuModelTest.cpp+1−1

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/AccountsServiceDBusAdaptor.cpp−42

This diff is too big to show here.

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.h−47

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+70−27

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/launchermodeltest.cpp+345−46

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+19−13

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.h+14−19

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

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+10−4

This diff is too big to show here.

tests/plugins/Wizard/tst_pagelist.cpp+35−6

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−93

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+22−14

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+61−46

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.qml+37−12

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+4−4

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

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_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+51−36

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_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−137

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−115

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−593

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−501

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml−598

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml−643

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+32−24

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+402−158

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−26

This diff is too big to show here.

tests/qmltests/Greeter/tst_NarrowView.qml−508

This diff is too big to show here.

tests/qmltests/Greeter/tst_WideView.qml−513

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+1155−62

This diff is too big to show here.

tests/qmltests/Notifications/Notification.qml+1

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+259−61

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+28−29

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+84−38

This diff is too big to show here.

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+29−35

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+110−111

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+176−13

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

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_MenuContent.qml+17−5

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+544−179

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelBar.qml+27−36

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+147−41

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenuPage.qml+54−50

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+33

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+40

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−145

This diff is too big to show here.

tests/qmltests/Stages/tst_ApplicationWindow.qml−421

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml−426

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qml−372

This diff is too big to show here.

tests/qmltests/Stages/tst_SpreadDelegate.qml−173

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/Stages/tst_TabletStage.qml−154

This diff is too big to show here.

tests/qmltests/Stages/tst_WindowMoveResizeArea.qml−237

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+678−214

This diff is too big to show here.

tests/qmltests/UnityLogo.png

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+248−264

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+3045−519

This diff is too big to show here.

tests/qmltests/tst_ShellWithPassphrase.qml−136

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+196−250

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml−304

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−4

This diff is too big to show here.

tests/uqmlscene/main.cpp+26−34

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+18−15

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+306−64

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.