.bazaar/Makefiledeleted−6
@@ -1,6 +0,0 @@
2− mkdir -p ~/.bazaar/plugins
3− cp plugins/* ~/.bazaar/plugins
6− rm ~/.bazaar/plugins/makecheck_unity_phablet.py*
.bazaar/plugins/makecheck_unity_phablet.pydeleted−51
@@ -1,51 +0,0 @@
2−# Copyright 2013, 2014 Canonical Ltd.
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.
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.
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/>.
18−from bzrlib import branch
19−from bzrlib.urlutils import local_path_from_url
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"):
28− os.chdir(local_path_from_url(master_branch.base))
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):
34− print("\n\n*** Warning ***\n\n"
35− "Basic tests failed. This commit will not pass continuous "
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)
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")
50−branch.Branch.hooks.install_named_hook(
51− 'pre_commit', execute_makecheck, 'make check pre-commit')
.bzr-builddeb/default.confdeleted−2
@@ -1,7 +0,0 @@
3−# QtCreator project files
5−# Eclipse project files
.crossbuilder/post_deploynew file+1
@@ -2,8 +2,15 @@
3# QtCreator project files
3# QtCreator project files
5# Eclipse project files
7# Eclipse project files
9/.pydevproject
11/.pydevproject
12+# KDevelop project Files
@@ -40,6 +40,19 @@ if(cmake_build_type_lower MATCHES coverage)
40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
43+find_package (ECM 1.7.0 QUIET NO_MODULE)
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")
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" )
43# Make sure we have all the needed symbols
56# Make sure we have all the needed symbols
44set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
57set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
45set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
58set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
@@ -49,19 +62,41 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
49 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
62 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
51include(FindPkgConfig)
64include(FindPkgConfig)
52−find_package(Qt5Core 5.4 REQUIRED)
65+find_package(Qt5Core 5.6 REQUIRED)
53−find_package(Qt5Qml 5.4 REQUIRED)
66+find_package(Qt5Qml 5.6 REQUIRED)
54−find_package(Qt5Quick 5.4 REQUIRED)
67+find_package(Qt5Quick 5.6 REQUIRED)
55−find_package(Qt5Gui 5.4 REQUIRED)
68+find_package(Qt5Gui 5.6 REQUIRED)
56−find_package(Qt5DBus 5.4 REQUIRED)
69+find_package(Qt5DBus 5.6 REQUIRED)
57−find_package(Qt5Concurrent 5.4 REQUIRED)
70+find_package(Qt5Concurrent 5.6 REQUIRED)
58−find_package(Qt5Sql 5.4 REQUIRED)
71+find_package(Qt5Sql 5.6 REQUIRED)
59−
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)
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=16)
77+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
78pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
79pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
80pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
81+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)
64pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
82pkg_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
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}
96+if (${UBUNTUGESTUREPRIV} STREQUAL UBUNTUGESTUREPRIV-NOTFOUND)
97+ message(FATAL_ERROR "UbuntuGestures private headers not found.")
99+# end of UbuntuGesture private headers check
66# Standard install paths
101# Standard install paths
67include(GNUInstallDirs)
102include(GNUInstallDirs)
@@ -113,9 +148,8 @@ include(autopilot)
113declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
148declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
115set(SHELL_APP unity8)
150set(SHELL_APP unity8)
116−set(DASH_APP unity8-dash)
117−set(SCOPE_TOOL unity-scope-tool)
118set(INDICATORS_CLIENT_APP indicators-client)
151set(INDICATORS_CLIENT_APP indicators-client)
152+set(GREETER_APP unity8-greeter)
119set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
153set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
121include_directories(
155include_directories(
@@ -124,8 +158,6 @@ include_directories(
124 ${APPLICATION_API_INCLUDE_DIRS}
158 ${APPLICATION_API_INCLUDE_DIRS}
127−set(ARTIFACTS_DIR "" CACHE PATH "Store test artifacts in this directory.")
129# Quiet logger
161# Quiet logger
130set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")
162set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")
131if(NOT QUIET_LOGGER)
163if(NOT QUIET_LOGGER)
@@ -144,7 +176,6 @@ endif()
145# add subdirectories to build
177# add subdirectories to build
146add_subdirectory(include)
178add_subdirectory(include)
147−add_subdirectory(libs)
148add_subdirectory(src)
179add_subdirectory(src)
149add_subdirectory(tools)
180add_subdirectory(tools)
150add_subdirectory(qml)
181add_subdirectory(qml)
@@ -15,23 +15,17 @@ download source
15 $ bzr branch lp:unity8 ~/unity8/trunk
15 $ bzr branch lp:unity8 ~/unity8/trunk
16 $ cd ~/unity8/trunk
16 $ cd ~/unity8/trunk
18−install dependencies
18+install dependencies and build Unity 8
19--------------------
19--------------------
20−If its your first time, install build dependencies
22$ cd ~/unity8/trunk
21$ cd ~/unity8/trunk
23−$ ./build.sh --setup
22+$ ./build.sh
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
30−build Unity 8
24+ If its your first time, this will install the required dependencies to build and
31−-------------
25+ build it.
33−$ cd ~/unity8/trunk
27+ You might want to also install unity-scope-home and unity-scope-click which
34−$ ./build.sh
28+ are technically "recommends", not strict dependencies
36You may also rebuild with the -c for clean, which just deletes the build
30You may also rebuild with the -c for clean, which just deletes the build
@@ -43,13 +37,15 @@ Running Unity 8 on your desktop
43run the Unity 8 shell
37run the Unity 8 shell
44---------------------
38---------------------
45$ cd ~/unity8/trunk
39$ cd ~/unity8/trunk
46−$ ./run.sh
40+$ cd builddir
48−Options can be passed to test the lock screen
42+Each component of unity8 can be ran independently for development and testing
49−$ ./run.sh -p OR -k
43+For example:
51−-p is for pin lock, for which the default prompt answer is "1234"
48+Check out the tests/qmltests/ directory for a list of things that can be ran.
52−-k is for keylock passphrase, for which the default prompt answer is "password"
@@ -70,50 +66,15 @@ Notes
71Running Unity 8 on devices
67Running Unity 8 on devices
72==========================
68==========================
73−- Ubuntu Touch builds are currently only available in 14.04 flavour
74−- supported hardware should match one of those listed here
75− https://wiki.ubuntu.com/Touch/Devices#Running_fine
76−- follow the Ubuntu Touch install instructions for your chosen device
77− https://wiki.ubuntu.com/Touch/Install
78−- make sure your device is connected to a network
79−- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one
80− on the device yourself)
83−$ ./run_on_device.sh --setup
85− - install your public SSH key on the device
86− - install the needed dependencies
88−$ ./run_on_device.sh
70+Running unity8 on a device should be done using crossbuilder.
90− - rsync the code to the device
72+* https://launchpad.net/crossbuilder and
91− - build on the device
73+* https://wiki.ubuntu.com/Touch/Crossbuilder
92− - replace the running shell
74+for more details on crossbuilder.
94−Options can be passed to test the lock screen
95−$ ./run_on_device.sh -p OR -k
97−-p is for pin lock, for which the default prompt answer is "1234"
98−-k is for keylock passphrase, for which the default prompt answer is "password"
102−- using adb over TCP has some advantages, Google will be of help here
103− - NOTE: this is not yet available for flipped images
104− - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
105− - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
106− - it's unsafe - anyone can connect to your device
107− - with TCP the Nexus 10 doesn't drop the adb connection when locking
109−- exporting ANDROID_SERIAL=$your_device_serial or
110− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
112−- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh
113− to not use adb forwarding - useful if you use multiple devices
114−- using Ninja (package ninja-build - run_on_device.sh -s installs this now)
115− will improve build times (especially in the nothing-to-build case)
76+unity8 will automatically restart on the phone once deployment
77+has finished due to post-build-steps set up in this repository.
118Coding guidelines
79Coding guidelines
119=================
80=================
@@ -201,3 +162,27 @@ $ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name
201or run them all with
162or run them all with
203$ PYTHONPATH=../tests/autopilot autopilot3 run unity8
164$ PYTHONPATH=../tests/autopilot autopilot3 run unity8
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:
172+* Enable/disable Qt scenegraph visualizer on the fly:
174+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSceneGraphVisualizer <mode>
176+ This is equivalent to exporting QSG_VISUALIZE=<mode> before running unity8, except it does it on the
179+* Toggle slow animations on the fly:
181+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSlowAnimations <true|false>
183+* Change logging filter rules on the fly:
185+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetLoggingFilterRules <filter>
187+ This is equivalent to exporting QT_LOGGING_RULES or defining them in QT_LOGGING_CONF, except it does
@@ -0,0 +1,2 @@
1+@Library('ubports-build-tools') _
2+buildAndProvideDebianPackage()
@@ -0,0 +1,31 @@
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.
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
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`.
9+## Where to report issues
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.
13+## Developing Lomiri on Ubuntu Touch
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
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.
19+Before you start, [install Clickable](https://clickable-ut.dev/en/latest/install.html).
21+Now, clone this repository to your computer: `git clone https://github.com/ubports/unity8.git`
23+Move into this directory: `cd unity8`
25+Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:
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.
@@ -1,5 +1,21 @@
4+# Copyright (C) 2017 Canonical Ltd
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.
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.
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/>.
3SETUP=false
19SETUP=false
4CLEAN=false
20CLEAN=false
5NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
21NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
@@ -9,7 +25,6 @@ usage() {
9 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
25 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
10 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2
26 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2
11 echo "OPTIONS:" >&2
27 echo "OPTIONS:" >&2
12− echo " -s, --setup Setup the build environment and branch Unity" >&2
13 echo " -c, --clean Clean the build tree before building" >&2
28 echo " -c, --clean Clean the build tree before building" >&2
@@ -22,7 +37,6 @@ eval set -- "$ARGS"
22while [ $# -gt 0 ]
37while [ $# -gt 0 ]
24 case "$1" in
39 case "$1" in
25− -s|--setup) SETUP=true;;
26 -c|--clean) CLEAN=true;;
40 -c|--clean) CLEAN=true;;
27 -h|--help) usage;;
41 -h|--help) usage;;
28 --) shift;break;;
42 --) shift;break;;
@@ -35,31 +49,6 @@ done
35BUILD_TYPE="debug"
49BUILD_TYPE="debug"
36[ $# -eq 1 ] && BUILD_TYPE="$1"
50[ $# -eq 1 ] && BUILD_TYPE="$1"
38−install_dependencies() {
39− sudo apt-get update || exit 4
40− echo "Installing Unity 8 dependencies.."
41− sudo apt-get install devscripts \
43− gsettings-desktop-schemas \
44− gsettings-ubuntu-schemas \
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 \
63mk_build_deps() {
52mk_build_deps() {
64 if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
53 if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
65 sed 's/\:native//g' $CODE_DIR/debian/control > control
54 sed 's/\:native//g' $CODE_DIR/debian/control > control
@@ -85,13 +74,9 @@ else
85 BUILD_COMMAND="make -j$NUM_JOBS"
74 BUILD_COMMAND="make -j$NUM_JOBS"
91− if $CLEAN; then rm -rf builddir; fi
77+if $CLEAN; then rm -rf builddir; fi
92− mkdir -p builddir
78+mkdir -p builddir
93− cd builddir
79+cd builddir
94− mk_build_deps
80+mk_build_deps
95− cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
81+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
96− ${BUILD_COMMAND} || exit 7
82+${BUILD_COMMAND} || exit 7
clickable.yamlnew file+153
@@ -0,0 +1,153 @@
1+clickable_minimum_required: '7'
3+build: echo Run \'clickable build --libs --verbose\' to build && false
9+ test: make xvfballtests -j${NUM_PROCS}
21+ - gsettings-ubuntu-schemas
22+ - libandroid-properties-dev
23+ - libconnectivity-qt1-dev
30+ - libgnome-desktop-3-12
31+ - libgnome-desktop-3-dev
32+ - libgsettings-qt-dev
34+ - liblightdm-qt5-3-dev
40+ - libqt5xmlpatterns5-dev
43+ - libsystemsettings-dev
44+ - libubuntu-app-launch2-dev
45+ - libubuntu-download-manager-common-dev
46+ - libubuntugestures5-dev
47+ - libubuntugestures5-private-dev
51+ - libusermetricsoutput1-dev
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
67+ - qml-module-ubuntu-components
68+ - qml-module-ubuntu-layouts
69+ - qml-module-ubuntu-settings-components
70+ - qml-module-ubuntu-test
73+ - qtbase5-private-dev
76+ - qtdeclarative5-dev-tools
77+ - qtdeclarative5-private-dev
78+ - qtdeclarative5-ubuntu-content1
79+ - ttf-ubuntu-font-family
93+ - gsettings-ubuntu-schemas
94+ - libandroid-properties-dev
95+ - libconnectivity-qt1-dev
102+ - libgnome-desktop-3-12
103+ - libgnome-desktop-3-dev
104+ - libgsettings-qt-dev
106+ - liblightdm-qt5-3-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
123+ - libusermetricsoutput1-dev
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
139+ - qml-module-ubuntu-components
140+ - qml-module-ubuntu-layouts
141+ - qml-module-ubuntu-settings-components
142+ - qml-module-ubuntu-test
145+ - qtbase5-private-dev
147+ - qtdeclarative5-dev
148+ - qtdeclarative5-dev-tools
149+ - qtdeclarative5-private-dev
150+ - qtdeclarative5-ubuntu-content1
151+ - ttf-ubuntu-font-family
152+ - ubports-wallpapers
cmake/modules/QmlPlugins.cmakedeleted−148
@@ -1,148 +0,0 @@
1−# If you need to override the qmlplugindump binary, create the qmlplugin executable
2−# target before loading this plugin.
4−if(NOT TARGET qmlplugindump)
5− find_program(qmlplugindump_exe qmlplugindump)
7− if(NOT qmlplugindump_exe)
8− msg(FATAL_ERROR "Could not locate qmlplugindump.")
11− add_executable(qmlplugindump IMPORTED)
12− set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
16−# A custom target for building the qmltypes files manually.
18−if (NOT TARGET qmltypes)
19− add_custom_target(qmltypes)
22−# Creates a target for copying resource files into build dir and optionally installing them.
24−# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
25−# into ${DESTINATION}/${path}.
27−# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
29−# export_qmlfiles(plugin path
30−# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
33−# [TARGET_PREFIX string] # Will be prefixed to the target name
37−# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
39−macro(export_qmlfiles PLUGIN PATH)
40− set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
41− cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
43− if(NOT QMLFILES_SEARCH_PATH)
44− set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
47− if(QMLFILES_BINARY_DIR)
48− set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
50− set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
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
64− execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
67− add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
68− COMMAND cp ${QMLFILES} ${qmlfiles_dir}
73− if(QMLFILES_DESTINATION)
74− # install the qmlfiles file.
75− install(FILES ${QMLFILES}
76− DESTINATION ${QMLFILES_DESTINATION}/${PATH}
82−# Creates a target for generating the typeinfo file for a QML plugin and/or installs the plugin
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}.
89−# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
91−# export_qmlplugin(plugin version 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
101−# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the source dir.
102−# It will be made a dependency of the "qmltypes" target.
104−macro(export_qmlplugin PLUGIN VERSION PATH)
105− set(options NO_TYPES)
106− set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
108− cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
110− if(QMLPLUGIN_BINARY_DIR)
111− set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
113− # Find import path to point qmlplugindump at
114− string(REGEX REPLACE "/${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
115− set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
118− if(NOT QMLPLUGIN_NO_TYPES)
119− # Relative path for the module
120− string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")
122− # Find the last segment of the plugin name to use as qmltypes basename
123− string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
124− set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
125− set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
127− add_custom_target(${target_prefix}-qmltypes
128− COMMAND env ${QMLPLUGIN_ENVIRONMENT} $<TARGET_FILE:qmlplugindump> -notrelocatable
129− ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
130− WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
132− add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
133− add_dependencies(qmltypes ${target_prefix}-qmltypes)
136− set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
137− ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
138− LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
139− RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
142− if (QMLPLUGIN_DESTINATION)
143− # Install additional targets
144− install(TARGETS ${QMLPLUGIN_TARGETS}
145− DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
cmake/modules/QmlTest.cmake+188−12
@@ -55,6 +55,55 @@ function(add_qml_test PATH COMPONENT_NAME)
55endfunction()
55endfunction()
58+# add_qml_test_data(path component_name
62+# Install file called ${component_name} (or ${component_name}.qml) under
65+function(add_qml_test_data PATH COMPONENT_NAME)
66+ cmake_parse_arguments(TEST "" "DESTINATION" "" ${ARGN})
68+ set(filename "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/${COMPONENT_NAME}")
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}")
81+ if (NOT EXISTS "${filename}")
82+ set(filename "${filename}.qml")
83+ set(COMPONENT_NAME "${COMPONENT_NAME}.qml")
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}")
96+ if (TEST_DESTINATION)
97+ set(DESTINATION "${TEST_DESTINATION}")
99+ file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
100+ set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")
103+ install(FILES "${filename}" DESTINATION "${DESTINATION}")
58# add_qml_unittest(path component_name
107# add_qml_unittest(path component_name
@@ -71,6 +120,10 @@ function(add_qml_unittest PATH COMPONENT_NAME)
72 ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
121 ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
124+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")
125+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")
74endfunction()
127endfunction()
@@ -91,6 +144,10 @@ function(add_manual_qml_test PATH COMPONENT_NAME)
92 ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
145 ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
148+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")
149+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")
94endfunction()
151endfunction()
@@ -108,8 +165,7 @@ endfunction()
109# Logging options in the standard form of "-o filename,format"
166# Logging options in the standard form of "-o filename,format"
110# will be appended to the arguments list, prefixed with ARG_PREFIX.
167# will be appended to the arguments list, prefixed with ARG_PREFIX.
111−# XUnitXML files will be stored in current binary dir or under
168+# XUnitXML files will be stored in current binary dir.
112−# ARTIFACTS_DIR, if set.
114# Three targets will be created:
170# Three targets will be created:
115# - test${component_name} - Runs the test
171# - test${component_name} - Runs the test
@@ -122,14 +178,8 @@ function(add_executable_test COMPONENT_NAME TARGET)
122 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
178 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
123 mangle_arguments()
179 mangle_arguments()
125− if(ARTIFACTS_DIR)
181+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
126− file(RELATIVE_PATH path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
127− file(MAKE_DIRECTORY ${ARTIFACTS_DIR}/${path})
128− set(file_logger -o ${ARTIFACTS_DIR}/${path}/test${COMPONENT_NAME}.xml,xunitxml)
130− file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
131− set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
182+ set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
134 bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})
184 bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})
@@ -151,7 +201,7 @@ function(add_executable_test COMPONENT_NAME TARGET)
151 add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
201 add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
152 COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
202 COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
153 ${depends}
203 ${depends}
154− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1
204+ ENVIRONMENT QT_QPA_PLATFORM=xcb QML2_IMPORT_PATH=${imports} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1 ${QMLTEST_ENVIRONMENT}
155 TARGETS ${xvfb_targets}
205 TARGETS ${xvfb_targets}
@@ -207,8 +257,129 @@ function(add_manual_test COMPONENT_NAME TARGET)
207endfunction()
257endfunction()
260+# add_meta_test(target)
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
266+function(add_meta_test TARGET_NAME)
267+ cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})
269+ add_custom_target(${TARGET_NAME})
271+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
273+ file(WRITE "${filename}" "#!/bin/sh\n\n")
275+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
278+ add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
279+ # else we will write the rest of the script as we add cmake targets
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"
210################### INTERNAL ####################
290################### INTERNAL ####################
292+function(install_test_script TARGET_NAME)
293+ cmake_parse_arguments(TEST "" "" "COMMAND;ENVIRONMENT" ${ARGN})
295+ # Now write the above test into a shell script that we can run on an
297+ set(script "#!/bin/sh\n\nset -x\n\n")
298+ foreach(ONE_ENV ${TEST_ENVIRONMENT})
299+ set(script "${script}export ${ONE_ENV}\n")
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}' ")
314+ set(script "${script}\"\$@\"") # Allow passing arguments if desired
316+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
318+ # Generate script to file then read it back to resolve any generator
319+ # expressions before we try to replace paths.
321+ OUTPUT "${filename}"
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.
330+ # START OF CODE BLOCK --------------------------------------------------
332+ file(READ \"${filename}\" replacestr)
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}\")
357+ file(WRITE \"${filename}\" \"\${replacestr}\")
359+ # END OF CODE BLOCK --------------------------------------------------
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"
369+function(add_meta_dependencies UPSTREAM_TARGET)
370+ cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})
372+ foreach(depend ${TEST_DEPENDS})
373+ add_dependencies(${UPSTREAM_TARGET} ${depend})
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")
212# add_qmltest_target(target_name target
383# add_qmltest_target(target_name target
213# COMMAND test_exe [arg1 [...]] # execute this test with arguments
384# COMMAND test_exe [arg1 [...]] # execute this test with arguments
214# [...] # see above for available arguments:
385# [...] # see above for available arguments:
@@ -231,6 +402,11 @@ function(add_qmltest_target TARGET_NAME TARGET)
231 DEPENDS ${TARGET} ${QMLTEST_DEPENDS}
402 DEPENDS ${TARGET} ${QMLTEST_DEPENDS}
405+ install_test_script(${TARGET_NAME}
406+ ENVIRONMENT ${QMLTEST_ENVIRONMENT}
407+ COMMAND ${QMLTEST_COMMAND}
234 if(QMLTEST_ADD_TEST)
410 if(QMLTEST_ADD_TEST)
235 add_test(
411 add_test(
236 NAME ${TARGET_NAME}
412 NAME ${TARGET_NAME}
@@ -248,7 +424,7 @@ function(add_qmltest_target TARGET_NAME TARGET)
250 foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})
426 foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})
251− add_dependencies(${UPSTREAM_TARGET} ${TARGET_NAME})
427+ add_meta_dependencies(${UPSTREAM_TARGET} DEPENDS ${TARGET_NAME})
252 endforeach()
428 endforeach()
253endfunction()
429endfunction()
data/51-unity8-greeter.confnew file+2
@@ -0,0 +1,2 @@
2+greeter-session=unity8-greeter
@@ -1,24 +1,27 @@
1# generate desktop files
1# generate desktop files
2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
3−configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
4configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)
3configure_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)
6# install desktop files
6# install desktop files
7install(FILES
7install(FILES
8 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
8 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
9− ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop
10 ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop
9 ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop
11 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
10 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
15install(FILES
13install(FILES
16− ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png
14+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
17− DESTINATION ${SHELL_APP_DIR}/Dash/
15+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
19+ 51-unity8-greeter.conf
20+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
20add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)
23add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)
22install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
25install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
23−install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
26+install(FILES com.canonical.Unity.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
24install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)
27install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)
data/com.canonical.Unity.gschema.xmlnew file+255
@@ -0,0 +1,255 @@
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" />
8+ <enum id="home-expanded-enum">
9+ <value nick="Not Expanded" value="0" />
10+ <value nick="Expanded" value="1" />
12+ <enum id="launcher-position-enum">
13+ <value nick="Left" value="0" />
14+ <value nick="Bottom" value="1" />
16+ <enum id="desktop-type-enum">
17+ <value nick="Ubuntu" value="0" />
18+ <value nick="UbuntuKylin" value="1" />
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>
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>
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>
37+ <key type="i" name="minimize-count">
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>
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>
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>
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>
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>
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>
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>
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>
84+ <key type="as" name="whitelist-repeated-keys">
86+ 'XF86KbdBrightnessUp',
87+ 'XF86KbdBrightnessDown',
88+ 'XF86MonBrightnessUp',
89+ 'XF86MonBrightnessDown',
90+ 'XF86AudioRaiseVolume',
91+ 'XF86AudioLowerVolume'
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>
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>
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>
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>
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>
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>
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>
139+ <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
140+ <key type="as" name="favorites">
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',
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>
158+ <key type="as" name="items">
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'
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
data/com.canonical.Unity8.gschema.xml+24−4
@@ -11,8 +11,8 @@
11 <summary>The usage mode.</summary>
11 <summary>The usage mode.</summary>
12 <description>The usage mode chosen will affect the Window Management behaviour.</description>
12 <description>The usage mode chosen will affect the Window Management behaviour.</description>
14− <key type="y" name="edge-barrier-sensitivity">
14+ <key type="u" name="edge-barrier-sensitivity">
15− <default>35</default>
15+ <default>50</default>
16 <range min="1" max="100"/>
16 <range min="1" max="100"/>
17 <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>
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>
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>
@@ -23,7 +23,7 @@
23 <description>How much you have to push (in grid units)the mouse against an edge barrier when sensibility is 100.</description>
23 <description>How much you have to push (in grid units)the mouse against an edge barrier when sensibility is 100.</description>
25 <key type="u" name="edge-barrier-max-push">
25 <key type="u" name="edge-barrier-max-push">
26− <default>60</default>
26+ <default>120</default>
27 <summary>Maximum push needed to overcome edge barrier</summary>
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>
28 <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
@@ -33,7 +33,7 @@
33 <description>How big (in grid units) the edge-drag sensitive area should be.</description>
33 <description>How big (in grid units) the edge-drag sensitive area should be.</description>
35 <key type="b" name="autohide-launcher">
35 <key type="b" name="autohide-launcher">
36− <default>true</default>
36+ <default>false</default>
37 <summary>Autohide the launcher</summary>
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>
38 <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
@@ -43,6 +43,26 @@
43 <summary>Width of the launcher in grid units.</summary>
43 <summary>Width of the launcher in grid units.</summary>
44 <description>Changes the width of the launcher in all usage modes.</description>
44 <description>Changes the width of the launcher in all usage modes.</description>
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>
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>
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>
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>
48 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
68 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
data/test.sensorsnew file+12
@@ -0,0 +1,12 @@
2+create accel 0 1000 0.1
7+# simulate crash on the ground
data/unity8-dash.confdeleted−25
@@ -1,25 +0,0 @@
1−description "Unity Shell v8 Dash"
2−author "Michael Zanetti <michael.zanetti@canonical.com>"
4−emits scope-ui-starting
6−start on started unity8
7−stop on stopping unity8
11−# Focused app is 100 so we want to be less likely to get
12−# killed than the focused app but more than Unity8
17−respawn limit unlimited
19−env APP_ID=unity8-dash
22− initctl emit scope-ui-starting
25−exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=/usr/share/applications/unity8-dash.desktop
data/unity8-dash.desktop.indeleted−9
@@ -1,9 +0,0 @@
4−Comment=An interface for using the Scopes system
5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash
7−Icon=@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/Dash/unity8-dash.png
data/unity8-dash.pngdeleted
Binary file not shown.
data/unity8-dash.svgdeleted−326
@@ -1,326 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<!-- Created with Inkscape (http://www.inkscape.org/) -->
5− xmlns:dc="http://purl.org/dc/elements/1.1/"
6− xmlns:cc="http://creativecommons.org/ns#"
7− xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8− xmlns:svg="http://www.w3.org/2000/svg"
9− xmlns="http://www.w3.org/2000/svg"
10− xmlns:xlink="http://www.w3.org/1999/xlink"
11− xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12− xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13− viewBox="0 0 512 512"
14− style="enable-background:new"
15− inkscape:export-ydpi="180"
16− inkscape:export-xdpi="180"
17− inkscape:export-filename="app_shape02.png"
18− sodipodi:docname="apps-scope.svg"
19− inkscape:version="0.91+devel r"
25− inkscape:snap-global="false"
26− fit-margin-bottom="18"
30− inkscape:snap-grids="true"
31− inkscape:guide-bbox="true"
33− inkscape:snap-center="true"
34− inkscape:snap-object-midpoints="true"
35− inkscape:snap-midpoints="true"
36− inkscape:snap-smooth-nodes="true"
37− inkscape:snap-intersection-paths="true"
38− inkscape:object-nodes="true"
39− inkscape:object-paths="true"
40− inkscape:snap-bbox-midpoints="true"
41− inkscape:snap-bbox-edge-midpoints="true"
42− inkscape:bbox-nodes="true"
43− inkscape:bbox-paths="true"
44− inkscape:snap-bbox="true"
46− inkscape:showpageshadow="false"
47− inkscape:snap-page="true"
48− inkscape:window-maximized="1"
49− inkscape:window-y="24"
50− inkscape:window-x="0"
51− inkscape:window-height="1029"
52− inkscape:window-width="1920"
54− inkscape:current-layer="layer3"
55− inkscape:document-units="px"
56− inkscape:cy="204.04409"
57− inkscape:cx="-384.5809"
59− inkscape:pageshadow="2"
60− inkscape:pageopacity="0"
62− bordercolor="#666666"
114− originy="16.999996" />
132− orientation="-0.70710678,0.70710678"
137− position="256,-32.000001"
144− orientation="0.70710678,0.70710678"
145− position="544,-32.000001"
149− position="248,15.999999"
172− position="180.48,-96"
175− </sodipodi:namedview>
179− inkscape:collect="always"
180− id="linearGradient4203">
182− style="stop-color:#ea5420;stop-opacity:1"
186− style="stop-color:#f37e40;stop-opacity:1"
191− clipPathUnits="userSpaceOnUse"
194− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.24899998;fill:#5e2c73;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
195− d="M 360,50 594,284 V 215.89844 C 594,70.73665 573.2426,50 427.94531,50 Z"
197− inkscape:connector-curvature="0" />
200− clipPathUnits="userSpaceOnUse"
203− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
204− d="M 543.8125,454.1875 312.18945,685.81055 367.94531,681 C 512.70468,668.50896 526.55393,654.72881 539,510.10156 Z"
206− inkscape:connector-curvature="0" />
209− inkscape:collect="always"
210− xlink:href="#linearGradient4203"
211− id="linearGradient4209"
216− gradientUnits="userSpaceOnUse" />
218− inkscape:collect="always"
219− style="color-interpolation-filters:sRGB"
226− inkscape:collect="always"
227− stdDeviation="1.4390401"
228− id="feGaussianBlur4222" />
231− inkscape:collect="always"
232− xlink:href="#linearGradient4226"
233− id="linearGradient4232"
238− gradientUnits="userSpaceOnUse"
239− spreadMethod="reflect" />
241− inkscape:collect="always"
242− id="linearGradient4226">
244− style="stop-color:#a73812;stop-opacity:1"
248− style="stop-color:#973310;stop-opacity:0"
253− inkscape:collect="always"
254− style="color-interpolation-filters:sRGB"
261− inkscape:collect="always"
262− stdDeviation="11.512321"
263− id="feGaussianBlur4236" />
271− <dc:format>image/svg+xml</dc:format>
273− rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
274− <dc:title></dc:title>
279− inkscape:groupmode="layer"
281− inkscape:label="Background">
283− style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
284− d="M 0 0 L 0 183.89844 L 0 328.10156 L 0 512 L 512 512 L 512 328.10156 L 512 183.89844 L 512 0 L 0 0 z "
287− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
288− d="M 0 256 L 0 328.10156 L 0 462.53516 C 0 479.69677 0.052846476 496.03174 0.13085938 512 L 511.86914 512 C 511.94715 496.03174 512 479.69677 512 462.53516 L 512 256 L 0 256 z "
292− inkscape:groupmode="layer"
294− inkscape:label="Pictogram"
295− style="display:inline"
296− transform="translate(-32,-32)">
298− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#d04616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4220);enable-background:accumulate"
303− transform="rotate(90,-7.1132638e-7,31.999996)" />
305− transform="rotate(90,-7.1132638e-7,31.999996)"
310− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient4232);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4234);enable-background:accumulate" />
312− transform="rotate(90)"
317− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
319− style="display:inline;fill:#ea5420;fill-opacity:1;stroke-width:2.9398191;enable-background:new"
321− d="m 193.9963,269.54024 c -10.19878,0 -18.46137,8.2634 -18.46137,18.46139 0,10.19309 8.26259,18.45568 18.46137,18.45568 10.19311,0 18.45569,-8.26259 18.45569,-18.45568 0,-10.19799 -8.26258,-18.46139 -18.45569,-18.46139 z m 131.78525,83.88906 c -8.82832,5.09898 -11.85536,16.38129 -6.75557,25.20475 5.0933,8.82834 16.37561,11.85455 25.20393,6.75556 8.82752,-5.0933 11.85457,-16.37561 6.75559,-25.20475 -5.0933,-8.82263 -16.38212,-11.84887 -25.20395,-6.75556 z m -91.69319,-65.42767 c 0,-18.24028 9.05999,-34.35498 22.92309,-44.11321 l -13.49406,-22.6012 c -16.14883,10.79461 -28.16435,27.28971 -33.15766,46.60863 5.82648,4.75434 9.55584,11.99194 9.55584,20.10497 0,8.10813 -3.72936,15.34572 -9.55584,20.10006 4.98681,19.32463 17.00232,35.82055 33.15766,46.61514 l 13.49406,-22.60689 c -13.8631,-9.75253 -22.92309,-25.86641 -22.92309,-44.1075 z m 53.91207,-53.91776 c 28.16514,0 51.27274,21.59491 53.69828,49.13495 l 26.30048,-0.38772 c -1.29405,-20.33173 -10.17604,-38.58421 -23.82372,-52.00594 -7.01814,2.65149 -15.12464,2.2459 -22.13139,-1.79314 -7.01894,-4.0504 -11.41969,-10.88319 -12.62271,-18.30044 -6.8214,-1.88254 -14.00046,-2.91323 -21.42257,-2.91323 -12.75925,0 -24.82271,2.99695 -35.53359,8.29836 l 12.82509,22.98243 c 6.89944,-3.21075 14.5963,-5.01526 22.71013,-5.01526 z m 0,107.82982 c -8.11383,0 -15.81069,-1.80533 -22.70931,-5.01528 l -12.82511,22.98163 c 10.71088,5.3079 22.77434,8.30568 35.53442,8.30568 7.42211,0 14.60118,-1.0315 21.42177,-2.91975 1.20301,-7.41724 5.60537,-14.24352 12.6227,-18.30125 7.01161,-4.04555 15.11326,-4.44382 22.13137,-1.79232 13.64769,-13.42174 22.52968,-31.67421 23.82372,-52.00595 l -26.30696,-0.38772 c -2.41986,27.54738 -25.52665,49.13496 -53.6926,49.13496 z m 37.77461,-119.35113 c 8.82834,5.09818 20.11145,2.07845 25.20475,-6.74987 5.099,-8.82833 2.07928,-20.11145 -6.74988,-25.21126 -8.82832,-5.0933 -20.11063,-2.06705 -25.21125,6.76127 -5.09247,8.82345 -2.06625,20.10657 6.75638,25.19986 z"
322− inkscape:connector-curvature="0"
323− inkscape:transform-center-x="16.232534"
324− inkscape:transform-center-y="-0.0024900663" />
data/unity8-dash.url-dispatcherdeleted−6
data/unity8-filewatcher.conf+5
@@ -1,6 +1,11 @@
1description "File system watcher for unity8"
1description "File system watcher for unity8"
2author "Michael Zanetti <michael.zanetti@canonical.com>"
2author "Michael Zanetti <michael.zanetti@canonical.com>"
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.
4# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
9# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
5start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
10start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
data/unity8-greeter-init.confnew file+12
@@ -0,0 +1,12 @@
1+description "Unity 8 Greeter initialization"
2+author "Michael Terry <mterry@ubuntu.com>"
4+start on unity8-greeter-started
6+emits indicator-services-start
9+ start --no-wait ofono-setup || true
10+ initctl emit --no-wait indicator-services-start || true
11+ start --no-wait maliit-server || true
data/unity8-greeter-wrappernew file+109
@@ -0,0 +1,109 @@
2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
4+# Copyright (C) 2011,2013,2016 Canonical Ltd
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.
10+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
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.
17+trap cleanup TERM EXIT
22+ # Kill upstart and indicators
23+ if [ -n "$INIT_PID" ]; then
26+ if [ -n "$CMD_PID" ]; then
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"
41+SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
42+rm -f $SUB_SOCKET # clear socket in case we were hard shut down
44+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"
46+# If touch session script (which sets up grid units and mir variables) is available, use it
48+if which ubuntu-touch-session >/dev/null; then
49+ TOUCH_WRAPPER=ubuntu-touch-session
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
56+set_greeter_var QT_IM_MODULE maliitphablet
57+set_greeter_var QT_QPA_PLATFORM ubuntumirclient
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
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 &
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
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
81+# Start any pre-greeter tasks if needed (like wizard)
82+initctl emit unity8-greeter-starting
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).
91+# Do this after unity8-greeter-starting, in case a customization upstart job
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"
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"
105+# And finally actually start the greeter
106+exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
data/unity8-greeter.desktop.innew file+7
@@ -0,0 +1,7 @@
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
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/
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;
11+[Disable Sleep and Wake]
12+Identity=unix-user:lightdm
13+Action=org.freedesktop.NetworkManager.sleep-wake
18+[Disable WiFi Sharing]
19+Identity=unix-user:lightdm
20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open
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
32+[Disable User Connections]
33+Identity=unix-user:lightdm
34+Action=org.freedesktop.NetworkManager.use-user-connections
39+[Enable Controlling of Network Connections]
40+Identity=unix-user:lightdm
41+Action=org.freedesktop.NetworkManager.network-control
@@ -2,37 +2,51 @@ description "Unity Shell v8"
2author "Ricardo Mendoza <ricmm@ubuntu.com>"
2author "Ricardo Mendoza <ricmm@ubuntu.com>"
4emits indicator-services-start
4emits indicator-services-start
5+emits indicator-services-end
6−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus
7+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus
7stop on desktop-end
8stop on desktop-end
9kill timeout 120
10kill timeout 120
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).
19+env QML_NO_TOUCH_COMPRESSION=1
12expect stop
22expect stop
24+# FIXME Create an autopilot test that makes sure start+stop and restart
25+# work fine at least 2 times
14pre-start script
27pre-start script
15 # Tell unity-mir to raise SIGSTOP after we start
28 # Tell unity-mir to raise SIGSTOP after we start
16 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
29 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
18− if [ -n "$MIR_SOCKET" ]; then
19− # FIXME Create an autopilot test that makes sure start+stop and restart
20− # work fine at least 2 times
21− # Save original value of MIR_SOCKET in case we are stopped,
31+ # Save original value of MIR_SOCKET so that we can restore it when stopped,
22− # as we modify the variable for future jobs, including ourself.
32+ # as we modify the variable for future jobs, including ourself.
23− UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SOCKET)
24− initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
33+ initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET
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
40+ MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket
27 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
42 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
28− initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
29− initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
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'}"
44+ initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
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'}"
37 # Remove the normal and trusted sockets if still there
51 # Remove the normal and trusted sockets if still there
38 if [ -S "$MIR_SERVER_FILE" ]; then
52 if [ -S "$MIR_SERVER_FILE" ]; then
@@ -50,9 +64,28 @@ pre-start script
50 # the lag seen in the indicator panel pull-down (LP: #1488327) and also
64 # the lag seen in the indicator panel pull-down (LP: #1488327) and also
51 # reduces lag seen in apps:
65 # reduces lag seen in apps:
52 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1
66 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1
68+ # Workaround for text not rendering correctly
69+ initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1
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
78+ initctl set-env MODE=full-shell
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
55−exec ${BINARY:-unity8} $ARGS
88+exec ${BINARY:-unity8} --mode=$MODE $ARGS
57post-start script
90post-start script
58 initctl emit --no-wait indicator-services-start
91 initctl emit --no-wait indicator-services-start
@@ -60,7 +93,7 @@ end script
61post-stop script
94post-stop script
62 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
95 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
63− initctl unset-env --global UNITY_MIR_SOCKET
64 initctl unset-env --global MIR_SERVER_PROMPT_FILE
96 initctl unset-env --global MIR_SERVER_PROMPT_FILE
65 initctl emit application-end
97 initctl emit application-end
98+ initctl emit indicator-services-end
@@ -1,3 +1,1068 @@
1+unity8 (8.20+ubports) xenial; urgency=medium
3+ * Replace dependency on ubuntu-wallpapers with ubports-wallpapers
5+ -- Dalton Durst <dalton@ubports.com> Fri, 5 Oct 2018 13:28:20 -0500
7+unity8 (8.17+ubports3) xenial; urgency=medium
11+ -- UBports auto importer <infra@ubports.com> Mon, 31 Jul 2017 03:12:43 +0200
13+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium
16+ * Make the default store uri point to gnome software center
18+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 06 Apr 2017 10:49:29 +0300
20+unity8 (8.15+17.04.20170404.7-0ubuntu1) zesty; urgency=medium
22+ [ Albert Astals Cid ]
23+ * Tweak app drawer a bit (LP: #1667570)
26+ * Make some small changes to the greeter's session list
27+ * Handle a user in the greeter having never selected a session better
31+ * Do not occlude windows with an ongoing unmaximize transition (LP:
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
39+ * Don't hide the launcher on super press if it's locked visible (LP:
41+ * fix searchfield selection in drawer (LP: #1677259)
42+ * make sure the stage has focus when going to spread (LP: #1672053,
44+ * don't autostart the dash app, but show its .desktop file instead
46+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Apr 2017 22:56:06 +0000
48+unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium
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:
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:
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)
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
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)
75+ * Protect against loading invalid window geometry (LP: #1674262)
76+ * Remove usage of the deprecated (and non-functional) system-image-
78+ * Implement Ctrl+Alt+T to launch the terminal app (LP: #1673500)
79+ * Only take normal and dialog surface types into account for launcher
81+ * Fix the shutdown dialog after recent refactoring in
82+ DBusUnitySessionService (LP: #1676426)
85+ * drop the grey background behind icons in the drawer (LP: #1675688)
88+ * Fix Unity/Platform::isPC, and add tests (LP: #1670657)
90+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 28 Mar 2017 21:50:20 +0000
92+unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium
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)
101+ [ Daniel d'Andrada ]
102+ * Really disable the window decoration when in staged mode (LP:
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:
110+ * Reset always-show-osk gsetting on startup to default value (false
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
116+ * Fix unsnapping a maximized window from the panel (LP: #1671721)
117+ * Disable altDrag feature outside windowed mode
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)
126+ * Add support for closing apps from the spread with "Q" (LP: #1670327)
127+ * hide "private" launcher quicklist entries when the greeter is locked
129+ * add surface titles to launcher's quicklist (LP: #1661668)
130+ * properly reset the drawer state when cancelling a horizontal drag
132+ * fix the focus moving correctly between launcher and drawer (LP:
134+ * unfocus the drawer's textfield when it is moved (LP: #1669839)
137+ * Fix up indicators-client after refactoring (LP: #1672797)
139+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 21 Mar 2017 10:58:13 +0000
141+unity8 (8.15+17.04.20170308-0ubuntu1) zesty; urgency=medium
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:
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
156+ [ Daniel d'Andrada ]
157+ * Drag child windows with Alt+LeftMouseButton (LP: #1664947)
160+ * TopLevelWindowModel: connect to the OSK surface to know when it goes
161+ away so we can clean up after it. (LP: #1670681)
164+ * Initialize sessionMode to single when mock is reset (LP: #1667463)
167+ * Make the menu string "Back" translatable
168+ * Let the OSK be driven by a switch in indicator-keyboard (LP:
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)
177+ * Set QT_IM_MODULE in the greeter so that the OSK can come up. (LP:
179+ * Simplify our startup handling of Mir environment variables and set
180+ the right socket path in snappy.
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:
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:
192+ * Split up Shell::test_spreadDisabled to ensure initial state for each
195+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 08 Mar 2017 09:56:46 +0000
197+unity8 (8.15+17.04.20170221-0ubuntu1) zesty; urgency=medium
199+ * Handle ubuntu-app-launch API/ABI break
201+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2017 13:23:23 +0000
203+unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium
205+ [ Albert Astals Cid ]
206+ * Make menus items close the menu when clicking on them (LP: #1657082,
208+ * Clicking on an open menu closes it + test
209+ * Make the menus and submenus do not go outside the screen when
211+ * Auto open submenus on hover (LP: #1657085)
212+ * Make the double click on a menu not be maximize the window below
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
221+ * Remove variable that is always false (LP: #1585910)
223+ [ Daniel d'Andrada ]
224+ * Consolidate launcher API checks
227+ * Fixes for activating minimized windows and restoring fullscreen ones
228+ (LP: #1656808, #1658937, #1658938)
231+ * move right edge push area up some levels so it can be used on top of
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
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)
246+ * Added overflow support to application menus.
247+ * Updated menu colors
249+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 16 Feb 2017 13:49:18 +0000
251+unity8 (8.15+17.04.20170206-0ubuntu1) zesty; urgency=medium
253+ [ Daniel d'Andrada ]
254+ * Initial support for child windows (menus, dialogs, tooltips) (LP:
255+ #1543467, #1591384, #1656727)
257+ -- Albert Astals Cid <albert.astals@canonical.com> Mon, 06 Feb 2017 09:12:23 +0000
259+unity8 (8.15+17.04.20170131.1-0ubuntu1) zesty; urgency=medium
262+ * Remove dependencies on clickscope.
264+ -- Albert Astals Cid <albert.astals@canonical.com> Tue, 31 Jan 2017 14:40:33 +0000
266+unity8 (8.15+17.04.20170124-0ubuntu1) zesty; urgency=medium
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
276+ [ Daniel d'Andrada ]
277+ * Simplify DecoratedWindow
278+ * Remove unnecessary warning message
281+ * Add a test for the session chooser icon in the greeter's sessions
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
293+ * Simplify the lightdm mock to make future greeter improvements easier
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
303+ * hint the launcher to indicate a successful size change to the user
305+ * Improvements for the appdrawer (LP: #1648173)
306+ * Adjust home key to still focus the dash instead of messing with the
308+ * allow 4 finger simulation with mousetouchadaptor
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
315+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 24 Jan 2017 07:46:58 +0000
317+unity8 (8.15+17.04.20170110.4-0ubuntu1) zesty; urgency=medium
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
326+ * Deprecate usage of Mir's input resampling, instead opting for: (LP:
330+ * Allow the scopes list to automatically scroll when a scope is being
331+ dragged past the bounds of the screen. (LP: #1575319)
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)
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
346+ * Nuke leftover Platform in IndicatorsManager
349+ * Added registry for application menus
351+ [ Michael Terry, Nick Dedekind ]
352+ * Run the qmluitests.sh autopkg test against the installed package.
354+ [ Michał Sawicz, Nick Dedekind ]
358+ * Remove the payments widget and dependency on libpay as no longer
361+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 10 Jan 2017 14:48:42 +0000
363+unity8 (8.15+17.04.20161215-0ubuntu2~1) zesty; urgency=medium
367+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 04 Jan 2017 10:54:32 +0200
369+unity8 (8.15+17.04.20161215-0ubuntu1) zesty; urgency=medium
371+ * Let the model deal with some window management decisions (LP:
374+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Thu, 15 Dec 2016 16:17:29 +0000
376+unity8 (8.15+17.04.20161207.1-0ubuntu1) zesty; urgency=medium
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)
387+ [ Daniel d'Andrada ]
388+ * Fix "make tryApplicationWindow"
389+ * Take save/restore functions out of WindowResizeArea
392+ * Enable the greeter to remember which session the user last logged
396+ * Fix the Super key not invoking the dash scope home (LP: #1607427)
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)
405+ * MenuItemFactory: Add subtitle support to SwitchItem widget
407+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 07 Dec 2016 13:49:24 +0000
409+unity8 (8.15+17.04.20161129-0ubuntu1) zesty; urgency=medium
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
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)
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
435+ * Added a setting to enable/disable the indicator dropdown menu.
437+ [ Daniel d'Andrada ]
438+ * There's no need for WindowDecoration to access the appDelegate
441+ * Enable brightness (laptop backlight) handling on desktop/laptop PCs
445+ * disable spread interaction while locked (LP: #1641578)
447+ [ Andrea Azzarone, Michał Sawicz ]
448+ * Implement launcher tooltips.
451+ * Remove dependency on transitional package. (LP: #1583079)
453+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 29 Nov 2016 09:43:33 +0000
455+unity8 (8.15+17.04.20161116.1-0ubuntu1) zesty; urgency=medium
457+ [ Marco Trevisan (Treviño) ]
458+ * MenuItemFactory: bind calendar backend properties to calendarMenu item
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.
463+ * MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu
465+ * Bump version as USC breaks with unity8 << 8.14
467+ [ Albert Astals Cid ]
468+ * [Hopefully] Fix infinite loop in some of the GSV tests (LP:
471+ [ Marco Trevisan (Treviño) ]
472+ * testLauncher: use tryCompare to check launcher contentY
475+ * Stabilize OrientedShell tests
477+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Wed, 16 Nov 2016 10:44:59 +0000
479+unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium
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,
487+ * Make the PreviewButtons be of the width of the button and not half
489+ * Fix first column of the preview table to be 25%
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
499+ * Add a new setting to enable/disable the launcher
502+ * Stabilize test_doubleTapToMaximizeWindow()
503+ * Enable loading the main Qt catalog which in turn allows for using
505+ * Fix the pixelated notification icon by setting sourceSize (LP:
509+ * More path lookup fixes for running inside of a snap. (LP: #1629009)
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,
516+ * Delay alt tab for tiny bit in order to avoid flickering on quick alt-
520+ * Reload Infographics userdata when the day changes (LP: #1378814)
522+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 09 Nov 2016 15:10:32 +0000
524+unity8 (8.14+17.04.20161027-0ubuntu1) zesty; urgency=medium
526+ * MenuItemFactory: activate item on calendar selection change (LP:
529+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000
531+unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium
533+ [ Albert Astals Cid ]
534+ * Make PreviewProgress be thicker again (LP: #1629382)
535+ * tst_PreviewZoomableImage: Wait for LazyImage transitions on init()
539+ * Remove UbuntuShapeForItem and replace its use with the more standard
540+ Ubuntu.Components.UbuntuShape.
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
547+ [ Marco Trevisan (Treviño) ]
548+ * MenuItemFactory: use more features from SlotsLayout based settings
552+ * Grab launcher icon information from ubuntu-app-launch, not directly
554+ * Adjust root paths if we're running inside a snap. (LP: #1629009)
557+ * Merge all Stages into one single codebase. Apply new spread visuals.
558+ (LP: #1489517, #1603914, #1635800)
560+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 24 Oct 2016 11:37:28 +0000
562+unity8 (8.14+16.10.20160922-0ubuntu2) yakkety; urgency=medium
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.
569+ -- Michael Terry <mterry@ubuntu.com> Mon, 03 Oct 2016 10:43:25 -0400
571+unity8 (8.14+16.10.20160922-0ubuntu1) yakkety; urgency=medium
573+ [ Albert Astals Cid ]
574+ * LVWPH: update clipItem height when list height changes (LP:
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
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
589+ * Make tryGenericScopeView show the scope correctly
590+ * Make sure the spinner does not get too close to the title text (LP:
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.
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:
603+ * Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput
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
609+ [ Daniel d'Andrada ]
610+ * Set progress bar indeterminate when processing signal received. (LP:
612+ * Implement cursor confinement (LP: #1590099)
615+ * Add a frontend to the sessions model and enable a session chooser in
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:
624+ * Fix 2 failing color-related tests
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
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
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
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.
646+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 22 Sep 2016 07:46:57 +0000
648+unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
650+ [ Daniel d'Andrada ]
651+ * Added implementation for MirSurfaceInterface::persistentId
653+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 31 Aug 2016 11:56:09 +0000
655+unity8 (8.14+16.10.20160826-0ubuntu1) yakkety; urgency=medium
657+ * Make sure we emit sounds when taking a screenshot even after media-
660+ -- Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com> Fri, 26 Aug 2016 08:14:14 +0000
662+unity8 (8.14+16.10.20160819-0ubuntu1) yakkety; urgency=medium
665+ * Reset topmostIsFullscreen to correctly rotate the shell when
666+ dismissing SIM PIN screen (LP: #1614070)
668+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 19 Aug 2016 14:16:54 +0000
670+unity8 (8.14+16.10.20160811.1-0ubuntu1) yakkety; urgency=medium
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
679+ [ Daniel d'Andrada ]
680+ * Remove stage property from Application
683+ * Allow libertine-scope to show empty search result hint unmodified.
687+ * Open the quicklist (context) menu also using the Menu key (LP:
689+ * Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:
691+ * Apply the correct keymap also on prompt surfaces (LP: #1610124)
692+ * Implement an optional system update feature during OOBE wizard (LP:
694+ * Implement a page for choosing HW keyboard layout in OOBE wizard
697+ * Clean up some build script legacy
698+ * Add a crossbuilder_post file to make crossbuilder restart unity8
700+ * fixes for the automatic switching between usage modes (LP: #1590944)
703+ * Add object names for setup wizard
705+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 11 Aug 2016 06:28:20 +0000
707+unity8 (8.14+16.10.20160803-0ubuntu1) yakkety; urgency=medium
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)
718+ * Unfocus the search text field in the dash page header when requested
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)
725+ [ Albert Astals Cid, Andrea Cimitan ]
726+ * Unbox the artshapeLoader
728+ [ Daniel d'Andrada ]
729+ * Fix splashscreen orientation when app rotates own contents (LP:
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)
737+ * Implement frontend support for running keyboard indicator
738+ * Provide window/surface close shortcuts across all the stages (LP:
740+ * Restart the location trust prompt service when exiting the wizard
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:
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)
755+ * Add arm64 support, drop unnecessary B-D on web plugin
757+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 03 Aug 2016 15:56:27 +0000
759+unity8 (8.14+16.10.20160728-0ubuntu1) yakkety; urgency=medium
762+ * Bump the version to secure UITK compatibility
764+ [ Albert Astals Cid ]
765+ * Pass the correct number of arguments to mapToItem (LP: #1606835)
767+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 28 Jul 2016 08:17:13 +0000
769+unity8 (8.13+16.10.20160714+fix1-0ubuntu2~1) yakkety; urgency=medium
771+ * Rebuild against Qt 5.6.
772+ * Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850
774+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 22 Jul 2016 09:03:54 +0300
776+unity8 (8.13+16.10.20160714-0ubuntu1) yakkety; urgency=medium
778+ [ Daniel d'Andrada ]
779+ * Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack
781+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 14 Jul 2016 07:09:29 +0000
783+unity8 (8.12+16.10.20160711-0ubuntu1) yakkety; urgency=medium
786+ * Add a SessionsModel to lightdm to support the greeter's session
788+ * Add unity8-greeter package which contains a basic, but usable
789+ LightDM greeter. (LP: #1324602)
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)
797+ -- Michael Terry <michael.terry@canonical.com> Mon, 11 Jul 2016 17:24:20 +0000
799+unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium
802+ * emit the correct role changed signal on count visible changed (LP:
805+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 07 Jul 2016 16:49:32 +0000
807+unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium
810+ * don't displace windows if the OSK is on another screen (LP:
813+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 05 Jul 2016 10:00:57 +0000
815+unity8 (8.12+16.10.20160627.5-0ubuntu1) yakkety; urgency=medium
817+ [ Albert Astals Cid ]
818+ * Stop watching the old header item height once it's not our header
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
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)
839+ * Make PreviewRatingSingleDisplay visible again after editing a
840+ review. (LP: #1587097)
841+ * Correct errors in all png images to prevent libpng warnings.
844+ * Fix some smaller issues with OOBE wizard password pages (LP:
846+ * Prevent mouse wheel events from going through shell elements (LP:
848+ * Do not let mouse and wheel events pass thru the titlebar (LP:
850+ * Hide the maximize window button based on size restrictions (LP:
853+ [ Marco Trevisan (Treviño) ]
854+ * Unity8.conf: ensure MIR_SOCKET is set for future customers (such as
856+ * ClientIndicator: be more informative about loading failures for
857+ dynamically created objects
860+ * Stop unity8 from getting in a "switch-to-greeter" loop when locking
861+ on a desktop. (LP: #1593718)
864+ * set minimum window sizes on dash
865+ * displace application windows when the OSK would cover them
868+ * Force dash to always stay in the main stage. (lp:#1592404) (LP:
870+ * Save the last surface stage on stage drop. (LP: #1579003)
871+ * Default portrait only apps to the side stage. (LP: #1573153)
873+ [ Albert Astals Cid, Andrea Cimitan, Michał Sawicz, Nick Dedekind ]
874+ * Added live video playback in dash previews
876+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 27 Jun 2016 18:48:59 +0000
878+unity8 (8.12+16.10.20160620.3-0ubuntu1) yakkety; urgency=medium
880+ [ Michael Terry, Michał Sawicz ]
881+ * Support unlocking via fingerprint, if one is registered.
883+ -- Michael Terry <michael.terry@canonical.com> Mon, 20 Jun 2016 20:25:25 +0000
885+unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium
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:
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
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
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
917+ [ Alexandros Frantzis ]
918+ * Improve the way notifications interact with power management (LP:
922+ * Correctly refresh cardcreator cache on artshapestyle changes (LP:
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:
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
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)
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)
944+ * Implement keyboard shortcuts info panel
945+ * Implement window controls overlay activatable with 3 fingers tap
947+ * Select correct Chinese input method for OSK in the wizard (LP:
951+ * Add support for the launcher surface pips displaying the correct
953+ * Add support for the persistent alert state. (LP: #1575147, #1584348,
955+ * send a Alt-release event on alt+tab instead of delaying it
956+ completely and invoking it later (LP: #1565236)
959+ * added a new upstart $SESSION for unity8-desktop-session (LP:
962+ -- Michael Terry <michael.terry@canonical.com> Fri, 17 Jun 2016 01:22:57 +0000
964+unity8 (8.12+16.10.20160601.1-0ubuntu1) yakkety; urgency=medium
967+ * Added apparmor profile for unity8-dash.
969+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 01 Jun 2016 20:59:03 +0000
971+unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium
973+ [ Albert Astals Cid ]
974+ * Activate on click for SimpleMessages (LP: #1421696)
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)
989+ [ Albert Astals Cid, Daniel d'Andrada ]
990+ * Remove DirectionalDragArea and libs/UbuntuGestures and port to SDK
994+ * Hide the preview review input field when a rating is required (LP:
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)
1008+ * Close the PageHeaderExtraPanel when a filter option is selected (LP:
1010+ * Wrap primaryFilter in a flickable to make it behave nicely. (LP:
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)
1020+ [ Lukáš Tinkl, Michael Terry ]
1021+ * With a maximized window, "dragging" the panel down should restore it
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)
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
1034+ -- Michael Terry <michael.terry@canonical.com> Fri, 27 May 2016 13:54:44 +0000
1036+unity8 (8.12+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium
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)
1043+ [ Michael Zanetti ]
1044+ * fix the SIM PIN darkening after it got removed accidentally (LP:
1047+ [ Michał Sawicz, Nick Dedekind ]
1048+ * Fixed saving current stage and loss of surface focus when switching
1052+ * Fixed incorrect osk surface item resizing the surface.
1054+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 20 May 2016 08:44:19 +0000
1056+unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium
1061+ [ Daniel d'Andrada, Michał Sawicz ]
1062+ * Move prompt surfaces from MirSurface to Application
1064+ -- Nick Dedekind <ci-train-bot@canonical.com> Wed, 18 May 2016 11:20:04 +0000
1unity8 (8.12+16.04.20160504.2-0ubuntu1) xenial; urgency=medium
1066unity8 (8.12+16.04.20160504.2-0ubuntu1) xenial; urgency=medium
3 [ Albert Astals Cid ]
1068 [ Albert Astals Cid ]
@@ -159,7 +1224,7 @@ unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium
159unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
1224unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
161 [ Michael Terry ]
1226 [ Michael Terry ]
163 * Fix setting OSK layout in OOBE wizard
1228 * Fix setting OSK layout in OOBE wizard
164 * Stop the left edge tutorial from being shown when the bottom edge
1229 * Stop the left edge tutorial from being shown when the bottom edge
165 tutorial wants to be shown after receiving a call.
1230 tutorial wants to be shown after receiving a call.
@@ -2871,7 +3936,7 @@ unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium
2871 * Re-architecture unity8 to use the QtMirCompositor library so that
3936 * Re-architecture unity8 to use the QtMirCompositor library so that
2872 the Qt scenegraph renderer is used as the Mir compositor, and
3937 the Qt scenegraph renderer is used as the Mir compositor, and
2873 application surfaces are added to the QML scene as items.
3938 application surfaces are added to the QML scene as items.
2875 [ Michael Zanetti ]
3940 [ Michael Zanetti ]
2876 * Port phone right-edge spread code to use QtCompositor
3941 * Port phone right-edge spread code to use QtCompositor
2877 * Add right-edge spread animation for tablet
3942 * Add right-edge spread animation for tablet
@@ -3145,8 +4210,8 @@ unity8 (7.90+14.10.20140703.1-0ubuntu1) utopic; urgency=low
3146unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
4211unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
3148− * debian/control:
4213+ * debian/control:
3149− list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
4214+ list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
3150 choice, since provides are not versionned, should restore installability
4215 choice, since provides are not versionned, should restore installability
3151 on amd64 and i386
4216 on amd64 and i386
@@ -6248,7 +7313,7 @@ unity8 (7.81.2) saucy; urgency=low
6248 [ Michał Sawicz ]
7313 [ Michał Sawicz ]
6249 * Fix icons in ApplicationsFilterGrid.qml.
7314 * Fix icons in ApplicationsFilterGrid.qml.
6250 * Support flipped image in run_on_device.
7315 * Support flipped image in run_on_device.
6252 [ Michael Zanetti ]
7317 [ Michael Zanetti ]
6253 * Don't clear lockscreen when it's fading out.
7318 * Don't clear lockscreen when it's fading out.
6254 * Reworked Launcher folding.
7319 * Reworked Launcher folding.
@@ -6333,7 +7398,7 @@ qml-phone-shell (1.79) raring; urgency=low
6334 [ Michael Terry ]
7399 [ Michael Terry ]
6335 * Make greeter look like the desktop one
7400 * Make greeter look like the desktop one
6337 [ Gerry Boland ]
7402 [ Gerry Boland ]
6338 * Fix a bug where a minimized app gets focus after closing another app
7403 * Fix a bug where a minimized app gets focus after closing another app
6339 * Applied a workaround to reduce flickering when launching apps
7404 * Applied a workaround to reduce flickering when launching apps
@@ -6349,7 +7414,7 @@ qml-phone-shell (1.79) raring; urgency=low
6349qml-phone-shell (1.78) raring; urgency=low
7414qml-phone-shell (1.78) raring; urgency=low
6351 [ Sergio Schvezov ]
7416 [ Sergio Schvezov ]
6352− * 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
6353 the launcher (LP: #1178262).
7418 the launcher (LP: #1178262).
6355 [ Daniel d'Andrada ]
7420 [ Daniel d'Andrada ]
@@ -6391,7 +7456,7 @@ qml-phone-shell (1.77) raring; urgency=low
6391 [ Mathieu Trudel-Lapierre ]
7456 [ Mathieu Trudel-Lapierre ]
6392 * debian/control:
7457 * debian/control:
6393 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.
7458 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.
6394− - 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.
6395 * debian/copyright: fix syntax.
7460 * debian/copyright: fix syntax.
6397 [ Michał Sawicz ]
7462 [ Michał Sawicz ]
@@ -6401,7 +7466,7 @@ qml-phone-shell (1.77) raring; urgency=low
6401 * Renamed Media player files to match with new application name.
7466 * Renamed Media player files to match with new application name.
6403 [ Daniel d'Andrada ]
7468 [ Daniel d'Andrada ]
6404− * New: DirectionalDragArea component. An area that detects axis-aligned
7469+ * New: DirectionalDragArea component. An area that detects axis-aligned
6405 single-finger drag gestures.
7470 single-finger drag gestures.
6406 * Make it possible to send touch events from within QML test code.
7471 * Make it possible to send touch events from within QML test code.
@@ -6838,7 +7903,7 @@ qml-phone-shell (1.39) quantal; urgency=low
6839qml-phone-shell (1.38) quantal; urgency=low
7904qml-phone-shell (1.38) quantal; urgency=low
6841− * fix launching of notepad
7906+ * fix launching of notepad
6843 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500
7908 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500
@@ -6851,14 +7916,14 @@ qml-phone-shell (1.37) quantal; urgency=low
6852qml-phone-shell (1.36) quantal; urgency=low
7917qml-phone-shell (1.36) quantal; urgency=low
6854− * launch real notepad app
7919+ * launch real notepad app
6855 * fix launching of mock apps
7920 * fix launching of mock apps
6857 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500
7922 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500
6859qml-phone-shell (1.35) quantal; urgency=low
7924qml-phone-shell (1.35) quantal; urgency=low
6861− * integrate ubuntu-browser instead of snowshoe
7926+ * integrate ubuntu-browser instead of snowshoe
6863 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500
7928 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500
@@ -6942,7 +8007,7 @@ qml-phone-shell (1.22) quantal; urgency=low
6943qml-phone-shell (1.21) quantal; urgency=low
8008qml-phone-shell (1.21) quantal; urgency=low
6945− * New release with fullscreen launcher fixes
8010+ * New release with fullscreen launcher fixes
6947 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000
8012 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000
@@ -6954,7 +8019,7 @@ qml-phone-shell (1.20) quantal; urgency=low
6955qml-phone-shell (1.19) quantal; urgency=low
8020qml-phone-shell (1.19) quantal; urgency=low
6957− * enable multi-threaded render for apps
8022+ * enable multi-threaded render for apps
6959 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000
8024 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000
@@ -6962,7 +8027,7 @@ qml-phone-shell (1.18) quantal; urgency=low
6963 [ Bill Filler ]
8028 [ Bill Filler ]
6964 * update launcher to use wk2-render (chromeless webkit) for facebook
8029 * update launcher to use wk2-render (chromeless webkit) for facebook
6965− and twitter
8030+ and twitter
6967 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000
8032 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000
@@ -6974,7 +8039,7 @@ qml-phone-shell (1.17) quantal; urgency=low
6975qml-phone-shell (1.16) quantal; urgency=low
8040qml-phone-shell (1.16) quantal; urgency=low
6977− * fix to launch new gallery with correct args
8042+ * fix to launch new gallery with correct args
6979 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500
8044 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500
@@ -7036,7 +8101,7 @@ qml-phone-shell (1.2) quantal; urgency=low
7037qml-phone-shell (1.1) quantal; urgency=low
8102qml-phone-shell (1.1) quantal; urgency=low
7039− * comment out console.log() to prevent crash
8104+ * comment out console.log() to prevent crash
7041 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100
8106 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100
@@ -7064,19 +8129,19 @@ qml-phone-shell (0.7) quantal; urgency=low
7064 * qml-phone-shell.conf: better setup of env vars and launch
8129 * qml-phone-shell.conf: better setup of env vars and launch
7065 via dbus-luanch to properly setup session bus
8130 via dbus-luanch to properly setup session bus
7066 * shellapplication.cpp: don't setup custom env before launching
8131 * shellapplication.cpp: don't setup custom env before launching
7067− processes
8132+ processes
7069 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200
8134 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200
7071qml-phone-shell (0.6) quantal; urgency=low
8136qml-phone-shell (0.6) quantal; urgency=low
7073− * added additional Android env vars to upstart script
8138+ * added additional Android env vars to upstart script
7075 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400
8140 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400
7077qml-phone-shell (0.5) quantal; urgency=low
8142qml-phone-shell (0.5) quantal; urgency=low
7079− * added support to launch telephony-app
8144+ * added support to launch telephony-app
7081 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400
8146 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400
@@ -7103,3 +8168,8 @@ qml-phone-shell (0.1) quantal; urgency=low
7103 * Initial release
8168 * Initial release
7105 -- Bill Filler <bill.filler@canonical.com> Wed, 10 Oct 2012 10:19:53 -0400
8170 -- Bill Filler <bill.filler@canonical.com> Wed, 10 Oct 2012 10:19:53 -0400
8171+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium
8173+ [ Michael Zanetti ]
8174+ * Make the default store uri point to gnome software center
@@ -2,214 +2,271 @@ Source: unity8
2Section: x11
2Section: x11
3Priority: optional
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5−Build-Depends: cmake,
5+Build-Depends:
6− dbus-test-runner,
9+ dbus-test-runner,
7− debhelper (>= 9),
10+ debhelper (>= 9),
9−# To allow cross-compiling to work, we also must append :native
10−# to g++ so we don't try to run armhf g++
11−# on an x86 CPU for example, when cross-compiling.
12− g++:native,
13+ g++:native,
13− libandroid-properties-dev,
14+ gdb,
14− graphviz,
15+ graphviz,
15− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
16+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
17+ libandroid-properties-dev,
16− libconnectivity-qt1-dev (>= 0.7.1),
18+ libconnectivity-qt1-dev (>= 0.7.1),
17− libevdev-dev,
19+ libevdev-dev,
18− libgeonames-dev (>= 0.2),
20+ libgeonames-dev (>= 0.2),
19− libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
21+ libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
20− libgl1-mesa-dri,
22+ libgl1-mesa-dri,
21− libgles2-mesa-dev[armhf],
23+ libgles2-mesa-dev[arm64 armhf],
22− libglib2.0-dev,
24+ libglib2.0-dev,
25+ libgnome-desktop-3-dev,
23− libgsettings-qt-dev,
26+ libgsettings-qt-dev,
24− libhardware-dev,
27+ libhardware-dev,
28+ liblightdm-qt5-3-dev,
25− libpam0g-dev,
29+ libpam0g-dev,
27− libpulse-dev,
30+ libpulse-dev,
28− libqmenumodel-dev (>= 0.2.9),
31+ libqmenumodel-dev (>= 0.2.12),
29− libqt5svg5-dev,
33+ libqt5svg5-dev,
30− libqt5xmlpatterns5-dev,
34+ libqt5xmlpatterns5-dev,
35+ libqtdbusmock1-dev (>= 0.7),
31− libsystemsettings-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),
32− libudev-dev,
42+ libudev-dev,
33− libunity-api-dev (>= 7.112),
44+ libunity-api-dev (>= 8.7),
34− libusermetricsoutput1-dev,
45+ libusermetricsoutput1-dev,
35−# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
36− libx11-dev[!armhf],
46+ libx11-dev[!arm64 !armhf],
37− libxcb1-dev[!armhf],
47+ libxcb1-dev[!arm64 !armhf],
38− libxi-dev[!armhf],
48+ libxi-dev[!arm64 !armhf],
40− pkg-config,
49+ pkg-config,
41− python3-all:any,
50+ python3-all:any,
42− python3-setuptools,
51+ python3-setuptools,
43− qml-module-qt-labs-folderlistmodel,
52+ qml-module-qt-labs-folderlistmodel,
53+ qml-module-qt-labs-settings,
54+ qml-module-qtmultimedia (>= 5.6),
55+ qml-module-qtqml-statemachine,
44− qml-module-qtquick-layouts,
56+ qml-module-qtquick-layouts,
45− qml-module-qtquick-xmllistmodel,
57+ qml-module-qtquick-xmllistmodel,
46− qml-module-qtquick2,
58+ qml-module-qtquick2,
47− qml-module-qtsysteminfo,
59+ qml-module-qtsysteminfo,
48− qml-module-qttest,
60+ qml-module-qttest,
49− qt5-default,
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,
50− qtbase5-dev (>= 5.4),
65+ qtbase5-dev (>= 5.6),
51− qtbase5-dev-tools,
66+ qtbase5-dev-tools,
52− qtbase5-private-dev (>= 5.4),
67+ qtbase5-private-dev (>= 5.6),
53− qtdeclarative5-dev (>= 5.4),
69+ qtdeclarative5-dev (>= 5.6),
54− qtdeclarative5-dev-tools,
70+ qtdeclarative5-dev-tools,
55− qtdeclarative5-private-dev (>= 5.4),
71+ qtdeclarative5-private-dev (>= 5.6),
56− qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
57− qtdeclarative5-ubuntu-content1,
72+ qtdeclarative5-ubuntu-content1,
58− qtdeclarative5-ubuntu-settings-components (>= 0.7),
59− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
60− qtdeclarative5-ubuntu-web-plugin,
61− ttf-ubuntu-font-family,
73+ ttf-ubuntu-font-family,
62Standards-Version: 3.9.4
76Standards-Version: 3.9.4
63−Homepage: http://launchpad.net/unity
77+Homepage: https://github.com/ubports/unity8
64−# If you aren't a member of ~unity-team but need to upload
78+Vcs-Git: https://github.com/ubports/unity8
65−# packaging changes, just go ahead. ~unity-team will notice
66−# and sync up the code again.
67−Vcs-Bzr: https://code.launchpad.net/unity8
68−Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
69XS-Testsuite: autopkgtest
79XS-Testsuite: autopkgtest
70X-Ubuntu-Use-Langpack: yes
80X-Ubuntu-Use-Langpack: yes
72Package: indicators-client
82Package: indicators-client
73−Architecture: amd64 armhf i386
83+Architecture: any
74−Depends: qmenumodel-qml (>= 0.2.9),
85+ qmenumodel-qml (>= 0.2.11),
75− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
86+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
76− unity8 (= ${binary:Version}),
87+ unity8 (= ${binary:Version}),
77− ${misc:Depends},
88+ ${misc:Depends},
78− ${shlibs:Depends},
89+ ${shlibs:Depends},
79Description: Indicators client test application
90Description: Indicators client test application
80 This package contains the client application for indicators used by autopilot
91 This package contains the client application for indicators used by autopilot
82−Package: unity-scope-tool
93+Package: unity8-greeter
83Architecture: any
94Architecture: any
84−Depends: unity8-common (= ${source:Version}),
95+Depends:
96+ unity-system-compositor,
85− unity8-private (= ${binary:Version}),
97+ unity8 (= ${binary:Version}),
86− ${misc:Depends},
98+ ${misc:Depends},
87− ${shlibs:Depends},
99+ ${shlibs:Depends},
88−# We do call pkg-config libunity-scopes from the code
100+Recommends:
89− pkg-config,
101+ lightdm,
90− libunity-scopes-dev,
102+Provides:
91−Description: Development tool for Unity scopes
103+ lightdm-greeter,
92− This package contains the development tool for new generation Unity scopes, based
104+Description: The Unity8 Greeter
93− on Unity8.
105+ The Unity 8 greeter is the primary login greeter for Ubuntu devices.
95Package: unity8
107Package: unity8
96Architecture: any
108Architecture: any
97−Provides: indicator-renderer,
110+ indicator-renderer,
98−Depends: dmz-cursor-theme,
112+ dmz-cursor-theme,
99− gsettings-desktop-schemas,
113+ gsettings-desktop-schemas,
100− libcap2-bin,
114+ libcap2-bin,
101− libglib2.0-bin,
115+ libglib2.0-bin,
102− qmenumodel-qml (>= 0.2.9),
116+ qmenumodel-qml (>= 0.2.11),
117+ qml-module-biometryd,
103− qml-module-qt-labs-folderlistmodel,
118+ qml-module-qt-labs-folderlistmodel,
119+ qml-module-qt-labs-settings,
120+ qml-module-qtqml-statemachine,
104− qml-module-qtquick-xmllistmodel,
121+ qml-module-qtquick-xmllistmodel,
105− qml-module-qtsysteminfo,
122+ qml-module-qtsysteminfo,
106− qtdeclarative5-qtmir-plugin (>= 0.4.8),
123+ qtdeclarative5-qtmir-plugin (>= 0.4.8),
107− qtdeclarative5-ubuntu-telephony0.1,
124+ qtdeclarative5-ubuntu-telephony0.1,
108− qtdeclarative5-ubuntu-web-plugin,
109− ubuntu-system-settings,
125+ ubuntu-system-settings (>= 0.4),
110− unity-launcher-impl-7,
126+ unity-launcher-impl-13,
111− unity8-common (= ${source:Version}),
127+ unity8-common (= ${source:Version}),
112− unity8-private (= ${binary:Version}),
128+ unity8-private (= ${binary:Version}),
113− unity8-private | unity-launcher-impl,
129+ unity8-private | unity-launcher-impl,
114− ${misc:Depends},
130+ ${misc:Depends},
115− ${shlibs:Depends},
131+ ${shlibs:Depends},
116−Recommends: indicator-session,
132+Recommends:
117− unity-scope-click,
133+ indicator-keyboard,
118− unity-scope-mediascanner2,
134+ indicator-session,
135+ unity-greeter-session-broadcast,
119−Breaks: indicator-network (<< 0.5.1+14.10.20141014),
137+ indicator-network (<< 0.5.1+14.10.20141014),
138+ ubuntu-keyboard (<< 0.100),
120− ubuntu-touch-session (<< 0.107),
139+ ubuntu-touch-session (<< 0.107),
121− unity8-greeter (<< 7.89),
141+ unity8-greeter (<< 7.89),
122−Replaces: ubuntu-touch-session (<< 0.82~),
143+ ubuntu-touch-session (<< 0.82~),
123− unity8-greeter (<< 7.89),
145+ unity8-greeter (<< 7.89),
124−Conflicts: ubuntu-system-settings-wizard,
147+ ubuntu-system-settings-wizard,
125Description: Unity 8 shell
148Description: Unity 8 shell
126 The Unity 8 shell is the primary user interface for Ubuntu devices.
149 The Unity 8 shell is the primary user interface for Ubuntu devices.
128Package: unity8-common
151Package: unity8-common
129Architecture: all
152Architecture: all
130−Depends: qml-module-qtquick-layouts,
154+ qml-module-qtquick-layouts,
155+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
131− qtdeclarative5-ubuntu-settings-components (>= 0.7),
156+ qml-module-ubuntu-settings-components,
132− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
157+ qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
133− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
134− qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
158+ qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
159+ qttranslations5-l10n,
135− ubuntu-thumbnailer-impl-0,
160+ ubuntu-thumbnailer-impl-0,
136− unity-application-impl-15,
161+ unity-application-impl-27,
137− unity-notifications-impl-3,
162+ unity-notifications-impl-3,
138− unity-plugin-scopes | unity-scopes-impl,
163+ unity8-schemas,
139− unity-scopes-impl-12,
140− unity8-fake-env | unity-application-impl,
164+ unity8-tests | unity-application-impl,
141− ${misc:Depends},
165+ ${misc:Depends},
142−Breaks: unity8 (<< 7.86),
167+ unity8 (<< 7.86),
143−Replaces: unity8 (<< 7.86),
169+ unity8 (<< 7.86),
144Description: Unity 8 shell (common files)
170Description: Unity 8 shell (common files)
145 The Unity 8 shell is the primary user interface for Ubuntu devices.
171 The Unity 8 shell is the primary user interface for Ubuntu devices.
147− This package contains the QML, graphics and locale files shared between
173+ This package contains the QML, graphics and locale files for unity8.
148− unity8 and unity-scope-tool.
150Package: unity8-autopilot
175Package: unity8-autopilot
151Architecture: all
176Architecture: all
152−Depends: autopilot-qt5 (>= 1.4),
178+ autopilot-qt5 (>= 1.4),
153− gir1.2-glib-2.0,
179+ gir1.2-glib-2.0,
154− gir1.2-notify-0.7,
180+ gir1.2-notify-0.7,
155− libqt5test5,
181+ libqt5test5,
156− libqt5widgets5,
182+ libqt5widgets5,
157− ofono-phonesim,
183+ ofono-phonesim,
158− python3-autopilot,
184+ python3-autopilot,
159− python3-evdev,
185+ python3-evdev,
160− python3-fixtures,
186+ python3-fixtures,
161− python3-gi,
187+ python3-gi,
162− qttestability-autopilot (>= 1.4),
188+ qttestability-autopilot (>= 1.4),
163− ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
189+ ubuntu-ui-toolkit-autopilot (>= 1.3.2030),
165− unity8 (= ${source:Version}),
190+ unity8 (= ${source:Version}),
166− unity8-fake-env (= ${source:Version}),
191+ unity8-tests (= ${source:Version}),
167− url-dispatcher-tools,
192+ url-dispatcher-tools,
169− ${misc:Depends},
194+ ${misc:Depends},
171− ${shlibs:Depends},
195+ ${python3:Depends},
172Description: Test package for Unity 8 shell
196Description: Test package for Unity 8 shell
173 Autopilot tests for the unity8 package
197 Autopilot tests for the unity8 package
175−Package: unity8-fake-env
199+Package: unity8-tests
176Architecture: any
200Architecture: any
177Multi-Arch: same
201Multi-Arch: same
178−Pre-Depends: ${misc:Pre-Depends},
203+ ${misc:Pre-Depends},
209+ qtdeclarative5-dev-tools,
210+ unity8 (= ${source:Version}),
179−Depends: ${misc:Depends},
212+ ${misc:Depends},
180− ${shlibs:Depends},
213+ ${shlibs:Depends},
181−Provides: unity-application-impl,
215+ unity-application-impl,
182− unity-application-impl-15,
216+ unity-application-impl-27,
183−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
219+ unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
184−Description: Fake environment for running Unity 8 shell
223+Description: Scripts and mocks for running Unity 8 shell tests
185 Provides fake implementations of some QML modules used by Unity 8 shell
224 Provides fake implementations of some QML modules used by Unity 8 shell
186− (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.
188Package: unity8-private
228Package: unity8-private
189Architecture: any
229Architecture: any
190Multi-Arch: same
230Multi-Arch: same
191−Pre-Depends: ${misc:Pre-Depends},
232+ ${misc:Pre-Depends},
192−Depends: accountsservice-ubuntu-schemas (>= 0.0.5),
234+ accountsservice-ubuntu-schemas (>= 0.0.7),
193− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
235+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
194− libhardware2,
236+ libhardware2,
196− unity-schemas (>= 7.3.1+14.10.20140915),
197− qtdeclarative5-gsettings1.0,
198− qml-module-qtmultimedia,
237+ qml-module-qtmultimedia,
238+ qtdeclarative5-gsettings1.0,
199− ${misc:Depends},
240+ ${misc:Depends},
200− ${shlibs:Depends},
241+ ${shlibs:Depends},
201−Provides: unity-launcher-impl,
243+ unity-launcher-impl,
202− unity-launcher-impl-7,
244+ unity-launcher-impl-13,
203Description: Unity 8 private libs
245Description: Unity 8 private libs
204 The Unity 8 shell is the primary user interface for Ubuntu devices.
246 The Unity 8 shell is the primary user interface for Ubuntu devices.
206 This package contains the private libraries for QML and other components
248 This package contains the private libraries for QML and other components
207 only used by the shell.
249 only used by the shell.
251+Package: unity8-schemas
257+ unity-schemas (>= 7.3.1+14.10.20140915),
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.
263+ This package contains the configuration schemas used by unity.
209Package: unity8-doc
265Package: unity8-doc
210Section: doc
266Section: doc
211Architecture: all
267Architecture: all
212Multi-Arch: foreign
268Multi-Arch: foreign
213−Depends: ${misc:Depends},
270+ ${misc:Depends},
214Description: Documentation for Unity8
271Description: Documentation for Unity8
215 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
272 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
@@ -7,6 +7,12 @@ include /usr/share/dpkg/default.mk
7#export DH_VERBOSE=1
7#export DH_VERBOSE=1
8export DPKG_GENSYMBOLS_CHECK_LEVEL=4
8export DPKG_GENSYMBOLS_CHECK_LEVEL=4
9export NO_PNG_PKG_MANGLE=1
9export NO_PNG_PKG_MANGLE=1
12+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
14+# Skip tests on the archs they are known to be flaky with current configuration
15+testskip_architectures := arm64 powerpc ppc64el s390x
12 dh $@ --parallel --fail-missing --with python3
18 dh $@ --parallel --fail-missing --with python3
@@ -18,7 +24,19 @@ override_dh_auto_configure:
19override_dh_auto_build:
25override_dh_auto_build:
20 # doc is not a default target
26 # doc is not a default target
21− dh_auto_build -- all doc
27+ dh_auto_build -- -O all doc
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
37+ dh_auto_test --no-parallel -- -O -k xvfballtests
23override_dh_install:
41override_dh_install:
24 # install autopilot tests
42 # install autopilot tests
@@ -31,8 +49,9 @@ override_dh_install:
32# use private lib directories
50# use private lib directories
33override_dh_makeshlibs:
51override_dh_makeshlibs:
34− dh_makeshlibs -Nunity8-private -Nunity8-fake-env
52+ dh_makeshlibs -Nunity8-private -Nunity8-tests
36−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
37override_dh_shlibdeps:
54override_dh_shlibdeps:
38− 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,10 +1,11 @@
1Tests: qmluitests.sh
1Tests: qmluitests.sh
2Restrictions: allow-stderr
2Restrictions: allow-stderr
4− @builddeps@,
4+ dpkg-dev,
7Tests: autopilot.sh
7Tests: autopilot.sh
8Restrictions: allow-stderr,
8Restrictions: allow-stderr,
9 isolation-machine,
9 isolation-machine,
10−Depends: unity8-autopilot,
11+ unity8-autopilot,
debian/tests/qmluitests.sh+4−14
@@ -1,21 +1,11 @@
2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
3# log all commands and abort on error
4# log all commands and abort on error
6−SHELL_QML_PATH=$(pkg-config --variable=plugindir unity-shell-api)
7+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
7−UNITY_SOURCE_DIR=$(readlink -f $(dirname $(readlink -f $0))/../..)
9−dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
10− -DARTIFACTS_DIR=${ADT_ARTIFACTS} \
9+export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
11− -DUNITY_PLUGINPATH=${SHELL_QML_PATH} \
12− -DUNITY_MOCKPATH=${SHELL_QML_PATH}/mocks
13−dh_auto_build --parallel -- -C tests/mocks
14−dh_auto_build --parallel -- -C tests/plugins
15−dh_auto_build --parallel -- -C tests/qmltests
16−dh_auto_build --parallel -- -C tests/uqmlscene
17−dh_auto_build --parallel -- -C tests/utils
19−export UNITY_SOURCE_DIR
11+/usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh
21−dh_auto_build --parallel -- -k xvfballtests
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 @@
1−usr/share/glib-2.0/schemas
2usr/share/locale
1usr/share/locale
3usr/share/unity8/Components
2usr/share/unity8/Components
5usr/share/unity8/Notifications
3usr/share/unity8/Notifications
6usr/share/unity8/graphics
4usr/share/unity8/graphics
7var/lib/polkit-1/localauthority/10-vendor.d
5var/lib/polkit-1/localauthority/10-vendor.d
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+2−4
@@ -1,18 +1,16 @@
1usr/lib/*/libunity8-private.*
1usr/lib/*/libunity8-private.*
2−usr/lib/*/unity8/libUbuntuGestures*
3usr/lib/*/unity8/qml/AccountsService
2usr/lib/*/unity8/qml/AccountsService
4usr/lib/*/unity8/qml/Cursor
3usr/lib/*/unity8/qml/Cursor
5−usr/lib/*/unity8/qml/Dash
6usr/lib/*/unity8/qml/GlobalShortcut
4usr/lib/*/unity8/qml/GlobalShortcut
7usr/lib/*/unity8/qml/Greeter
5usr/lib/*/unity8/qml/Greeter
8−usr/lib/*/unity8/qml/IntegratedLightDM
6+usr/lib/*/unity8/qml/LightDM
9usr/lib/*/unity8/qml/Lights
7usr/lib/*/unity8/qml/Lights
10usr/lib/*/unity8/qml/Powerd
8usr/lib/*/unity8/qml/Powerd
11usr/lib/*/unity8/qml/ScreenshotDirectory
9usr/lib/*/unity8/qml/ScreenshotDirectory
12usr/lib/*/unity8/qml/SessionBroadcast
10usr/lib/*/unity8/qml/SessionBroadcast
11+usr/lib/*/unity8/qml/UInput
13usr/lib/*/unity8/qml/Ubuntu
12usr/lib/*/unity8/qml/Ubuntu
14usr/lib/*/unity8/qml/Unity
13usr/lib/*/unity8/qml/Unity
15−usr/lib/*/unity8/qml/UInput
16usr/lib/*/unity8/qml/Utils
14usr/lib/*/unity8/qml/Utils
17usr/lib/*/unity8/qml/WindowManager
15usr/lib/*/unity8/qml/WindowManager
18usr/lib/*/unity8/qml/Wizard
16usr/lib/*/unity8/qml/Wizard
debian/unity8-schemas.installnew file+1
@@ -0,0 +1 @@
1+usr/share/glib-2.0/schemas
debian/unity8-fake-env.install → debian/unity8-tests.installrenamed+4−1
@@ -2,5 +2,8 @@ data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
2usr/bin/unity-mock-indicator-service
2usr/bin/unity-mock-indicator-service
3usr/lib/*/unity8/qml/mocks
3usr/lib/*/unity8/qml/mocks
4usr/lib/*/unity8/qml/nonmirplugins
4usr/lib/*/unity8/qml/nonmirplugins
5−usr/lib/*/unity8/qml/scopefakes
5+usr/lib/*/unity8/qml/utils
7+usr/lib/*/unity8/uqmlscene
6usr/share/unity8/mocks
8usr/share/unity8/mocks
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+8−10
@@ -1,21 +1,19 @@
1−var/lib/unity8/version
1+data/devices.conf etc/ubuntu/
2−data/unity8-dash.conf usr/share/upstart/sessions/
2+data/test.sensors etc/ubuntusensors/
3data/unity8-filewatcher.conf usr/share/upstart/sessions/
3data/unity8-filewatcher.conf usr/share/upstart/sessions/
4data/unity8.conf usr/share/upstart/sessions/
4data/unity8.conf usr/share/upstart/sessions/
5−data/devices.conf etc/ubuntu/
6usr/bin/unity8
5usr/bin/unity8
8−usr/share/applications/unity8-dash.desktop
9usr/share/applications/unity8.desktop
6usr/share/applications/unity8.desktop
7+usr/share/unity8/ApplicationMenus
8+usr/share/unity8/DeviceConfiguration.qml
9+usr/share/unity8/DisabledScreenNotice.qml
10usr/share/unity8/Greeter
10usr/share/unity8/Greeter
11usr/share/unity8/Launcher
11usr/share/unity8/Launcher
12+usr/share/unity8/OrientedShell.qml
12usr/share/unity8/Panel
13usr/share/unity8/Panel
13usr/share/unity8/Rotation
14usr/share/unity8/Rotation
14−usr/share/unity8/DeviceConfiguration.qml
15−usr/share/unity8/OrientedShell.qml
16−usr/share/unity8/DisabledScreenNotice.qml
17usr/share/unity8/Shell.qml
15usr/share/unity8/Shell.qml
18−usr/share/unity8/Stages
16+usr/share/unity8/Stage
19usr/share/unity8/Tutorial
17usr/share/unity8/Tutorial
20usr/share/unity8/Wizard
18usr/share/unity8/Wizard
21−usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
19+var/lib/unity8/version
@@ -1,8 +1,5 @@
2− * Copyright (C) 2012 Canonical, Ltd.
2+ * Copyright (C) 2012-2016 Canonical, Ltd.
5− * Ugo Riboni <ugo.riboni@canonical.com>
7 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -17,8 +14,7 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20−#ifndef PATHS_H
17+#pragma once
24#include <QtCore/QCoreApplication>
20#include <QtCore/QCoreApplication>
@@ -27,10 +23,28 @@
27#include <QtQml/QQmlEngine>
23#include <QtQml/QQmlEngine>
28#include <QStandardPaths>
24#include <QStandardPaths>
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("");
38+ installRootSet = true;
30inline bool isRunningInstalled() {
43inline bool isRunningInstalled() {
31− static bool installed = (QCoreApplication::applicationDirPath() ==
44+ // Tests don't use the normal binary, so we want to check binary *and*
32− QDir(QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
45+ // the environment. Installed tests have UNITY_TESTING_DATADIR set.
33− return installed;
46+ static bool installed_test_env = !qgetenv("UNITY_TESTING_DATADIR").isEmpty();
47+ return !installRoot().isNull() || installed_test_env;
36inline QString buildDirectory() {
50inline QString buildDirectory() {
@@ -45,24 +59,46 @@ inline QString sourceDirectory() {
46inline QString translationDirectory() {
60inline QString translationDirectory() {
47 if (isRunningInstalled()) {
61 if (isRunningInstalled()) {
48− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
62+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
64+ return buildDirectory() + QStringLiteral("/po/locale");
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";
75+ return datadir + "/tests";
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";
50− return QString(buildDirectory() + "/po/locale");
86+ return libdir + "/tests";
54inline QString qmlDirectory() {
90inline QString qmlDirectory() {
55 if (isRunningInstalled()) {
91 if (isRunningInstalled()) {
56− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
92+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
58− return QString(sourceDirectory() + "/qml");
94+ return sourceDirectory() + QStringLiteral("/qml");
62inline QStringList overrideImportPaths() {
98inline QStringList overrideImportPaths() {
63 QStringList paths;
99 QStringList paths;
64 if (!isRunningInstalled()) {
100 if (!isRunningInstalled()) {
65− paths << QString(buildDirectory() + "/plugins");
101+ paths << buildDirectory() + QStringLiteral("/plugins");
67 return paths;
103 return paths;
@@ -70,9 +106,9 @@ inline QStringList overrideImportPaths() {
70inline QStringList nonMirImportPaths() {
106inline QStringList nonMirImportPaths() {
71 QStringList paths;
107 QStringList paths;
72 if (isRunningInstalled()) {
108 if (isRunningInstalled()) {
73− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
109+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
75− paths << QString(buildDirectory() + "/nonmirplugins");
111+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");
77 return paths;
113 return paths;
@@ -80,23 +116,23 @@ inline QStringList nonMirImportPaths() {
80inline QStringList fallbackImportPaths() {
116inline QStringList fallbackImportPaths() {
81 QStringList paths;
117 QStringList paths;
82 if (isRunningInstalled()) {
118 if (isRunningInstalled()) {
83− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
119+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
84− paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
120+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
85− paths << QStringLiteral("@SHELL_PLUGINDIR@");
121+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");
86− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
122+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
88 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
124 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
89 paths << QStringLiteral("@SHELL_PLUGINDIR@");
125 paths << QStringLiteral("@SHELL_PLUGINDIR@");
90− paths << QString(buildDirectory() + "/tests/mocks");
126+ paths << buildDirectory() + QStringLiteral("/tests/mocks");
92 return paths;
128 return paths;
95inline QString mockPluginsDir() {
131inline QString mockPluginsDir() {
96 if (isRunningInstalled()) {
132 if (isRunningInstalled()) {
97− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
133+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
99− return QString(buildDirectory() + "/tests/mocks");
135+ return buildDirectory() + QStringLiteral("/tests/mocks");
@@ -137,5 +173,3 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
138 engine->setImportPathList(importPathList);
174 engine->setImportPathList(importPathList);
libs/CMakeLists.txtdeleted−1
@@ -1 +0,0 @@
1−add_subdirectory(UbuntuGestures)
libs/UbuntuGestures/CMakeLists.txtdeleted−41
@@ -1,41 +0,0 @@
1−# in order to include Qt's private headers
2−remove_definitions(-DQT_NO_KEYWORDS)
4−set(UbuntuGestures_SOURCES
5− CandidateInactivityTimer.cpp
9− TouchOwnershipEvent.cpp
11− UnownedTouchEvent.cpp
14−add_definitions(-DUBUNTUGESTURES_LIBRARY)
16−add_library(UbuntuGestures SHARED ${UbuntuGestures_SOURCES})
18−qt5_use_modules(UbuntuGestures Core Quick)
20−# So that Foo.cpp can #include "Foo.moc"
21−include_directories(${CMAKE_CURRENT_BINARY_DIR})
23−install(TARGETS UbuntuGestures
24− DESTINATION ${SHELL_PRIVATE_LIBDIR})
27−# There's no cmake var for v8 include path :-/ so create one
28−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
29−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")
30− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
32− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
35−# DANGER! DANGER! Using Qt's private API!
37− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38− ${Qt5Quick_INCLUDE_DIRS}
39− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
40− ${Qt5V8_PRIVATE_INCLUDE_DIR}
libs/UbuntuGestures/CandidateInactivityTimer.cppdeleted−46
@@ -1,46 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "CandidateInactivityTimer.h"
19−namespace UbuntuGestures {
21−CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
22− AbstractTimer *timer, QObject *parent)
26− , m_candidate(candidate)
28− connect(m_timer, &AbstractTimer::timeout,
29− this, &CandidateInactivityTimer::onTimeout);
30− m_timer->setInterval(durationMs);
31− m_timer->setSingleShot(true);
35−CandidateInactivityTimer::~CandidateInactivityTimer()
40−void CandidateInactivityTimer::onTimeout()
42− qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
43− Q_EMIT candidateDefaulted(m_touchId, m_candidate);
46−} // namespace UbuntuGestures
libs/UbuntuGestures/CandidateInactivityTimer.hdeleted−51
@@ -1,51 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
18−#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
26−namespace UbuntuGestures {
28−class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
31− CandidateInactivityTimer(int touchId, QQuickItem *candidate,
32− AbstractTimer *timer,
33− QObject *parent = nullptr);
35− virtual ~CandidateInactivityTimer();
37− const int durationMs = 1000;
40− void candidateDefaulted(int touchId, QQuickItem *candidate);
44− AbstractTimer *m_timer;
46− QQuickItem *m_candidate;
49−} // namespace UbuntuGestures
51−#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
libs/UbuntuGestures/DebugHelpers.cppdeleted−95
@@ -1,95 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "DebugHelpers.h"
18−#include <QTouchEvent>
19−#include <QMouseEvent>
21−QString touchPointStateToString(Qt::TouchPointState state)
24− case Qt::TouchPointPressed:
25− return QStringLiteral("pressed");
26− case Qt::TouchPointMoved:
27− return QStringLiteral("moved");
28− case Qt::TouchPointStationary:
29− return QStringLiteral("stationary");
30− case Qt::TouchPointReleased:
31− return QStringLiteral("released");
33− return QStringLiteral("INVALID_STATE");
37−QString touchEventToString(const QTouchEvent *ev)
41− switch (ev->type()) {
42− case QEvent::TouchBegin:
43− message.append("TouchBegin ");
45− case QEvent::TouchUpdate:
46− message.append("TouchUpdate ");
48− case QEvent::TouchEnd:
49− message.append("TouchEnd ");
51− case QEvent::TouchCancel:
52− message.append("TouchCancel ");
55− message.append("INVALID_TOUCH_EVENT_TYPE ");
58− foreach(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {
60− QStringLiteral("(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())
71−QString mouseEventToString(const QMouseEvent *ev)
75− switch (ev->type()) {
76− case QEvent::MouseButtonPress:
77− message.append("MouseButtonPress ");
79− case QEvent::MouseButtonRelease:
80− message.append("MouseButtonRelease ");
82− case QEvent::MouseButtonDblClick:
83− message.append("MouseButtonDblClick ");
85− case QEvent::MouseMove:
86− message.append("MouseMove ");
89− message.append("INVALID_MOUSE_EVENT_TYPE ");
92− message.append(QStringLiteral("pos(%1, %2)").arg(ev->x()).arg(ev->y()));
libs/UbuntuGestures/DebugHelpers.hdeleted−31
@@ -1,31 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTUGESTURES_DEBUG_HELPER_H
18−#define UBUNTUGESTURES_DEBUG_HELPER_H
22−#include "UbuntuGesturesGlobal.h"
27−UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);
28−UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);
29−UBUNTUGESTURES_EXPORT QString mouseEventToString(const QMouseEvent *ev);
31−#endif // UBUNTUGESTURES_DEBUG_HELPER_H
libs/UbuntuGestures/Pool.hdeleted−124
@@ -1,124 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTUGESTURES_POOL_H
18−#define UBUNTUGESTURES_POOL_H
22−#include "UbuntuGesturesGlobal.h"
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.
30− To be used in Pool, ItemType needs to have the following methods:
34− A constructor that takes no parameters. An object contructed with it must return false if
37− - bool isValid() const;
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.
44− Resets the object to its initial, empty, state. After calling this method, isValid() must
47−template <class ItemType> class Pool
50− Pool() : m_lastUsedIndex(-1) {
55− Iterator() : index(-1), item(nullptr) {}
56− Iterator(int index, ItemType *item)
57− : index(index), item(item) {}
59− ItemType *operator->() const { return item; }
60− ItemType &operator*() const { return *item; }
61− ItemType &value() const { return *item; }
63− operator bool() const { return item != nullptr; }
69− ItemType &getEmptySlot() {
70− Q_ASSERT(m_lastUsedIndex < m_slots.size());
72− // Look for an in-between vacancy first
73− for (int i = 0; i < m_lastUsedIndex; ++i) {
74− ItemType &item = m_slots[i];
75− if (!item.isValid()) {
81− if (m_lastUsedIndex >= m_slots.size()) {
82− m_slots.resize(m_lastUsedIndex + 1);
85− return m_slots[m_lastUsedIndex];
88− void freeSlot(Iterator &iterator) {
89− m_slots[iterator.index].reset();
90− if (iterator.index == m_lastUsedIndex) {
93− } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());
97− // Iterates through all valid items (i.e. the occupied slots)
98− // calling the given function, with the option of ending the loop early.
100− // bool Func(Iterator& item)
102− // Returning true means it wants to continue the "for" loop, false
103− // terminates the loop.
104− template<typename Func> void forEach(Func func) {
106− for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {
107− it.item = &m_slots[it.index];
108− if (!it.item->isValid())
116− bool isEmpty() const { return m_lastUsedIndex == -1; }
120− QVector<ItemType> m_slots;
121− int m_lastUsedIndex;
124−#endif // UBUNTUGESTURES_POOL_H
libs/UbuntuGestures/TimeSource.cppdeleted−49
@@ -1,49 +0,0 @@
2− * Copyright (C) 2013 - Canonical Ltd.
4− * This program is free software: you can redistribute it and/or modify it
5− * under the terms of the GNU Lesser General Public License, as
6− * published by the Free Software Foundation; either version 2.1 or 3.0
9− * This program is distributed in the hope that it will be useful, but
10− * WITHOUT ANY WARRANTY; without even the implied warranties of
11− * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
12− * PURPOSE. See the applicable version of the GNU Lesser General Public
13− * License for more details.
15− * You should have received a copy of both the GNU Lesser General Public
16− * License along with this program. If not, see <http://www.gnu.org/licenses/>
18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
21−#include "TimeSource.h"
23−#include <QElapsedTimer>
25−namespace UbuntuGestures {
26−class RealTimeSourcePrivate {
32−using namespace UbuntuGestures;
34−RealTimeSource::RealTimeSource()
35− : UbuntuGestures::TimeSource()
36− , d(new RealTimeSourcePrivate)
41−RealTimeSource::~RealTimeSource()
46−qint64 RealTimeSource::msecsSinceReference()
48− return d->timer.elapsed();
libs/UbuntuGestures/TimeSource.hdeleted−64
@@ -1,64 +0,0 @@
2− * Copyright (C) 2013,2015 Canonical Ltd.
4− * This program is free software: you can redistribute it and/or modify it
5− * under the terms of the GNU Lesser General Public License, as
6− * published by the Free Software Foundation; either version 2.1 or 3.0
9− * This program is distributed in the hope that it will be useful, but
10− * WITHOUT ANY WARRANTY; without even the implied warranties of
11− * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
12− * PURPOSE. See the applicable version of the GNU Lesser General Public
13− * License for more details.
15− * You should have received a copy of both the GNU Lesser General Public
16− * License along with this program. If not, see <http://www.gnu.org/licenses/>
18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
21−#ifndef UBUNTUGESTURES_TIMESOURCE_H
22−#define UBUNTUGESTURES_TIMESOURCE_H
24−#include "UbuntuGesturesGlobal.h"
25−#include <QSharedPointer>
27−namespace UbuntuGestures {
29− Interface for a time source.
31−class UBUNTUGESTURES_EXPORT TimeSource {
33− virtual ~TimeSource() {}
34− /* Returns the current time in milliseconds since some reference time in the past. */
35− virtual qint64 msecsSinceReference() = 0;
37−typedef QSharedPointer<TimeSource> SharedTimeSource;
40− Implementation of a time source
42−class RealTimeSourcePrivate;
43−class UBUNTUGESTURES_EXPORT RealTimeSource : public TimeSource {
46− virtual ~RealTimeSource();
47− qint64 msecsSinceReference() override;
49− RealTimeSourcePrivate *d;
53− A fake time source, useful for tests
55−class FakeTimeSource : public TimeSource {
57− FakeTimeSource() { m_msecsSinceReference = 0; }
58− qint64 msecsSinceReference() override { return m_msecsSinceReference; }
59− qint64 m_msecsSinceReference;
62−} // namespace UbuntuGestures
64−#endif // UBUNTUGESTURES_TIMESOURCE_H
libs/UbuntuGestures/Timer.cppdeleted−152
@@ -1,152 +0,0 @@
2− * Copyright (C) 2014-2015 Canonical, Ltd.
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.
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.
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/>.
19−namespace UbuntuGestures {
21−Timer::Timer(QObject *parent) : AbstractTimer(parent)
23− m_timer.setSingleShot(false);
24− connect(&m_timer, &QTimer::timeout, this, &AbstractTimer::timeout);
27−int Timer::interval() const
29− return m_timer.interval();
32−void Timer::setInterval(int msecs)
34− m_timer.setInterval(msecs);
40− AbstractTimer::start();
46− AbstractTimer::stop();
49−bool Timer::isSingleShot() const
51− return m_timer.isSingleShot();
54−void Timer::setSingleShot(bool value)
56− m_timer.setSingleShot(value);
59−/////////////////////////////////// FakeTimer //////////////////////////////////
61−FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent)
62− : UbuntuGestures::AbstractTimer(parent)
64− , m_singleShot(false)
65− , m_timeSource(timeSource)
69−void FakeTimer::update()
75− if (m_nextTimeoutTime <= m_timeSource->msecsSinceReference()) {
76− if (isSingleShot()) {
79− m_nextTimeoutTime += interval();
85−void FakeTimer::start()
87− AbstractTimer::start();
88− m_nextTimeoutTime = m_timeSource->msecsSinceReference() + (qint64)interval();
91−int FakeTimer::interval() const
96−void FakeTimer::setInterval(int msecs)
101−bool FakeTimer::isSingleShot() const
103− return m_singleShot;
106−void FakeTimer::setSingleShot(bool value)
108− m_singleShot = value;
111−/////////////////////////////////// FakeTimerFactory //////////////////////////////////
113−FakeTimerFactory::FakeTimerFactory()
115− m_timeSource.reset(new FakeTimeSource);
118−void FakeTimerFactory::updateTime(qint64 targetTime)
120− qint64 minTimeoutTime = targetTime;
122− for (int i = 0; i < timers.count(); ++i) {
123− FakeTimer *timer = timers[i].data();
124− if (timer && timer->isRunning() && timer->nextTimeoutTime() < minTimeoutTime) {
125− minTimeoutTime = timer->nextTimeoutTime();
129− m_timeSource->m_msecsSinceReference = minTimeoutTime;
131− for (int i = 0; i < timers.count(); ++i) {
132− FakeTimer *timer = timers[i].data();
138− if (m_timeSource->msecsSinceReference() < targetTime) {
139− updateTime(targetTime);
143−AbstractTimer *FakeTimerFactory::createTimer(QObject *parent)
145− FakeTimer *fakeTimer = new FakeTimer(m_timeSource, parent);
147− timers.append(fakeTimer);
152−} // namespace UbuntuGestures
libs/UbuntuGestures/Timer.hdeleted−122
@@ -1,122 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTUGESTURES_TIMER_H
18−#define UBUNTUGESTURES_TIMER_H
20−#include "UbuntuGesturesGlobal.h"
21−#include "TimeSource.h"
27−namespace UbuntuGestures {
29−/* Defines an interface for a Timer. Useful for tests. */
30−class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
34− AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}
35− virtual int interval() const = 0;
36− virtual void setInterval(int msecs) = 0;
37− virtual void start() { m_isRunning = true; }
38− virtual void start(int msecs)
43− virtual void stop() { m_isRunning = false; }
44− bool isRunning() const { return m_isRunning; }
45− virtual bool isSingleShot() const = 0;
46− virtual void setSingleShot(bool value) = 0;
53−/* Essentially a QTimer wrapper */
54−class UBUNTUGESTURES_EXPORT Timer : public AbstractTimer
58− Timer(QObject *parent = nullptr);
60− int interval() const override;
61− void setInterval(int msecs) override;
62− void start() override;
63− void stop() override;
64− bool isSingleShot() const override;
65− void setSingleShot(bool value) override;
71−class UBUNTUGESTURES_EXPORT FakeTimer : public AbstractTimer
75− FakeTimer(const SharedTimeSource &timeSource, QObject *parent = nullptr);
78− qint64 nextTimeoutTime() const { return m_nextTimeoutTime; }
80− int interval() const override;
81− void setInterval(int msecs) override;
82− void start() override;
83− bool isSingleShot() const override;
84− void setSingleShot(bool value) override;
88− SharedTimeSource m_timeSource;
89− qint64 m_nextTimeoutTime;
92−class UBUNTUGESTURES_EXPORT AbstractTimerFactory
95− virtual ~AbstractTimerFactory() {}
96− virtual AbstractTimer *createTimer(QObject *parent = nullptr) = 0;
99−class UBUNTUGESTURES_EXPORT TimerFactory : public AbstractTimerFactory
102− AbstractTimer *createTimer(QObject *parent = nullptr) override { return new Timer(parent); }
105−class UBUNTUGESTURES_EXPORT FakeTimerFactory : public AbstractTimerFactory
109− virtual ~FakeTimerFactory() {}
111− void updateTime(qint64 msecsSinceReference);
112− QSharedPointer<TimeSource> timeSource() { return m_timeSource; }
114− AbstractTimer *createTimer(QObject *parent = nullptr) override;
115− QList<QPointer<FakeTimer>> timers;
117− QSharedPointer<FakeTimeSource> m_timeSource;
120−} // namespace UbuntuGestures
122−#endif // UBUNTUGESTURES_TIMER_H
libs/UbuntuGestures/TouchOwnershipEvent.hdeleted−50
@@ -1,50 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H
18−#define UBUNTU_TOUCHOWNERSHIPEVENT_H
21−#include "UbuntuGesturesGlobal.h"
24− When an item get an ownership event for a touch it can grab/steal that touch
25− with a clean conscience.
27−class UBUNTUGESTURES_EXPORT TouchOwnershipEvent : public QEvent
30− TouchOwnershipEvent(int touchId, bool gained);
32− static Type touchOwnershipEventType();
35− Whether ownership was gained (true) or lost (false)
37− bool gained() const { return m_gained; }
40− Id of the touch whose ownership was granted.
42− int touchId() const { return m_touchId; }
45− static Type m_touchOwnershipType;
50−#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H
libs/UbuntuGestures/TouchRegistry.cppdeleted−553
@@ -1,553 +0,0 @@
2− * Copyright (C) 2014-2015 Canonical, Ltd.
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.
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.
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/>.
17−#include "TouchRegistry.h"
19−#include <QCoreApplication>
22−#pragma GCC diagnostic push
23−#pragma GCC diagnostic ignored "-pedantic"
24−#include <private/qquickitem_p.h>
25−#pragma GCC diagnostic pop
27−#include "CandidateInactivityTimer.h"
29−#include "TouchOwnershipEvent.h"
30−#include "UnownedTouchEvent.h"
32−#define TOUCHREGISTRY_DEBUG 0
34−#if TOUCHREGISTRY_DEBUG
35− #include "DebugHelpers.h"
36− #define UG_DEBUG qDebug() << "[TouchRegistry]"
37−#endif // TOUCHREGISTRY_DEBUG
39−using namespace UbuntuGestures;
41−TouchRegistry *TouchRegistry::m_instance = nullptr;
43−TouchRegistry::TouchRegistry(QObject *parent)
45− , m_inDispatchLoop(false)
46− , m_timerFactory(new TimerFactory)
50−TouchRegistry::~TouchRegistry()
52− Q_ASSERT(m_instance != nullptr);
53− m_instance = nullptr;
54− delete m_timerFactory;
57−TouchRegistry *TouchRegistry::instance()
59− if (m_instance == nullptr) {
60− m_instance = new TouchRegistry;
65−void TouchRegistry::setTimerFactory(AbstractTimerFactory *timerFactory)
67− delete m_timerFactory;
68− m_timerFactory = timerFactory;
71−void TouchRegistry::update(const QTouchEvent *event)
73− #if TOUCHREGISTRY_DEBUG
74− UG_DEBUG << "got" << qPrintable(touchEventToString(event));
77− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
78− for (int i = 0; i < touchPoints.count(); ++i) {
79− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
80− if (touchPoint.state() == Qt::TouchPointPressed) {
81− TouchInfo &touchInfo = m_touchInfoPool.getEmptySlot();
82− touchInfo.init(touchPoint.id());
83− } else if (touchPoint.state() == Qt::TouchPointReleased) {
84− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchPoint.id());
86− touchInfo->physicallyEnded = true;
90− deliverTouchUpdatesToUndecidedCandidatesAndWatchers(event);
92− freeEndedTouchInfos();
95−void TouchRegistry::deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event)
97− // TODO: Look into how we could optimize this whole thing.
98− // Although it's not really a problem as we should have at most two candidates
99− // for each point and there should not be many active points at any given moment.
100− // But having three nested for-loops does scare.
102− const QList<QTouchEvent::TouchPoint> &updatedTouchPoints = event->touchPoints();
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
108− QHash<QQuickItem*, QList<int>> touchIdsForItems;
110− // Build touchIdsForItems
111− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
112− if (touchInfo->isOwned() && touchInfo->watchers.isEmpty())
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− if (candidate.state != CandidateInfo::InterimOwner) {
122− touchIdsForItems[candidate.item.data()].append(touchInfo->id);
127− const QList<QPointer<QQuickItem>> &watchers = touchInfo->watchers;
128− for (int i = 0; i < watchers.count(); ++i) {
129− if (!watchers[i].isNull()) {
130− touchIdsForItems[watchers[i].data()].append(touchInfo->id);
141− // TODO: Consider what happens if an item calls any of TouchRegistry's public methods
142− // from the event handler callback.
143− m_inDispatchLoop = true;
144− auto it = touchIdsForItems.constBegin();
145− while (it != touchIdsForItems.constEnd()) {
146− QQuickItem *item = it.key();
147− const QList<int> &touchIds = it.value();
148− dispatchPointsToItem(event, touchIds, item);
151− m_inDispatchLoop = false;
154−void TouchRegistry::freeEndedTouchInfos()
156− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
157− if (touchInfo->ended()) {
158− m_touchInfoPool.freeSlot(touchInfo);
165− Extracts the touches with the given touchIds from event and send them in a
166− UnownedTouchEvent to the given item
168−void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
171− Qt::TouchPointStates touchPointStates = 0;
172− QList<QTouchEvent::TouchPoint> touchPoints;
174− const QList<QTouchEvent::TouchPoint> &allTouchPoints = event->touchPoints();
176− QTransform windowToCandidateTransform = QQuickItemPrivate::get(item)->windowToItemTransform();
177− QMatrix4x4 windowToCandidateMatrix(windowToCandidateTransform);
179− for (int i = 0; i < allTouchPoints.count(); ++i) {
180− const QTouchEvent::TouchPoint &originalTouchPoint = allTouchPoints[i];
181− if (touchIds.contains(originalTouchPoint.id())) {
182− QTouchEvent::TouchPoint touchPoint = originalTouchPoint;
184− translateTouchPointFromScreenToWindowCoords(touchPoint);
186− // Set the point's local coordinates to that of the item
187− touchPoint.setRect(windowToCandidateTransform.mapRect(touchPoint.sceneRect()));
188− touchPoint.setStartPos(windowToCandidateTransform.map(touchPoint.startScenePos()));
189− touchPoint.setLastPos(windowToCandidateTransform.map(touchPoint.lastScenePos()));
190− touchPoint.setVelocity(windowToCandidateMatrix.mapVector(touchPoint.velocity()).toVector2D());
192− touchPoints.append(touchPoint);
193− touchPointStates |= touchPoint.state();
197− QTouchEvent *eventForItem = new QTouchEvent(event->type(),
202− eventForItem->setWindow(event->window());
203− eventForItem->setTimestamp(event->timestamp());
204− eventForItem->setTarget(event->target());
206− UnownedTouchEvent unownedTouchEvent(eventForItem);
208− #if TOUCHREGISTRY_DEBUG
209− UG_DEBUG << "Sending unowned" << qPrintable(touchEventToString(eventForItem))
213− QCoreApplication::sendEvent(item, &unownedTouchEvent);
216−void TouchRegistry::translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint)
218− touchPoint.setScreenRect(touchPoint.sceneRect());
219− touchPoint.setStartScreenPos(touchPoint.startScenePos());
220− touchPoint.setLastScreenPos(touchPoint.lastScenePos());
222− touchPoint.setSceneRect(touchPoint.rect());
223− touchPoint.setStartScenePos(touchPoint.startPos());
224− touchPoint.setLastScenePos(touchPoint.lastPos());
227−bool TouchRegistry::eventFilter(QObject *watched, QEvent *event)
231− switch (event->type()) {
232− case QEvent::TouchBegin:
233− case QEvent::TouchUpdate:
234− case QEvent::TouchEnd:
235− case QEvent::TouchCancel:
236− update(static_cast<QTouchEvent*>(event));
243− // Do not filter out the event. i.e., let it be handled further as
244− // we're just monitoring events
248−void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)
250− #if TOUCHREGISTRY_DEBUG
251− UG_DEBUG << "addCandidateOwnerForTouch id" << id << "candidate" << candidate;
254− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
255− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
257− if (touchInfo->isOwned()) {
258− qWarning("TouchRegistry: trying to add candidate owner for a touch that's already owned");
262− // TODO: Check if candidate already exists
264− CandidateInfo candidateInfo;
265− candidateInfo.state = CandidateInfo::Undecided;
266− candidateInfo.item = candidate;
267− candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,
268− m_timerFactory->createTimer(),
270− connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,
271− this, &TouchRegistry::rejectCandidateOwnerForTouch);
273− touchInfo->candidates.append(candidateInfo);
275− connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });
278−void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)
280− #if TOUCHREGISTRY_DEBUG
281− UG_DEBUG << "addTouchWatcher id" << touchId << "watcher" << watcher;
284− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
285− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
287− // TODO: Check if watcher already exists
289− touchInfo->watchers.append(watcher);
292−void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)
294− #if TOUCHREGISTRY_DEBUG
295− UG_DEBUG << "removeCandidateOwnerForTouch id" << id << "candidate" << candidate;
298− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
299− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
302− // TODO: check if the candidate is in fact the owner of the touch
304− bool removed = false;
305− for (int i = 0; i < touchInfo->candidates.count() && !removed; ++i) {
306− if (touchInfo->candidates[i].item == candidate) {
307− removeCandidateOwnerForTouchByIndex(touchInfo, i);
313−void TouchRegistry::pruneNullCandidatesForTouch(int touchId)
315− #if TOUCHREGISTRY_DEBUG
316− UG_DEBUG << "pruneNullCandidatesForTouch touchId" << touchId;
319− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
321− // doesn't matter as touch is already gone.
326− while (i < touchInfo->candidates.count()) {
327− if (touchInfo->candidates[i].item.isNull()) {
328− removeCandidateOwnerForTouchByIndex(touchInfo, i);
335−void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::TouchInfo>::Iterator &touchInfo,
338− // TODO: check if the candidate is in fact the owner of the touch
340− Q_ASSERT(candidateIndex < touchInfo->candidates.count());
342− if (candidateIndex == 0 && touchInfo->candidates[candidateIndex].state != CandidateInfo::Undecided) {
343− qCritical("TouchRegistry: touch owner is being removed.");
345− removeCandidateHelper(touchInfo, candidateIndex);
347− if (candidateIndex == 0) {
348− // the top candidate has been removed. if the new top candidate
349− // wants the touch let him know he's now the owner.
350− if (touchInfo->isOwned()) {
351− touchInfo->notifyCandidatesOfOwnershipResolution();
355− if (!m_inDispatchLoop && touchInfo->ended()) {
356− m_touchInfoPool.freeSlot(touchInfo);
360−void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
362− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
363− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
365− Q_ASSERT(!touchInfo->isOwned());
367− int candidateIndex = -1;
368− for (int i = 0; i < touchInfo->candidates.count(); ++i) {
369− CandidateInfo &candidateInfo = touchInfo->candidates[i];
370− if (candidateInfo.item == candidate) {
371− candidateInfo.state = CandidateInfo::Requested;
372− delete candidateInfo.inactivityTimer;
373− candidateInfo.inactivityTimer = nullptr;
378− #if TOUCHREGISTRY_DEBUG
379− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate << "index: " << candidateIndex;
382− // add it as a candidate if not present yet
383− if (candidateIndex < 0) {
384− CandidateInfo candidateInfo;
385− candidateInfo.state = CandidateInfo::InterimOwner;
386− candidateInfo.item = candidate;
387− candidateInfo.inactivityTimer = nullptr;
388− touchInfo->candidates.append(candidateInfo);
389− // it's the last one
390− candidateIndex = touchInfo->candidates.count() - 1;
391− connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });
394− // If it's the top candidate it means it's now the owner. Let
395− // it know about it.
396− if (candidateIndex == 0) {
397− touchInfo->notifyCandidatesOfOwnershipResolution();
401−Pool<TouchRegistry::TouchInfo>::Iterator TouchRegistry::findTouchInfo(int id)
403− Pool<TouchInfo>::Iterator touchInfo;
405− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &someTouchInfo) -> bool {
406− if (someTouchInfo->id == id) {
407− touchInfo = someTouchInfo;
418−void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)
420− // NB: It's technically possible that candidate is a dangling pointer at this point.
421− // Although that would most likely be due to a bug in our code.
422− // In any case, only dereference it after it's confirmed that it indeed exists.
424− #if TOUCHREGISTRY_DEBUG
425− UG_DEBUG << "rejectCandidateOwnerForTouch id" << id << "candidate" << (void*)candidate;
428− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
430− #if TOUCHREGISTRY_DEBUG
431− UG_DEBUG << "Failed to find TouchInfo for id" << id;
436− int rejectedCandidateIndex = -1;
438− // Check if the given candidate is valid and still undecided
439− for (int i = 0; i < touchInfo->candidates.count() && rejectedCandidateIndex == -1; ++i) {
440− CandidateInfo &candidateInfo = touchInfo->candidates[i];
441− if (candidateInfo.item == candidate) {
442− Q_ASSERT(i > 0 || candidateInfo.state == CandidateInfo::Undecided);
443− if (i == 0 && candidateInfo.state != CandidateInfo::Undecided) {
444− qCritical() << "TouchRegistry: Can't reject item (" << (void*)candidate
445− << ") as it already owns touch" << id;
448− // we found the guy and it's all fine.
449− rejectedCandidateIndex = i;
454− // If we reached this point it's because the given candidate exists and is indeed undecided.
456− Q_ASSERT(rejectedCandidateIndex >= 0 && rejectedCandidateIndex < touchInfo->candidates.size());
459− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
460− QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);
463− removeCandidateHelper(touchInfo, rejectedCandidateIndex);
465− if (rejectedCandidateIndex == 0) {
466− // the top candidate has been removed. if the new top candidate
467− // wants the touch let him know he's now the owner.
468− if (touchInfo->isOwned()) {
469− touchInfo->notifyCandidatesOfOwnershipResolution();
474−void TouchRegistry::removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex)
477− CandidateInfo &candidateInfo = touchInfo->candidates[candidateIndex];
479− delete candidateInfo.inactivityTimer;
480− candidateInfo.inactivityTimer = nullptr;
482− if (candidateInfo.item) {
483− disconnect(candidateInfo.item.data(), nullptr, this, nullptr);
486− touchInfo->candidates.removeAt(candidateIndex);
489−////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////
491−TouchRegistry::TouchInfo::TouchInfo(int id)
496−void TouchRegistry::TouchInfo::reset()
500− for (int i = 0; i < candidates.count(); ++i) {
501− CandidateInfo &candidate = candidates[i];
502− delete candidate.inactivityTimer;
503− candidate.inactivityTimer.clear(); // shoundn't be needed but anyway...
507−void TouchRegistry::TouchInfo::init(int id)
510− physicallyEnded = false;
515−bool TouchRegistry::TouchInfo::isOwned() const
517− return !candidates.isEmpty() && candidates.first().state != CandidateInfo::Undecided;
520−bool TouchRegistry::TouchInfo::ended() const
522− Q_ASSERT(isValid());
523− return physicallyEnded && (isOwned() || candidates.isEmpty());
526−void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()
528− Q_ASSERT(isOwned());
530− #if TOUCHREGISTRY_DEBUG
531− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id
532− << " gained) to candidate" << candidates[0].item;
535− // need to take a copy of the item list in case
536− // we call back in to remove candidate during the lost ownership event.
537− QList<QPointer<QQuickItem>> items;
538− Q_FOREACH(const CandidateInfo& info, candidates) {
542− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
543− QCoreApplication::sendEvent(items[0], &gainedOwnershipEvent);
545− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
546− for (int i = 1; i < items.count(); ++i) {
547− #if TOUCHREGISTRY_DEBUG
548− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id << " lost) to candidate"
551− QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
libs/UbuntuGestures/TouchRegistry.hdeleted−201
@@ -1,201 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UNITY_TOUCHREGISTRY_H
18−#define UNITY_TOUCHREGISTRY_H
23−#include <QTouchEvent>
26−#include "UbuntuGesturesGlobal.h"
27−#include "CandidateInactivityTimer.h"
31−namespace UbuntuGestures {
32− class AbstractTimerFactory;
36− Where the ownership of touches is registered.
38− Singleton used for adding a touch point ownership model analogous to the one
39− described in the XInput 2.2 protocol[1] on top of the existing input dispatch logic in QQuickWindow.
41− It provides a much more flexible and powerful way of dealing with pointer ownership than the existing
42− mechanisms in Qt. Namely QQuickItem::grabTouchPoints, QuickItem::keepTouchGrab,
43− QQuickItem::setFiltersChildMouseEvents, QQuickItem::ungrabTouchPoints and QQuickItem::touchUngrabEvent.
47− 1- An item receives a a new touch point. If he's not sure whether he wants it yet, he calls:
48− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
49− touchEvent->ignore();
50− Ignoring the event is crucial so that it can be seen by other interested parties, which will
53− 2- That item will then start receiving UnownedTouchEvents for that touch from step 1. Once he's
54− made a decision he calls either:
55− TouchRegistry::instance()->requestTouchOwnership(touchId, this);
56− If he wants the touch point or:
57− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
58− if he does not want it.
60− Candidates are put in a priority queue. The first one to call addCandidateOwnerForTouch() will
61− take precedence over the others for receiving ownership over the touch point (from now on called
62− simply top-candidate).
64− If the top-candidate calls requestTouchOwnership() he will immediately receive a
65− TouchOwnershipEvent(gained=true) for that touch point. He can then safely call
66− QQuickItem::grabTouchPoints to actually get the owned touch points. The other candidates
67− will receive TouchOwnershipEvent(gained=false) and will no longer receive UnownedTouchEvents
68− for that touch point. They will have to undo whatever action they were performing with that
71− But if the top-candidate calls removeCandidateOwnerForTouch() instead, he's popped from the
72− candidacy queue and ownership is given to the new top-most candidate if he has already
73− made his decision, that is.
75− The TouchRegistry cannot enforce the results of this pointer ownership negotiation (i.e.,
76− who gets to grab the touch points) as that would clash with QQuickWindow's input event
77− dispatching logic. The candidates have to respect the decision and grab the touch points
80− If an item wants ownership over touches as soon as he receives the TouchBegin for them, his step 1
82− TouchRegistry::instance()->requestTouchOwnership(touchId, this);
83− touchEvent->accept();
84− He won't get any UnownedTouchEvent for that touch as he is already the interim owner (ie, QQuickWindow
85− will keep sending touch updates to him already). Eventually he will be notified once ownership has
86− been granted to him (from TouchRegistry perspective), from which point onwards he could safely assume
87− other TouchRegistry users wouldn't snatch this touch away from him.
89− Items oblivious to TouchRegistry will lose their touch points without warning, just like in plain Qt.
91− [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
93−class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
97− virtual ~TouchRegistry();
99− // Returns a pointer to the application's TouchRegistry instance.
100− static TouchRegistry *instance();
102− void update(const QTouchEvent *event);
104− // Calls update() if the given event is a QTouchEvent
105− bool eventFilter(QObject *watched, QEvent *event) override;
107− // An item that might later request ownership over the given touch point.
108− // He will be kept informed about that touch point through UnownedTouchEvents
109− // All candidates must eventually decide whether they want to own the touch point
110− // or not. That decision is informed through requestTouchOwnership() or
111− // removeCandidateOwnerForTouch()
112− void addCandidateOwnerForTouch(int id, QQuickItem *candidate);
114− // The same as rejecting ownership of a touch
115− void removeCandidateOwnerForTouch(int id, QQuickItem *candidate);
117− // The candidate object wants to be the owner of the touch with the given id.
118− // If he's currently the oldest/top-most candidate, he will get an ownership
119− // event immediately. If not, he will get ownership if (or once) he becomes the
120− // top-most candidate.
121− void requestTouchOwnership(int id, QQuickItem *candidate);
123− // An item that has no interest (effective or potential) in owning a touch point
124− // but would nonetheless like to be kept up-to-date on its state.
125− void addTouchWatcher(int touchId, QQuickItem *watcherItem);
127− // Useful for tests, where you should use fake timers
128− void setTimerFactory(UbuntuGestures::AbstractTimerFactory *timerFactory);
131− void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);
134− // Only instance() can cronstruct one
135− TouchRegistry(QObject *parent = nullptr);
137− class CandidateInfo {
140− // A candidate owner that doesn't yet know for sure whether he wants the touch point
141− // (gesture recognition is stilll going on)
143− // A candidate owner that wants the touch but hasn't been granted it yet,
144− // most likely because there's an undecided candidate with higher priority
146− // An item that is the interim owner of the touch, receiving QTouchEvents of it
147− // from QQuickWindow. Ie, it's the actual touch owner from Qt's point of view.
148− // It wants to keep its touch ownership but hasn't been granted it by TouchRegistry
149− // yet because of undecided candidates higher up.
152− QPointer<QQuickItem> item;
153− QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
158− TouchInfo() : id(-1) {}
160− bool isValid() const { return id >= 0; }
164− bool physicallyEnded;
165− bool isOwned() const;
167− void notifyCandidatesOfOwnershipResolution();
169− // TODO optimize storage (s/QList/Pool)
170− QList<CandidateInfo> candidates;
171− QList<QPointer<QQuickItem>> watchers;
174− void pruneNullCandidatesForTouch(int touchId);
175− void removeCandidateOwnerForTouchByIndex(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
176− void removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
178− Pool<TouchInfo>::Iterator findTouchInfo(int id);
180− void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);
182− static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);
184− static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
186− void freeEndedTouchInfos();
188− Pool<TouchInfo> m_touchInfoPool;
190− // the singleton instance
191− static TouchRegistry *m_instance;
193− bool m_inDispatchLoop;
195− UbuntuGestures::AbstractTimerFactory *m_timerFactory;
197− friend class tst_TouchRegistry;
198− friend class tst_DirectionalDragArea;
201−#endif // UNITY_TOUCHREGISTRY_H
libs/UbuntuGestures/UnownedTouchEvent.hdeleted−45
@@ -1,45 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H
18−#define UBUNTU_UNOWNEDTOUCHEVENT_H
20−#include <QTouchEvent>
21−#include <QScopedPointer>
22−#include "UbuntuGesturesGlobal.h"
25− A touch event with touch points that do not belong the item receiving it.
27− See TouchRegistry::addCandidateOwnerForTouch and TouchRegistry::addTouchWatcher
29−class UBUNTUGESTURES_EXPORT UnownedTouchEvent : public QEvent
32− UnownedTouchEvent(QTouchEvent *touchEvent);
33− static Type unownedTouchEventType();
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();
41− static Type m_unownedTouchEventType;
42− QScopedPointer<QTouchEvent> m_touchEvent;
45−#endif // UBUNTU_UNOWNEDTOUCHEVENT_H
plugins/AccountsService/AccountsService.cpp+42−33
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
25#include <glib.h>
25#include <glib.h>
27#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")
27#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")
28−#define IFACE_LOCATION_HERE QStringLiteral("com.ubuntu.location.providers.here.AccountsService")
29#define IFACE_UBUNTU_INPUT QStringLiteral("com.ubuntu.AccountsService.Input")
28#define IFACE_UBUNTU_INPUT QStringLiteral("com.ubuntu.AccountsService.Input")
30#define IFACE_UBUNTU_SECURITY QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")
29#define IFACE_UBUNTU_SECURITY QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")
31#define IFACE_UBUNTU_SECURITY_OLD QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")
30#define IFACE_UBUNTU_SECURITY_OLD QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")
@@ -33,11 +32,13 @@
33#define IFACE_UNITY_PRIVATE QStringLiteral("com.canonical.unity.AccountsService.Private")
32#define IFACE_UNITY_PRIVATE QStringLiteral("com.canonical.unity.AccountsService.Private")
35#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
34#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
36−#define PROP_DEMO_EDGES QStringLiteral("demo-edges")
35+#define PROP_DEMO_EDGES QStringLiteral("DemoEdges2")
37#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")
36#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")
38#define PROP_EMAIL QStringLiteral("Email")
37#define PROP_EMAIL QStringLiteral("Email")
38+#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")
39#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
39#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
40#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
40#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
41+#define PROP_FAILED_FINGERPRINT_LOGINS QStringLiteral("FailedFingerprintLogins")
41#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
42#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
42#define PROP_INPUT_SOURCES QStringLiteral("InputSources")
43#define PROP_INPUT_SOURCES QStringLiteral("InputSources")
43#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
44#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
@@ -66,9 +67,9 @@ Q_DECLARE_METATYPE(StringMapList)
66QVariant primaryButtonConverter(const QVariant &value)
67QVariant primaryButtonConverter(const QVariant &value)
68 QString stringValue = value.toString();
69 QString stringValue = value.toString();
69− if (stringValue == "left") {
70+ if (stringValue == QLatin1String("left")) {
70 return QVariant::fromValue(0);
71 return QVariant::fromValue(0);
71− } else if (stringValue == "right") {
72+ } else if (stringValue == QLatin1String("right")) {
72 return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
73 return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
74 return QVariant::fromValue(0); // default to left
75 return QVariant::fromValue(0); // default to left
@@ -91,14 +92,14 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
91 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
92 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
92 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
93 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
93 registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
94 registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
94− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
95+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));
95− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
96 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
96 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
97 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
97 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
98 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
98 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
99 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
99 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
100 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
100 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
101 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
101 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
102+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));
102 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
103 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
104 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
105 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
@@ -176,6 +177,12 @@ void AccountsService::markDemoEdgeCompleted(const QString &edge)
180+bool AccountsService::enableFingerprintIdentification() const
182+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);
183+ return value.toBool();
179bool AccountsService::enableLauncherWhileLocked() const
186bool AccountsService::enableLauncherWhileLocked() const
181 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
188 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
@@ -206,32 +213,6 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
206 return (PasswordDisplayHint)value.toInt();
213 return (PasswordDisplayHint)value.toInt();
209−bool AccountsService::hereEnabled() const
211− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED);
212− return value.toBool();
215−void AccountsService::setHereEnabled(bool enabled)
217− setProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, enabled);
220−QString AccountsService::hereLicensePath() const
222− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
223− QString hereLicensePath = value.toString();
224− if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
225− hereLicensePath = QStringLiteral("");
226− return hereLicensePath;
229−bool AccountsService::hereLicensePathValid() const
231− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
232− return !value.toString().isNull();
235QString AccountsService::realName() const
216QString AccountsService::realName() const
237 auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
218 auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
@@ -274,6 +255,34 @@ QStringList AccountsService::keymaps() const
274 return {QStringLiteral("us")};
255 return {QStringLiteral("us")};
258+void AccountsService::setKeymaps(const QStringList &keymaps)
260+ if (keymaps.isEmpty()) {
261+ qWarning() << "Setting empty keymaps is not supported";
265+ StringMapList result;
266+ Q_FOREACH(const QString &keymap, keymaps) {
268+ map.insert(QStringLiteral("xkb"), keymap);
272+ setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));
273+ Q_EMIT keymapsChanged();
276+uint AccountsService::failedFingerprintLogins() const
278+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();
281+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)
283+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);
277uint AccountsService::failedLogins() const
286uint AccountsService::failedLogins() const
279 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
288 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
plugins/AccountsService/AccountsService.h+16−21
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ class QDBusInterface;
29class AccountsService: public QObject
29class AccountsService: public QObject
32− Q_ENUMS(PasswordDisplayHint)
33 Q_PROPERTY (QString user
32 Q_PROPERTY (QString user
35 WRITE setUser
34 WRITE setUser
@@ -41,6 +40,9 @@ class AccountsService: public QObject
41 Q_PROPERTY (QStringList demoEdgesCompleted
40 Q_PROPERTY (QStringList demoEdgesCompleted
42 READ demoEdgesCompleted
41 READ demoEdgesCompleted
43 NOTIFY demoEdgesCompletedChanged)
42 NOTIFY demoEdgesCompletedChanged)
43+ Q_PROPERTY (bool enableFingerprintIdentification
44+ READ enableFingerprintIdentification
45+ NOTIFY enableFingerprintIdentificationChanged)
44 Q_PROPERTY (bool enableLauncherWhileLocked
46 Q_PROPERTY (bool enableLauncherWhileLocked
45 READ enableLauncherWhileLocked
47 READ enableLauncherWhileLocked
46 NOTIFY enableLauncherWhileLockedChanged)
48 NOTIFY enableLauncherWhileLockedChanged)
@@ -60,27 +62,20 @@ class AccountsService: public QObject
60 READ failedLogins
62 READ failedLogins
61 WRITE setFailedLogins
63 WRITE setFailedLogins
62 NOTIFY failedLoginsChanged)
64 NOTIFY failedLoginsChanged)
63− Q_PROPERTY(bool hereEnabled
65+ Q_PROPERTY (uint failedFingerprintLogins
64− READ hereEnabled
66+ READ failedFingerprintLogins
65− WRITE setHereEnabled
67+ WRITE setFailedFingerprintLogins
66− NOTIFY hereEnabledChanged)
68+ NOTIFY failedFingerprintLoginsChanged)
67− Q_PROPERTY(QString hereLicensePath
69− NOTIFY hereLicensePathChanged)
70− Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
71− READ hereLicensePathValid
72− NOTIFY hereLicensePathChanged)
73 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
69 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
74 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
70 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
75− Q_PROPERTY(QStringList keymaps
71+ Q_PROPERTY(QStringList keymaps READ keymaps WRITE setKeymaps NOTIFY keymapsChanged)
77− NOTIFY keymapsChanged)
80 enum PasswordDisplayHint {
74 enum PasswordDisplayHint {
78+ Q_ENUM(PasswordDisplayHint)
85 explicit AccountsService(QObject *parent = 0, const QString & user = QString());
80 explicit AccountsService(QObject *parent = 0, const QString & user = QString());
86 ~AccountsService() = default;
81 ~AccountsService() = default;
@@ -91,6 +86,7 @@ public:
91 void setDemoEdges(bool demoEdges);
86 void setDemoEdges(bool demoEdges);
92 QStringList demoEdgesCompleted() const;
87 QStringList demoEdgesCompleted() const;
93 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
88 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
89+ bool enableFingerprintIdentification() const;
94 bool enableLauncherWhileLocked() const;
90 bool enableLauncherWhileLocked() const;
95 bool enableIndicatorsWhileLocked() const;
91 bool enableIndicatorsWhileLocked() const;
96 QString backgroundFile() const;
92 QString backgroundFile() const;
@@ -98,28 +94,27 @@ public:
98 PasswordDisplayHint passwordDisplayHint() const;
94 PasswordDisplayHint passwordDisplayHint() const;
99 uint failedLogins() const;
95 uint failedLogins() const;
100 void setFailedLogins(uint failedLogins);
96 void setFailedLogins(uint failedLogins);
101− bool hereEnabled() const;
97+ uint failedFingerprintLogins() const;
102− void setHereEnabled(bool enabled);
98+ void setFailedFingerprintLogins(uint failedFingerprintLogins);
103− QString hereLicensePath() const;
104− bool hereLicensePathValid() const;
105 QString realName() const;
99 QString realName() const;
106 void setRealName(const QString &realName);
100 void setRealName(const QString &realName);
107 QString email() const;
101 QString email() const;
108 void setEmail(const QString &email);
102 void setEmail(const QString &email);
109 QStringList keymaps() const;
103 QStringList keymaps() const;
104+ void setKeymaps(const QStringList &keymaps);
111Q_SIGNALS:
106Q_SIGNALS:
112 void userChanged();
107 void userChanged();
113 void demoEdgesChanged();
108 void demoEdgesChanged();
114 void demoEdgesCompletedChanged();
109 void demoEdgesCompletedChanged();
110+ void enableFingerprintIdentificationChanged();
115 void enableLauncherWhileLockedChanged();
111 void enableLauncherWhileLockedChanged();
116 void enableIndicatorsWhileLockedChanged();
112 void enableIndicatorsWhileLockedChanged();
117 void backgroundFileChanged();
113 void backgroundFileChanged();
118 void statsWelcomeScreenChanged();
114 void statsWelcomeScreenChanged();
119 void passwordDisplayHintChanged();
115 void passwordDisplayHintChanged();
120 void failedLoginsChanged();
116 void failedLoginsChanged();
121− void hereEnabledChanged();
117+ void failedFingerprintLoginsChanged();
122− void hereLicensePathChanged();
123 void realNameChanged();
118 void realNameChanged();
124 void emailChanged();
119 void emailChanged();
125 void keymapsChanged();
120 void keymapsChanged();
plugins/AccountsService/AccountsService.qmltypesdeleted−41
@@ -1,41 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'
11− name: "AccountsService"
13− exports: ["AccountsService/AccountsService 0.1"]
16− exportMetaObjectRevisions: [0]
18− name: "PasswordDisplayHint"
24− Property { name: "user"; type: "string" }
25− Property { name: "demoEdges"; type: "bool" }
26− Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
27− Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
28− Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
29− Property { name: "backgroundFile"; type: "string"; isReadonly: true }
30− Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
31− Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
32− Property { name: "failedLogins"; type: "uint" }
33− Property { name: "hereEnabled"; type: "bool" }
34− Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
35− Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
37− name: "markDemoEdgeCompleted"
38− Parameter { name: "edge"; type: "string" }
plugins/AccountsService/CMakeLists.txt+1−2
@@ -7,9 +7,8 @@ add_library(AccountsService-qml MODULE
10−qt5_use_modules(AccountsService-qml DBus Qml)
12target_link_libraries(AccountsService-qml
10target_link_libraries(AccountsService-qml
13 ${GLIB_LIBRARIES}
12 ${GLIB_LIBRARIES}
plugins/AccountsService/com.canonical.unity.AccountsService.xml+10
@@ -9,11 +9,17 @@
9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
12+ <!-- Marks that V1 (pre-8.21) edge demos have been run. Legacy value. -->
12 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
13 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
13 <property name="demo-edges" type="b" access="readwrite">
14 <property name="demo-edges" type="b" access="readwrite">
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
15 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
15 </property>
16 </property>
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"/>
17 <!-- List of tutorial pages that have been completed by the user -->
23 <!-- List of tutorial pages that have been completed by the user -->
18 <property name="DemoEdgesCompleted" type="as" access="readwrite">
24 <property name="DemoEdgesCompleted" type="as" access="readwrite">
19 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
25 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
@@ -47,5 +53,9 @@
47 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
53 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
48 </property>
54 </property>
56+ <property name="FailedFingerprintLogins" type="u" access="readwrite">
57+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
50 </interface>
60 </interface>
plugins/CMakeLists.txt+2−3
@@ -1,4 +1,4 @@
1−include(QmlPlugins)
1+find_package(QmlPlugins)
3# Set up and install a plugin for unity8.
3# Set up and install a plugin for unity8.
@@ -15,9 +15,8 @@ add_subdirectory(AccountsService)
15add_subdirectory(Cursor)
15add_subdirectory(Cursor)
16add_subdirectory(GlobalShortcut)
16add_subdirectory(GlobalShortcut)
17add_subdirectory(Greeter)
17add_subdirectory(Greeter)
18−add_subdirectory(IntegratedLightDM)
18+add_subdirectory(LightDM)
19add_subdirectory(Lights)
19add_subdirectory(Lights)
20−add_subdirectory(Dash)
21add_subdirectory(Powerd)
20add_subdirectory(Powerd)
22add_subdirectory(ScreenshotDirectory)
21add_subdirectory(ScreenshotDirectory)
23add_subdirectory(SessionBroadcast)
22add_subdirectory(SessionBroadcast)
plugins/Cursor/CMakeLists.txt+8−4
@@ -3,13 +3,18 @@ add_subdirectory(3rd_party)
3include_directories(
3include_directories(
4 ${CMAKE_CURRENT_SOURCE_DIR}
4 ${CMAKE_CURRENT_SOURCE_DIR}
5 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
5 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
6 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
10 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
9set(QMLPLUGIN_SRC
13set(QMLPLUGIN_SRC
10 plugin.cpp
14 plugin.cpp
11− MousePointer.cpp
15+ CursorImageInfo.cpp
12 CursorImageProvider.cpp
16 CursorImageProvider.cpp
13 # We need to run moc on this header
18 # We need to run moc on this header
14 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
19 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
@@ -21,8 +26,7 @@ add_library(Cursor-qml SHARED
21target_link_libraries(Cursor-qml
26target_link_libraries(Cursor-qml
22 xcursorloader-static
27 xcursorloader-static
23 ${QT5PLATFORM_SUPPORT_LDFLAGS}
28 ${QT5PLATFORM_SUPPORT_LDFLAGS}
29+ Qt5::Qml Qt5::Quick Qt5::Svg
26−qt5_use_modules(Cursor-qml Qml Quick DBus Network Gui Sql Concurrent Svg)
28−add_unity8_plugin(Cursor 1.0 Cursor TARGETS Cursor-qml)
32+add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)
plugins/Cursor/Cursor.qml+40−6
@@ -1,5 +1,5 @@
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -15,14 +15,48 @@
17import QtQuick 2.4
17import QtQuick 2.4
18−import Cursor 1.0 // For MousePointer
18+import Cursor 1.1
20MousePointer {
21MousePointer {
21 id: mousePointer
22 id: mousePointer
26+ themeName: mousePointer.themeName
27+ cursorName: mousePointer.cursorName
28+ cursorHeight: mousePointer.height
32+ active: mousePointer.visible && imageInfo.frameCount > 1
33+ sourceComponent: AnimatedSprite {
34+ x: -imageInfo.hotspot.x
35+ y: -imageInfo.hotspot.y
36+ source: imageInfo.imageSource
40+ width: imageInfo.frameWidth
41+ height: imageInfo.frameHeight
43+ frameCount: imageInfo.frameCount
44+ frameDuration: imageInfo.frameDuration
45+ frameWidth: imageInfo.frameWidth
46+ frameHeight: imageInfo.frameHeight
48+ running: Powerd.status === Powerd.On
53+ active: mousePointer.visible && imageInfo.frameCount === 1
23− Image {
54+ sourceComponent: Image {
24− x: -mousePointer.hotspotX
55+ x: -imageInfo.hotspot.x
25− y: -mousePointer.hotspotY
56+ y: -imageInfo.hotspot.y
26− source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName
57+ source: imageInfo.imageSource
58+ width: sourceSize.width
59+ height: sourceSize.height
plugins/Cursor/Cursor.qmltypesdeleted−78
@@ -1,78 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Cursor 1.0 plugins'
11− name: "MirMousePointerInterface"
12− defaultProperty: "data"
13− prototype: "QQuickItem"
14− Property { name: "cursorName"; type: "string"; isReadonly: true }
15− Property { name: "themeName"; type: "string"; isReadonly: true }
16− Property { name: "hotspotX"; type: "double"; isReadonly: true }
17− Property { name: "hotspotY"; type: "double"; isReadonly: true }
19− name: "cursorNameChanged"
20− Parameter { name: "name"; type: "string" }
23− name: "themeNameChanged"
24− Parameter { name: "name"; type: "string" }
27− name: "hotspotXChanged"
28− Parameter { name: "value"; type: "double" }
31− name: "hotspotYChanged"
32− Parameter { name: "value"; type: "double" }
35− name: "handleMouseEvent"
36− Parameter { name: "timestamp"; type: "ulong" }
37− Parameter { name: "movement"; type: "QPointF" }
38− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
39− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
42− name: "handleWheelEvent"
43− Parameter { name: "timestamp"; type: "ulong" }
44− Parameter { name: "angleDelta"; type: "QPoint" }
45− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
50− defaultProperty: "data"
51− prototype: "MirMousePointerInterface"
52− exports: ["Cursor/MousePointer 1.0"]
53− exportMetaObjectRevisions: [0]
55− name: "pushedLeftBoundary"
56− Parameter { name: "amount"; type: "double" }
57− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
60− name: "pushedRightBoundary"
61− Parameter { name: "amount"; type: "double" }
62− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
65− name: "handleMouseEvent"
66− Parameter { name: "timestamp"; type: "ulong" }
67− Parameter { name: "movement"; type: "QPointF" }
68− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
69− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
72− name: "handleWheelEvent"
73− Parameter { name: "timestamp"; type: "ulong" }
74− Parameter { name: "angleDelta"; type: "QPoint" }
75− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
plugins/Cursor/CursorImageInfo.cppnew file+115
@@ -0,0 +1,115 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#include "CursorImageInfo.h"
19+CursorImageInfo::CursorImageInfo(QObject *parent)
24+void CursorImageInfo::setCursorName(const QString &cursorName)
26+ if (cursorName != m_cursorName) {
27+ m_cursorName = cursorName;
29+ Q_EMIT cursorNameChanged();
33+void CursorImageInfo::setCursorHeight(qreal cursorHeight)
35+ if (cursorHeight != m_cursorHeight) {
36+ m_cursorHeight = cursorHeight;
38+ Q_EMIT cursorHeightChanged();
42+void CursorImageInfo::setThemeName(const QString &themeName)
44+ if (m_themeName != themeName) {
45+ m_themeName = themeName;
47+ Q_EMIT themeNameChanged();
51+void CursorImageInfo::update()
53+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName, (int) m_cursorHeight);
55+ Q_EMIT hotspotChanged();
56+ Q_EMIT frameWidthChanged();
57+ Q_EMIT frameHeightChanged();
58+ Q_EMIT frameCountChanged();
59+ Q_EMIT frameDurationChanged();
60+ Q_EMIT imageSourceChanged();
63+QPoint CursorImageInfo::hotspot() const
66+ return m_cursorImage->hotspot;
72+qreal CursorImageInfo::frameWidth() const
75+ return m_cursorImage->frameWidth;
81+qreal CursorImageInfo::frameHeight() const
84+ return m_cursorImage->frameHeight;
90+int CursorImageInfo::frameCount() const
93+ return m_cursorImage->frameCount;
99+int CursorImageInfo::frameDuration() const
101+ if (m_cursorImage) {
102+ return m_cursorImage->frameDuration;
108+QUrl CursorImageInfo::imageSource() const
110+ auto urlString = QString("image://cursor/%1/%2/%3")
111+ .arg(m_themeName, m_cursorName)
112+ .arg(m_cursorHeight);
114+ return QUrl(urlString);
plugins/Cursor/CursorImageInfo.hnew file+82
@@ -0,0 +1,82 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#ifndef CURSOR_IMAGE_INFO_H
18+#define CURSOR_IMAGE_INFO_H
20+#include "CursorImageProvider.h"
26+class CursorImageInfo : public QObject
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)
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)
42+ CursorImageInfo(QObject *parent = nullptr);
44+ QString themeName() const { return m_themeName; }
45+ void setThemeName(const QString &);
47+ QString cursorName() const { return m_cursorName; }
48+ void setCursorName(const QString &);
50+ qreal cursorHeight() const { return m_cursorHeight; }
51+ void setCursorHeight(qreal);
53+ QPoint hotspot() const;
54+ qreal frameWidth() const;
55+ qreal frameHeight() const;
56+ int frameCount() const;
57+ int frameDuration() const;
58+ QUrl imageSource() const;
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();
76+ QString m_cursorName;
77+ qreal m_cursorHeight{0};
79+ CursorImage *m_cursorImage{nullptr};
82+#endif // CURSOR_IMAGE_INFO_H
plugins/Cursor/CursorImageProvider.cpp+85−42
@@ -1,5 +1,5 @@
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
4 * This program is free software: you can redistribute it and/or modify it under
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
5 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -27,7 +27,7 @@ CursorImageProvider *CursorImageProvider::m_instance = nullptr;
28// BuiltInCursorImage
28// BuiltInCursorImage
30−BuiltInCursorImage::BuiltInCursorImage()
30+BuiltInCursorImage::BuiltInCursorImage(int cursorHeight)
32 const char *svgString =
32 const char *svgString =
33 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
33 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
@@ -42,10 +42,15 @@ BuiltInCursorImage::BuiltInCursorImage()
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\" />"
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\" />"
45+ // NB: Original image dimension is 20x32. Ensure aspect ratio is kept
45− qimage = QImage(20, 32, QImage::Format_ARGB32);
46+ qimage = QImage((20./32.)*cursorHeight, cursorHeight, QImage::Format_ARGB32);
46 qimage.fill(Qt::transparent);
47 qimage.fill(Qt::transparent);
47 QPainter imagePainter(&qimage);
48 QPainter imagePainter(&qimage);
50+ frameWidth = qimage.width();
51+ frameHeight = qimage.height();
52+ requestedHeight = cursorHeight;
49 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));
54 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));
50 svgRenderer->render(&imagePainter);
55 svgRenderer->render(&imagePainter);
51 delete svgRenderer;
56 delete svgRenderer;
@@ -59,6 +64,8 @@ BlankCursorImage::BlankCursorImage()
60 qimage = QImage(1, 1, QImage::Format_ARGB32);
65 qimage = QImage(1, 1, QImage::Format_ARGB32);
61 qimage.fill(Qt::transparent);
66 qimage.fill(Qt::transparent);
67+ frameWidth = qimage.width();
68+ frameHeight = qimage.height();
@@ -69,40 +76,72 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)
70 qimage = cursor.pixmap().toImage();
77 qimage = cursor.pixmap().toImage();
71 hotspot = cursor.hotSpot();
78 hotspot = cursor.hotSpot();
79+ frameWidth = qimage.width();
80+ frameHeight = qimage.height();
75// XCursorImage
84// XCursorImage
77−XCursorImage::XCursorImage(const QString &theme, const QString &file)
86+XCursorImage::XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx)
78− : xcursorImages(nullptr)
80− // TODO: Consider grid unit value
81− // Hardcoding to a medium size for now
82− int preferredCursorHeightPx = 32;
88+ requestedHeight = preferredCursorHeightPx;
84− xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
90+ XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
85 preferredCursorHeightPx);
91 preferredCursorHeightPx);
86− if (!xcursorImages) {
92+ if (!xcursorImages || xcursorImages->nimage == 0) {
90− // Just take the first one. It will have multiple images in case of an animated cursor.
96+ frameCount = xcursorImages->nimage;
91− // TODO: Support animated cursors
92− if ( xcursorImages->nimage > 0) {
93− XcursorImage *xcursorImage = xcursorImages->images[0];
95− qimage = QImage((uchar*)xcursorImage->pixels,
98+ for (int i = 0; i < xcursorImages->nimage; ++i) {
96− xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
99+ XcursorImage *xcursorImage = xcursorImages->images[i];
100+ if (frameWidth < (int)xcursorImage->width) {
101+ frameWidth = xcursorImage->width;
103+ if (frameHeight < (int)xcursorImage->height) {
104+ frameHeight = xcursorImage->height;
107+ frameDuration = (int)xcursorImage->delay;
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.";
117+ // Assume that the hotspot position does not animate
118+ XcursorImage *xcursorImage = xcursorImages->images[0];
98 hotspot.setX(xcursorImage->xhot);
119 hotspot.setX(xcursorImage->xhot);
99 hotspot.setY(xcursorImage->yhot);
120 hotspot.setY(xcursorImage->yhot);
123+ // Build the sprite as a single row of frames
124+ qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);
125+ qimage.fill(Qt::transparent);
128+ QPainter painter(&qimage);
130+ for (int i = 0; i < xcursorImages->nimage; ++i) {
131+ XcursorImage *xcursorImage = xcursorImages->images[i];
133+ auto frameImage = QImage((uchar*)xcursorImage->pixels,
134+ xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
136+ painter.drawImage(QPoint(i*frameWidth, 0), frameImage);
140+ XcursorImagesDestroy(xcursorImages);
103XCursorImage::~XCursorImage()
143XCursorImage::~XCursorImage()
105− XcursorImagesDestroy(xcursorImages);
@@ -135,6 +174,8 @@ CursorImageProvider::CursorImageProvider()
135 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));
174 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));
136 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));
175 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));
177+ m_fallbackNames[QStringLiteral("grabbing")].append(QStringLiteral("closedhand")); // Breeze
138 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));
179 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));
139 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));
180 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));
@@ -196,44 +237,43 @@ CursorImageProvider::~CursorImageProvider()
196 m_instance = nullptr;
237 m_instance = nullptr;
199−QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSize *size, const QSize & /*requestedSize*/)
240+QImage CursorImageProvider::requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize & /*requestedSize*/)
201− CursorImage *cursorImage = fetchCursor(cursorThemeAndName);
242+ CursorImage *cursorImage = fetchCursor(cursorThemeAndNameAndHeight);
202 size->setWidth(cursorImage->qimage.width());
243 size->setWidth(cursorImage->qimage.width());
203 size->setHeight(cursorImage->qimage.height());
244 size->setHeight(cursorImage->qimage.height());
205 return cursorImage->qimage;
246 return cursorImage->qimage;
208−QPoint CursorImageProvider::hotspot(const QString &themeName, const QString &cursorName)
210− CursorImage *cursorImage = fetchCursor(themeName, cursorName);
212− return cursorImage->hotspot;
218−CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)
249+CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndNameAndHeight)
220 QString themeName;
251 QString themeName;
221 QString cursorName;
252 QString cursorName;
223− QStringList themeAndNameList = cursorThemeAndName.split('/');
255+ QStringList themeAndNameList = cursorThemeAndNameAndHeight.split('/');
224− if (themeAndNameList.size() != 2) {
256+ if (themeAndNameList.size() != 3) {
225 return nullptr;
257 return nullptr;
227 themeName = themeAndNameList[0];
259 themeName = themeAndNameList[0];
228 cursorName = themeAndNameList[1];
260 cursorName = themeAndNameList[1];
263+ cursorHeight = themeAndNameList[2].toInt(&ok);
266+ qWarning().nospace() << "CursorImageProvider: invalid cursor height ("<<themeAndNameList[2]<<")."
267+ " Falling back to "<<cursorHeight<<" pixels";
231− return fetchCursor(themeName, cursorName);
271+ return fetchCursor(themeName, cursorName, cursorHeight);
234−CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName)
274+CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight)
236− CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName);
276+ CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName, cursorHeight);
238 // Try some fallbacks
278 // Try some fallbacks
239 if (cursorImage->qimage.isNull()) {
279 if (cursorImage->qimage.isNull()) {
@@ -242,7 +282,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
242 int i = 0;
282 int i = 0;
243 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {
283 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {
244 qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);
284 qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);
245− cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i));
285+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i), cursorHeight);
@@ -252,14 +292,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
252 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {
292 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {
253 qDebug() << "CursorImageProvider:" << cursorName
293 qDebug() << "CursorImageProvider:" << cursorName
254 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";
294 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";
255− cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"));
295+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"), cursorHeight);
258 if (cursorImage->qimage.isNull()) {
298 if (cursorImage->qimage.isNull()) {
259 // finally, go for the built-in cursor
299 // finally, go for the built-in cursor
260 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";
300 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";
261− if (!m_builtInCursorImage) {
301+ if (!m_builtInCursorImage || m_builtInCursorImage->requestedHeight != cursorHeight) {
262− m_builtInCursorImage.reset(new BuiltInCursorImage);
302+ m_builtInCursorImage.reset(new BuiltInCursorImage(cursorHeight));
264 cursorImage = m_builtInCursorImage.data();
304 cursorImage = m_builtInCursorImage.data();
@@ -267,17 +307,20 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
267 return cursorImage;
307 return cursorImage;
270−CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)
310+CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight)
272 if (cursorName == QLatin1String("blank")) {
312 if (cursorName == QLatin1String("blank")) {
273 return &m_blankCursorImage;
313 return &m_blankCursorImage;
274− } else if (cursorName == QLatin1String("custom")) {
314+ } else if (cursorName.startsWith(QLatin1String("custom"))) {
275 return m_customCursorImage.data();
315 return m_customCursorImage.data();
277 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
317 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
279 if (!themeCursors.contains(cursorName)) {
319 if (!themeCursors.contains(cursorName)) {
280− themeCursors[cursorName] = new XCursorImage(themeName, 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);
283 return themeCursors[cursorName];
326 return themeCursors[cursorName];
plugins/Cursor/CursorImageProvider.h+20−9
@@ -31,20 +31,31 @@ public:
31 virtual ~CursorImage() {}
31 virtual ~CursorImage() {}
33 QImage qimage;
33 QImage qimage;
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.
34 QPoint hotspot;
39 QPoint hotspot;
44+ int frameDuration{40};
46+ // Requested height when creating this cursor.
47+ int requestedHeight{0};
37class XCursorImage : public CursorImage {
50class XCursorImage : public CursorImage {
39− XCursorImage(const QString &theme, const QString &file);
52+ XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx);
40 virtual ~XCursorImage();
53 virtual ~XCursorImage();
42− XcursorImages *xcursorImages;
45class BuiltInCursorImage : public CursorImage {
56class BuiltInCursorImage : public CursorImage {
47− BuiltInCursorImage();
58+ BuiltInCursorImage(int cursorHeight);
50class BlankCursorImage : public CursorImage {
61class BlankCursorImage : public CursorImage {
@@ -66,18 +77,18 @@ public:
66 static CursorImageProvider *instance() { return m_instance; }
77 static CursorImageProvider *instance() { return m_instance; }
69− QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;
80+ QImage requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize &requestedSize) override;
71− QPoint hotspot(const QString &themeName, const QString &cursorName);
82+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight);
73 void setCustomCursor(const QCursor &customCursor);
84 void setCustomCursor(const QCursor &customCursor);
76− CursorImage *fetchCursor(const QString &cursorThemeAndName);
87+ CursorImage *fetchCursor(const QString &cursorThemeAndNameAndHeight);
77− CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);
78− CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName);
88+ CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight);
80 // themeName -> (cursorName -> cursorImage)
90 // themeName -> (cursorName -> cursorImage)
91+ // TODO: discard old, unused, cursors
81 QMap<QString, QMap<QString, CursorImage*> > m_cursors;
92 QMap<QString, QMap<QString, CursorImage*> > m_cursors;
83 QScopedPointer<CursorImage> m_builtInCursorImage;
94 QScopedPointer<CursorImage> m_builtInCursorImage;
plugins/Cursor/MousePointer.cpp+126−39
@@ -1,5 +1,5 @@
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
4 * This program is free software: you can redistribute it and/or modify it under
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
5 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -22,6 +22,7 @@
23#include <QQuickWindow>
23#include <QQuickWindow>
24#include <QGuiApplication>
24#include <QGuiApplication>
26#include <qpa/qwindowsysteminterface.h>
27#include <qpa/qwindowsysteminterface.h>
@@ -29,10 +30,7 @@ MousePointer::MousePointer(QQuickItem *parent)
29 : MirMousePointerInterface(parent)
30 : MirMousePointerInterface(parent)
30 , m_cursorName(QStringLiteral("left_ptr"))
31 , m_cursorName(QStringLiteral("left_ptr"))
31 , m_themeName(QStringLiteral("default"))
32 , m_themeName(QStringLiteral("default"))
38void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
36void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
@@ -46,29 +44,83 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse
46 Q_EMIT mouseMoved();
44 Q_EMIT mouseMoved();
49− qreal newX = x() + movement.x();
47+ m_accumulatedMovement += movement;
50− if (newX < 0) {
48+ // don't apply the fractional part
49+ QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));
50+ m_accumulatedMovement -= appliedMovement;
52+ qreal newX = x() + appliedMovement.x();
53+ qreal newY = y() + appliedMovement.y();
54+ const qreal sceneWidth = parentItem()->width();
55+ const qreal sceneHeight = parentItem()->height();
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);
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);
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);
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);
73+ } else if (newX < 0) { // left edge
51 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
74 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
52− newX = 0;
75+ m_pushing = true;
53− } else if (newX > parentItem()->width()) {
76+ } else if (newX >= sceneWidth) { // right edge
54− Q_EMIT pushedRightBoundary(newX - parentItem()->width(), buttons);
77+ Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);
55− newX = parentItem()->width();
78+ m_pushing = true;
79+ } else if (newY < m_topBoundaryOffset) { // top edge
80+ Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);
82+ } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing
84+ Q_EMIT pushStopped();
59− qreal newY = y() + movement.y();
89+ applyItemConfinement(newX, newY);
61− newY = 0;
91+ setX(qBound(0.0, newX, sceneWidth - 1));
62− } else if (newY > parentItem()->height()) {
63− newY = parentItem()->height();
65− setY(newY);
92+ setY(qBound(0.0, newY, sceneHeight - 1));
67 QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
94 QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
68 QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
95 QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
69 buttons, modifiers);
96 buttons, modifiers);
99+void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)
101+ Q_ASSERT(parentItem() != nullptr);
103+ if (m_confiningItem.isNull()) {
107+ QRectF confiningItemGeometry(0, 0, m_confiningItem->width(), m_confiningItem->height());
109+ QRectF confiningRect = m_confiningItem->mapRectToItem(parentItem(), confiningItemGeometry);
111+ if (newX < confiningRect.x()) {
112+ newX = confiningRect.x();
113+ } else if (newX > confiningRect.right()) {
114+ newX = confiningRect.right();
117+ if (newY < confiningRect.y()) {
118+ newY = confiningRect.y();
119+ } else if (newY > confiningRect.bottom()) {
120+ newY = confiningRect.bottom();
72void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
124void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
74 if (!parentItem()) {
126 if (!parentItem()) {
@@ -80,6 +132,20 @@ void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::Keyb
80 QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
132 QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
135+int MousePointer::topBoundaryOffset() const
137+ return m_topBoundaryOffset;
140+void MousePointer::setTopBoundaryOffset(int topBoundaryOffset)
142+ if (m_topBoundaryOffset == topBoundaryOffset)
145+ m_topBoundaryOffset = topBoundaryOffset;
146+ Q_EMIT topBoundaryOffsetChanged(topBoundaryOffset);
83void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
149void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
85 if (change == ItemSceneChange) {
151 if (change == ItemSceneChange) {
@@ -89,8 +155,32 @@ void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
90void MousePointer::registerWindow(QWindow *window)
156void MousePointer::registerWindow(QWindow *window)
158+ if (window == m_registeredWindow) {
162+ if (m_registeredWindow) {
163+ m_registeredWindow->disconnect(this);
92− if (m_registeredWindow && window != m_registeredWindow) {
166+ m_registeredWindow = window;
168+ if (m_registeredWindow) {
169+ connect(window, &QWindow::screenChanged, this, &MousePointer::registerScreen);
170+ registerScreen(window->screen());
172+ registerScreen(nullptr);
176+void MousePointer::registerScreen(QScreen *screen)
178+ if (m_registeredScreen == screen) {
182+ if (m_registeredScreen) {
93− auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredWindow->screen()->handle()->cursor());
183+ auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
94 if (previousCursor) {
184 if (previousCursor) {
95 previousCursor->setMousePointer(nullptr);
185 previousCursor->setMousePointer(nullptr);
@@ -98,10 +188,10 @@ void MousePointer::registerWindow(QWindow *window)
101− m_registeredWindow = window;
191+ m_registeredScreen = screen;
103− if (m_registeredWindow) {
193+ if (m_registeredScreen) {
104− auto cursor = dynamic_cast<MirPlatformCursor*>(window->screen()->handle()->cursor());
194+ auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
105 if (cursor) {
195 if (cursor) {
106 cursor->setMousePointer(this);
196 cursor->setMousePointer(this);
@@ -115,22 +205,6 @@ void MousePointer::setCursorName(const QString &cursorName)
115 if (cursorName != m_cursorName) {
205 if (cursorName != m_cursorName) {
116 m_cursorName = cursorName;
206 m_cursorName = cursorName;
117 Q_EMIT cursorNameChanged(m_cursorName);
207 Q_EMIT cursorNameChanged(m_cursorName);
122−void MousePointer::updateHotspot()
124− QPoint newHotspot = CursorImageProvider::instance()->hotspot(m_themeName, m_cursorName);
126− if (m_hotspotX != newHotspot.x()) {
127− m_hotspotX = newHotspot.x();
128− Q_EMIT hotspotXChanged(m_hotspotX);
131− if (m_hotspotY != newHotspot.y()) {
132− m_hotspotY = newHotspot.y();
133− Q_EMIT hotspotYChanged(m_hotspotY);
@@ -146,3 +220,16 @@ void MousePointer::setCustomCursor(const QCursor &customCursor)
147 CursorImageProvider::instance()->setCustomCursor(customCursor);
221 CursorImageProvider::instance()->setCustomCursor(customCursor);
224+QQuickItem* MousePointer::confiningItem() const
226+ return m_confiningItem.data();
229+void MousePointer::setConfiningItem(QQuickItem *item)
231+ if (item != m_confiningItem) {
232+ m_confiningItem = item;
233+ Q_EMIT confiningItemChanged();
plugins/Cursor/MousePointer.h+32−7
@@ -1,5 +1,5 @@
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
4 * This program is free software: you can redistribute it and/or modify it under
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
5 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -20,12 +20,15 @@
21#include <QPointer>
21#include <QPointer>
22#include <QWindow>
22#include <QWindow>
24// Unity API
25// Unity API
25#include <unity/shell/application/MirMousePointerInterface.h>
26#include <unity/shell/application/MirMousePointerInterface.h>
27class MousePointer : public MirMousePointerInterface {
28class MousePointer : public MirMousePointerInterface {
30+ Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)
31+ Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)
30 MousePointer(QQuickItem *parent = nullptr);
33 MousePointer(QQuickItem *parent = nullptr);
@@ -35,11 +38,14 @@ public:
35 void setThemeName(const QString &themeName) override;
38 void setThemeName(const QString &themeName) override;
36 QString themeName() const override { return m_themeName; }
39 QString themeName() const override { return m_themeName; }
38− qreal hotspotX() const override { return m_hotspotX; }
39− qreal hotspotY() const override { return m_hotspotY; }
41 void setCustomCursor(const QCursor &) override;
41 void setCustomCursor(const QCursor &) override;
43+ QQuickItem* confiningItem() const;
44+ void setConfiningItem(QQuickItem*);
46+ int topBoundaryOffset() const;
47+ void setTopBoundaryOffset(int topBoundaryOffset);
43public Q_SLOTS:
49public Q_SLOTS:
44 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
50 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
45 Qt::KeyboardModifiers modifiers) override;
51 Qt::KeyboardModifiers modifiers) override;
@@ -48,20 +54,39 @@ public Q_SLOTS:
49 void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
55 void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
50 void pushedRightBoundary(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);
51 void mouseMoved();
63 void mouseMoved();
64+ void confiningItemChanged();
66+ void topBoundaryOffsetChanged(int topBoundaryOffset);
54 void itemChange(ItemChange change, const ItemChangeData &value) override;
69 void itemChange(ItemChange change, const ItemChangeData &value) override;
72+ void registerScreen(QScreen *screen);
57 void registerWindow(QWindow *window);
75 void registerWindow(QWindow *window);
58− void updateHotspot();
76+ void applyItemConfinement(qreal &newX, qreal &newY);
60 QPointer<QWindow> m_registeredWindow;
78 QPointer<QWindow> m_registeredWindow;
79+ QPointer<QScreen> m_registeredScreen;
61 QString m_cursorName;
80 QString m_cursorName;
62 QString m_themeName;
81 QString m_themeName;
64− int m_hotspotY;
83+ // Accumulated, unapplied, mouse movement.
84+ QPointF m_accumulatedMovement;
86+ QPointer<QQuickItem> m_confiningItem;
88+ int m_topBoundaryOffset{0};
89+ bool m_pushing{false};
67#endif // MOUSEPOINTER_H
92#endif // MOUSEPOINTER_H
plugins/Cursor/plugin.cpp+4−2
@@ -1,5 +1,5 @@
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -22,13 +22,15 @@
22#include "plugin.h"
22#include "plugin.h"
25+#include "CursorImageInfo.h"
25#include "CursorImageProvider.h"
26#include "CursorImageProvider.h"
26#include "MousePointer.h"
27#include "MousePointer.h"
28void CursorPlugin::registerTypes(const char *uri)
29void CursorPlugin::registerTypes(const char *uri)
30 Q_ASSERT(uri == QLatin1String("Cursor"));
31 Q_ASSERT(uri == QLatin1String("Cursor"));
32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");
31− qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");
33+ qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");
34void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
36void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Cursor/qmldir+1−1
@@ -1,3 +1,3 @@
1module Cursor
1module Cursor
2plugin Cursor-qml
2plugin Cursor-qml
3−Cursor 1.0 Cursor.qml
3+Cursor 1.1 Cursor.qml
plugins/Dash/AudioProgressBar.qmldeleted−54
@@ -1,54 +0,0 @@
2− * Copyright 2015 Canonical Ltd.
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.
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.
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/>.
18−import Ubuntu.Components 1.3
24− implicitHeight: progressBarImage.height
27− readonly property double progress: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource) ? DashAudioPlayer.progress : 0
31− anchors { left: parent.left; right: parent.right }
33− source: "graphics/music_progress_bg.png"
35− sourceSize.width: width
36− sourceSize.height: height
41− objectName: "progressBarFill"
43− readonly property int maxWidth: progressBarImage.width
46− left: progressBarImage.left
47− right: progressBarImage.right
48− verticalCenter: progressBarImage.verticalCenter
49− rightMargin: maxWidth - (maxWidth * root.progress)
52− backgroundColor: UbuntuColors.orange
plugins/Dash/CMakeLists.txtdeleted−43
@@ -1,43 +0,0 @@
1−# There's no cmake var for v8 include path :-/
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)
7− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
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}
18−remove_definitions(-DQT_NO_KEYWORDS)
22− listviewwithpageheader.cpp
25− horizontaljournal.cpp
29−add_library(Dash-qml MODULE
33−target_link_libraries(Dash-qml
35− ${Qt5Quick_LIBRARIES}
38−qt5_use_modules(Dash-qml Qml Quick Concurrent)
40−add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
42−install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)
43−file(COPY graphics/music_progress_bg.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/graphics/)
plugins/Dash/CardAttributes.qmldeleted−71
@@ -1,71 +0,0 @@
2− * Copyright 2014 Canonical Ltd.
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.
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.
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/>.
18−import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
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
36− spacing: units.gu(0.5)
37− readonly property int column: index % grid.columns;
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;
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
52− // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
53− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
54− source: "icon" in modelData && modelData["icon"] || ""
59− width: parent.width - x
60− anchors.verticalCenter: parent.verticalCenter
61− text: "value" in modelData && modelData["value"] || "";
62− elide: Text.ElideRight
64− font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
66− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
plugins/Dash/CardAudioProgress.qmldeleted−59
@@ -1,59 +0,0 @@
2− * Copyright 2015 Canonical Ltd.
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.
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.
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/>.
18−import Ubuntu.Components 1.3
24− implicitHeight: positionLabel.y + positionLabel.height
25− visible: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)
27− property int duration: 0
28− property alias source: progress.source
29− property color color: theme.palette.normal.baseText
30− readonly property int position: root.visible ? DashAudioPlayer.position / 1000 : 0
34− anchors { left: parent.left; right: parent.right }
43− verticalAlignment: Text.AlignBottom
45− text: DashAudioPlayer.lengthToString(root.position)
54− verticalAlignment: Text.AlignBottom
56− text: DashAudioPlayer.lengthToString(duration)
plugins/Dash/CardCreator.jsdeleted−949
@@ -1,949 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
19−// %1 is the template["card-background"]["elements"][0]
20−// %2 is the template["card-background"]["elements"][1]
21−// %3 is whether the loader should be asynchronous or not
22−// %4 is the template["card-background"] string
23−var kBackgroundLoaderCode = 'Loader {\n\
24− id: backgroundLoader; \n\
25− objectName: "backgroundLoader"; \n\
26− anchors.fill: parent; \n\
27− asynchronous: %3; \n\
28− visible: status == Loader.Ready; \n\
29− sourceComponent: UbuntuShape { \n\
30− objectName: "background"; \n\
31− radius: "medium"; \n\
33− switch (root.backgroundShapeStyle) { \n\
34− case "inset": return UbuntuShape.Inset; \n\
35− case "shadow": return UbuntuShape.DropShadow; \n\
37− case "flat": return UbuntuShape.Flat; \n\
40− backgroundColor: getColor(0) || "white"; \n\
41− secondaryBackgroundColor: getColor(1) || backgroundColor; \n\
42− backgroundMode: UbuntuShape.VerticalGradient; \n\
43− anchors.fill: parent; \n\
44− source: backgroundImage.source ? backgroundImage : null; \n\
45− property real luminance: Style.luminance(backgroundColor); \n\
46− property Image backgroundImage: Image { \n\
47− objectName: "backgroundImage"; \n\
49− if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
53− function getColor(index) { \n\
54− if (cardData && typeof cardData["background"] === "object" \n\
55− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { \n\
56− return cardData["background"]["elements"][index]; \n\
57− } else return index === 0 ? %1 : %2; \n\
62−// %1 is used as anchors of artShapeHolder
63−// %2 is used as image width
64−// %3 is used as image height
65−// %4 is whether the image or the Loader with the UbuntuShape/ProportionalShape should be visible
66−// %5 is used as aspect ratio fallback
67−// %6 is whether the loader should be asynchronous or not
68−// %7 is injected as code to artImage
69−// %8 is used as image fallback
70−var kArtShapeHolderCode = 'Item { \n\
71− id: artShapeHolder; \n\
72− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
73− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\
76− id: artShapeLoader; \n\
77− objectName: "artShapeLoader"; \n\
78− readonly property string cardArt: cardData && cardData["art"] || %8; \n\
79− active: cardArt != ""; \n\
80− asynchronous: %6; \n\
81− visible: status == Loader.Ready; \n\
82− sourceComponent: Item { \n\
84− objectName: "artShape"; \n\
85− visible: image.status == Image.Ready; \n\
86− readonly property alias image: artImage; \n\
88− anchors.fill: parent; \n\
90− sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent; \n\
92− id: artShapeShapeComponent; \n\
94− source: artImage; \n\
95− sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
96− radius: "medium"; \n\
98− switch (root.artShapeStyle) { \n\
99− case "inset": return UbuntuShape.Inset; \n\
100− case "shadow": return UbuntuShape.DropShadow; \n\
102− case "flat": return UbuntuShape.Flat; \n\
108− id: artShapeIconComponent; \n\
109− ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; } \n\
112− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\
113− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : %5; \n\
114− Component.onCompleted: { updateWidthHeightBindings(); } \n\
115− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\
116− function updateWidthHeightBindings() { \n\
117− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\
118− width = root.fixedArtShapeSize.width; \n\
119− height = root.fixedArtShapeSize.height; \n\
121− width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); \n\
122− height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
125− CroppedImageMinimumSourceSize { \n\
127− objectName: "artImage"; \n\
128− source: artShapeLoader.cardArt; \n\
129− asynchronous: %6; \n\
139−// %1 is anchors.fill
142−// %4 is whether the icon should be asynchronous or not
143−var kAudioButtonCode = 'AbstractButton { \n\
144− id: audioButton; \n\
145− anchors.fill: %1; \n\
148− readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
150− anchors.fill: parent; \n\
151− visible: parent.pressed; \n\
152− radius: "medium"; \n\
155− color: Qt.rgba(0, 0, 0, 0.5); \n\
156− anchors.centerIn: parent; \n\
157− width: parent.width * 0.5; \n\
159− radius: width / 2; \n\
162− anchors.centerIn: parent; \n\
163− width: parent.width * 0.3; \n\
166− name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
168− asynchronous: %4; \n\
171− if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
172− if (DashAudioPlayer.playing) { \n\
173− DashAudioPlayer.pause(); \n\
175− DashAudioPlayer.play(); \n\
178− var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\
179− DashAudioPlayer.playSource(source, playlist); \n\
182− onPressAndHold: { \n\
183− root.pressAndHold(); \n\
187−// %1 is whether the loader should be asynchronous or not
188−// %2 is the header height code
189−var kOverlayLoaderCode = 'Loader { \n\
190− id: overlayLoader; \n\
191− readonly property real overlayHeight: %2 + units.gu(2); \n\
192− anchors.fill: artShapeHolder; \n\
193− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
194− asynchronous: %1; \n\
195− visible: showHeader && status == Loader.Ready; \n\
196− sourceComponent: UbuntuShapeOverlay { \n\
198− property real luminance: Style.luminance(overlayColor); \n\
199− aspect: UbuntuShape.Flat; \n\
200− radius: "medium"; \n\
201− overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
202− overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
206−// multiple row version of HeaderRowCode
207−function kHeaderRowCodeGenerator() {
208− var kHeaderRowCodeTemplate = 'Row { \n\
210− objectName: "outerRow"; \n\
211− property real margins: units.gu(1); \n\
212− spacing: margins; \n\
215− anchors.right: parent.right; \n\
216− anchors.margins: margins; \n\
217− anchors.rightMargin: 0; \n\
222− var args = Array.prototype.slice.call(arguments);
223− var isCardTool = args.shift();
224− var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
225− var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
229−// multiple item version of kHeaderContainerCode
230−function kHeaderContainerCodeGenerator() {
231− var headerContainerCodeTemplate = 'Item { \n\
232− id: headerTitleContainer; \n\
234− width: parent.width - x; \n\
235− implicitHeight: %2; \n\
240− var args = Array.prototype.slice.call(arguments);
241− var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));
245−// %1 is used as anchors of mascotShapeLoader
246−// %2 is whether the loader should be asynchronous or not
247−var kMascotShapeLoaderCode = 'Loader { \n\
248− id: mascotShapeLoader; \n\
249− objectName: "mascotShapeLoader"; \n\
250− asynchronous: %2; \n\
251− active: mascotImage.status === Image.Ready; \n\
252− visible: showHeader && active && status == Loader.Ready; \n\
253− width: units.gu(6); \n\
254− height: units.gu(5.625); \n\
255− sourceComponent: UbuntuShape { image: mascotImage } \n\
259−// %1 is used as anchors of mascotImage
260−// %2 is used as visible of mascotImage
261−// %3 is injected as code to mascotImage
262−// %4 is used as fallback image
263−var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
264− id: mascotImage; \n\
265− objectName: "mascotImage"; \n\
267− source: cardData && cardData["mascot"] || %4; \n\
268− width: units.gu(6); \n\
269− height: units.gu(5.625); \n\
270− horizontalAlignment: Image.AlignHCenter; \n\
271− verticalAlignment: Image.AlignVCenter; \n\
276−// %1 is used as anchors of titleLabel
277−// %2 is used as color of titleLabel
278−// %3 is used as extra condition for visible of titleLabel
279−// %4 is used as title width
280−// %5 is used as horizontal alignment
281−var kTitleLabelCode = 'Label { \n\
283− objectName: "titleLabel"; \n\
285− elide: Text.ElideRight; \n\
286− fontSize: "small"; \n\
287− wrapMode: Text.Wrap; \n\
288− maximumLineCount: 2; \n\
289− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
291− visible: showHeader %3; \n\
293− text: root.title; \n\
294− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
295− horizontalAlignment: %5; \n\
298−// %1 is used as extra anchors of emblemIcon
299−// %2 is used as color of emblemIcon
300−// FIXME The width code is a
301−// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
302−var kEmblemIconCode = 'Icon { \n\
304− objectName: "emblemIcon"; \n\
306− bottom: titleLabel.baseline; \n\
307− right: parent.right; \n\
310− source: cardData && cardData["emblem"] || ""; \n\
312− height: source != "" ? titleLabel.font.pixelSize : 0; \n\
313− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
316−// %1 is used as anchors of touchdown effect
317−var kTouchdownCode = 'UbuntuShape { \n\
319− objectName: "touchdown"; \n\
321− visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed; \n\
322− radius: "medium"; \n\
323− borderSource: "radius_pressed.sci" \n\
326−// %1 is used as anchors of subtitleLabel
327−// %2 is used as color of subtitleLabel
328−var kSubtitleLabelCode = 'Label { \n\
329− id: subtitleLabel; \n\
330− objectName: "subtitleLabel"; \n\
332− anchors.topMargin: units.dp(2); \n\
333− elide: Text.ElideRight; \n\
334− maximumLineCount: 1; \n\
335− fontSize: "x-small"; \n\
336− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
338− visible: titleLabel.visible && titleLabel.text; \n\
339− text: cardData && cardData["subtitle"] || ""; \n\
340− font.weight: Font.Light; \n\
343−// %1 is used as anchors of attributesRow
344−// %2 is used as color of attributesRow
345−var kAttributesRowCode = 'CardAttributes { \n\
346− id: attributesRow; \n\
347− objectName: "attributesRow"; \n\
350− fontScale: root.fontScale; \n\
351− model: cardData && cardData["attributes"]; \n\
354−// %1 is used as anchors of socialActionsRow
355−// %2 is used as color of socialActionsRow
356−var kSocialActionsRowCode = 'CardSocialActions { \n\
357− id: socialActionsRow; \n\
358− objectName: "socialActionsRow"; \n\
361− model: cardData && cardData["socialActions"]; \n\
362− onClicked: root.action(actionId); \n\
365−// %1 is used as top anchor of summary
366−// %2 is used as topMargin anchor of summary
367−// %3 is used as color of summary
368−var kSummaryLabelCode = 'Label { \n\
370− objectName: "summaryLabel"; \n\
373− left: parent.left; \n\
374− right: parent.right; \n\
375− margins: units.gu(1); \n\
378− wrapMode: Text.Wrap; \n\
379− maximumLineCount: 5; \n\
380− elide: Text.ElideRight; \n\
381− text: cardData && cardData["summary"] || ""; \n\
382− height: text ? implicitHeight : 0; \n\
383− fontSize: "small"; \n\
387−// %1 is used as bottom anchor of audio progress bar
388−// %2 is used as left anchor of audio progress bar
389−// %3 is used as text color
390−var kAudioProgressBarCode = 'CardAudioProgress { \n\
391− id: audioProgressBar; \n\
392− duration: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["duration"]) || 0; \n\
393− source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
397− right: parent.right; \n\
398− margins: units.gu(1); \n\
403−function sanitizeColor(colorString) {
404− if (colorString !== undefined) {
405− if (colorString.match(/^[#a-z0-9]*$/i) === null) {
406− // This is not the perfect regexp for color
407− // but what we're trying to do here is just protect
408− // against injection so it's ok
415−function cardString(template, components, isCardTool) {
418− var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
420− code = 'AbstractButton { \n\
422− property var cardData; \n\
423− property string artShapeStyle: "inset"; \n\
424− property string backgroundShapeStyle: "inset"; \n\
425− property real fontScale: 1.0; \n\
426− property var scopeStyle: null; \n\
428− property size fixedArtShapeSize: Qt.size(-1, -1); \n\
429− readonly property string title: cardData && cardData["title"] || ""; \n\
430− property bool showHeader: true; \n\
431− implicitWidth: childrenRect.width; \n\
433− \n'.arg(templateInteractive);
435− code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
437− var hasArt = components["art"] && components["art"]["field"] || false;
438− var hasSummary = components["summary"] || false;
439− var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
440− var artAndSummary = hasArt && hasSummary && !isConciergeMode;
441− var isHorizontal = template["card-layout"] === "horizontal";
442− var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
443− (hasSummary && (template["card-background"] || components["background"]));
444− var hasTitle = components["title"] || false;
445− var hasMascot = components["mascot"] || false;
446− var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
447− var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
448− var hasSubtitle = hasTitle && components["subtitle"] || false;
449− var hasHeaderRow = hasMascot && hasTitle;
450− var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
451− var hasSocialActions = hasTitle && components["social-actions"] || false;
452− var isAudio = template["quick-preview-type"] === "audio";
453− var asynchronous = isCardTool ? "false" : "true";
455− code += 'signal action(var actionId);\n';
457− // For now we only support audio cards with [optional] art, title, subtitle
458− // in horizontal mode
459− // Anything else makes it behave not like an audio card
460− if (hasSummary) isAudio = false;
461− if (!isHorizontal) isAudio = false;
462− if (hasMascot) isAudio = false;
463− if (hasEmblem) isAudio = false;
464− if (headerAsOverlay) isAudio = false;
465− if (hasAttributes) isAudio = false;
468− if (hasBackground) {
469− var templateCardBackground;
470− if (template && typeof template["card-background"] === "string") {
471− templateCardBackground = 'decodeURI("' + encodeURI(template["card-background"]) + '")';
473− templateCardBackground = '""';
476− var backgroundElements0;
477− var backgroundElements1;
478− if (template && typeof template["card-background"] === "object" && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
479− var element0 = sanitizeColor(template["card-background"]["elements"][0]);
480− var element1 = sanitizeColor(template["card-background"]["elements"][1]);
481− if (element0 !== undefined) {
482− backgroundElements0 = '"%1"'.arg(element0);
484− if (element1 !== undefined) {
485− backgroundElements1 = '"%1"'.arg(element1);
488− code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
492− code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
494− var widthCode, heightCode;
497− artAnchors = 'left: parent.left';
498− if (hasMascot || hasTitle) {
499− widthCode = 'height * artShape.aspect'
500− heightCode = 'headerHeight + 2 * units.gu(1)';
502− // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?
503− // So we define a "random" height of the image height + 2 gu for the margins
504− widthCode = 'height * artShape.aspect'
505− heightCode = 'units.gu(7.625)';
508− artAnchors = 'horizontalCenter: parent.horizontalCenter;';
509− widthCode = 'root.width'
510− heightCode = 'width / artShape.aspect';
513− var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;
514− if (isNaN(aspectRatio)) {
517− var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";
518− fallback = encodeURI(fallback);
519− var fallbackStatusCode = "";
520− var fallbackURICode = '""';
521− if (fallback !== "") {
522− // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
523− // which in kArtShapeHolderCode is %8
524− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
525− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
527− code += kArtShapeHolderCode.arg(artAnchors)
530− .arg(isConciergeMode ? "false" : "true")
533− .arg(fallbackStatusCode)
534− .arg(fallbackURICode);
536− code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
539− if (headerAsOverlay) {
540− var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
541− code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
544− var headerVerticalAnchors;
545− if (headerAsOverlay) {
546− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\
547− bottomMargin: units.gu(1);\n';
551− headerVerticalAnchors = 'top: artShapeHolder.top; \n\
552− topMargin: units.gu(1);\n';
554− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\
555− topMargin: units.gu(1);\n';
558− headerVerticalAnchors = 'top: parent.top; \n\
559− topMargin: units.gu(1);\n';
563− var headerLeftAnchor;
564− var headerLeftAnchorHasMargin = false;
565− if (isHorizontal && hasArt) {
566− headerLeftAnchor = 'left: artShapeHolder.right; \n\
567− leftMargin: units.gu(1);\n';
568− headerLeftAnchorHasMargin = true;
569− } else if (isHorizontal && isAudio) {
570− headerLeftAnchor = 'left: audioButton.right; \n\
571− leftMargin: units.gu(1);\n';
572− headerLeftAnchorHasMargin = true;
574− headerLeftAnchor = 'left: parent.left;\n';
577− var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary && !isAudio;
580− code += 'readonly property int headerHeight: row.height;\n'
581− } else if (hasMascot) {
582− code += 'readonly property int headerHeight: mascotImage.height;\n'
583− } else if (hasAttributes) {
584− if (hasTitle && hasSubtitle) {
585− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
586− } else if (hasTitle) {
587− code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'
589− code += 'readonly property int headerHeight: attributesRow.height;\n'
591− } else if (isAudio) {
593− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
594− } else if (hasTitle) {
595− code += 'readonly property int headerHeight: titleLabel.height + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
597− code += 'readonly property int headerHeight: audioProgressBar.height;\n'
599− } else if (hasSubtitle) {
600− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'
601− } else if (hasTitle) {
602− code += 'readonly property int headerHeight: titleLabel.height;\n'
604− code += 'readonly property int headerHeight: 0;\n'
607− var mascotShapeCode = '';
608− var mascotCode = '';
610− var useMascotShape = !hasBackground && !headerAsOverlay;
611− var mascotAnchors = '';
612− if (!hasHeaderRow) {
613− mascotAnchors += headerLeftAnchor;
614− mascotAnchors += headerVerticalAnchors;
615− if (!headerLeftAnchorHasMargin) {
616− mascotAnchors += 'leftMargin: units.gu(1);\n'
619− mascotAnchors = 'verticalCenter: parent.verticalCenter;'
622− if (useMascotShape) {
623− mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
626− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
627− var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
628− fallback = encodeURI(fallback);
629− var fallbackStatusCode = "";
630− var fallbackURICode = '""';
631− if (fallback !== "") {
632− // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode
633− // which in kMascotImageCode is %4
634− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %4;';
635− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
637− mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackStatusCode).arg(fallbackURICode);
640− 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")';
642− var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
643− var titleSubtitleCode = '';
646− if (headerAsOverlay) {
647− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
648− } else if (hasSummary) {
649− titleColor = 'summary.color';
650− } else if (hasBackground) {
651− titleColor = summaryColorWithBackground;
653− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
657− var subtitleAnchors;
658− var attributesAnchors;
659− var titleContainerAnchors;
660− var titleRightAnchor;
661− var titleWidth = "undefined";
663− var extraRightAnchor = '';
664− var extraLeftAnchor = '';
665− if (!touchdownOnArtShape) {
666− extraRightAnchor = 'rightMargin: units.gu(1); \n';
667− extraLeftAnchor = 'leftMargin: units.gu(1); \n';
668− } else if (headerAsOverlay && !hasEmblem) {
669− extraRightAnchor = 'rightMargin: units.gu(1); \n';
673− titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
675− titleContainerAnchors = 'right: parent.right; ';
676− titleContainerAnchors += headerLeftAnchor;
677− titleContainerAnchors += headerVerticalAnchors;
678− if (!headerLeftAnchorHasMargin) {
679− titleContainerAnchors += extraLeftAnchor;
683− titleRightAnchor = 'right: emblemIcon.left; \n\
684− rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';
686− titleRightAnchor = 'right: parent.right; \n'
687− titleRightAnchor += extraRightAnchor;
690− if (hasTitleContainer) {
691− // Using headerTitleContainer
692− titleAnchors = titleRightAnchor;
693− titleAnchors += 'left: parent.left; \n\
695− subtitleAnchors = 'right: parent.right; \n\
696− left: parent.left; \n';
697− subtitleAnchors += extraRightAnchor;
699− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
700− subtitleAnchors += 'top: titleLabel.bottom;\n';
702− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
704− } else if (hasMascot) {
705− // Using row without titleContainer
706− titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
707− titleWidth = "parent.width - x";
709− if (headerAsOverlay) {
710− // Using anchors to the overlay
711− titleAnchors = titleRightAnchor;
712− titleAnchors += 'left: parent.left; \n\
713− leftMargin: units.gu(1); \n\
714− top: overlayLoader.top; \n\
715− topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';
717− // Using anchors to the mascot/parent
718− titleAnchors = titleRightAnchor;
719− titleAnchors += headerLeftAnchor;
720− titleAnchors += headerVerticalAnchors;
721− if (!headerLeftAnchorHasMargin) {
722− titleAnchors += extraLeftAnchor;
725− subtitleAnchors = 'left: titleLabel.left; \n\
726− leftMargin: titleLabel.leftMargin; \n';
727− subtitleAnchors += extraRightAnchor;
730− subtitleAnchors += 'right: parent.right; \n';
732− subtitleAnchors += 'right: titleLabel.right; \n';
736− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
737− subtitleAnchors += 'top: titleLabel.bottom;\n';
739− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
743− var titleAlignment = "Text.AlignHCenter";
744− if (template["card-layout"] === "horizontal"
745− || typeof components["title"] !== "object"
746− || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
747− var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
748− for (var key in keys) {
751− if (typeof components[key] === "string"
752− || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
758− // code for different elements
759− var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
760− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
764− // code for the title container
765− var containerCode = [];
766− var containerHeight = 'titleLabel.height';
767− containerCode.push(titleCode);
769− subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);
770− containerCode.push(subtitleCode);
771− containerHeight += ' + subtitleLabel.height';
774− containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));
776− if (hasAttributes) {
777− attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
778− containerCode.push(attributesCode);
779− containerHeight += ' + attributesRow.height';
782− if (hasTitleContainer) {
784− titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);
787− titleSubtitleCode = titleCode;
789− titleSubtitleCode += subtitleCode;
791− if (hasAttributes) {
792− titleSubtitleCode += attributesCode;
798− var rowCode = [mascotCode, titleSubtitleCode];
799− if (mascotShapeCode != '') {
800− rowCode.unshift(mascotShapeCode);
802− code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
804− code += mascotShapeCode + mascotCode + titleSubtitleCode;
808− var audioProgressBarLeftAnchor = 'audioButton.right';
809− var audioProgressBarBottomAnchor = 'audioButton.bottom';
810− var audioProgressBarTextColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
812− code += kAudioProgressBarCode.arg(audioProgressBarBottomAnchor)
813− .arg(audioProgressBarLeftAnchor)
814− .arg(audioProgressBarTextColor);
816− var audioButtonAnchorsFill;
817− var audioButtonWidth;
818− var audioButtonHeight;
820− audioButtonAnchorsFill = 'artShapeHolder';
821− audioButtonWidth = 'undefined';
822− audioButtonHeight = 'undefined';
824− audioButtonAnchorsFill = 'undefined';
825− audioButtonWidth = 'height';
826− audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
827− : 'root.fixedHeaderHeight + 2 * units.gu(1)';
829− code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
833− var summaryTopAnchor;
834− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
835− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
836− else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
837− else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
838− else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
839− else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
840− else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
841− else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
842− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
843− else summaryTopAnchor = 'parent.top';
846− if (hasBackground) {
847− summaryColor = summaryColorWithBackground;
849− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
852− var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
854− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
857− if (hasSocialActions) {
859− var socialTopAnchor;
861− if (hasSummary) socialTopAnchor = 'summary.bottom;';
862− else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
863− else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
864− else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';
865− else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';
866− else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';
867− else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';
868− else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';
869− else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';
870− else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
871− else socialTopAnchor = 'parent.top';
873− socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'
876− if (hasBackground) {
877− socialColor = summaryColorWithBackground;
879− socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
882− code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
885− var touchdownAnchors;
886− if (hasBackground) {
887− touchdownAnchors = 'fill: backgroundLoader';
888− } else if (touchdownOnArtShape) {
889− touchdownAnchors = 'fill: artShapeHolder';
891− touchdownAnchors = 'fill: root'
893− code += kTouchdownCode.arg(touchdownAnchors);
895− var implicitHeight = 'implicitHeight: ';
896− if (hasSocialActions) {
897− implicitHeight += 'socialActionsRow.y + socialActionsRow.height + units.gu(1);\n';
898− } else if (hasSummary) {
899− implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
900− } else if (isAudio) {
901− implicitHeight += 'audioButton.height;\n';
902− } else if (headerAsOverlay) {
903− implicitHeight += 'artShapeHolder.height;\n';
904− } else if (hasHeaderRow) {
905− implicitHeight += 'row.y + row.height + units.gu(1);\n';
906− } else if (hasMascot) {
907− implicitHeight += 'mascotImage.y + mascotImage.height;\n';
908− } else if (hasTitleContainer) {
909− implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';
910− } else if (hasAttributes) {
911− implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';
912− } else if (hasSubtitle) {
913− implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
914− } else if (hasTitle) {
915− implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
916− } else if (hasArt) {
917− implicitHeight += 'artShapeHolder.height;\n';
919− implicitHeight = '';
922− // Close the AbstractButton
923− code += implicitHeight + '}\n';
928−function createCardComponent(parent, template, components, isCardTool, identifier) {
929− var imports = 'import QtQuick 2.4; \n\
930− import Ubuntu.Components 1.3; \n\
931− import Ubuntu.Settings.Components 0.1; \n\
933− import Utils 0.1;\n';
934− var card = cardString(template, components, isCardTool);
935− var code = imports + 'Component {\n' + card + '}\n';
938− return Qt.createQmlObject(code, parent, identifier);
940− console.error("ERROR: Invalid component created.");
941− console.error("Template:");
942− console.error(JSON.stringify(template));
943− console.error("Components:");
944− console.error(JSON.stringify(components));
945− console.error("Code:");
946− console.error(code);
plugins/Dash/CardCreatorCache.qmldeleted−40
@@ -1,40 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
19−import "CardCreator.js" as CardCreator
24− property var cache: new Object();
26− function getCardComponent(template, components, isCardTool) {
27− if (template === undefined || components === undefined)
30− var tString = JSON.stringify(template);
31− var cString = JSON.stringify(components);
32− var allString = tString + cString + isCardTool;
33− var component = cache[allString];
34− if (component === undefined) {
35− component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);
36− cache[allString] = component;
plugins/Dash/CardSocialActions.qmldeleted−94
@@ -1,94 +0,0 @@
2− * Copyright 2016 Canonical Ltd.
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.
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.
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/>.
18−import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
23− spacing: units.gu(0.5)
25− property alias model: repeater.model
26− property color color: theme.palette.normal.baseText
28− signal clicked(var actionId)
32− visible: repeater.count > 0
36− leftMargin:units.dp(1);
37− rightMargin: units.dp(1);
39− color: Qt.darker(theme.palette.normal.background, 1.12)
40− height: visible ? units.dp(1) : 0
48− leftMargin: units.gu(1)
49− rightMargin: units.gu(1)
52− readonly property int visibleItems: {
53− if (width <= units.gu(12)) // small card
55− else if (width <= units.gu(21)) // medium card
57− else // large or horizontal card
65− active: index < row.visibleItems
66− sourceComponent: AbstractButton {
67− objectName: "delegate" + index
74− readonly property url urlIcon: modelData && modelData["icon"] || ""
75− readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
78− // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
79− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
81− color: socialActions.color
84− if (urlIcon) source = urlIcon
88− onClicked: socialActions.clicked(modelData["id"]);
89− onPressedChanged: if (pressed && icon.urlTemporaryIcon != "") icon.source = icon.urlTemporaryIcon
plugins/Dash/CroppedImageMinimumSourceSize.qmldeleted−38
@@ -1,38 +0,0 @@
2− * Copyright (C) 2014, 2015 Canonical, Ltd.
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.
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.
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/>.
22− fillMode: Image.PreserveAspectCrop
24− property bool useHeight: false
25− function updateUseHeight()
27− // Do not turn into a binding since otherwise the qml
28− // engine complains about binding loops
29− useHeight = (implicitWidth / implicitHeight) > (width / height);
32− onHeightChanged: updateUseHeight();
33− onWidthChanged: updateUseHeight();
34− onImplicitHeightChanged: updateUseHeight();
35− onImplicitWidthChanged: updateUseHeight();
37− sourceSize: useHeight ? Qt.size(0, height) : Qt.size(width, 0)
plugins/Dash/Dash.qmltypesdeleted−100
@@ -1,100 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Dash 0.1 plugins'
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: "cacheBuffer"; type: "int" }
19− Property { name: "displayMarginBeginning"; type: "double" }
20− Property { name: "displayMarginEnd"; type: "double" }
23− name: "HorizontalJournal"
24− defaultProperty: "data"
25− prototype: "AbstractDashView"
26− exports: ["Dash/HorizontalJournal 0.1"]
27− exportMetaObjectRevisions: [0]
28− Property { name: "rowHeight"; type: "double" }
31− name: "ListViewWithPageHeader"
32− defaultProperty: "flickableData"
33− prototype: "QQuickFlickable"
34− exports: ["Dash/ListViewWithPageHeader 0.1"]
35− exportMetaObjectRevisions: [0]
36− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
37− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
38− Property { name: "pageHeader"; type: "QQuickItem"; isPointer: true }
39− Property { name: "sectionDelegate"; type: "QQmlComponent"; isPointer: true }
40− Property { name: "sectionProperty"; type: "string" }
41− Property { name: "forceNoClip"; type: "bool" }
42− Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
43− Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
44− Property { name: "cacheBuffer"; type: "int" }
45− Signal { name: "headerChanged" }
46− Method { name: "positionAtBeginning" }
47− Method { name: "showHeader" }
48− Method { name: "firstCreatedIndex"; type: "int" }
49− Method { name: "createdItemCount"; type: "int" }
53− Parameter { name: "modelIndex"; type: "int" }
56− name: "maximizeVisibleArea"
58− Parameter { name: "modelIndex"; type: "int" }
61− name: "maximizeVisibleArea"
63− Parameter { name: "modelIndex"; type: "int" }
64− Parameter { name: "itemHeight"; type: "int" }
69− defaultProperty: "data"
70− prototype: "AbstractDashView"
71− exports: ["Dash/OrganicGrid 0.1"]
72− exportMetaObjectRevisions: [0]
73− Property { name: "smallDelegateSize"; type: "QSizeF" }
74− Property { name: "bigDelegateSize"; type: "QSizeF" }
77− name: "VerticalJournal"
78− defaultProperty: "data"
79− prototype: "AbstractDashView"
80− exports: ["Dash/VerticalJournal 0.1"]
81− exportMetaObjectRevisions: [0]
82− Property { name: "columnWidth"; type: "double" }
86− name: "CardCreatorCache"
87− exports: ["CardCreatorCache -1.-1"]
88− exportMetaObjectRevisions: [-1]
92− Property { name: "cache"; type: "QVariant" }
94− name: "getCardComponent"
96− Parameter { name: "template"; type: "QVariant" }
97− Parameter { name: "components"; type: "QVariant" }
plugins/Dash/DashAudioPlayer.qmldeleted−96
@@ -1,96 +0,0 @@
2− * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
19−import QtMultimedia 5.6
23− readonly property real progress: audio.position / audio.duration
24− readonly property bool playing: audio.playbackState === Audio.PlayingState
25− readonly property bool paused: audio.playbackState === Audio.PausedState
26− readonly property bool stopped: audio.playbackState === Audio.StoppedState
27− readonly property alias position: audio.position
28− readonly property url currentSource: audio.playlist.currentItemSource
30− function playSource(newSource, newPlaylist) {
32− audio.playlist.clear();
34− // Look for newSource in newPlaylist
35− var sourceIndex = -1;
36− for (var i in newPlaylist) {
37− if (AudioUrlComparer.compare(newSource, newPlaylist[i])) {
43− if (sourceIndex === -1 && newSource != "") {
44− // If the playing song is not in the playlist, add it
45− urls.push(newSource);
48− for (var i in newPlaylist) {
49− urls.push(newPlaylist[i]);
51− audio.playlist.addItems(urls);
52− audio.playlist.currentIndex = sourceIndex;
54− audio.playlist.addItem(newSource);
55− audio.playlist.currentIndex = 0;
72− property QtObject audio: Audio {
76− objectName: "playlist"
79− onErrorStringChanged: console.warn("Dash Audio player error:", errorString)
82− function lengthToString(s) {
83− if (typeof(s) !== "number" || s < 0) return "";
85− var sec = "" + s % 60;
86− if (sec.length == 1) sec = "0" + sec;
87− var hour = Math.floor(s / 3600);
89− return Math.floor(s / 60) + ":" + sec;
91− var min = "" + Math.floor(s / 60) % 60;
92− if (min.length == 1) min = "0" + min;
93− return hour + ":" + min + ":" + sec;
plugins/Dash/ScopeStyle.qmldeleted−95
@@ -1,95 +0,0 @@
2− * Copyright 2014 Canonical Ltd.
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.
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.
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/>.
19−import Ubuntu.Components 1.3
21−/*! \brief Helper for processing scope customization options.
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
29− /// Style object passed from the scope
30− property var style: Object()
32− /// Color used for text and symbolic icons
33− readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
35− /// Luminance of the foreground color
36− readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
38− /// Color used for the overall background
39− readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"
41− /// Luminance of the background color
42− readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
44− /*! \brief Get the most contrasting available color based on luminance
46− * If background color is transparent, theme provided colors are taken into account
48− function getTextColor(luminance) {
49− if (Math.abs(foregroundLuminance - luminance) >
50− Math.abs(d.opaqueBackgroundLuminance - luminance)) {
53− return d.opaqueBackground;
57− /// Source of the logo image for the header
58− readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
60− /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
63− /// Foreground color for the header
64− readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
66− /// Color of the header divider
67− readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"
69− /// Background style for the navigation
70− readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
72− /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
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)
83− readonly property color opaqueBackground: {
86− (Math.abs(foregroundLuminance - defaultLightLuminance) >
87− Math.abs(foregroundLuminance - defaultDarkLuminance)) ?
88− defaultLight : defaultDark
90− readonly property real opaqueBackgroundLuminance: Style.luminance(opaqueBackground)
92− readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }
plugins/Dash/abstractdashview.cppdeleted−346
@@ -1,346 +0,0 @@
2− * Copyright (C) 2013, 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "abstractdashview.h"
19−AbstractDashView::AbstractDashView()
20− : m_delegateModel(nullptr)
21− , m_asyncRequestedIndex(-1)
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)
31− connect(this, &AbstractDashView::widthChanged, this, &AbstractDashView::relayout);
32− connect(this, &AbstractDashView::heightChanged, this, &AbstractDashView::onHeightChanged);
35−QAbstractItemModel *AbstractDashView::model() const
37− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
40−void AbstractDashView::setModel(QAbstractItemModel *model)
42− if (model != this->model()) {
43− if (!m_delegateModel) {
44− createDelegateModel();
46− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);
48− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
49− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);
51− cleanupExistingItems();
53− Q_EMIT modelChanged();
58−QQmlComponent *AbstractDashView::delegate() const
60− return m_delegateModel ? m_delegateModel->delegate() : nullptr;
63−void AbstractDashView::setDelegate(QQmlComponent *delegate)
65− if (delegate != this->delegate()) {
66− if (!m_delegateModel) {
67− createDelegateModel();
70− cleanupExistingItems();
72− m_delegateModel->setDelegate(delegate);
74− Q_EMIT delegateChanged();
75− m_delegateValidated = false;
80−qreal AbstractDashView::columnSpacing() const
82− return m_columnSpacing;
85−void AbstractDashView::setColumnSpacing(qreal columnSpacing)
87− if (columnSpacing != m_columnSpacing) {
88− m_columnSpacing = columnSpacing;
89− Q_EMIT columnSpacingChanged();
91− if (isComponentComplete()) {
97−qreal AbstractDashView::rowSpacing() const
102−void AbstractDashView::setRowSpacing(qreal rowSpacing)
104− if (rowSpacing != m_rowSpacing) {
105− m_rowSpacing = rowSpacing;
106− Q_EMIT rowSpacingChanged();
108− if (isComponentComplete()) {
114−int AbstractDashView::cacheBuffer() const
119−void AbstractDashView::setCacheBuffer(int buffer)
122− qmlInfo(this) << "Cannot set a negative cache buffer";
126− if (m_buffer != buffer) {
128− if (isComponentComplete()) {
131− emit cacheBufferChanged();
135−qreal AbstractDashView::displayMarginBeginning() const
137− return m_displayMarginBeginning;
140−void AbstractDashView::setDisplayMarginBeginning(qreal begin)
142− if (m_displayMarginBeginning == begin)
144− m_displayMarginBeginning = begin;
145− if (isComponentComplete()) {
148− emit displayMarginBeginningChanged();
151−qreal AbstractDashView::displayMarginEnd() const
153− return m_displayMarginEnd;
156−void AbstractDashView::setDisplayMarginEnd(qreal end)
158− if (m_displayMarginEnd == end)
160− m_displayMarginEnd = end;
161− if (isComponentComplete()) {
164− emit displayMarginEndChanged();
167−void AbstractDashView::createDelegateModel()
169− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);
170− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &AbstractDashView::itemCreated);
171− if (isComponentComplete())
172− m_delegateModel->componentComplete();
175−void AbstractDashView::refill()
177− if (!isComponentComplete() || height() < 0) {
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;
186− bool added = addVisibleItems(from, to, false);
187− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
188− added |= addVisibleItems(bufferFrom, bufferTo, true);
190− if (added || removed) {
191− m_implicitHeightDirty = true;
196−bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)
198− if (fillToY <= fillFromY)
204− if (m_delegateModel->count() == 0)
209− findBottomModelIndexToAdd(&modelIndex, &yPos);
210− bool changed = false;
211− while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {
212− if (!createItem(modelIndex, asynchronous))
216− findBottomModelIndexToAdd(&modelIndex, &yPos);
219− findTopModelIndexToAdd(&modelIndex, &yPos);
220− while (modelIndex >= 0 && yPos > fillFromY) {
221− if (!createItem(modelIndex, asynchronous))
225− findTopModelIndexToAdd(&modelIndex, &yPos);
231−QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)
233− if (asynchronous && m_asyncRequestedIndex != -1)
236− m_asyncRequestedIndex = -1;
237− QObject* object = m_delegateModel->object(modelIndex, asynchronous);
238− QQuickItem *item = qmlobject_cast<QQuickItem*>(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";
248− m_asyncRequestedIndex = modelIndex;
252− addItemToView(modelIndex, item);
257−void AbstractDashView::releaseItem(QQuickItem *item)
259− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);
260− if (flags & QQmlDelegateModel::Destroyed) {
261− item->setParentItem(nullptr);
265−void AbstractDashView::setImplicitHeightDirty()
267− m_implicitHeightDirty = true;
270−void AbstractDashView::itemCreated(int modelIndex, QObject *object)
272− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
274− qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;
277− item->setParentItem(this);
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;
291−void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)
294− cleanupExistingItems();
296− processModelRemoves(changeSet.removes());
302−void AbstractDashView::relayout()
304− m_needsRelayout = true;
308−void AbstractDashView::onHeightChanged()
313−void AbstractDashView::updatePolish()
318− if (m_needsRelayout) {
320− m_needsRelayout = false;
321− m_implicitHeightDirty = true;
326− const qreal from = -m_displayMarginBeginning;
327− const qreal to = height() + m_displayMarginEnd;
328− updateItemCulling(from, to);
330− if (m_implicitHeightDirty) {
331− calculateImplicitHeight();
332− m_implicitHeightDirty = false;
336−void AbstractDashView::componentComplete()
338− if (m_delegateModel)
339− m_delegateModel->componentComplete();
341− QQuickItem::componentComplete();
343− m_needsRelayout = true;
plugins/Dash/abstractdashview.hdeleted−129
@@ -1,129 +0,0 @@
2− * Copyright (C) 2013, 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef ABSTRACTDASHVIEW_H
18−#define ABSTRACTDASHVIEW_H
22−class QAbstractItemModel;
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
26−#include <private/qqmldelegatemodel_p.h>
28−#pragma GCC diagnostic pop
30−class AbstractDashView : public QQuickItem
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)
46−friend class VerticalJournalTest;
47−friend class HorizontalJournalTest;
48−friend class OrganicGridTest;
53− QAbstractItemModel *model() const;
54− void setModel(QAbstractItemModel *model);
56− QQmlComponent *delegate() const;
57− void setDelegate(QQmlComponent *delegate);
59− qreal columnSpacing() const;
60− void setColumnSpacing(qreal columnSpacing);
62− qreal rowSpacing() const;
63− void setRowSpacing(qreal rowSpacing);
65− int cacheBuffer() const;
66− void setCacheBuffer(int);
68− qreal displayMarginBeginning() const;
69− void setDisplayMarginBeginning(qreal);
71− qreal displayMarginEnd() const;
72− void setDisplayMarginEnd(qreal);
76− void delegateChanged();
77− void columnSpacingChanged();
78− void rowSpacingChanged();
79− void cacheBufferChanged();
80− void displayMarginBeginningChanged();
81− void displayMarginEndChanged();
87− void updatePolish() override;
88− void componentComplete() override;
90− void releaseItem(QQuickItem *item);
91− void setImplicitHeightDirty();
94− void itemCreated(int modelIndex, QObject *object);
95− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);
96− void onHeightChanged();
99− void createDelegateModel();
101− bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);
102− QQuickItem *createItem(int modelIndex, bool asynchronous);
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− virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
114− QQmlDelegateModel *m_delegateModel;
116− // Index we are waiting because we requested it asynchronously
117− int m_asyncRequestedIndex;
119− int m_columnSpacing;
122− qreal m_displayMarginBeginning;
123− qreal m_displayMarginEnd;
124− bool m_needsRelayout;
125− bool m_delegateValidated;
126− bool m_implicitHeightDirty;
plugins/Dash/graphics/music_progress_bg.pngdeleted
Binary file not shown.
plugins/Dash/horizontaljournal.cppdeleted−242
@@ -1,242 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
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
26−#include "horizontaljournal.h"
28−#include <qqmlengine.h>
29−#pragma GCC diagnostic push
30−#pragma GCC diagnostic ignored "-pedantic"
31−#include <private/qqmldelegatemodel_p.h>
33−#include <private/qquickitem_p.h>
34−#pragma GCC diagnostic pop
36−HorizontalJournal::HorizontalJournal()
37− : m_firstVisibleIndex(-1)
42−qreal HorizontalJournal::rowHeight() const
47−void HorizontalJournal::setRowHeight(qreal rowHeight)
49− if (rowHeight != m_rowHeight) {
50− m_rowHeight = rowHeight;
51− Q_EMIT rowHeightChanged();
53− if (isComponentComplete()) {
54− Q_FOREACH(QQuickItem *item, m_visibleItems) {
55− item->setHeight(rowHeight);
62−void HorizontalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
64− if (m_visibleItems.isEmpty()) {
68− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();
69− if (m_lastInRowIndexPosition.contains(*modelIndex - 1)) {
70− *yPos = m_visibleItems.last()->y() + m_rowHeight + rowSpacing();
72− *yPos = m_visibleItems.last()->y();
77−void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
79− if (m_visibleItems.isEmpty()) {
83− *modelIndex = m_firstVisibleIndex - 1;
84− if (m_lastInRowIndexPosition.contains(*modelIndex)) {
85− *yPos = m_visibleItems.first()->y() - rowSpacing() - m_rowHeight;
87− *yPos = m_visibleItems.first()->y();
92−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
94− bool changed = false;
96− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {
97− releaseItem(m_visibleItems.takeFirst());
99− m_firstVisibleIndex++;
102− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {
103− releaseItem(m_visibleItems.takeLast());
105− m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());
108− if (m_visibleItems.isEmpty()) {
109− m_firstVisibleIndex = -1;
115−void HorizontalJournal::addItemToView(int modelIndex, QQuickItem *item)
117− if (item->height() != m_rowHeight) {
118− qWarning() << "Item" << modelIndex << "height is not the one that the rowHeight mandates, resetting it";
119− item->setHeight(m_rowHeight);
122− if (m_visibleItems.isEmpty()) {
123− Q_ASSERT(modelIndex == 0);
126− m_visibleItems << item;
127− m_firstVisibleIndex = 0;
129− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count()
130− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {
131− QQuickItem *lastItem = m_visibleItems.last();
132− if (lastItem->x() + lastItem->width() + columnSpacing() + item->width() <= width()) {
134− item->setY(lastItem->y());
135− item->setX(lastItem->x() + lastItem->width() + columnSpacing());
138− item->setY(lastItem->y() + m_rowHeight + rowSpacing());
140− m_lastInRowIndexPosition[modelIndex - 1] = lastItem->x();
142− m_visibleItems << item;
143− } else if (modelIndex == m_firstVisibleIndex - 1) {
144− QQuickItem *firstItem = m_visibleItems.first();
145− if (m_lastInRowIndexPosition.contains(modelIndex)) {
146− // It is the last item of its row, so start a new one since we're going back
147− item->setY(firstItem->y() - rowSpacing() - m_rowHeight);
148− item->setX(m_lastInRowIndexPosition[modelIndex]);
150− item->setY(firstItem->y());
151− item->setX(firstItem->x() - columnSpacing() - item->width());
153− m_firstVisibleIndex = modelIndex;
154− m_visibleItems.prepend(item);
156− qWarning() << "HorizontalJournal::addItemToView - Got unexpected modelIndex"
157− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();
162−void HorizontalJournal::cleanupExistingItems()
164− // Cleanup the existing items
165− Q_FOREACH(QQuickItem *item, m_visibleItems)
167− m_visibleItems.clear();
168− m_lastInRowIndexPosition.clear();
169− m_firstVisibleIndex = -1;
170− setImplicitHeightDirty();
173−void HorizontalJournal::calculateImplicitHeight()
175− if (m_firstVisibleIndex >= 0) {
176− const int nIndexes = m_firstVisibleIndex + m_visibleItems.count();
177− const double bottomMostY = m_visibleItems.last()->y() + m_rowHeight;
178− const double averageHeight = bottomMostY / nIndexes;
179− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - nIndexes));
181− setImplicitHeight(0);
185−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
187− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {
188− for (int i = remove.count - 1; i >= 0; --i) {
189− const int indexToRemove = remove.index + i;
190− // We only support removing from the end so
191− // any of the last items of a column has to be indexToRemove
192− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;
193− if (indexToRemove == lastIndex) {
194− releaseItem(m_visibleItems.takeLast());
195− m_lastInRowIndexPosition.remove(indexToRemove);
197− if (indexToRemove < lastIndex) {
198− qDebug() << "HorizontalJournal only supports removal from the end of the model, resetting instead";
199− cleanupExistingItems();
202− setImplicitHeightDirty();
207− if (m_visibleItems.isEmpty()) {
208− m_firstVisibleIndex = -1;
213−void HorizontalJournal::doRelayout()
215− // If m_firstVisibleIndex is not 0 we need to drop all the delegates
216− // since we can't consistently relayout without the first item being there
218− if (m_firstVisibleIndex == 0) {
220− const QList<QQuickItem*> allItems = m_visibleItems;
221− m_visibleItems.clear();
222− m_lastInRowIndexPosition.clear();
223− Q_FOREACH(QQuickItem *item, allItems) {
224− addItemToView(i, item);
228− Q_FOREACH(QQuickItem *item, m_visibleItems) {
231− m_visibleItems.clear();
232− m_lastInRowIndexPosition.clear();
233− m_firstVisibleIndex = -1;
237−void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
239− Q_FOREACH(QQuickItem *item, m_visibleItems) {
240− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);
plugins/Dash/horizontaljournal.hdeleted−63
@@ -1,63 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef HORIZONTALJOURNAL_H
18−#define HORIZONTALJOURNAL_H
20−#include "abstractdashview.h"
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
27− * All delegates are forced to rowHeight if they don't have it.
29− class HorizontalJournal : public AbstractDashView
33− Q_PROPERTY(qreal rowHeight READ rowHeight WRITE setRowHeight NOTIFY rowHeightChanged)
35−friend class HorizontalJournalTest;
40− qreal rowHeight() const;
41− void setRowHeight(qreal rowHeight);
44− void rowHeightChanged();
47− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
48− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
49− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
50− void addItemToView(int modelIndex, QQuickItem *item) override;
51− void cleanupExistingItems() override;
52− void calculateImplicitHeight() override;
53− void doRelayout() override;
54− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
55− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
57− int m_firstVisibleIndex;
58− QList<QQuickItem*> m_visibleItems;
59− QMap<int, double> m_lastInRowIndexPosition;
plugins/Dash/listviewwithpageheader.cppdeleted−1398
@@ -1,1398 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
18− * Some documentation on how this thing works:
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.
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.
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.
39− * * Make sure all items are positioned correctly
40− * * Add/Remove items if needed
41− * * Update the content height if it was dirty
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
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.
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())
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.
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.
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.
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
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.
92−#include "listviewwithpageheader.h"
94−#include <QCoreApplication>
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>
107−qreal ListViewWithPageHeader::ListItem::height() const
109− return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
112−qreal ListViewWithPageHeader::ListItem::y() const
114− return m_item->y() - (m_sectionItem ? m_sectionItem->height() : 0);
117−void ListViewWithPageHeader::ListItem::setY(qreal newY)
119− if (m_sectionItem) {
120− m_sectionItem->setY(newY);
121− m_item->setY(newY + m_sectionItem->height());
127−bool ListViewWithPageHeader::ListItem::culled() const
129− return QQuickItemPrivate::get(m_item)->culled;
132−void ListViewWithPageHeader::ListItem::setCulled(bool culled)
134− QQuickItemPrivate::get(m_item)->setCulled(culled);
136− QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
139−void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
141− m_sectionItem = sectionItem;
144−ListViewWithPageHeader::ListViewWithPageHeader()
145− : m_delegateModel(nullptr)
146− , m_asyncRequestedIndex(-1)
147− , m_delegateValidated(false)
148− , m_firstVisibleIndex(-1)
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)
158− , m_inContentHeightKeepHeaderShown(false)
161− m_clipItem = new QQuickItem(contentItem());
162−// m_clipItem = new QQuickRectangle(contentItem());
163−// ((QQuickRectangle*)m_clipItem)->setColor(Qt::gray);
165− m_contentYAnimation = new QQuickNumberAnimation(this);
166− m_contentYAnimation->setEasing(QEasingCurve::OutQuad);
167− m_contentYAnimation->setProperty(QStringLiteral("contentY"));
168− m_contentYAnimation->setDuration(200);
169− m_contentYAnimation->setTargetObject(this);
171− connect(this, &ListViewWithPageHeader::contentWidthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);
172− connect(this, &ListViewWithPageHeader::contentHeightChanged, this, &ListViewWithPageHeader::onContentHeightChanged);
173− connect(this, &ListViewWithPageHeader::heightChanged, this, &ListViewWithPageHeader::onHeightChanged);
174− connect(m_contentYAnimation, &QQuickNumberAnimation::runningChanged, this, &ListViewWithPageHeader::contentYAnimationRunningChanged);
176− setFlickableDirection(VerticalFlick);
179−ListViewWithPageHeader::~ListViewWithPageHeader()
183−QAbstractItemModel *ListViewWithPageHeader::model() const
185− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
188−void ListViewWithPageHeader::setModel(QAbstractItemModel *model)
190− if (model != this->model()) {
191− if (!m_delegateModel) {
192− createDelegateModel();
194− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
196− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
197− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
198− Q_EMIT modelChanged();
201−// Q_EMIT contentHeightChanged();
202−// Q_EMIT contentYChanged();
206−QQmlComponent *ListViewWithPageHeader::delegate() const
208− return m_delegateModel ? m_delegateModel->delegate() : nullptr;
211−void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
213− if (delegate != this->delegate()) {
214− if (!m_delegateModel) {
215− createDelegateModel();
218− // Cleanup the existing items
219− Q_FOREACH(ListItem *item, m_visibleItems)
221− m_visibleItems.clear();
222− initializeValuesForEmptyList();
224− m_delegateModel->setDelegate(delegate);
226− Q_EMIT delegateChanged();
227− m_delegateValidated = false;
228− m_contentHeightDirty = true;
233−void ListViewWithPageHeader::initializeValuesForEmptyList()
235− m_firstVisibleIndex = -1;
238− m_clipItem->setY(0);
239− if (m_topSectionItem) {
240− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
244−QQuickItem *ListViewWithPageHeader::header() const
246− return m_headerItem;
249−void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)
251− if (m_headerItem != headerItem) {
252− qreal oldHeaderHeight = 0;
253− qreal oldHeaderY = 0;
255− oldHeaderHeight = m_headerItem->height();
256− oldHeaderY = m_headerItem->y();
257− m_headerItem->setParentItem(nullptr);
259− m_headerItem = headerItem;
261− m_headerItem->setParentItem(contentItem());
262− m_headerItem->setZ(1);
263− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();
264− QQuickItemPrivate::get(m_headerItem)->addItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);
266− qreal newHeaderHeight = m_headerItem ? m_headerItem->height() : 0;
267− if (!m_visibleItems.isEmpty() && newHeaderHeight != oldHeaderHeight) {
268− headerHeightChanged(newHeaderHeight, oldHeaderHeight, oldHeaderY);
270− m_contentHeightDirty = true;
272− Q_EMIT headerChanged();
276−QQmlComponent *ListViewWithPageHeader::sectionDelegate() const
278− return m_sectionDelegate;
281−void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)
283− if (delegate != m_sectionDelegate) {
284− // TODO clean existing sections
286− m_sectionDelegate = delegate;
288− m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);
289− m_topSectionItem->setZ(3);
290− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
291− connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);
293− // TODO create sections for existing items
295− Q_EMIT sectionDelegateChanged();
296− Q_EMIT stickyHeaderHeightChanged();
300−QString ListViewWithPageHeader::sectionProperty() const
302− return m_sectionProperty;
305−void ListViewWithPageHeader::setSectionProperty(const QString &property)
307− if (property != m_sectionProperty) {
308− m_sectionProperty = property;
310− updateWatchedRoles();
312− // TODO recreate sections
314− Q_EMIT sectionPropertyChanged();
318−bool ListViewWithPageHeader::forceNoClip() const
320− return m_forceNoClip;
323−void ListViewWithPageHeader::setForceNoClip(bool noClip)
325− if (noClip != m_forceNoClip) {
326− m_forceNoClip = noClip;
328− Q_EMIT forceNoClipChanged();
332−int ListViewWithPageHeader::stickyHeaderHeight() const
334− return m_topSectionItem ? m_topSectionItem->height() : 0;
337−qreal ListViewWithPageHeader::headerItemShownHeight() const
339− return m_headerItemShownHeight;
342−int ListViewWithPageHeader::cacheBuffer() const
344− return m_cacheBuffer;
347−void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
349− if (cacheBuffer < 0) {
350− qmlInfo(this) << "Cannot set a negative cache buffer";
354− if (cacheBuffer != m_cacheBuffer) {
355− m_cacheBuffer = cacheBuffer;
356− Q_EMIT cacheBufferChanged();
361−void ListViewWithPageHeader::positionAtBeginning()
363− if (m_delegateModel->count() <= 0)
366− qreal headerHeight = (m_headerItem ? m_headerItem->height() : 0);
367− if (m_firstVisibleIndex != 0) {
368− // TODO This could be optimized by trying to reuse the interesection
369− // of items that may end up intersecting between the existing
370− // m_visibleItems and the items we are creating in the next loop
371− Q_FOREACH(ListItem *item, m_visibleItems)
373− m_visibleItems.clear();
374− m_firstVisibleIndex = -1;
376− // Create the item 0, it will be already correctly positioned at createItem()
377− m_clipItem->setY(0);
378− ListItem *item = createItem(0, false);
379− // Create the subsequent items
381− qreal pos = item->y() + item->height();
382− const qreal bufferTo = height() + m_cacheBuffer;
383− while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
384− if (!(item = createItem(modelIndex, false)))
386− pos += item->height();
390− m_previousContentY = m_visibleItems.first()->y() - headerHeight;
392− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);
394− // TODO This should not be needed and the code that adjust the m_headerItem position
395− // in viewportMoved() should be enough but in some cases we have not found a way to reproduce
396− // yet the code of viewportMoved() fails so here we make sure that at least if we are calling
397− // positionAtBeginning the header item will be correctly positioned
398− m_headerItem->setY(-m_minYExtent);
402−static inline bool uFuzzyCompare(qreal r1, qreal r2)
404− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
407−void ListViewWithPageHeader::showHeader()
412− const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
413− if (!uFuzzyCompare(to, contentY())) {
414− const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();
415− if (headerShownByItsOwn && m_headerItemShownHeight == 0) {
416− // We are not clipping since we are just at the top of the viewport
417− // but because of the showHeader animation we will need to, so
418− // enable the clipping without logically moving the items
419− m_headerItemShownHeight = m_headerItem->y() + m_headerItem->height() - contentY();
420− if (!m_visibleItems.isEmpty()) {
422− ListItem *firstItem = m_visibleItems.first();
423− firstItem->setY(firstItem->y() - m_headerItemShownHeight);
426− Q_EMIT headerItemShownHeightChanged();
428− m_contentYAnimation->setTo(to);
429− contentYAnimationType = ContentYAnimationShowHeader;
430− m_contentYAnimation->start();
434−int ListViewWithPageHeader::firstCreatedIndex() const
436− return m_firstVisibleIndex;
439−int ListViewWithPageHeader::createdItemCount() const
441− return m_visibleItems.count();
444−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
446− ListItem *item = itemAtIndex(modelIndex);
448− return item->m_item;
453−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)
455− ListItem *listItem = itemAtIndex(modelIndex);
457− return maximizeVisibleArea(listItem, listItem->height());
463−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)
468− ListItem *listItem = itemAtIndex(modelIndex);
470− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));
476−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)
480− const auto listItemY = m_clipItem->y() + listItem->y();
481− if (listItemY > contentY() && listItemY + listItemHeight > contentY() + height()) {
482− // we can scroll the list up to show more stuff
483− const auto to = qMin(listItemY, listItemY + listItemHeight - height());
484− m_contentYAnimation->setTo(to);
485− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
486− m_contentYAnimation->start();
487− } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||
488− (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))
490− // we can scroll the list down to show more stuff
491− auto realVisibleListItemY = listItemY;
492− if (m_topSectionItem) {
493− // If we are showing the top section sticky item and this item doesn't have a section
494− // item we have to make sure to scroll it a bit more so that it is not underlapping
495− // the top section sticky item
496− bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;
497− if (topSectionShown && !listItem->sectionItem()) {
498− realVisibleListItemY -= m_topSectionItem->height();
501− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());
502− m_contentYAnimation->setTo(to);
503− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
504− m_contentYAnimation->start();
511−qreal ListViewWithPageHeader::minYExtent() const
513−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;
514− return m_minYExtent;
517−qreal ListViewWithPageHeader::maxYExtent() const
519− return height() - contentHeight();
522−void ListViewWithPageHeader::componentComplete()
524− if (m_delegateModel)
525− m_delegateModel->componentComplete();
527− QQuickFlickable::componentComplete();
532−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
534− // Check we are not being taken down and don't paint anything
535− // TODO Check if we still need this in 5.2
536− // For reproduction just inifnite loop testDash or testDashContent
537− if (!QQmlEngine::contextForObject(this)->parentContext())
540− QQuickFlickable::viewportMoved(orient);
541−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();
542− const qreal diff = m_previousContentY - contentY();
544− m_previousContentY = contentY();
549−void ListViewWithPageHeader::adjustHeader(qreal diff)
551− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;
553− const auto oldHeaderItemShownHeight = m_headerItemShownHeight;
554− if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {
555− m_headerItem->setHeight(m_headerItem->implicitHeight());
556− // We are going down (but it's not because of the rebound at the end)
557− // (but the header was not shown by it's own position)
558− // or the header is partially shown and we are not doing a maximizeVisibleArea either
559− const bool scrolledUp = m_previousContentY > contentY();
560− const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());
561− const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
562− const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
564− if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {
565− m_headerItemShownHeight = 0;
566− m_headerItem->setY(-m_minYExtent);
567− } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {
568− if (maximizeVisibleAreaRunning && diff > 0) {
569− // If we are maximizing and the header was shown, make sure we hide it
570− m_headerItemShownHeight -= diff;
572− m_headerItemShownHeight += diff;
574− if (uFuzzyCompare(contentY(), -m_minYExtent)) {
575− m_headerItemShownHeight = 0;
577− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());
579− if (m_headerItemShownHeight > 0) {
580− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {
581− m_headerItem->setY(contentY());
582− m_headerItemShownHeight = m_headerItem->height();
584− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);
587− m_headerItem->setY(-m_minYExtent);
590− Q_EMIT headerItemShownHeightChanged();
592− // Stick the header item to the top when dragging down
593− m_headerItem->setY(contentY());
594− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));
596− // We will be changing the clip item, need to accomadate for it
597− // otherwise we move the firstItem down/up twice (unless the
598− // show header animation is running, where we want to keep the viewport stable)
599− if (!showHeaderAnimationRunning) {
600− diff += oldHeaderItemShownHeight - m_headerItemShownHeight;
605− if (!m_visibleItems.isEmpty()) {
607− ListItem *firstItem = m_visibleItems.first();
608− firstItem->setY(firstItem->y() + diff);
609− if (showHeaderAnimationRunning) {
615−void ListViewWithPageHeader::createDelegateModel()
617− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);
618− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &ListViewWithPageHeader::itemCreated);
619− if (isComponentComplete())
620− m_delegateModel->componentComplete();
621− updateWatchedRoles();
624−void ListViewWithPageHeader::refill()
629− if (!isComponentComplete()) {
633− const qreal from = contentY();
634− const qreal to = from + height();
635− const qreal bufferFrom = from - m_cacheBuffer;
636− const qreal bufferTo = to + m_cacheBuffer;
638− bool added = addVisibleItems(from, to, false);
639− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
640− added |= addVisibleItems(bufferFrom, bufferTo, true);
642− if (added || removed) {
643− m_contentHeightDirty = true;
647−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)
652− if (m_delegateModel->count() == 0)
656−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;
660− if (!m_visibleItems.isEmpty()) {
661− modelIndex = m_firstVisibleIndex + m_visibleItems.count();
662− item = m_visibleItems.last();
663− pos = item->y() + item->height() + m_clipItem->y();
665− bool changed = false;
666−// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;
667− while (modelIndex < m_delegateModel->count() && pos <= fillTo) {
668−// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;
669− if (!(item = createItem(modelIndex, asynchronous)))
671− pos += item->height();
678− if (!m_visibleItems.isEmpty()) {
679− modelIndex = m_firstVisibleIndex - 1;
680− item = m_visibleItems.first();
681− pos = item->y() + m_clipItem->y();
683− while (modelIndex >= 0 && pos > fillFrom) {
684−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;
685− if (!(item = createItem(modelIndex, asynchronous)))
687− pos -= item->height();
695−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)
697− QQuickItem *item = listItem->m_item;
698− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);
699− if (flags & QQmlDelegateModel::Destroyed) {
700− item->setParentItem(nullptr);
702− listItem->sectionItem()->deleteLater();
706−void ListViewWithPageHeader::releaseItem(ListItem *listItem)
708− QQuickItemPrivate::get(listItem->m_item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
709− if (listItem->sectionItem()) {
710− QQuickItemPrivate::get(listItem->sectionItem())->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
712− m_itemsToRelease << listItem;
715−void ListViewWithPageHeader::updateWatchedRoles()
717− if (m_delegateModel) {
718− QList<QByteArray> roles;
719− if (!m_sectionProperty.isEmpty())
720− roles << m_sectionProperty.toUtf8();
721− m_delegateModel->setWatchedRoles(roles);
725−QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)
727− if (!m_sectionDelegate)
730− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
732− if (modelIndex > 0) {
733− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
734− if (section == prevSection)
737− if (modelIndex + 1 < model()->rowCount() && !alreadyInserted) {
738− // Already inserted items can't steal next section header
739− const QString nextSection = m_delegateModel->stringValue(modelIndex + 1, m_sectionProperty);
740− if (section == nextSection) {
741− // Steal the section header
742− ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems
744− QQuickItem *sectionItem = nextItem->sectionItem();
745− nextItem->setSectionItem(nullptr);
751− return getSectionItem(section);
754−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString §ionText, bool watchGeometry)
756− QQuickItem *sectionItem = nullptr;
758− QQmlContext *creationContext = m_sectionDelegate->creationContext();
759− QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));
760− context->setContextProperty(QStringLiteral("section"), sectionText);
761− context->setContextProperty(QStringLiteral("delegateIndex"), -1);
762− QObject *nobj = m_sectionDelegate->beginCreate(context);
764− QQml_setParent_noEvent(context, nobj);
765− sectionItem = qobject_cast<QQuickItem *>(nobj);
769− sectionItem->setZ(2);
770− QQml_setParent_noEvent(sectionItem, m_clipItem);
771− sectionItem->setParentItem(m_clipItem);
776− m_sectionDelegate->completeCreate();
778− if (watchGeometry) {
779− QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
785−void ListViewWithPageHeader::updateSectionItem(int modelIndex)
787− ListItem *item = itemAtIndex(modelIndex);
789− const QString sectionText = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
791− bool needSectionHeader = true;
792− // if it is the same section as the previous item need to drop the section
793− if (modelIndex > 0) {
794− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
795− if (sectionText == prevSection) {
796− needSectionHeader = false;
800− if (needSectionHeader) {
801− if (!item->sectionItem()) {
802− item->setSectionItem(getSectionItem(sectionText));
804− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();
805− context->setContextProperty(QStringLiteral("section"), sectionText);
808− if (item->sectionItem()) {
809− item->sectionItem()->deleteLater();
810− item->setSectionItem(nullptr);
816−bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
818−// qDebug() << "ListViewWithPageHeader::removeNonVisibleItems" << bufferFrom << bufferTo;
819− // Do not remove items if we are overshooting up or down, since we'll come back
820− // to the "stable" position and delete/create items without any reason
821− if (contentY() < -m_minYExtent) {
823− } else if (contentY() + height() > contentHeight()) {
826− bool changed = false;
828− bool foundVisible = false;
830− int removedItems = 0;
831− const auto oldFirstVisibleIndex = m_firstVisibleIndex;
832− while (i < m_visibleItems.count()) {
833− ListItem *item = m_visibleItems[i];
834− const qreal pos = item->y() + m_clipItem->y();
835−// qDebug() << i << pos << (pos + item->height()) << bufferFrom << bufferTo;
836− if (pos + item->height() < bufferFrom || pos > bufferTo) {
837−// qDebug() << "Releasing" << i << (pos + item->height() < bufferFrom) << pos + item->height() << bufferFrom << (pos > bufferTo) << pos << bufferTo;
839− m_visibleItems.removeAt(i);
843− if (!foundVisible) {
844− foundVisible = true;
845− const int itemIndex = m_firstVisibleIndex + removedItems + i;
846− m_firstVisibleIndex = itemIndex;
851− if (!foundVisible) {
852− initializeValuesForEmptyList();
854− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
861−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)
863−// qDebug() << "CREATE ITEM" << modelIndex;
864− if (asynchronous && m_asyncRequestedIndex != -1)
867− m_asyncRequestedIndex = -1;
868− QObject* object = m_delegateModel->object(modelIndex, asynchronous);
869− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
872− m_delegateModel->release(object);
873− if (!m_delegateValidated) {
874− m_delegateValidated = true;
875− QObject* delegateObj = delegate();
876− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";
879− m_asyncRequestedIndex = modelIndex;
883−// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;
884− ListItem *listItem = new ListItem;
885− listItem->m_item = item;
886− listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));
887− QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
888− ListItem *prevItem = itemAtIndex(modelIndex - 1);
889− bool lostItem = false; // Is an item that we requested async but because of model changes
890− // it is no longer attached to any of the existing items (has no prev nor next item)
891− // nor is the first item
893− listItem->setY(prevItem->y() + prevItem->height());
895− ListItem *currItem = itemAtIndex(modelIndex);
897− // There's something already in m_visibleItems at out index, meaning this is an insert, so attach to its top
898− listItem->setY(currItem->y() - listItem->height());
900− ListItem *nextItem = itemAtIndex(modelIndex + 1);
902− listItem->setY(nextItem->y() - listItem->height());
903− } else if (modelIndex == 0) {
904− listItem->setY(-m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0));
905− } else if (!m_visibleItems.isEmpty()) {
911− listItem->setCulled(true);
912− releaseItem(listItem);
915− listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());
916− if (m_visibleItems.isEmpty()) {
917− m_visibleItems << listItem;
919− m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);
921− if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {
922− m_firstVisibleIndex = modelIndex;
925− if (listItem->sectionItem()) {
926− QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();
927− context->setContextProperty(QStringLiteral("delegateIndex"), modelIndex);
930− m_contentHeightDirty = true;
936−void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)
938− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
940− qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;
943−// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;
944− // Check we are not being taken down and don't paint anything
945− // TODO Check if we still need this in 5.2
946− // For reproduction just inifnite loop testDash or testDashContent
947− if (!QQmlEngine::contextForObject(this)->parentContext())
950− item->setParentItem(m_clipItem);
951− QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
952− context->setContextProperty(QStringLiteral("ListViewWithPageHeader"), this);
953− context->setContextProperty(QStringLiteral("heightToClip"), QVariant::fromValue<int>(0));
954− if (modelIndex == m_asyncRequestedIndex) {
955− createItem(modelIndex, false);
960−void ListViewWithPageHeader::updateClipItem()
962− m_clipItem->setHeight(height() - m_headerItemShownHeight);
963− m_clipItem->setY(contentY() + m_headerItemShownHeight);
964− m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);
967−void ListViewWithPageHeader::onContentHeightChanged()
972−void ListViewWithPageHeader::onContentWidthChanged()
974− m_clipItem->setWidth(contentItem()->width());
977−void ListViewWithPageHeader::onHeightChanged()
983−void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)
985− // TODO Do something with reset
986−// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
987− const auto oldFirstVisibleIndex = m_firstVisibleIndex;
989− Q_FOREACH(const QQmlChangeSet::Change remove, changeSet.removes()) {
990−// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
991− if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
992− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
993− // If all the items we are removing are either not created or culled
994− // we have to grow down to avoid viewport changing
995− bool growDown = true;
996− for (int i = 0; growDown && i < remove.count; ++i) {
997− const int modelIndex = remove.index + i;
998− ListItem *item = itemAtIndex(modelIndex);
999− if (item && !item->culled()) {
1003− for (int i = remove.count - 1; i >= 0; --i) {
1004− const int visibleIndex = remove.index + i - m_firstVisibleIndex;
1005− if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {
1006− ListItem *item = m_visibleItems[visibleIndex];
1007− // Pass the section item down if needed
1008− if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {
1009− ListItem *nextItem = m_visibleItems[visibleIndex + 1];
1010− if (!nextItem->sectionItem()) {
1011− nextItem->setSectionItem(item->sectionItem());
1012− item->setSectionItem(nullptr);
1016− m_visibleItems.removeAt(visibleIndex);
1020− adjustMinYExtent();
1021− } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {
1022− m_visibleItems.first()->setY(oldFirstValidIndexPos);
1024− if (m_visibleItems.isEmpty()) {
1025− m_firstVisibleIndex = -1;
1027− m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);
1029− } else if (remove.index + remove.count <= m_firstVisibleIndex) {
1030− m_firstVisibleIndex -= remove.count;
1032− for (int i = remove.count - 1; i >= 0; --i) {
1033− const int modelIndex = remove.index + i;
1034− if (modelIndex == m_asyncRequestedIndex) {
1035− m_asyncRequestedIndex = -1;
1036− } else if (modelIndex < m_asyncRequestedIndex) {
1037− m_asyncRequestedIndex--;
1042− Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {
1043−// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
1044− const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
1045− const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
1046− if (insertingInValidIndexes || firstItemWithViewOnTop)
1048− // If the items we are adding won't be really visible
1049− // we grow up instead of down to not change the viewport
1050− bool growUp = false;
1051− if (!firstItemWithViewOnTop) {
1052− for (int i = 0; i < m_visibleItems.count(); ++i) {
1053− if (!m_visibleItems[i]->culled()) {
1054− if (insert.index <= m_firstVisibleIndex + i) {
1062− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
1063− for (int i = insert.count - 1; i >= 0; --i) {
1064− const int modelIndex = insert.index + i;
1065− ListItem *item = createItem(modelIndex, false);
1067− ListItem *firstItem = m_visibleItems.first();
1068− firstItem->setY(firstItem->y() - item->height());
1070− // Adding an item may break a "same section" chain, so check
1071− // if we need adding a new section item
1072− if (m_sectionDelegate) {
1073− ListItem *nextItem = itemAtIndex(modelIndex + 1);
1074− if (nextItem && !nextItem->sectionItem()) {
1075− nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));
1076− if (growUp && nextItem->sectionItem()) {
1077− ListItem *firstItem = m_visibleItems.first();
1078− firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());
1083− if (firstItemWithViewOnTop) {
1084− ListItem *firstItem = m_visibleItems.first();
1085− firstItem->setY(oldFirstValidIndexPos);
1087− adjustMinYExtent();
1088− } else if (insert.index <= m_firstVisibleIndex) {
1089− m_firstVisibleIndex += insert.count;
1092− for (int i = insert.count - 1; i >= 0; --i) {
1093− const int modelIndex = insert.index + i;
1094− if (modelIndex <= m_asyncRequestedIndex) {
1095− m_asyncRequestedIndex++;
1100− Q_FOREACH(const QQmlChangeSet::Change change, changeSet.changes()) {
1101− for (int i = change.start(); i < change.end(); ++i) {
1102− updateSectionItem(i);
1104− // Also update the section header for the next item after the change since it may be influenced
1105− updateSectionItem(change.end());
1108− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
1109− if (m_visibleItems.isEmpty()) {
1110− initializeValuesForEmptyList();
1112− adjustMinYExtent();
1116− for (int i = 0; i < m_visibleItems.count(); ++i) {
1117− ListItem *item = m_visibleItems[i];
1118− if (item->sectionItem()) {
1119− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();
1120− context->setContextProperty(QStringLiteral("delegateIndex"), m_firstVisibleIndex + i);
1126− m_contentHeightDirty = true;
1129−void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)
1131− setInteractive(!running);
1133− m_contentHeightDirty = true;
1138−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
1140− const qreal heightDiff = newGeometry.height() - oldGeometry.height();
1141− if (heightDiff != 0) {
1142− if (!m_visibleItems.isEmpty()) {
1143− ListItem *firstItem = m_visibleItems.first();
1144− const auto prevFirstItemY = firstItem->y();
1145− if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY()) {
1146− firstItem->setY(firstItem->y() - heightDiff);
1147− } else if (item == firstItem->sectionItem()) {
1148− firstItem->setY(firstItem->y() + heightDiff);
1151− if (firstItem->y() != prevFirstItemY) {
1152− adjustMinYExtent();
1157− adjustMinYExtent();
1159− m_contentHeightDirty = true;
1163−void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)
1165− if (item == m_headerItem) {
1166− const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;
1168− adjustHeader(diff);
1169− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();
1172− m_contentHeightDirty = true;
1177−void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)
1179− const qreal heightDiff = newHeaderHeight - oldHeaderHeight;
1180− if (m_headerItemShownHeight > 0) {
1181− // If the header is shown because of the clip
1183− m_headerItemShownHeight += heightDiff;
1184− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);
1186− adjustMinYExtent();
1187− Q_EMIT headerItemShownHeightChanged();
1189− if (oldHeaderY + oldHeaderHeight > contentY()) {
1190− // If the header is shown because its position
1192− ListItem *firstItem = m_visibleItems.first();
1193− firstItem->setY(firstItem->y() + heightDiff);
1196− // If the header is not on screen, just change the start of the list
1197− // so the viewport is not changed
1198− adjustMinYExtent();
1204−void ListViewWithPageHeader::adjustMinYExtent()
1206− if (m_visibleItems.isEmpty() || (contentHeight() + m_minYExtent < height())) {
1209− qreal nonCreatedHeight = 0;
1210− if (m_firstVisibleIndex != 0) {
1211− // Calculate the average height of items to estimate the position of the list start
1212− const int visibleItems = m_visibleItems.count();
1213− qreal visibleItemsHeight = 0;
1214− Q_FOREACH(ListItem *item, m_visibleItems) {
1215− visibleItemsHeight += item->height();
1217− nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
1218−// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;
1220− const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);
1221− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;
1222− if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {
1224− m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);
1229−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const
1231− const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;
1232− if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())
1233− return m_visibleItems[visibleIndexedModelIndex];
1238−void ListViewWithPageHeader::layout()
1244− if (!m_visibleItems.isEmpty()) {
1245− const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;
1246− const qreal visibleTo = contentY() + height() - m_clipItem->y();
1248− qreal pos = m_visibleItems.first()->y();
1250−// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
1251− int firstReallyVisibleItem = -1;
1252− int modelIndex = m_firstVisibleIndex;
1253− Q_FOREACH(ListItem *item, m_visibleItems) {
1254− const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;
1255− item->setCulled(cull);
1257− if (!cull && firstReallyVisibleItem == -1) {
1258− firstReallyVisibleItem = modelIndex;
1259− if (m_topSectionItem) {
1260− // Positing the top section sticky item is a two step process
1261− // First we set it either we cull it (because it doesn't need to be sticked to the top)
1262− // or stick it to the top
1263− // Then after the loop we'll make sure that if there's another section just below it
1264− // pushed the sticky section up to make it disappear
1265− const qreal topSectionStickPos = m_headerItemShownHeight + contentY() - m_clipItem->y();
1266− bool showStickySectionItem;
1267− // We need to show the "top section sticky item" when the position at the "top" of the
1268− // viewport is bigger than the start of the position of the first visible item
1269− // i.e. the first visible item starts before the viewport, or when the first
1270− // visible item starts just at the viewport start and it does not have its own section item
1271− if (topSectionStickPos > pos) {
1272− showStickySectionItem = true;
1273− } else if (topSectionStickPos == pos) {
1274− showStickySectionItem = !item->sectionItem();
1276− showStickySectionItem = false;
1278− if (!showStickySectionItem) {
1279− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
1280− if (item->sectionItem()) {
1281− // This seems it should happen since why would we cull the top section
1282− // if the first visible item has no section header? This only happens briefly
1283− // when increasing the height of a list that is at the bottom, the m_topSectionItem
1284− // gets shown shortly in the next polish call
1285− QQuickItemPrivate::get(item->sectionItem())->setCulled(false);
1288− // Update the top sticky section header
1289− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
1290− QQmlContext *context = QQmlEngine::contextForObject(m_topSectionItem)->parentContext();
1291− context->setContextProperty(QStringLiteral("section"), section);
1293− QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);
1294− m_topSectionItem->setY(topSectionStickPos);
1295− int delegateIndex = modelIndex;
1296− // Look for the first index with this section text
1297− while (delegateIndex > 0) {
1298− const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty);
1299− if (prevSection != section)
1303− context->setContextProperty(QStringLiteral("delegateIndex"), delegateIndex);
1304− if (item->sectionItem()) {
1305− QQuickItemPrivate::get(item->sectionItem())->setCulled(true);
1310− QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();
1311− const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);
1312− if (!cull && pos < clipFrom) {
1313− context->setContextProperty(QStringLiteral("heightToClip"), clipFrom - pos);
1315− context->setContextProperty(QStringLiteral("heightToClip"), QVariant::fromValue<int>(0));
1317−// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;
1318− pos += item->height();
1322− // Second step of section sticky item positioning
1323− // Look at the next section header, check if it's pushing up the sticky one
1324− if (m_topSectionItem) {
1325− if (firstReallyVisibleItem >= 0) {
1326− for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {
1327− ListItem *item = m_visibleItems[i];
1328− if (item->sectionItem()) {
1329− if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {
1330− m_topSectionItem->setY(item->y() - m_topSectionItem->height());
1338− m_inLayout = false;
1341−void ListViewWithPageHeader::updatePolish()
1343− // Check we are not being taken down and don't paint anything
1344− // TODO Check if we still need this in 5.2
1345− // For reproduction just inifnite loop testDash or testDashContent
1346− if (!QQmlEngine::contextForObject(this)->parentContext())
1349− Q_FOREACH(ListItem *item, m_itemsToRelease)
1350− reallyReleaseItem(item);
1351− m_itemsToRelease.clear();
1360− if (m_contentHeightDirty) {
1361− qreal contentHeight;
1362− if (m_visibleItems.isEmpty()) {
1363− contentHeight = m_headerItem ? m_headerItem->height() : 0;
1365− const int modelCount = model()->rowCount();
1366− const int visibleItems = m_visibleItems.count();
1367− const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;
1368− qreal nonCreatedHeight = 0;
1369− if (lastValidIndex != modelCount - 1) {
1370− const int visibleItems = m_visibleItems.count();
1371− qreal visibleItemsHeight = 0;
1372− Q_FOREACH(ListItem *item, m_visibleItems) {
1373− visibleItemsHeight += item->height();
1375− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);
1376− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;
1378− ListItem *item = m_visibleItems.last();
1379− contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();
1380− if (m_firstVisibleIndex != 0) {
1381− // Make sure that if we are shrinking we tell the view we still fit
1382− m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));
1386− m_contentHeightDirty = false;
1387− adjustMinYExtent();
1388− if (contentHeight + m_minYExtent < height()) {
1389− // need this since in the previous call to adjustMinYExtent contentHeight is not set yet
1392− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
1393− setContentHeight(contentHeight);
1394− m_inContentHeightKeepHeaderShown = false;
1398−#include "moc_listviewwithpageheader.cpp"
plugins/Dash/listviewwithpageheader.hdeleted−218
@@ -1,218 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef LISTVIEWWITHPAGEHEADER_H
18−#define LISTVIEWWITHPAGEHEADER_H
20−#include <private/qquickitemchangelistener_p.h>
21−#include <private/qquickflickable_p.h>
23−class QAbstractItemModel;
24−class QQuickNumberAnimation;
26−class QQmlDelegateModel;
30− Note for users of this class
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
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
43− By not having the second async we get a better sizing when the delegate is created and things work better
46−class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeListener
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)
59− friend class ListViewWithPageHeaderTest;
60− friend class ListViewWithPageHeaderTestSection;
61− friend class ListViewWithPageHeaderTestExternalModel;
64− ListViewWithPageHeader();
65− ~ListViewWithPageHeader();
67− QAbstractItemModel *model() const;
68− void setModel(QAbstractItemModel *model);
70− QQmlComponent *delegate() const;
71− void setDelegate(QQmlComponent *delegate);
73− QQuickItem *header() const;
74− void setHeader(QQuickItem *header);
76− QQmlComponent *sectionDelegate() const;
77− void setSectionDelegate(QQmlComponent *delegate);
79− QString sectionProperty() const;
80− void setSectionProperty(const QString &property);
82− bool forceNoClip() const;
83− void setForceNoClip(bool noClip);
85− int stickyHeaderHeight() const;
86− qreal headerItemShownHeight() const;
88− int cacheBuffer() const;
89− void setCacheBuffer(int cacheBuffer);
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;
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);
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();
115− void componentComplete() override;
116− void viewportMoved(Qt::Orientations orient) override;
117− qreal minYExtent() const override;
118− qreal maxYExtent() const override;
119− void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;
120− void itemImplicitHeightChanged(QQuickItem *item) override;
121− void updatePolish() override;
124− void itemCreated(int modelIndex, QObject *object);
125− void onContentHeightChanged();
126− void onContentWidthChanged();
127− void onHeightChanged();
128− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);
129− void contentYAnimationRunningChanged(bool running);
135− qreal height() const;
138− void setY(qreal newY);
140− bool culled() const;
141− void setCulled(bool culled);
143− QQuickItem *sectionItem() const { return m_sectionItem; }
144− void setSectionItem(QQuickItem *sectionItem);
148− QQuickItem *m_sectionItem;
151− bool maximizeVisibleArea(ListItem *listItem, int listItemHeight);
153− void createDelegateModel();
157− bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);
158− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
159− ListItem *createItem(int modelIndex, bool asynchronous);
161− void adjustHeader(qreal diff);
162− void adjustMinYExtent();
163− void updateClipItem();
164− void headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY);
165− ListItem *itemAtIndex(int modelIndex) const; // Returns the item at modelIndex if has been created
166− void releaseItem(ListItem *item);
167− void reallyReleaseItem(ListItem *item);
168− void updateWatchedRoles();
169− QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);
170− QQuickItem *getSectionItem(const QString §ionText, bool watchGeometry = true);
171− void updateSectionItem(int modelIndex);
172− void initializeValuesForEmptyList();
174− QQmlDelegateModel *m_delegateModel;
176− // Index we are waiting because we requested it asynchronously
177− int m_asyncRequestedIndex;
179− // Used to only give a warning once if the delegate does not return objects
180− bool m_delegateValidated;
182− // Visible indexes, [0] is m_firstValidIndex, [0+1] is m_firstValidIndex +1, ...
183− QList<ListItem *> m_visibleItems;
184− int m_firstVisibleIndex;
188− QQuickItem *m_clipItem;
190− // If any of the heights has changed
191− // or new items have been added/removed
192− bool m_contentHeightDirty;
194− QQuickItem *m_headerItem;
195− qreal m_previousContentY;
196− qreal m_previousHeaderImplicitHeight;
197− qreal m_headerItemShownHeight; // The height of header shown when the header is shown outside its topmost position
198− // i.e. it's being shown after dragging down in the middle of the list
199− enum ContentYAnimationType { ContentYAnimationShowHeader, ContentYAnimationMaximizeVisibleArea };
200− ContentYAnimationType contentYAnimationType;
201− QQuickNumberAnimation *m_contentYAnimation;
203− QQmlComponent *m_sectionDelegate;
204− QString m_sectionProperty;
205− QQuickItem *m_topSectionItem;
209− bool m_inContentHeightKeepHeaderShown;
212− // Qt 5.0 doesn't like releasing the items just after itemCreated
213− // so we delay the releasing until the next updatePolish
214− QList<ListItem *> m_itemsToRelease;
plugins/Dash/organicgrid.cppdeleted−260
@@ -1,260 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "organicgrid.h"
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
21−#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
24−OrganicGrid::OrganicGrid()
25− : m_firstVisibleIndex(-1)
26− , m_numberOfModulesPerRow(-1)
30−QSizeF OrganicGrid::smallDelegateSize() const
32− return m_smallDelegateSize;
35−void OrganicGrid::setSmallDelegateSize(const QSizeF size)
37− if (m_smallDelegateSize != size) {
38− m_smallDelegateSize = size;
39− Q_EMIT smallDelegateSizeChanged();
41− if (isComponentComplete()) {
47−QSizeF OrganicGrid::bigDelegateSize() const
49− return m_bigDelegateSize;
52−void OrganicGrid::setBigDelegateSize(const QSizeF size)
54− if (m_bigDelegateSize != size) {
55− m_bigDelegateSize = size;
56− Q_EMIT bigDelegateSizeChanged();
58− if (isComponentComplete()) {
64−QPointF OrganicGrid::positionForIndex(int modelIndex) const
66− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();
67− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();
68− const int itemsPerRow = m_numberOfModulesPerRow * 6;
69− const int rowIndex = floor(modelIndex / itemsPerRow);
70− const int columnIndex = floor((modelIndex - rowIndex * itemsPerRow) / 6);
72− qreal yPos = (moduleHeight + rowSpacing()) * rowIndex;
73− const int moduleIndex = modelIndex % 6;
74− if (moduleIndex == 2) {
75− yPos += m_smallDelegateSize.height() + rowSpacing();
76− } else if (moduleIndex == 3 || moduleIndex == 5) {
77− yPos += m_bigDelegateSize.height() + rowSpacing();
80− qreal xPos = (moduleWidth + columnSpacing()) * columnIndex;
81− if (moduleIndex == 1) {
82− xPos += m_smallDelegateSize.width() + columnSpacing();
83− } else if (moduleIndex == 3) {
84− xPos += m_bigDelegateSize.width() + columnSpacing();
85− } else if (moduleIndex == 4) {
86− xPos += (m_smallDelegateSize.width() + columnSpacing()) * 2;
87− } else if (moduleIndex == 5) {
88− xPos += m_bigDelegateSize.width() + m_smallDelegateSize.width() + columnSpacing() * 2;
91− return QPointF(xPos, yPos);
94−QSizeF OrganicGrid::sizeForIndex(int modelIndex) const
96− const int moduleIndex = modelIndex % 6;
97− if (moduleIndex == 0 || moduleIndex == 1 || moduleIndex == 3 || moduleIndex == 5) {
98− return m_smallDelegateSize;
100− return m_bigDelegateSize;
104−void OrganicGrid::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
106− if (m_visibleItems.isEmpty()) {
110− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();
111− // We create stuff in a 6-module basis, so always return back
112− // the y position of the first item
113− const int firstModuleIndex = ((*modelIndex) / 6) * 6;
114− *yPos = positionForIndex(firstModuleIndex).y();
118−void OrganicGrid::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
120− if (m_visibleItems.isEmpty()) {
124− *modelIndex = m_firstVisibleIndex - 1;
125− // We create stuff in a 6-module basis, so always return back
126− // the y position of the last item bottom
127− const int lastModuleIndex = ((*modelIndex) / 6) * 6 + 5;
128− *yPos = positionForIndex(lastModuleIndex).y();
129− *yPos += sizeForIndex(lastModuleIndex).height();
133−void OrganicGrid::addItemToView(int modelIndex, QQuickItem *item)
135− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count() or the first
136− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {
137− m_visibleItems << item;
138− } else if (modelIndex == m_firstVisibleIndex - 1) {
139− m_firstVisibleIndex = modelIndex;
140− m_visibleItems.prepend(item);
141− } else if (modelIndex == 0) {
142− m_firstVisibleIndex = 0;
143− m_visibleItems << item;
145− qWarning() << "OrganicGrid::addItemToView - Got unexpected modelIndex"
146− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();
150− const QPointF pos = positionForIndex(modelIndex);
151− item->setPosition(pos);
153− item->setSize(sizeForIndex(modelIndex));
156−bool OrganicGrid::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
158− bool changed = false;
160− // As adding, we also remove in a 6-module basis
161− int lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;
162− bool removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;
163− while (removeIndex && !m_visibleItems.isEmpty()) {
164− releaseItem(m_visibleItems.takeFirst());
166− m_firstVisibleIndex++;
168− lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;
169− removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;
172− int firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;
173− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;
174− while (removeIndex && !m_visibleItems.isEmpty()) {
175− releaseItem(m_visibleItems.takeLast());
178− firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;
179− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;
182− if (m_visibleItems.isEmpty()) {
183− m_firstVisibleIndex = -1;
189−void OrganicGrid::cleanupExistingItems()
191− Q_FOREACH(QQuickItem *item, m_visibleItems)
193− m_visibleItems.clear();
194− m_firstVisibleIndex = -1;
195− setImplicitHeightDirty();
198−void OrganicGrid::doRelayout()
200− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();
201− m_numberOfModulesPerRow = floor((width() + columnSpacing()) / (moduleWidth + columnSpacing()));
202− m_numberOfModulesPerRow = qMax(1, m_numberOfModulesPerRow);
204− int i = m_firstVisibleIndex;
205− const QList<QQuickItem*> allItems = m_visibleItems;
206− m_visibleItems.clear();
207− Q_FOREACH(QQuickItem *item, allItems) {
208− addItemToView(i, item);
213−void OrganicGrid::updateItemCulling(qreal visibleFromY, qreal visibleToY)
215− Q_FOREACH(QQuickItem *item, m_visibleItems) {
216− QQuickItemPrivate::get(item)->setCulled(item->y() + item->height() <= visibleFromY || item->y() >= visibleToY);
220−void OrganicGrid::calculateImplicitHeight()
222− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();
223− const int itemCount = !model() ? 0 : model()->rowCount();
224− const int itemsPerRow = m_numberOfModulesPerRow * 6;
225− const int fullRows = floor(itemCount / itemsPerRow);
226− const qreal fullRowsHeight = fullRows == 0 ? 0 : fullRows * moduleHeight + rowSpacing() * (fullRows - 1);
228− const int remainingItems = itemCount - fullRows * itemsPerRow;
229− if (remainingItems == 0) {
230− setImplicitHeight(fullRowsHeight);
231− } else if (remainingItems <= 2) {
232− setImplicitHeight(fullRowsHeight + m_smallDelegateSize.height() + rowSpacing());
234− setImplicitHeight(fullRowsHeight + rowSpacing() + moduleHeight);
238−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
240− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {
241− for (int i = remove.count - 1; i >= 0; --i) {
242− const int indexToRemove = remove.index + i;
243− // We only support removing from the end
244− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;
245− if (indexToRemove == lastIndex) {
246− releaseItem(m_visibleItems.takeLast());
248− if (indexToRemove < lastIndex) {
249− qDebug() << "OrganicGrid only supports removal from the end of the model, resetting instead";
250− cleanupExistingItems();
256− if (m_visibleItems.isEmpty()) {
257− m_firstVisibleIndex = -1;
259− setImplicitHeightDirty();
plugins/Dash/organicgrid.hdeleted−91
@@ -1,91 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
20−#include "abstractdashview.h"
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).
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.
30− * +---+ +---+ +-----+
37− * +-----+ +---+ +---+
39− * Modules are positioned one after the other in a grid like fashion, i.e.
49−class OrganicGrid : public AbstractDashView
53− Q_PROPERTY(QSizeF smallDelegateSize READ smallDelegateSize WRITE setSmallDelegateSize NOTIFY smallDelegateSizeChanged)
54− Q_PROPERTY(QSizeF bigDelegateSize READ bigDelegateSize WRITE setBigDelegateSize NOTIFY bigDelegateSizeChanged)
56−friend class OrganicGridTest;
61− QSizeF smallDelegateSize() const;
62− void setSmallDelegateSize(const QSizeF size);
64− QSizeF bigDelegateSize() const;
65− void setBigDelegateSize(const QSizeF size);
68− void smallDelegateSizeChanged();
69− void bigDelegateSizeChanged();
71− QPointF positionForIndex(int modelIndex) const;
72− QSizeF sizeForIndex(int modelIndex) const;
74− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
75− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
76− void addItemToView(int modelIndex, QQuickItem *item) override;
77− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
78− void cleanupExistingItems() override;
79− void doRelayout() override;
80− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
81− void calculateImplicitHeight() override;
82− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
84− QSizeF m_smallDelegateSize;
85− QSizeF m_bigDelegateSize;
86− int m_firstVisibleIndex;
87− int m_numberOfModulesPerRow;
88− QList<QQuickItem*> m_visibleItems;
plugins/Dash/plugin.cppdeleted−70
@@ -1,70 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
20−#include "horizontaljournal.h"
21−#include "listviewwithpageheader.h"
22−#include "organicgrid.h"
23−#include "verticaljournal.h"
25−#include <QAbstractItemModel>
28−static QUrl oauthCleanedUrl(QUrl u)
31− q.removeQueryItem(QStringLiteral("oauth_nonce"));
32− q.removeQueryItem(QStringLiteral("oauth_timestamp"));
33− q.removeQueryItem(QStringLiteral("oauth_consumer_key"));
34− q.removeQueryItem(QStringLiteral("oauth_signature_method"));
35− q.removeQueryItem(QStringLiteral("oauth_version"));
36− q.removeQueryItem(QStringLiteral("oauth_signature"));
41−class AudioComparer : public QObject
45− Q_INVOKABLE bool compare(const QUrl &url1, const QUrl &url2)
47− return oauthCleanedUrl(url1) == oauthCleanedUrl(url2);
51−static QObject *audio_comparer_singleton_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
54− Q_UNUSED(scriptEngine)
56− return new AudioComparer();
59−void DashPlugin::registerTypes(const char *uri)
61− Q_ASSERT(uri == QLatin1String("Dash"));
62− qmlRegisterType<QAbstractItemModel>();
63− qmlRegisterType<HorizontalJournal>(uri, 0, 1, "HorizontalJournal");
64− qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");
65− qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");
66− qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");
67− qmlRegisterSingletonType<AudioComparer>(uri, 0, 1, "AudioUrlComparer", audio_comparer_singleton_provider);
plugins/Dash/qmldirdeleted−11
@@ -1,11 +0,0 @@
4−singleton CardCreatorCache 0.1 CardCreatorCache.qml
5−singleton DashAudioPlayer 0.1 DashAudioPlayer.qml
6−ScopeStyle 0.1 ScopeStyle.qml
7−CardAttributes 0.1 CardAttributes.qml
8−CardSocialActions 0.1 CardSocialActions.qml
9−CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml
10−AudioProgressBar 0.1 AudioProgressBar.qml
11−CardAudioProgress 0.1 CardAudioProgress.qml
plugins/Dash/verticaljournal.cppdeleted−273
@@ -1,273 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
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
28−#include "verticaljournal.h"
30−#pragma GCC diagnostic push
31−#pragma GCC diagnostic ignored "-pedantic"
32−#include <private/qquickitem_p.h>
33−#pragma GCC diagnostic pop
35−VerticalJournal::VerticalJournal()
40−qreal VerticalJournal::columnWidth() const
42− return m_columnWidth;
45−void VerticalJournal::setColumnWidth(qreal columnWidth)
47− if (columnWidth != m_columnWidth) {
48− m_columnWidth = columnWidth;
49− Q_EMIT columnWidthChanged();
51− if (isComponentComplete()) {
52− Q_FOREACH(const auto &column, m_columnVisibleItems) {
53− Q_FOREACH(const ViewItem item, column) {
54− item.m_item->setWidth(columnWidth);
62−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
65− *yPos = std::numeric_limits<qreal>::max();
67− Q_FOREACH(const auto &column, m_columnVisibleItems) {
68− if (!column.isEmpty()) {
69− const ViewItem &item = column.last();
70− *yPos = qMin(*yPos, item.y() + item.height() + rowSpacing());
71− *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);
78−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
81− *yPos = std::numeric_limits<qreal>::lowest();
82− int columnToAddTo = -1;
84− // Find the topmost free column
85− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
86− const auto &column = m_columnVisibleItems[i];
87− if (!column.isEmpty()) {
88− const ViewItem &item = column.first();
89− const auto itemTopPos = item.y() - rowSpacing();
90− if (itemTopPos > *yPos) {
92− *modelIndex = item.m_modelIndex - 1;
98− if (*modelIndex > 0) {
99− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));
100− while (m_indexColumnMap[*modelIndex] != columnToAddTo) {
101− // We found out that we have to add to columnToAddTo
102− // and thought that we had to add *modelIndex, but history tells
103− // it is not correct, so find up from *modelIndex until we found the index
104− // that has to end up in columnToAddTo
105− *modelIndex = *modelIndex - 1;
106− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));
111−bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
113− bool changed = false;
115− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
116− QList<ViewItem> &column = m_columnVisibleItems[i];
117− while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {
118− releaseItem(column.takeFirst().m_item);
122− while (!column.isEmpty() && column.last().y() > bufferToY) {
123− releaseItem(column.takeLast().m_item);
131−void VerticalJournal::addItemToView(int modelIndex, QQuickItem *item)
133− if (item->width() != m_columnWidth) {
134− qWarning() << "Item" << modelIndex << "width is not the one that the columnWidth mandates, resetting it";
135− item->setWidth(m_columnWidth);
138− // Check if we add it to the bottom of existing column items
139− const QList<ViewItem> &firstColumn = m_columnVisibleItems[0];
140− qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : -rowSpacing();
141− int columnToAddTo = 0;
142− for (int i = 1; i < m_columnVisibleItems.count(); ++i) {
143− const QList<ViewItem> &column = m_columnVisibleItems[i];
144− const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : -rowSpacing();
145− if (iY < columnToAddY) {
151− const QList<ViewItem> &columnToAdd = m_columnVisibleItems[columnToAddTo];
152− if (columnToAdd.isEmpty() || columnToAdd.last().m_modelIndex < modelIndex) {
153− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));
154− item->setY(columnToAddY + rowSpacing());
156− m_columnVisibleItems[columnToAddTo] << ViewItem(item, modelIndex);
157− m_indexColumnMap[modelIndex] = columnToAddTo;
159− Q_ASSERT(m_indexColumnMap.contains(modelIndex));
160− columnToAddTo = m_indexColumnMap[modelIndex];
161− columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();
163− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));
164− item->setY(columnToAddY - rowSpacing() - item->height());
166− m_columnVisibleItems[columnToAddTo].prepend(ViewItem(item, modelIndex));
170−void VerticalJournal::cleanupExistingItems()
172− // Cleanup the existing items
173− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {
174− QList<ViewItem> &column = m_columnVisibleItems[i];
175− Q_FOREACH(const ViewItem item, column)
176− releaseItem(item.m_item);
179− m_indexColumnMap.clear();
180− setImplicitHeightDirty();
183−void VerticalJournal::calculateImplicitHeight()
185− int lastModelIndex = -1;
186− qreal bottomMostY = 0;
187− Q_FOREACH(const auto &column, m_columnVisibleItems) {
188− if (!column.isEmpty()) {
189− const ViewItem &item = column.last();
190− lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);
191− bottomMostY = qMax(bottomMostY, item.y() + item.height());
194− if (lastModelIndex >= 0) {
195− const double averageHeight = bottomMostY / (lastModelIndex + 1);
196− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));
198− setImplicitHeight(0);
202−void VerticalJournal::doRelayout()
204− QList<ViewItem> allItems;
205− Q_FOREACH(const auto &column, m_columnVisibleItems)
210− const int nColumns = qMax(1., floor((double)(width() + columnSpacing()) / (m_columnWidth + columnSpacing())));
211− m_columnVisibleItems.resize(nColumns);
212− m_indexColumnMap.clear();
213− for (int i = 0; i < nColumns; ++i)
214− m_columnVisibleItems[i].clear();
216− // If the first of allItems doesn't contain index 0 we need to drop them
217− // all since we can't consistently relayout without the first item being there
219− if (!allItems.isEmpty()) {
220− if (allItems.first().m_modelIndex == 0) {
221− Q_FOREACH(const ViewItem item, allItems)
222− addItemToView(item.m_modelIndex, item.m_item);
224− Q_FOREACH(const ViewItem item, allItems)
225− releaseItem(item.m_item);
230−void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
232− Q_FOREACH(const auto &column, m_columnVisibleItems) {
233− Q_FOREACH(const ViewItem item, column) {
234− const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;
235− QQuickItemPrivate::get(item.m_item)->setCulled(cull);
240−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
242− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {
243− for (int i = remove.count - 1; i >= 0; --i) {
244− const int indexToRemove = remove.index + i;
245− // Since we only support removing from the end, indexToRemove
246− // must refer to the last item of one of the columns or
247− // be bigger than them (because it's not in the viewport and
248− // thus we have not created a delegate for it)
250− int lastCreatedIndex = INT_MIN;
251− for (int i = 0; !found && i < m_columnVisibleItems.count(); ++i) {
252− QList<ViewItem> &column = m_columnVisibleItems[i];
253− if (!column.isEmpty()) {
254− const int lastColumnIndex = column.last().m_modelIndex;
255− if (lastColumnIndex == indexToRemove) {
256− releaseItem(column.takeLast().m_item);
259− lastCreatedIndex = qMax(lastCreatedIndex, lastColumnIndex);
263− if (indexToRemove < lastCreatedIndex) {
264− qDebug() << "VerticalJournal only supports removal from the end of the model, resetting instead";
265− cleanupExistingItems();
268− setImplicitHeightDirty();
plugins/Dash/verticaljournal.hdeleted−100
@@ -1,100 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef VERTICALJOURNAL_H
18−#define VERTICALJOURNAL_H
20−#include "abstractdashview.h"
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.
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.
30− * All delegates are forced to columnWidth if they don't have it.
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.
40− * +-----+ +-----+ +-----+
43− * | 1 | +-----+ | 3 |
46− * +-----+ | 4 | +-----+
54−class VerticalJournal : public AbstractDashView
58− Q_PROPERTY(qreal columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged)
60−friend class VerticalJournalTest;
65− qreal columnWidth() const;
66− void setColumnWidth(qreal columnWidth);
69− void columnWidthChanged();
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; }
85− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
86− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
87− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
88− void addItemToView(int modelIndex, QQuickItem *item) override;
89− void cleanupExistingItems() override;
90− void calculateImplicitHeight() override;
91− void doRelayout() override;
92− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
95− QVector<QList<ViewItem>> m_columnVisibleItems;
96− QHash<int, int> m_indexColumnMap;
plugins/GlobalShortcut/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(globalshortcutplugin_SRCS
6add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
6add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
8−qt5_use_modules(GlobalShortcut-qml Quick Gui)
8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)
10add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
10add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
plugins/GlobalShortcut/GlobalShortcut.qmltypesdeleted−31
@@ -1,31 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable GlobalShortcut 1.0 plugins'
11− name: "GlobalShortcut"
12− defaultProperty: "data"
13− prototype: "QQuickItem"
14− exports: ["GlobalShortcut/GlobalShortcut 1.0"]
15− exportMetaObjectRevisions: [0]
16− Property { name: "shortcut"; type: "QVariant" }
17− Property { name: "active"; type: "bool" }
19− name: "shortcutChanged"
20− Parameter { name: "shortcut"; type: "QVariant" }
24− Parameter { name: "shortcut"; type: "string" }
27− name: "activeChanged"
28− Parameter { name: "active"; type: "bool" }
plugins/GlobalShortcut/globalshortcut.cpp+15−4
@@ -58,15 +58,26 @@ void GlobalShortcut::setActive(bool active)
59void GlobalShortcut::componentComplete()
59void GlobalShortcut::componentComplete()
61+ if (this->window()) {
62+ QMetaObject::invokeMethod(this, "setupFilterOnWindow", Q_ARG(QQuickWindow*, this->window()));
61 connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);
64 connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);
64void GlobalShortcut::keyPressEvent(QKeyEvent * event)
67void GlobalShortcut::keyPressEvent(QKeyEvent * event)
67− if (m_active) {
69+ if (!m_active) return;
68− Q_EMIT triggered(m_shortcut.toString());
72+ Q_EMIT triggered(m_shortcut.toString());
75+void GlobalShortcut::keyReleaseEvent(QKeyEvent * event)
77+ if (!m_active) return;
80+ Q_EMIT released(m_shortcut.toString());
72void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)
83void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)
plugins/GlobalShortcut/globalshortcut.h+5
@@ -55,6 +55,7 @@ public:
56 void componentComplete() override;
56 void componentComplete() override;
57 void keyPressEvent(QKeyEvent * event) override;
57 void keyPressEvent(QKeyEvent * event) override;
58+ void keyReleaseEvent(QKeyEvent * event) override;
60 void shortcutChanged(const QVariant &shortcut);
61 void shortcutChanged(const QVariant &shortcut);
@@ -62,6 +63,10 @@ Q_SIGNALS:
62 * Emitted when a global keypress of @p shortcut is detected
63 * Emitted when a global keypress of @p shortcut is detected
64 void triggered(const QString &shortcut);
65 void triggered(const QString &shortcut);
67+ * Emitted when a global keypress of @p shortcut is released
69+ void released(const QString &shortcut);
65 void activeChanged(bool active);
70 void activeChanged(bool active);
67private Q_SLOTS:
72private Q_SLOTS:
plugins/GlobalShortcut/globalshortcutregistry.cpp+14−4
@@ -73,20 +73,30 @@ bool GlobalShortcutRegistry::eventFilter(QObject *obj, QEvent *event)
73 Q_ASSERT(m_filteredWindow);
73 Q_ASSERT(m_filteredWindow);
74 Q_ASSERT(obj == static_cast<QObject*>(m_filteredWindow.data()));
74 Q_ASSERT(obj == static_cast<QObject*>(m_filteredWindow.data()));
76− if (event->type() == QEvent::KeyPress) {
76+ if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
77 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
78 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
80+ // Make a copy of the event so we don't alter it for passing on.
81+ QKeyEvent eCopy(keyEvent->type(),
83+ keyEvent->modifiers(),
85+ keyEvent->isAutoRepeat(),
78 int seq = keyEvent->key() + keyEvent->modifiers();
89 int seq = keyEvent->key() + keyEvent->modifiers();
79 if (m_shortcuts.contains(seq)) {
90 if (m_shortcuts.contains(seq)) {
80 const auto shortcuts = m_shortcuts.value(seq);
91 const auto shortcuts = m_shortcuts.value(seq);
81 Q_FOREACH(const auto &shortcut, shortcuts) {
92 Q_FOREACH(const auto &shortcut, shortcuts) {
82 if (shortcut) {
93 if (shortcut) {
83− qApp->sendEvent(shortcut, keyEvent);
94+ qApp->sendEvent(shortcut, &eCopy);
89− return event->isAccepted();
99+ return eCopy.isAccepted();
92 return QObject::eventFilter(obj, event);
102 return QObject::eventFilter(obj, event);
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−3
@@ -1,4 +1,3 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4add_definitions(-DSM_BUSNAME=systemBus)
3add_definitions(-DSM_BUSNAME=systemBus)
@@ -30,8 +29,7 @@ add_library(UnityLauncherAS-qml MODULE
30target_link_libraries(UnityLauncherAS-qml
29target_link_libraries(UnityLauncherAS-qml
31 unity8-private
30 unity8-private
32 ${GSETTINGS_QT_LDFLAGS}
31 ${GSETTINGS_QT_LDFLAGS}
32+ Qt5::DBus Qt5::Qml Qt5::Gui
35−qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)
37add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
35add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
plugins/Greeter/Unity/Launcher/Launcher.qmltypesdeleted−182
@@ -1,182 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'
12− prototype: "unity::shell::launcher::LauncherItemInterface"
13− exports: ["Unity.Launcher/LauncherItem 0.1"]
15− exportMetaObjectRevisions: [0]
18− name: "LauncherModel"
19− prototype: "unity::shell::launcher::LauncherModelInterface"
20− exports: ["Unity.Launcher/LauncherModel 0.1"]
23− exportMetaObjectRevisions: [0]
25− name: "requestRemove"
26− Parameter { name: "appId"; type: "string" }
28− Method { name: "refresh" }
31− type: "unity::shell::launcher::LauncherItemInterface*"
32− Parameter { name: "index"; type: "int" }
36− Parameter { name: "oldIndex"; type: "int" }
37− Parameter { name: "newIndex"; type: "int" }
41− Parameter { name: "appId"; type: "string" }
42− Parameter { name: "index"; type: "int" }
46− Parameter { name: "appId"; type: "string" }
49− name: "quickListActionInvoked"
50− Parameter { name: "appId"; type: "string" }
51− Parameter { name: "actionIndex"; type: "int" }
55− Parameter { name: "username"; type: "string" }
58− name: "getUrlForAppId"
60− Parameter { name: "appId"; type: "string" }
64− name: "QuickListModel"
65− prototype: "unity::shell::launcher::QuickListModelInterface"
66− exports: ["Unity.Launcher/QuickListModel 0.1"]
68− exportMetaObjectRevisions: [0]
71− name: "unity::shell::launcher::LauncherItemInterface"
73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
75− exportMetaObjectRevisions: [0]
76− Property { name: "appId"; type: "string"; isReadonly: true }
77− Property { name: "name"; type: "string"; isReadonly: true }
78− Property { name: "icon"; type: "string"; isReadonly: true }
79− Property { name: "pinned"; type: "bool"; isReadonly: true }
80− Property { name: "running"; type: "bool"; isReadonly: true }
81− Property { name: "recent"; type: "bool"; isReadonly: true }
82− Property { name: "progress"; type: "int"; isReadonly: true }
83− Property { name: "count"; type: "int"; isReadonly: true }
84− Property { name: "countVisible"; type: "bool"; isReadonly: true }
85− Property { name: "focused"; type: "bool"; isReadonly: true }
88− type: "unity::shell::launcher::QuickListModelInterface"
94− Parameter { name: "name"; type: "string" }
98− Parameter { name: "icon"; type: "string" }
101− name: "pinnedChanged"
102− Parameter { name: "pinned"; type: "bool" }
105− name: "runningChanged"
106− Parameter { name: "running"; type: "bool" }
109− name: "recentChanged"
110− Parameter { name: "running"; type: "bool" }
113− name: "progressChanged"
114− Parameter { name: "progress"; type: "int" }
117− name: "countChanged"
118− Parameter { name: "count"; type: "int" }
121− name: "countVisibleChanged"
122− Parameter { name: "countVisible"; type: "bool" }
125− name: "focusedChanged"
126− Parameter { name: "focused"; type: "bool" }
130− name: "unity::shell::launcher::LauncherModelInterface"
131− prototype: "QAbstractListModel"
132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
134− exportMetaObjectRevisions: [0]
136− name: "applicationManager"
137− type: "unity::shell::application::ApplicationManagerInterface"
140− Property { name: "onlyPinned"; type: "bool" }
141− Signal { name: "hint" }
144− Parameter { name: "oldIndex"; type: "int" }
145− Parameter { name: "newIndex"; type: "int" }
149− type: "unity::shell::launcher::LauncherItemInterface*"
150− Parameter { name: "index"; type: "int" }
154− Parameter { name: "appId"; type: "string" }
155− Parameter { name: "index"; type: "int" }
159− Parameter { name: "appId"; type: "string" }
162− name: "requestRemove"
163− Parameter { name: "appId"; type: "string" }
166− name: "quickListActionInvoked"
167− Parameter { name: "appId"; type: "string" }
168− Parameter { name: "actionIndex"; type: "int" }
172− Parameter { name: "username"; type: "string" }
176− name: "unity::shell::launcher::QuickListModelInterface"
177− prototype: "QAbstractListModel"
178− exports: ["Unity.Launcher/QuickListInterface 0.1"]
180− exportMetaObjectRevisions: [0]
plugins/Greeter/Unity/Launcher/launcheritem.cpp+19
@@ -76,6 +76,25 @@ void LauncherItem::setIcon(const QString &icon)
79+QStringList LauncherItem::keywords() const
84+void LauncherItem::setKeywords(const QStringList &keywords)
86+ if (m_keywords != keywords) {
87+ m_keywords = keywords;
88+ Q_EMIT keywordsChanged(keywords);
92+uint LauncherItem::popularity() const
94+ // Not exposing usage order in greeter session at this point.
79bool LauncherItem::pinned() const
98bool LauncherItem::pinned() const
81 return m_pinned;
100 return m_pinned;
plugins/Greeter/Unity/Launcher/launcheritem.h+4
@@ -34,6 +34,8 @@ public:
34 QString appId() const override;
34 QString appId() const override;
35 QString name() const override;
35 QString name() const override;
36 QString icon() const override;
36 QString icon() const override;
37+ QStringList keywords() const override;
38+ uint popularity() const override;
37 bool pinned() const override;
39 bool pinned() const override;
38 bool running() const override;
40 bool running() const override;
39 bool recent() const override;
41 bool recent() const override;
@@ -49,6 +51,7 @@ public:
50 void setName(const QString &name);
52 void setName(const QString &name);
51 void setIcon(const QString &icon);
53 void setIcon(const QString &icon);
54+ void setKeywords(const QStringList &keywords);
52 void setPinned(bool pinned);
55 void setPinned(bool pinned);
53 void setRunning(bool running);
56 void setRunning(bool running);
54 void setRecent(bool recent);
57 void setRecent(bool recent);
@@ -63,6 +66,7 @@ private:
63 QString m_appId;
66 QString m_appId;
64 QString m_name;
67 QString m_name;
65 QString m_icon;
68 QString m_icon;
69+ QStringList m_keywords;
66 bool m_pinned;
70 bool m_pinned;
67 bool m_running;
71 bool m_running;
68 bool m_recent;
72 bool m_recent;
plugins/Greeter/Unity/Launcher/launchermodelas.cpp−7
@@ -76,13 +76,6 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
76 return QVariant();
76 return QVariant();
79−void LauncherModel::setAlerting(const QString &appId, bool alerting)
83− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
86unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
79unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
88 if (index < 0 || index >= m_list.count()) {
81 if (index < 0 || index >= m_list.count()) {
plugins/Greeter/Unity/Launcher/launchermodelas.h−1
@@ -41,7 +41,6 @@ public:
42 QVariant data(const QModelIndex &index, int role) const override;
42 QVariant data(const QModelIndex &index, int role) const override;
44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
45 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
44 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
46 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
45 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
47 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
46 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
plugins/Greeter/Unity/Launcher/quicklistmodel.cpp+2
@@ -65,6 +65,8 @@ QVariant QuickListModel::data(const QModelIndex &index, int role) const
65 return m_list.at(index.row()).icon();
65 return m_list.at(index.row()).icon();
66 case RoleClickable:
66 case RoleClickable:
67 return m_list.at(index.row()).clickable();
67 return m_list.at(index.row()).clickable();
69+ return false; // The greeter plugin would just not add any private entries
69 return QVariant();
71 return QVariant();
plugins/IntegratedLightDM/CMakeLists.txtdeleted−40
@@ -1,40 +0,0 @@
1−pkg_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)
5−add_subdirectory(liblightdm)
8− ${CMAKE_CURRENT_SOURCE_DIR}
9− ${CMAKE_CURRENT_BINARY_DIR}
10− ${CMAKE_SOURCE_DIR}/plugins/Utils
11− ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
12− #${LIBLIGHTDM_INCLUDE_DIRS}
13− ${libunity8-private_SOURCE_DIR}
14− ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
18− ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
26−add_library(IntegratedLightDM-qml MODULE
30−target_link_libraries(IntegratedLightDM-qml
33−# TODO: Once we split out a separate greeter process, uncomment these lines
34−# ${LIBLIGHTDM_LDFLAGS}
35− ${LIBUSERMETRICSOUTPUT_LDFLAGS}
38−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
40−add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)
plugins/IntegratedLightDM/Greeter.cppdeleted−138
@@ -1,138 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
16− * Author: Michael Terry <michael.terry@canonical.com>
20−#include "GreeterPrivate.h"
23−GreeterPrivate::GreeterPrivate(Greeter* parent)
24− : m_greeter(new QLightDM::Greeter(parent)),
32−Greeter::Greeter(QObject* parent)
34− d_ptr(new GreeterPrivate(this))
38− connect(d->m_greeter, &QLightDM::Greeter::showMessage,
39− this, &Greeter::showMessageFilter);
40− connect(d->m_greeter, &QLightDM::Greeter::showPrompt,
41− this, &Greeter::showPromptFilter);
42− connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,
43− this, &Greeter::authenticationCompleteFilter);
45− d->m_greeter->connectSync();
48−bool Greeter::isActive() const
54−void Greeter::setIsActive(bool active)
57− if (d->m_active != active) {
58− d->m_active = active;
59− Q_EMIT isActiveChanged();
63−bool Greeter::isAuthenticated() const
66− return d->m_greeter->isAuthenticated();
69−QString Greeter::authenticationUser() const
72− return d->m_greeter->authenticationUser();
75−bool Greeter::promptless() const
78− return d->promptless;
81−void Greeter::authenticate(const QString &username)
84− d->wasPrompted = false;
86− d->promptless = false;
87− Q_EMIT promptlessChanged();
90− d->m_greeter->authenticate(username);
91− Q_EMIT isAuthenticatedChanged();
92− Q_EMIT authenticationUserChanged(username);
95−void Greeter::respond(const QString &response)
98− d->m_greeter->respond(response);
101−bool Greeter::startSessionSync(const QString &session)
104− return d->m_greeter->startSessionSync(session);
107−void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
110− d->wasPrompted = true;
112− bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
114− // Strip prompt of any colons at the end
115− QString trimmedText = text.trimmed();
116− if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {
117− trimmedText.chop(1);
120− Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
123−void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
125− Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);
128−void Greeter::authenticationCompleteFilter()
131− if (!d->wasPrompted) {
132− d->promptless = true;
133− Q_EMIT promptlessChanged();
136− Q_EMIT isAuthenticatedChanged();
137− Q_EMIT authenticationComplete();
plugins/IntegratedLightDM/IntegratedLightDM.qmltypesdeleted−251
@@ -1,251 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 plugins'
13− exports: ["LightDM/Greeter 0.1"]
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 }
23− Parameter { name: "text"; type: "string" }
24− Parameter { name: "isError"; type: "bool" }
28− Parameter { name: "text"; type: "string" }
29− Parameter { name: "isSecret"; type: "bool" }
30− Parameter { name: "isDefaultPrompt"; type: "bool" }
32− Signal { name: "authenticationComplete" }
34− name: "authenticationUserChanged"
35− Parameter { name: "user"; type: "string" }
37− Signal { name: "isActiveChanged" }
38− Signal { name: "isAuthenticatedChanged" }
39− Signal { name: "showGreeter" }
40− Signal { name: "hideGreeter" }
42− name: "requestAuthenticationUser"
43− Parameter { name: "user"; type: "string" }
47− Parameter { name: "username"; type: "string" }
49− Method { name: "authenticate" }
52− Parameter { name: "response"; type: "string" }
55− name: "startSessionSync"
57− Parameter { name: "session"; type: "string" }
59− Method { name: "startSessionSync"; type: "bool" }
62− Parameter { name: "isActive"; type: "bool" }
66− name: "QAbstractProxyModel"
67− prototype: "QAbstractItemModel"
68− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
71− name: "QLightDM::UsersModel"
72− prototype: "QAbstractListModel"
73− exports: ["LightDM/UserRoles 0.1"]
75− exportMetaObjectRevisions: [0]
77− name: "UserModelRoles"
82− "BackgroundRole": 259,
84− "HasMessagesRole": 261,
85− "ImagePathRole": 262,
86− "BackgroundPathRole": 263
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" }
102− name: "setFilterRegExp"
103− Parameter { name: "pattern"; type: "string" }
106− name: "setFilterWildcard"
107− Parameter { name: "pattern"; type: "string" }
110− name: "setFilterFixedString"
111− Parameter { name: "pattern"; type: "string" }
113− Method { name: "clear" }
114− Method { name: "invalidate" }
117− name: "UnitySortFilterProxyModelQML"
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" }
124− name: "invertMatchChanged"
125− Parameter { type: "bool" }
130− Parameter { name: "row"; type: "int" }
135− Parameter { name: "row"; type: "int" }
136− Parameter { name: "role"; type: "int" }
138− Method { name: "count"; type: "int" }
142− Parameter { name: "role"; type: "int" }
143− Parameter { name: "value"; type: "QVariant" }
146− name: "mapRowToSource"
148− Parameter { name: "row"; type: "int" }
151− name: "mapFromSource"
153− Parameter { name: "row"; type: "int" }
158− Parameter { name: "row"; type: "int" }
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 }
168− name: "startChanged"
169− Parameter { name: "color"; type: "QColor" }
173− Parameter { name: "color"; type: "QColor" }
177− Parameter { name: "color"; type: "QColor" }
181− name: "UserMetricsOutput::UserMetrics"
182− prototype: "QObject"
183− exports: ["LightDM/Infographic 0.1"]
186− exportMetaObjectRevisions: [0]
187− Property { name: "label"; type: "string"; isReadonly: true }
188− Property { name: "username"; type: "string" }
191− type: "UserMetricsOutput::ColorTheme"
197− type: "UserMetricsOutput::ColorTheme"
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 }
205− name: "labelChanged"
206− Parameter { name: "label"; type: "string" }
209− name: "usernameChanged"
210− Parameter { name: "username"; type: "string" }
213− name: "firstColorChanged"
214− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
217− name: "firstMonthChanged"
218− Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }
221− name: "currentDayChanged"
222− Parameter { name: "currentDay"; type: "int" }
225− name: "secondColorChanged"
226− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
229− name: "secondMonthChanged"
230− Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }
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" }
245− prototype: "UnitySortFilterProxyModelQML"
246− exports: ["LightDM/Users 0.1"]
249− exportMetaObjectRevisions: [0]
plugins/IntegratedLightDM/UsersModel.cppdeleted−71
@@ -1,71 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
16− * Author: Michael Terry <michael.terry@canonical.com>
19−#include "UsersModel.h"
20−#include <QLightDM/UsersModel>
21−#include <QtCore/QSortFilterProxyModel>
23−// First, we define an internal class that wraps LightDM's UsersModel. This
24−// class will modify some of the data coming from LightDM. For example, we
25−// modify any empty Real Names into just normal Names.
26−// (We can't modify the data directly in UsersModel below because it won't sort
27−// using the modified data.)
28−class MangleModel : public QSortFilterProxyModel
33− explicit MangleModel(QObject* parent=0);
35− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
38−MangleModel::MangleModel(QObject* parent)
39− : QSortFilterProxyModel(parent)
41− setSourceModel(new QLightDM::UsersModel(this));
44−QVariant MangleModel::data(const QModelIndex &index, int role) const
46− QVariant variantData = QSortFilterProxyModel::data(index, role);
48− // If user's real name is empty, switch to unix name
49− if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {
50− variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);
51− } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {
52− const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";
53− variantData = stringData;
59−// **** Now we continue with actual UsersModel class ****
61−UsersModel::UsersModel(QObject* parent)
62− : UnitySortFilterProxyModelQML(parent)
64− setModel(new MangleModel(this));
65− setSortCaseSensitivity(Qt::CaseInsensitive);
66− setSortLocaleAware(true);
67− setSortRole(QLightDM::UsersModel::RealNameRole);
71−#include "UsersModel.moc"
plugins/LightDM/CMakeLists.txtnew file+26
@@ -0,0 +1,26 @@
1+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
3+find_package(Qt5Core REQUIRED)
4+find_package(Qt5Quick REQUIRED)
7+ ${CMAKE_CURRENT_SOURCE_DIR}
8+ ${CMAKE_CURRENT_BINARY_DIR}
9+ ${CMAKE_SOURCE_DIR}/plugins/Utils
10+ ${libunity8-private_SOURCE_DIR}
11+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
15+ ../Utils/unitysortfilterproxymodelqml.cpp
25+add_subdirectory(FullLightDM)
26+add_subdirectory(IntegratedLightDM)
plugins/IntegratedLightDM/DBusGreeter.cpp → plugins/LightDM/DBusGreeter.cpprenamed+5−4
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@ DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)
24 : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),
24 : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),
25 m_greeter(greeter)
25 m_greeter(greeter)
27− connect(m_greeter, &Greeter::isActiveChanged, this, &DBusGreeter::isActiveChangedHandler);
27+ connect(m_greeter, &Greeter::isActiveChanged,
28+ this, &DBusGreeter::isActiveChangedHandler);
30bool DBusGreeter::isActive() const
31bool DBusGreeter::isActive() const
@@ -34,12 +35,12 @@ bool DBusGreeter::isActive() const
35void DBusGreeter::ShowGreeter()
36void DBusGreeter::ShowGreeter()
37− return Q_EMIT m_greeter->showGreeter();
38+ Q_EMIT m_greeter->showGreeter();
40void DBusGreeter::HideGreeter()
41void DBusGreeter::HideGreeter()
42− return Q_EMIT m_greeter->hideGreeter();
43+ Q_EMIT m_greeter->hideGreeter();
45void DBusGreeter::isActiveChangedHandler()
46void DBusGreeter::isActiveChangedHandler()
plugins/IntegratedLightDM/DBusGreeter.h → plugins/LightDM/DBusGreeter.hrenamed
The content is the same.
plugins/IntegratedLightDM/DBusGreeterList.cpp → plugins/LightDM/DBusGreeterList.cpprenamed+3−3
@@ -43,10 +43,10 @@ bool DBusGreeterList::entryIsLocked() const
43 return !m_greeter->promptless();
43 return !m_greeter->promptless();
46−void DBusGreeterList::authenticationUserChangedHandler(const QString &user)
46+void DBusGreeterList::authenticationUserChangedHandler()
48− notifyPropertyChanged(QStringLiteral("ActiveEntry"), user);
48+ notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());
49− Q_EMIT EntrySelected(user);
49+ Q_EMIT EntrySelected(m_greeter->authenticationUser());
52void DBusGreeterList::promptlessChangedHandler()
52void DBusGreeterList::promptlessChangedHandler()
plugins/IntegratedLightDM/DBusGreeterList.h → plugins/LightDM/DBusGreeterList.hrenamed+1−1
@@ -47,7 +47,7 @@ Q_SIGNALS:
47 void entryIsLockedChanged();
47 void entryIsLockedChanged();
49private Q_SLOTS:
49private Q_SLOTS:
50− void authenticationUserChangedHandler(const QString &user);
50+ void authenticationUserChangedHandler();
51 void promptlessChangedHandler();
51 void promptlessChangedHandler();
plugins/LightDM/FullLightDM/CMakeLists.txtnew file+32
@@ -0,0 +1,32 @@
1+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
3+set(PLUGIN_CLASSNAME "FullLightDM")
5+add_definitions(-DFULL_LIGHTDM)
9+ ${CMAKE_CURRENT_BINARY_DIR}
14+ ${LIBLIGHTDM_INCLUDE_DIRS}
17+foreach(source_file ${QMLPLUGIN_SRC})
18+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
21+add_library(FullLightDM-qml MODULE
22+ ${RELATIVE_QMLPLUGIN_SRC}
25+target_link_libraries(FullLightDM-qml
27+ ${LIBLIGHTDM_LDFLAGS}
28+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29+ Qt5::DBus Qt5::Gui Qt5::Qml
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
3+typeinfo FullLightDM.qmltypes
plugins/LightDM/Greeter.cppnew file+279
@@ -0,0 +1,279 @@
2+ * Copyright (C) 2013-2017 Canonical, Ltd.
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.
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.
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/>.
19+#include "GreeterPrivate.h"
20+#include <QCoreApplication>
23+static Greeter *singleton = nullptr;
25+GreeterPrivate::GreeterPrivate(Greeter* parent)
26+ : m_greeter(new QLightDM::Greeter(parent)),
29+ everResponded(false),
35+Greeter::Greeter(QObject* parent)
37+ d_ptr(new GreeterPrivate(this))
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);
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);
52+ d->m_greeter->connectSync();
60+Greeter *Greeter::instance()
63+ singleton = new Greeter;
68+PromptsModel *Greeter::promptsModel()
74+bool Greeter::isActive() const
80+void Greeter::setIsActive(bool active)
83+ if (d->m_active != active) {
84+ d->m_active = active;
85+ Q_EMIT isActiveChanged();
89+bool Greeter::isAuthenticated() const
92+ return d->m_greeter->isAuthenticated();
95+QString Greeter::authenticationUser() const
98+ return d->cachedAuthUser;
101+void Greeter::checkAuthenticationUser()
104+ if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {
105+ d->cachedAuthUser = d->m_greeter->authenticationUser();
106+ Q_EMIT authenticationUserChanged();
110+QString Greeter::defaultSessionHint() const
113+ return d->m_greeter->defaultSessionHint();
116+bool Greeter::promptless() const
119+ return d->promptless;
122+QString Greeter::selectUser() const
125+ if (hasGuestAccount() && d->m_greeter->selectGuestHint()) {
126+ return QStringLiteral("*guest");
128+ return d->m_greeter->selectUserHint();
132+bool Greeter::hasGuestAccount() const
135+ return d->m_greeter->hasGuestAccountHint();
138+bool Greeter::showManualLoginHint() const
141+ return d->m_greeter->showManualLoginHint();
144+bool Greeter::hideUsersHint() const
147+ return d->m_greeter->hideUsersHint();
150+void Greeter::authenticate(const QString &username)
154+ d->responded = false;
155+ d->everResponded = false;
156+ if (d->promptless) {
157+ d->promptless = false;
158+ Q_EMIT promptlessChanged();
161+ if (authenticationUser() == username) {
162+ d->prompts = d->leftovers;
164+ d->leftovers.clear();
166+ if (username == QStringLiteral("*guest")) {
167+ d->m_greeter->authenticateAsGuest();
168+ } else if (username == QStringLiteral("*other")) {
169+ d->m_greeter->authenticate(nullptr);
171+ d->m_greeter->authenticate(username);
174+ Q_EMIT authenticationStarted();
175+ Q_EMIT isAuthenticatedChanged();
176+ checkAuthenticationUser();
179+void Greeter::respond(const QString &response)
182+ d->responded = true;
183+ d->everResponded = true;
184+ d->m_greeter->respond(response);
187+bool Greeter::startSessionSync(const QString &session)
190+ return d->m_greeter->startSessionSync(session);
193+void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
197+ checkAuthenticationUser(); // may have changed in liblightdm
199+ bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
200+ bool isSecret = type == QLightDM::Greeter::PromptTypeSecret;
202+ QString trimmedText;
203+ if (!isDefaultPrompt)
204+ trimmedText = text.trimmed();
206+ // Strip prompt of any colons at the end
207+ if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {
208+ trimmedText.chop(1);
211+ if (trimmedText == "login") {
212+ // 'login' is provided untranslated by LightDM when asking for a manual
214+ trimmedText = gettext("Username");
219+ d->responded = false;
222+ d->prompts.append(trimmedText, isSecret ? PromptsModel::Secret : PromptsModel::Question);
225+void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
229+ checkAuthenticationUser(); // may have changed in liblightdm
231+ bool isError = type == QLightDM::Greeter::MessageTypeError;
235+ d->responded = false;
237+ d->prompts.append(text, isError? PromptsModel::Error : PromptsModel::Message);
240+void Greeter::authenticationCompleteFilter()
244+ Q_EMIT isAuthenticatedChanged();
246+ bool automatic = !d->everResponded;
247+ bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;
249+ if (isAuthenticated() && automatic) {
250+ d->promptless = true;
251+ Q_EMIT promptlessChanged();
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);
260+ d->leftovers.append(gettext("Invalid password, please try again"), PromptsModel::Error);
262+ } else if (pamHasLeftoverMessages) {
263+ automatic = true; // treat this successful login as automatic, so user sees message
264+ d->leftovers = d->prompts;
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);
274+ if (isAuthenticated()) {
275+ Q_EMIT loginSuccess(automatic);
277+ Q_EMIT loginError(automatic);
plugins/IntegratedLightDM/Greeter.h → plugins/LightDM/Greeter.hrenamed+21−11
@@ -1,5 +1,5 @@
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,6 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Authors: Michael Terry <michael.terry@canonical.com>
19/* This class is a really tiny filter around QLightDM::Greeter. There are some
18/* This class is a really tiny filter around QLightDM::Greeter. There are some
@@ -22,13 +21,13 @@
22 such edits in the future, and by inserting ourselves here, we have more
21 such edits in the future, and by inserting ourselves here, we have more
23 control. */
22 control. */
25−#ifndef UNITY_GREETER_H
24+#pragma once
26−#define UNITY_GREETER_H
28#include <QLightDM/Greeter>
26#include <QLightDM/Greeter>
29#include <QtCore/QObject>
27#include <QtCore/QObject>
31class GreeterPrivate;
29class GreeterPrivate;
33class Greeter : public QObject
32class Greeter : public QObject
@@ -37,15 +36,25 @@ class Greeter : public QObject
37 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
36 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
38 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
37 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
39 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
38 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
43− explicit Greeter(QObject* parent=0);
44+ static Greeter *instance();
45 bool isActive() const;
47 bool isActive() const;
46 bool isAuthenticated() const;
48 bool isAuthenticated() const;
47 QString authenticationUser() const;
49 QString authenticationUser() const;
50+ QString defaultSessionHint() const;
48 bool promptless() const;
51 bool promptless() const;
52+ QString selectUser() const;
53+ bool hasGuestAccount() const;
54+ bool showManualLoginHint() const;
55+ bool hideUsersHint() const;
57+ PromptsModel *promptsModel();
50public Q_SLOTS:
59public Q_SLOTS:
51 void authenticate(const QString &username=QString());
60 void authenticate(const QString &username=QString());
@@ -54,21 +63,23 @@ public Q_SLOTS:
54 void setIsActive(bool isActive);
63 void setIsActive(bool isActive);
57− void showMessage(const QString &text, bool isError);
58− void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
59− void authenticationComplete();
60− void authenticationUserChanged(const QString &user);
66+ void authenticationUserChanged();
61 void isActiveChanged();
67 void isActiveChanged();
62 void isAuthenticatedChanged();
68 void isAuthenticatedChanged();
63 void promptlessChanged();
69 void promptlessChanged();
64 void showGreeter();
70 void showGreeter();
65 void hideGreeter();
71 void hideGreeter();
72+ void loginError(bool automatic);
73+ void loginSuccess(bool automatic);
74+ void authenticationStarted(); // useful for testing
67 // This signal is emitted by external agents like indicators, and the UI
76 // This signal is emitted by external agents like indicators, and the UI
68 // should switch to this user if possible.
77 // should switch to this user if possible.
69 void requestAuthenticationUser(const QString &user);
78 void requestAuthenticationUser(const QString &user);
81+ explicit Greeter(QObject* parent=0);
72 GreeterPrivate * const d_ptr;
83 GreeterPrivate * const d_ptr;
74 Q_DECLARE_PRIVATE(Greeter)
85 Q_DECLARE_PRIVATE(Greeter)
@@ -77,6 +88,5 @@ private Q_SLOTS:
77 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);
88 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);
78 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);
89 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);
79 void authenticationCompleteFilter();
90 void authenticationCompleteFilter();
91+ void checkAuthenticationUser();
plugins/IntegratedLightDM/GreeterPrivate.h → plugins/LightDM/GreeterPrivate.hrenamed+13−7
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015-2017 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,10 +14,14 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−#ifndef UNITY_GREETER_PRIVATE_H
17+#pragma once
18−#define UNITY_GREETER_PRIVATE_H
19+#include "PromptsModel.h"
20−#include <QLightDM/Greeter>
22+namespace QLightDM {
22class GreeterPrivate
26class GreeterPrivate
@@ -26,8 +30,12 @@ public:
27 QLightDM::Greeter *m_greeter;
31 QLightDM::Greeter *m_greeter;
28 bool m_active;
32 bool m_active;
29− bool wasPrompted;
33+ PromptsModel prompts;
34+ PromptsModel leftovers; // prompts to show during next auth for same user
30 bool promptless;
37 bool promptless;
38+ QString cachedAuthUser;
33 Greeter * const q_ptr;
41 Greeter * const q_ptr;
@@ -35,5 +43,3 @@ protected:
36 Q_DECLARE_PUBLIC(Greeter)
44 Q_DECLARE_PUBLIC(Greeter)
39−#endif // UNITY_GREETER_PRIVATE_H
plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+33
@@ -0,0 +1,33 @@
1+set(PLUGIN_CLASSNAME "IntegratedLightDM")
3+add_definitions(-DINTEGRATED_LIGHTDM)
5+foreach(include_directory ${QMLPLUGIN_INCLUDES})
6+ list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
11+ ${QMLPLUGIN_INCLUDES}
12+ ${libunity8-private_SOURCE_DIR}
13+ ${CMAKE_CURRENT_BINARY_DIR}
16+foreach(source_file ${QMLPLUGIN_SRC})
17+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
20+add_library(IntegratedLightDM-qml MODULE
21+ ${RELATIVE_QMLPLUGIN_SRC}
24+target_link_libraries(IntegratedLightDM-qml
27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28+ Qt5::DBus Qt5::Gui Qt5::Qml
31+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
33+add_subdirectory(liblightdm)
tests/mocks/IntegratedLightDM/QLightDM/Greeter → plugins/LightDM/IntegratedLightDM/QLightDM/Greeterrenamed+1−1
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
qml/Dash/ScopeSettings/ScopeSettingNumber.qml → plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelrenamed+2−6
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,4 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−import QtQuick 2.4
17+#include "../liblightdm/SessionsModel.h"
tests/mocks/IntegratedLightDM/QLightDM/UsersModel → plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelrenamed+1−1
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt → plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed+7−6
@@ -2,8 +2,10 @@ pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
3set(LibLightDM_SOURCES
3set(LibLightDM_SOURCES
4 Greeter.cpp
4 Greeter.cpp
5 UsersModel.cpp
6 UsersModel.cpp
6 GreeterPrivate.cpp
7 GreeterPrivate.cpp
8+ SessionsModelPrivate.cpp
7 UsersModelPrivate.cpp
9 UsersModelPrivate.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
10 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
9 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
11 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
@@ -24,30 +26,29 @@ target_link_libraries(integratedLightDM
24 ${GLIB_LIBRARIES}
26 ${GLIB_LIBRARIES}
25 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
27 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29+ Qt5::Concurrent Qt5::DBus Qt5::Gui
28target_link_libraries(integratedLightDMSession
31target_link_libraries(integratedLightDMSession
29 ${GLIB_LIBRARIES}
32 ${GLIB_LIBRARIES}
30 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
33 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
35+ Qt5::Concurrent Qt5::DBus Qt5::Gui
33target_link_libraries(MockLightDM-demo-shared
37target_link_libraries(MockLightDM-demo-shared
34 ${GLIB_LIBRARIES}
38 ${GLIB_LIBRARIES}
35 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
39 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
41+ Qt5::Concurrent Qt5::DBus Qt5::Gui
39−qt5_use_modules(integratedLightDM Concurrent DBus Gui)
40−qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
41−qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
43set_target_properties(integratedLightDM PROPERTIES
44set_target_properties(integratedLightDM PROPERTIES
44 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
45 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
45set_target_properties(integratedLightDMSession PROPERTIES
46set_target_properties(integratedLightDMSession PROPERTIES
46 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
47 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
47set_target_properties(MockLightDM-demo-shared PROPERTIES
48set_target_properties(MockLightDM-demo-shared PROPERTIES
48 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
49 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
49− OUTPUT_NAME lightdm-qt5-2)
50+ OUTPUT_NAME lightdm-qt5-3)
51install(TARGETS MockLightDM-demo-shared
52install(TARGETS MockLightDM-demo-shared
52− DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo
53+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
plugins/IntegratedLightDM/liblightdm/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed+6−8
@@ -49,7 +49,7 @@ QString Greeter::authenticationUser() const
50bool Greeter::hasGuestAccountHint() const
50bool Greeter::hasGuestAccountHint() const
52− return true;
52+ return false;
55QString Greeter::getHint(const QString &name) const
55QString Greeter::getHint(const QString &name) const
@@ -70,15 +70,10 @@ bool Greeter::hideUsersHint() const
71bool Greeter::showManualLoginHint() const
71bool Greeter::showManualLoginHint() const
73− return true;
73+ return false;
76bool Greeter::showRemoteLoginHint() const
76bool Greeter::showRemoteLoginHint() const
81−bool Greeter::lockHint () const
83 return false;
78 return false;
@@ -151,7 +146,10 @@ void Greeter::authenticateRemote(const QString &session, const QString &username
153void Greeter::cancelAuthentication()
148void Greeter::cancelAuthentication()
151+ d->cancelAuthentication();
156void Greeter::setLanguage (const QString &language)
154void Greeter::setLanguage (const QString &language)
plugins/IntegratedLightDM/liblightdm/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed+2−4
@@ -45,20 +45,19 @@ class Q_DECL_EXPORT Greeter : public QObject
46 Q_PROPERTY(QString hostname READ hostname CONSTANT)
46 Q_PROPERTY(QString hostname READ hostname CONSTANT)
47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
48− Q_PROPERTY(bool locked READ lockHint CONSTANT)
50− Q_ENUMS(PromptType MessageType)
53 enum PromptType {
50 enum PromptType {
54 PromptTypeQuestion,
51 PromptTypeQuestion,
55 PromptTypeSecret
52 PromptTypeSecret
58 enum MessageType {
56 enum MessageType {
59 MessageTypeInfo,
57 MessageTypeInfo,
60 MessageTypeError
58 MessageTypeError
63 explicit Greeter(QObject* parent=0);
62 explicit Greeter(QObject* parent=0);
64 virtual ~Greeter();
63 virtual ~Greeter();
@@ -68,7 +67,6 @@ public:
68 bool hideUsersHint() const;
67 bool hideUsersHint() const;
69 bool showManualLoginHint() const;
68 bool showManualLoginHint() const;
70 bool showRemoteLoginHint() const;
69 bool showRemoteLoginHint() const;
71− bool lockHint () const;
72 bool hasGuestAccountHint() const;
70 bool hasGuestAccountHint() const;
73 QString selectUserHint() const;
71 QString selectUserHint() const;
74 bool selectGuestHint() const;
72 bool selectGuestHint() const;
plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+28−24
@@ -50,8 +50,7 @@ public:
51 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
51 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
53− connect(&futureWatcher, &QFutureWatcher<int>::finished,
53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);
54− this, &GreeterImpl::finishPam);
55 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
54 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
56 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
55 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
57 // This next connect is how we pass ResponseFutures between threads
56 // This next connect is how we pass ResponseFutures between threads
@@ -207,6 +206,28 @@ public Q_SLOTS:
211+ if (pamHandle != nullptr) {
212+ QFuture<int> pamFuture = futureWatcher.future();
213+ pam_handle *handle = pamHandle;
214+ pamHandle = nullptr; // to disable normal finishPam() handling
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()));
222+ // Now let signal/slot handling happen so the thread can finish
223+ while (!pamFuture.isFinished()) {
224+ QCoreApplication::processEvents();
227+ pam_end(handle, PAM_CONV_ERR);
210Q_SIGNALS:
231Q_SIGNALS:
211 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
232 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
212 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
233 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
@@ -248,28 +269,6 @@ private Q_SLOTS:
253− if (pamHandle != nullptr) {
254− QFuture<int> pamFuture = futureWatcher.future();
255− pam_handle *handle = pamHandle;
256− pamHandle = nullptr; // to disable normal finishPam() handling
259− // Note the empty loop, we just want to clear the futures queue.
260− // Any further prompts from the pam thread will be immediately
261− // responded to/dismissed in handlePrompt().
262− while (respond(QString()));
264− // Now let signal/slot handling happen so the thread can finish
265− while (!pamFuture.isFinished()) {
266− QCoreApplication::processEvents();
269− pam_end(handle, PAM_CONV_ERR);
273 Greeter *greeter;
272 Greeter *greeter;
274 GreeterPrivate *greeterPrivate;
273 GreeterPrivate *greeterPrivate;
275 pam_handle* pamHandle;
274 pam_handle* pamHandle;
@@ -300,6 +299,11 @@ void GreeterPrivate::handleRespond(const QString &response)
300 m_impl->respond(response);
299 m_impl->respond(response);
302+void GreeterPrivate::cancelAuthentication()
304+ m_impl->cancelPam();
305#include "GreeterPrivate.moc"
309#include "GreeterPrivate.moc"
plugins/IntegratedLightDM/liblightdm/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed+1
@@ -38,6 +38,7 @@ public:
39 void handleAuthenticate();
39 void handleAuthenticate();
40 void handleRespond(const QString &response);
40 void handleRespond(const QString &response);
41+ void cancelAuthentication();
43 GreeterImpl *m_impl; // if the backend needs more private data
44 GreeterImpl *m_impl; // if the backend needs more private data
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppnew file+87
@@ -0,0 +1,87 @@
2+ * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
19+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
20+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
21+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
22+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
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)
29+#include "SessionsModel.h"
30+#include "SessionsModelPrivate.h"
31+#include <QtCore/QDir>
32+#include <QtCore/QString>
37+SessionsModel::SessionsModel(QObject* parent) :
38+ QAbstractListModel(parent),
39+ d_ptr(new SessionsModelPrivate(this))
41+ m_roleNames = QAbstractListModel::roleNames();
42+ m_roleNames[KeyRole] = "key";
43+ m_roleNames[TypeRole] = "type";
46+SessionsModel::~SessionsModel()
51+QVariant SessionsModel::data(const QModelIndex& index, int role) const
53+ Q_D(const SessionsModel);
55+ if(!index.isValid()) {
59+ int row = index.row();
62+ case QLightDM::SessionsModel::KeyRole:
63+ return d->sessionItems[row].key;
64+ case Qt::DisplayRole:
65+ return d->sessionItems[row].name;
71+QHash<int, QByteArray> SessionsModel::roleNames() const
76+int SessionsModel::rowCount(const QModelIndex& parent) const
78+ Q_D(const SessionsModel);
80+ if (parent.isValid()) {
82+ } else { // parent is root
83+ return d->sessionItems.size();
87+} // namespace QLightDM
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hnew file+72
@@ -0,0 +1,72 @@
2+ * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H
19+#define UNITY_INTEGRATED_SESSIONSMODEL_H
21+#include <QtCore/QAbstractListModel>
22+#include <QtCore/QString>
24+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
25+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
26+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
27+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
29+// This is taken from liblightdm and modified to confirm to our syle conventions
32+class SessionsModelPrivate;
34+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
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 */
47+ Q_ENUM(SessionModelRoles)
55+ explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
56+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
57+ virtual ~SessionsModel();
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;
64+ SessionsModelPrivate* const d_ptr;
67+ QHash<int, QByteArray> m_roleNames;
68+ Q_DECLARE_PRIVATE(SessionsModel)
72+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppnew file+36
@@ -0,0 +1,36 @@
2+ * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
18+#include "SessionsModelPrivate.h"
22+#include <QStringList>
27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
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, ""});
36+} // namespace QLightDM
tests/mocks/Unity/fake_filters.h → plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hrenamed+26−18
@@ -12,35 +12,43 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−#ifndef FAKE_FILTERS_H
18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
18−#define FAKE_FILTERS_H
19+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
20−#include <unity/shell/scopes/FiltersInterface.h>
21+#include <QtCore/QList>
21−#include <unity/shell/scopes/FilterBaseInterface.h>
22+#include <QtCore/QString>
23−class Filters : public unity::shell::scopes::FiltersInterface
24+namespace QLightDM
25− Q_OBJECT
26+class SessionsModel;
28− Filters(QObject* parent);
31+ QString key;
32+ QString type; // unused
34+ QString comment; // unused
30− int rowCount(const QModelIndex &parent) const override;
37+class SessionsModelPrivate
31− QVariant data(const QModelIndex &index, int role) const override;
38+{
40+ explicit SessionsModelPrivate(SessionsModel* parent=0);
41+ virtual ~SessionsModelPrivate() = default;
33− // Mock API
43+ QList<SessionItem> sessionItems;
34− int activeFiltersCount() const;
35− void addFakeFilters();
36− void addFilter(unity::shell::scopes::FilterBaseInterface* f);
38−Q_SIGNALS:
45+protected:
39− void activeFiltersCountChanged();
46+ SessionsModel* const q_ptr;
42−
49+ Q_DECLARE_PUBLIC(SessionsModel)
43− QVector<unity::shell::scopes::FilterBaseInterface*> m_filters;
46−#endif
52+} // namespace QLightDM
54+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
plugins/IntegratedLightDM/liblightdm/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+4−3
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :
40 QAbstractListModel(parent),
40 QAbstractListModel(parent),
41 d_ptr(new UsersModelPrivate(this))
41 d_ptr(new UsersModelPrivate(this))
45 // Extend roleNames (we want to keep the "display" role)
43 // Extend roleNames (we want to keep the "display" role)
46 QHash<int, QByteArray> roles = roleNames();
44 QHash<int, QByteArray> roles = roleNames();
47 roles[NameRole] = "name";
45 roles[NameRole] = "name";
@@ -52,6 +50,7 @@ UsersModel::UsersModel(QObject *parent) :
52 roles[SessionRole] = "session";
50 roles[SessionRole] = "session";
53 roles[HasMessagesRole] = "hasMessages";
51 roles[HasMessagesRole] = "hasMessages";
54 roles[ImagePathRole] = "imagePath";
52 roles[ImagePathRole] = "imagePath";
53+ roles[UidRole] = "uid";
55 setRoleNames(roles);
54 setRoleNames(roles);
57 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
56 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
@@ -101,6 +100,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const
101 return d->entries[row].has_messages;
100 return d->entries[row].has_messages;
102 case UsersModel::ImagePathRole:
101 case UsersModel::ImagePathRole:
103 return "";
102 return "";
103+ case UsersModel::UidRole:
104+ return d->entries[row].uid;
105 return QVariant();
106 return QVariant();
plugins/IntegratedLightDM/liblightdm/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+3−3
@@ -37,8 +37,6 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel
40− Q_ENUMS(UserModelRoles)
43 explicit UsersModel(QObject *parent = 0);
41 explicit UsersModel(QObject *parent = 0);
44 virtual ~UsersModel() = default;
42 virtual ~UsersModel() = default;
@@ -50,8 +48,10 @@ public:
50 SessionRole,
48 SessionRole,
51 HasMessagesRole,
49 HasMessagesRole,
52 ImagePathRole,
50 ImagePathRole,
53− BackgroundPathRole
51+ BackgroundPathRole,
54+ Q_ENUM(UserModelRoles)
56 int rowCount(const QModelIndex &parent) const override;
56 int rowCount(const QModelIndex &parent) const override;
57 QVariant data(const QModelIndex &index, int role) const override;
57 QVariant data(const QModelIndex &index, int role) const override;
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed+5−3
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
26#include <QDir>
26#include <QDir>
27#include <QSettings>
27#include <QSettings>
28#include <QStringList>
28#include <QStringList>
30namespace QLightDM
31namespace QLightDM
@@ -37,6 +38,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
38 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
39 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
39 QString currentUser = g_get_user_name();
40 QString currentUser = g_get_user_name();
41+ uid_t currentUid = getuid();
41 if (demoFile.exists()) {
43 if (demoFile.exists()) {
42 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
44 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
@@ -46,10 +48,10 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
46 Q_FOREACH(const QString &user, users)
48 Q_FOREACH(const QString &user, users)
48 QString name = settings.value(user + "/name", user).toString();
50 QString name = settings.value(user + "/name", user).toString();
49− entries.append({user, name, 0, 0, false, false, 0, 0});
51+ entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});
52− entries.append({currentUser, 0, 0, 0, false, false, 0, 0});
54+ entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});
54 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
56 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
55 this, [this](const QString &user) {
57 this, [this](const QString &user) {
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed+2−1
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ public:
40 bool has_messages;
40 bool has_messages;
41 QString session;
41 QString session;
42 QString infographic;
42 QString infographic;
45class UsersModelPrivate : public QObject
46class UsersModelPrivate : public QObject
plugins/LightDM/IntegratedLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module LightDM.IntegratedLightDM
2+plugin IntegratedLightDM-qml
3+typeinfo IntegratedLightDM.qmltypes
plugins/LightDM/PromptsModel.cppnew file+97
@@ -0,0 +1,97 @@
2+ * Copyright (C) 2017 Canonical, Ltd.
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.
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.
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/>.
18+#include "PromptsModel.h"
20+PromptsModel::PromptsModel(QObject* parent)
21+ : QAbstractListModel(parent)
23+ m_roleNames[TypeRole] = "type";
24+ m_roleNames[TextRole] = "text";
27+PromptsModel& PromptsModel::operator=(const PromptsModel &other)
30+ m_prompts = other.m_prompts;
32+ Q_EMIT countChanged();
36+int PromptsModel::rowCount(const QModelIndex &parent) const
38+ if (parent.isValid())
41+ return m_prompts.size();
44+QVariant PromptsModel::data(const QModelIndex &index, int role) const
46+ if (!index.isValid() || index.column() > 0 || index.row() >= m_prompts.size())
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();
57+QHash<int, QByteArray> PromptsModel::roleNames() const
62+void PromptsModel::prepend(const QString &text, PromptType type)
64+ beginInsertRows(QModelIndex(), 0, 0);
65+ m_prompts.prepend(PromptInfo{text, type});
68+ Q_EMIT countChanged();
71+void PromptsModel::append(const QString &text, PromptType type)
73+ beginInsertRows(QModelIndex(), m_prompts.size(), m_prompts.size());
74+ m_prompts.append(PromptInfo{text, type});
77+ Q_EMIT countChanged();
80+void PromptsModel::clear()
86+ Q_EMIT countChanged();
89+bool PromptsModel::hasPrompt() const
91+ Q_FOREACH(const PromptInfo &info, m_prompts) {
92+ if (info.type == PromptType::Secret || info.type == PromptType::Question) {
plugins/LightDM/PromptsModel.hnew file+70
@@ -0,0 +1,70 @@
2+ * Copyright (C) 2017 Canonical, Ltd.
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.
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.
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/>.
20+#include <QAbstractListModel>
22+class PromptsModel : public QAbstractListModel
26+ Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
29+ enum PromptsModelRoles {
30+ TypeRole = Qt::UserRole,
33+ Q_ENUM(PromptsModelRoles)
44+ explicit PromptsModel(QObject* parent=0);
46+ PromptsModel& operator=(const PromptsModel &other);
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;
52+ Q_INVOKABLE void prepend(const QString &text, PromptType type);
53+ Q_INVOKABLE void append(const QString &text, PromptType type);
57+ bool hasPrompt() const;
68+ QList<PromptInfo> m_prompts;
69+ QHash<int, QByteArray> m_roleNames;
plugins/LightDM/SessionsModel.cppnew file+135
@@ -0,0 +1,135 @@
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
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.
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.
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/>.
18+#include "SessionsModel.h"
19+#include <QtCore/QFile>
20+#include <QtCore/QSortFilterProxyModel>
22+QHash<int, QByteArray> SessionsModel::roleNames() const
27+int SessionsModel::rowCount(const QModelIndex& parent) const
29+ return m_model->rowCount(parent);
32+QList<QUrl> SessionsModel::iconSearchDirectories() const
34+ return m_iconSearchDirectories;
37+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)
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)
44+ localList.append(searchDirectory.toLocalFile());
46+ m_iconSearchDirectories = localList;
47+ Q_EMIT iconSearchDirectoriesChanged();
50+QUrl SessionsModel::iconUrl(const QString sessionKey) const
52+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
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";
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);
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";
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"
81+ path += "gnome_badge.png";
83+ } else if (sessionKey == "plasma") {
84+ path += "kde_badge.png";
86+ } else if (sessionKey == "xterm") {
87+ path += "recovery_console_badge.png";
89+ } else if (sessionKey == "remote-login") {
90+ path += "remote_login_help.png";
94+ if (QFile(path).exists() && iconFound) {
100+ // FIXME make this smarter
101+ return QUrl("./graphics/session_icons/unknown_badge.png");
104+QVariant SessionsModel::data(const QModelIndex& index, int role) const
107+ case SessionsModel::IconRole:
108+ return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());
110+ return m_model->data(index, role);
114+SessionsModel::SessionsModel(QObject* parent)
115+ : UnitySortFilterProxyModelQML(parent)
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";
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();
131+ setSortCaseSensitivity(Qt::CaseInsensitive);
132+ setSortLocaleAware(true);
133+ setSortRole(Qt::DisplayRole);
plugins/LightDM/SessionsModel.hnew file+66
@@ -0,0 +1,66 @@
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
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.
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.
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/>.
20+#include <unitysortfilterproxymodelqml.h>
21+#include <QLightDM/SessionsModel>
22+#include <QtCore/QHash>
23+#include <QtCore/QObject>
24+#include <QtCore/QUrl>
26+class SessionsModel : public UnitySortFilterProxyModelQML
30+ Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
31+ WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
34+ void iconSearchDirectoriesChanged();
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
43+ TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
46+ Q_ENUM(SessionModelRoles)
48+ explicit SessionsModel(QObject* parent=nullptr);
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;
56+ void setIconSearchDirectories(const QList<QUrl> searchDirectories);
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/")};
plugins/LightDM/UsersModel.cppnew file+238
@@ -0,0 +1,238 @@
2+ * Copyright (C) 2013,2015-2016 Canonical, Ltd.
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.
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.
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/>.
18+#include "UsersModel.h"
19+#include <QIdentityProxyModel>
20+#include <QLightDM/UsersModel>
24+// First, we define an internal class that wraps LightDM's UsersModel. This
25+// class will modify some of the data coming from LightDM. For example, we
26+// modify any empty Real Names into just normal Names. We also add optional
27+// rows, depending on configuration.
28+// (We can't modify the data directly in UsersModel below because it won't sort
29+// using the modified data.)
30+class MangleModel : public QIdentityProxyModel
35+ explicit MangleModel(QObject* parent=0);
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;
47+ int sourceRowCount() const;
49+ void updateGuestRow();
50+ void updateManualRow();
51+ void updateCustomRows();
53+ void addCustomRow(const CustomRow &newRow);
54+ void removeCustomRow(const QString &rowName);
56+ QList<CustomRow> m_customRows;
57+ bool m_updatingCustomRows;
60+MangleModel::MangleModel(QObject* parent)
61+ : QIdentityProxyModel(parent)
62+ , m_updatingCustomRows(false)
64+ setSourceModel(new QLightDM::UsersModel(this));
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);
81+QVariant MangleModel::data(const QModelIndex &index, int role) const
83+ QVariant variantData;
85+ if (index.row() >= rowCount())
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) {
97+ } else if (role == QLightDM::UsersModel::SessionRole) {
98+ variantData = Greeter::instance()->defaultSessionHint();
101+ variantData = QIdentityProxyModel::data(index, role);
104+ // If user's real name is empty, switch to unix name
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;
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();
120+void MangleModel::addCustomRow(const CustomRow &newRow)
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
128+ beginInsertRows(QModelIndex(), rowCount(), rowCount());
129+ m_customRows << newRow;
133+void MangleModel::removeCustomRow(const QString &rowName)
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);
146+void MangleModel::updateManualRow()
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;
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")});
159+ removeCustomRow(QStringLiteral("*other"));
162+void MangleModel::updateGuestRow()
164+ if (Greeter::instance()->hasGuestAccount())
165+ addCustomRow({QStringLiteral("*guest"), gettext("Guest Session")});
167+ removeCustomRow(QStringLiteral("*guest"));
170+void MangleModel::updateCustomRows()
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)
177+ m_updatingCustomRows = true;
180+ m_updatingCustomRows = false;
183+int MangleModel::rowCount(const QModelIndex &parent) const
185+ if (parent.isValid())
188+ return sourceRowCount() + m_customRows.size();
191+int MangleModel::sourceRowCount() const
193+ return Greeter::instance()->hideUsersHint() ? 0 : sourceModel()->rowCount();
196+QModelIndex MangleModel::index(int row, int column, const QModelIndex &parent) const
198+ if (row >= rowCount())
199+ return QModelIndex();
201+ bool isCustomRow = row >= sourceRowCount();
202+ if (isCustomRow && !parent.isValid()) {
203+ return createIndex(row, column);
205+ return QIdentityProxyModel::index(row, column, parent);
209+// **** Now we continue with actual UsersModel class ****
211+UsersModel::UsersModel(QObject* parent)
212+ : UnitySortFilterProxyModelQML(parent)
214+ setModel(new MangleModel(this));
215+ setSortCaseSensitivity(Qt::CaseInsensitive);
216+ setSortLocaleAware(true);
217+ setSortRole(QLightDM::UsersModel::RealNameRole);
221+bool UsersModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
223+ auto leftName = source_left.data(QLightDM::UsersModel::NameRole);
224+ auto rightName = source_right.data(QLightDM::UsersModel::NameRole);
226+ if (leftName == QStringLiteral("*guest"))
228+ if (rightName == QStringLiteral("*guest"))
230+ if (leftName == QStringLiteral("*other"))
232+ if (rightName == QStringLiteral("*other"))
235+ return UnitySortFilterProxyModelQML::lessThan(source_left, source_right);
238+#include "UsersModel.moc"
plugins/IntegratedLightDM/UsersModel.h → plugins/LightDM/UsersModel.hrenamed+6−8
@@ -1,5 +1,5 @@
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012-2013,2015-2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,19 +12,16 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Authors: Michael Terry <michael.terry@canonical.com>
19/* This class is a really tiny filter around QLightDM::UsersModel. There are
17/* This class is a really tiny filter around QLightDM::UsersModel. There are
20 some operations that we want to edit a bit for the benefit of Qml.
18 some operations that we want to edit a bit for the benefit of Qml.
21 Specifically, we want to sort users according to realName. */
19 Specifically, we want to sort users according to realName. */
23−#ifndef UNITY_USERSMODEL_H
21+#pragma once
24−#define UNITY_USERSMODEL_H
26#include <unitysortfilterproxymodelqml.h>
23#include <unitysortfilterproxymodelqml.h>
27−#include <QtCore/QObject>
24+#include <QObject>
29class UsersModel : public UnitySortFilterProxyModelQML
26class UsersModel : public UnitySortFilterProxyModelQML
@@ -32,6 +29,7 @@ class UsersModel : public UnitySortFilterProxyModelQML
34 explicit UsersModel(QObject* parent=0);
31 explicit UsersModel(QObject* parent=0);
34+ bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
plugins/IntegratedLightDM/plugin.cpp → plugins/LightDM/plugin.cpprenamed+37−7
@@ -1,5 +1,5 @@
2− * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,12 @@
19#include "DBusGreeter.h"
19#include "DBusGreeter.h"
20#include "DBusGreeterList.h"
20#include "DBusGreeterList.h"
21#include "Greeter.h"
21#include "Greeter.h"
22+#include "PromptsModel.h"
23+#include "SessionsModel.h"
22#include "UsersModel.h"
24#include "UsersModel.h"
23#include <libusermetricsoutput/ColorTheme.h>
25#include <libusermetricsoutput/ColorTheme.h>
24#include <libusermetricsoutput/UserMetrics.h>
26#include <libusermetricsoutput/UserMetrics.h>
27+#include <QLightDM/SessionsModel>
25#include <QLightDM/UsersModel>
28#include <QLightDM/UsersModel>
27#include <QAbstractItemModel>
30#include <QAbstractItemModel>
@@ -30,16 +33,31 @@
31static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
34static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
34 Q_UNUSED(scriptEngine)
36 Q_UNUSED(scriptEngine)
36− Greeter *greeter = new Greeter();
38+ Greeter *greeter = Greeter::instance();
37 new DBusGreeter(greeter, QStringLiteral("/"));
39 new DBusGreeter(greeter, QStringLiteral("/"));
38 new DBusGreeterList(greeter, QStringLiteral("/list"));
40 new DBusGreeterList(greeter, QStringLiteral("/list"));
42+ engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);
40 return greeter;
44 return greeter;
47+static QObject *prompts_provider(QQmlEngine *engine, QJSEngine *)
49+ auto model = Greeter::instance()->promptsModel();
50+ engine->setObjectOwnership(model, QQmlEngine::CppOwnership);
54+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
57+ Q_UNUSED(scriptEngine)
58+ return new SessionsModel();
43static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
61static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
45 Q_UNUSED(engine)
63 Q_UNUSED(engine)
@@ -54,16 +72,28 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
54 return UserMetricsOutput::UserMetrics::getInstance();
72 return UserMetricsOutput::UserMetrics::getInstance();
57−void IntegratedLightDMPlugin::registerTypes(const char *uri)
75+void PLUGIN_CLASSNAME::registerTypes(const char *uri)
59 qmlRegisterType<QAbstractItemModel>();
77 qmlRegisterType<QAbstractItemModel>();
60 qmlRegisterType<UserMetricsOutput::ColorTheme>();
78 qmlRegisterType<UserMetricsOutput::ColorTheme>();
80+#if defined INTEGRATED_LIGHTDM
62− Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
81+ Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
63− qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
64− qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
65 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
82 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);
87+ #error No library defined in LightDM plugin
90+ qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);
92+ qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
93+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
66 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
95 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
67 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
96 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
68 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
98 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
tests/mocks/IntegratedLightDM/plugin.h → plugins/LightDM/plugin.hrenamed+6−5
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014, 2015 Canonical, Ltd.
2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,15 +12,16 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−#ifndef MOCK_LIGHTDM_PLUGIN_H
18+#ifndef LIGHTDM_PLUGIN_H
18−#define MOCK_LIGHTDM_PLUGIN_H
19+#define LIGHTDM_PLUGIN_H
20#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlExtensionPlugin>
22#include <QtQml/QQmlExtensionPlugin>
23−class IntegratedLightDMPlugin : public QQmlExtensionPlugin
24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +30,4 @@ public:
29 void registerTypes(const char *uri) override;
30 void registerTypes(const char *uri) override;
32−#endif
33+#endif /* LIGHTDM_PLUGIN_H */
plugins/IntegratedLightDM/qmldir → plugins/LightDM/qmldirrenamed
The content is the same.
plugins/Lights/CMakeLists.txt+9−2
@@ -1,16 +1,23 @@
1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
3+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
4include_directories(
5include_directories(
5 ${ANDROID_HEADERS_INCLUDE_DIRS}
7 ${ANDROID_HEADERS_INCLUDE_DIRS}
8add_library(Lights-qml MODULE
10add_library(Lights-qml MODULE
9 plugin.cpp
11 plugin.cpp
10 Lights.cpp
12 Lights.cpp
13−qt5_use_modules(Lights-qml Qml Gui)
17+target_link_libraries(Lights-qml
18+ Qt5::Qml Qt5::Gui Qt5::DBus
14−target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})
19+ ${ANDROID_HARDWARE_LIBRARIES}
20+ ${ANDROID_PROPERTIES_LIBRARIES}
16add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
23add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
plugins/Lights/HfdLights.cppnew file+62
@@ -0,0 +1,62 @@
2+ * Copyright (C) 2021 UBports Foundation.
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.
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.
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/>.
16+ * Author: Florian Leeber <florian@ubports.com>
19+#include "HfdLights.h"
20+#include <QtCore/QDebug>
21+#include <QDBusArgument>
22+#include <QDBusConnection>
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"
29+HfdLights::HfdLights(QObject* parent)
32+ m_hfdInterface = new QDBusInterface(
33+ QStringLiteral(HFD_SERVICE_NAME),
34+ QStringLiteral(HFD_SERVICE_PATH),
35+ QStringLiteral(HFD_SERVICE_INTERFACE),
36+ QDBusConnection::systemBus(),
41+bool HfdLights::init()
43+ // hfd does not need any initalization to be used
47+void HfdLights::turnOn()
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);
56+void HfdLights::turnOff()
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);
tests/mocks/Unity/fake_unity_plugin.h → plugins/Lights/HfdLights.hrenamed+17−9
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2021 UBports Foundation.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -13,22 +13,30 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Author: Nick Dedekind <nick.dedekind@canonical.com>
16+ * Author: Florian Leeber <florian@ubports.com>
19−#ifndef FAKE_UNITY_PLUGIN_H
19+#ifndef UNITY_HFDLIGHTS_H
20−#define FAKE_UNITY_PLUGIN_H
20+#define UNITY_HFDLIGHTS_H
22−// Qt
22+#include <QtCore/QObject>
23−#include <QtQml/QQmlExtensionPlugin>
23+#include <QDBusInterface>
25−class FakeUnityPlugin : public QQmlExtensionPlugin
26+class HfdLights: public Lights
28− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
31− void registerTypes(const char *uri) override;
31+ explicit HfdLights(QObject *parent = 0);
34+ bool init() override;
35+ void turnOff() override;
36+ void turnOn() override;
39+ QDBusInterface* m_hfdInterface;
plugins/Lights/LegacyLights.cppnew file+91
@@ -0,0 +1,91 @@
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ * Copyright (C) 2021 UBports Foundation.
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.
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.
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/>.
17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
20+#include "LegacyLights.h"
21+#include <QtCore/QDebug>
24+#include "android-hardware.h"
28+LegacyLights::~LegacyLights()
31+ hw_device_t* device = (hw_device_t*) m_lightDevice;
32+ device->close(device);
36+bool LegacyLights::init()
45+ err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
48+ err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
50+ m_lightDevice = (light_device_t*)device;
54+ qWarning() << "Failed to access notification lights";
57+ qWarning() << "Failed to initialize lights hardware.";
62+void LegacyLights::turnOn()
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;
73+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
74+ qWarning() << "Failed to turn the light off";
78+void LegacyLights::turnOff()
81+ memset(&state, 0, sizeof(light_state_t));
82+ state.color = 0x00000000;
83+ state.flashMode = LIGHT_FLASH_NONE;
85+ state.flashOffMS = 0;
86+ state.brightnessMode = 0;
88+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
89+ qWarning() << "Failed to turn the light off";
plugins/Unity/DashCommunicator/plugin.h → plugins/Lights/LegacyLights.hrenamed+19−8
@@ -1,5 +1,6 @@
2 * Copyright (C) 2014 Canonical, Ltd.
2 * Copyright (C) 2014 Canonical, Ltd.
3+ * Copyright (C) 2021 UBports Foundation.
4 * This program is free software; you can redistribute it and/or modify
5 * 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 * it under the terms of the GNU General Public License as published by
@@ -13,22 +14,32 @@
13 * You should have received a copy of the GNU General Public License
14 * 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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Authors: Michael Zanetti <michael.zanetti@canonical.com>
17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
19−#ifndef DASHCOMMUNICATOR_PLUGIN_H
20+#ifndef UNITY_LEGACYLIGHTS_H
20−#define DASHCOMMUNICATOR_PLUGIN_H
21+#define UNITY_LEGACYLIGHTS_H
22−#include <QtQml/QQmlEngine>
23+#include <QtCore/QObject>
23−#include <QtQml/QQmlExtensionPlugin>
24+#include "Lights.h"
25−class DashCommunicatorPlugin : public QQmlExtensionPlugin
26+struct light_device_t;
28+class LegacyLights: public Lights
28− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
31− void registerTypes(const char *uri) override;
33+ ~LegacyLights();
36+ bool init() override;
37+ void turnOff() override;
38+ void turnOn() override;
41+ light_device_t* m_lightDevice;
plugins/Lights/Lights.cpp−65
@@ -26,20 +26,12 @@ extern "C" {
27Lights::Lights(QObject* parent)
27Lights::Lights(QObject* parent)
28 : QObject(parent),
28 : QObject(parent),
30 m_color("blue"),
29 m_color("blue"),
31 m_state(Lights::Off),
30 m_state(Lights::Off),
32 m_onMs(1000),
31 m_onMs(1000),
33 m_offMs(3000)
32 m_offMs(3000)
40− hw_device_t* device = (hw_device_t*) m_lightDevice;
41− device->close(device);
45void Lights::setState(Lights::State newState)
37void Lights::setState(Lights::State newState)
@@ -107,60 +99,3 @@ void Lights::setOffMillisec(int offMs)
107 // FIXME: update the property if the light is already on
99 // FIXME: update the property if the light is already on
113− if (m_lightDevice) {
118− hw_module_t* module;
120− err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
122− hw_device_t* device;
123− err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
125− m_lightDevice = (light_device_t*)device;
129− qWarning() << "Failed to access notification lights";
132− qWarning() << "Failed to initialize lights hardware.";
137−void Lights::turnOn()
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;
148− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
149− qWarning() << "Failed to turn the light off";
153−void Lights::turnOff()
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;
163− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
164− qWarning() << "Failed to turn the light off";
plugins/Lights/Lights.h+5−9
@@ -22,12 +22,9 @@
22#include <QtCore/QObject>
22#include <QtCore/QObject>
23#include <QtGui/QColor>
23#include <QtGui/QColor>
25−struct light_device_t;
27class Lights: public QObject
25class Lights: public QObject
31 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
28 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
32 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
29 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
33 Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
30 Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
@@ -38,9 +35,9 @@ public:
42 explicit Lights(QObject *parent = 0);
40 explicit Lights(QObject *parent = 0);
45 void setState(State newState);
42 void setState(State newState);
46 State state() const;
43 State state() const;
@@ -60,16 +57,15 @@ Q_SIGNALS:
60 void onMillisecChanged(int onMs);
57 void onMillisecChanged(int onMs);
61 void offMillisecChanged(int offMs);
58 void offMillisecChanged(int offMs);
64− light_device_t* m_lightDevice;
65 QColor m_color;
61 QColor m_color;
66 State m_state;
62 State m_state;
67 int m_onMs;
63 int m_onMs;
68 int m_offMs;
64 int m_offMs;
70− bool init();
66+ virtual bool init() = 0;
71− void turnOff();
67+ virtual void turnOff() = 0;
72− void turnOn();
68+ virtual void turnOn() = 0;
plugins/Lights/Lights.qmltypesdeleted−45
@@ -1,45 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Lights 0.1 plugins'
13− exports: ["Lights/Lights 0.1"]
16− exportMetaObjectRevisions: [0]
24− Property { name: "state"; type: "State" }
25− Property { name: "color"; type: "QColor" }
26− Property { name: "onMillisec"; type: "int" }
27− Property { name: "offMillisec"; type: "int" }
30− Parameter { name: "newState"; type: "State" }
34− Parameter { name: "color"; type: "QColor" }
37− name: "onMillisecChanged"
38− Parameter { name: "onMs"; type: "int" }
41− name: "offMillisecChanged"
42− Parameter { name: "offMs"; type: "int" }
plugins/Lights/android-hardware.h−4
@@ -15,9 +15,5 @@
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
22#include <hardware/hardware.h>
18#include <hardware/hardware.h>
23#include <hardware/lights.h>
19#include <hardware/lights.h>
plugins/Lights/plugin.cpp+20−1
@@ -18,6 +18,11 @@
19#include "plugin.h"
19#include "plugin.h"
20#include "Lights.h"
20#include "Lights.h"
21+#include "HfdLights.h"
22+#include "LegacyLights.h"
24+// libandroid-properties
25+#include <hybris/properties/properties.h>
22#include <QtQml/qqml.h>
27#include <QtQml/qqml.h>
@@ -25,7 +30,21 @@ static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
26 Q_UNUSED(engine)
31 Q_UNUSED(engine)
27 Q_UNUSED(scriptEngine)
32 Q_UNUSED(scriptEngine)
34+ bool use_hfd = false;
35+ char buffer[PROP_VALUE_MAX];
36+ auto result = property_get("ro.build.version.sdk", buffer, "0");
38+ auto sdkVersion = QString(buffer).toInt();
39+ if (sdkVersion >= 27 || sdkVersion == 0) {
28− return new Lights();
44+ return new HfdLights();
46+ return new LegacyLights();
31void LightsPlugin::registerTypes(const char *uri)
50void LightsPlugin::registerTypes(const char *uri)
plugins/Powerd/CMakeLists.txt+4−2
@@ -9,7 +9,9 @@ add_library(Powerd-qml MODULE
12−qt5_use_modules(Powerd-qml DBus Qml)
12+target_link_libraries(Powerd-qml
13−target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
14+ ${GIO_LDFLAGS}
15add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
17add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
plugins/Powerd/Powerd.h+2−2
@@ -27,8 +27,6 @@
27class Powerd: public QObject
27class Powerd: public QObject
31− Q_ENUMS(DisplayStateChangeReason)
32 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
30 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
@@ -41,11 +39,13 @@ public:
41 SnapDecision = 5, // Display changed state due to snap decision prompt
39 SnapDecision = 5, // Display changed state due to snap decision prompt
42 CallDone = 6, // Display changed state due to voice call end
40 CallDone = 6, // Display changed state due to voice call end
42+ Q_ENUM(DisplayStateChangeReason)
45 enum Status {
44 enum Status {
50 explicit Powerd(QObject *parent = 0);
50 explicit Powerd(QObject *parent = 0);
51 ~Powerd();
51 ~Powerd();
plugins/Powerd/Powerd.qmltypesdeleted−39
@@ -1,39 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Powerd 0.1 plugins'
13− exports: ["Powerd/Powerd 0.1"]
16− exportMetaObjectRevisions: [0]
18− name: "DisplayStateChangeReason"
33− Property { name: "status"; type: "Status"; isReadonly: true }
35− name: "statusChanged"
36− Parameter { name: "reason"; type: "DisplayStateChangeReason" }
plugins/ScreenshotDirectory/CMakeLists.txt+1−1
@@ -4,6 +4,6 @@ set(PLUGIN_SOURCES
6add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
6add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
7−qt5_use_modules(ScreenshotDirectory-qml Qml Gui Quick)
7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)
9add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
9add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
plugins/SessionBroadcast/CMakeLists.txt+1−2
@@ -6,9 +6,8 @@ add_library(SessionBroadcast-qml MODULE
9−qt5_use_modules(SessionBroadcast-qml DBus Qml)
11target_link_libraries(SessionBroadcast-qml
9target_link_libraries(SessionBroadcast-qml
12 ${GLIB_LIBRARIES}
11 ${GLIB_LIBRARIES}
plugins/SessionBroadcast/SessionBroadcast.cpp+35−9
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,12 +12,12 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Author: Michael Terry <michael.terry@canonical.com>
19#include "SessionBroadcast.h"
17#include "SessionBroadcast.h"
20#include <QDBusConnection>
18#include <QDBusConnection>
19+#include <QDBusConnectionInterface>
20+#include <QDBusInterface>
22#include <glib.h>
22#include <glib.h>
@@ -27,13 +27,39 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
27 m_username = QString::fromUtf8(g_get_user_name());
27 m_username = QString::fromUtf8(g_get_user_name());
29 auto connection = QDBusConnection::SM_BUSNAME();
29 auto connection = QDBusConnection::SM_BUSNAME();
30+ auto interface = connection.interface();
31+ interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));
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"),
38+ connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),
39+ this, SLOT(onStartUrl(const QString &, const QString &)));
41+ connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),
42+ this, SLOT(onShowHome(const QString &)));
45+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
47+ m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);
50+void SessionBroadcast::requestHomeShown(const QString &username)
52+ m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);
31− connection.connect(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
55+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
32− QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
56+{
33− QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
57+ // Since this signal is just used for testing, we don't *really* care if
34− QStringLiteral("ShowHome"),
58+ // username matches, but just in case we do eventually use the signal, we
35− this,
59+ // should only listen to our own requests.
36− SLOT(onShowHome(const QString &)));
60+ if (username == m_username) {
61+ Q_EMIT startUrl(url);
39void SessionBroadcast::onShowHome(const QString &username)
65void SessionBroadcast::onShowHome(const QString &username)
plugins/SessionBroadcast/SessionBroadcast.h+10−3
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16− * Authors: Michael Terry <michael.terry@canonical.com>
19#ifndef UNITY_SESSIONBROADCAST_H
17#ifndef UNITY_SESSIONBROADCAST_H
@@ -31,14 +29,23 @@ class SessionBroadcast: public QObject
32 explicit SessionBroadcast(QObject *parent = 0);
30 explicit SessionBroadcast(QObject *parent = 0);
32+ Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
33+ Q_INVOKABLE void requestHomeShown(const QString &username);
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);
35 void showHome();
40 void showHome();
37private Q_SLOTS:
42private Q_SLOTS:
43+ void onStartUrl(const QString &username, const QString &url);
38 void onShowHome(const QString &username);
44 void onShowHome(const QString &username);
41 QString m_username;
47 QString m_username;
48+ QDBusInterface *m_broadcaster;
plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19
@@ -1,19 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 plugins'
11− name: "SessionBroadcast"
13− exports: ["SessionBroadcast/SessionBroadcast 0.1"]
16− exportMetaObjectRevisions: [0]
17− Signal { name: "showHome" }
plugins/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(UInput-qml MODULE
6−qt5_use_modules(UInput-qml Qml)
6+target_link_libraries(UInput-qml Qt5::Qml)
7add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
7add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
plugins/UInput/UInput.qmltypesdeleted−44
@@ -1,44 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable UInput 0.1 plugins'
13− exports: ["UInput/UInput 0.1"]
14− exportMetaObjectRevisions: [0]
23− Method { name: "createMouse" }
24− Method { name: "removeMouse" }
27− Parameter { name: "dx"; type: "int" }
28− Parameter { name: "dy"; type: "int" }
32− Parameter { name: "button"; type: "Button" }
36− Parameter { name: "button"; type: "Button" }
40− Parameter { name: "dh"; type: "int" }
41− Parameter { name: "dv"; type: "int" }
plugins/UInput/uinput.h+1−1
@@ -27,7 +27,6 @@
27class UInput : public QObject
27class UInput : public QObject
33 enum Button {
32 enum Button {
@@ -35,6 +34,7 @@ public:
35 ButtonRight,
34 ButtonRight,
36 ButtonMiddle
35 ButtonMiddle
39 explicit UInput(QObject *parent = nullptr);
39 explicit UInput(QObject *parent = nullptr);
40 ~UInput();
40 ~UInput();
plugins/Ubuntu/CMakeLists.txt−2
@@ -1,4 +1,2 @@
1add_subdirectory(Gestures)
1add_subdirectory(Gestures)
2add_subdirectory(DownloadDaemonListener)
2add_subdirectory(DownloadDaemonListener)
3−add_subdirectory(Payments)
4−add_subdirectory(SystemImage)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+6−3
@@ -1,7 +1,6 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
3 ${CMAKE_CURRENT_BINARY_DIR}
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7set(DOWNLOADDAEMONLISTENER_SOURCES
6set(DOWNLOADDAEMONLISTENER_SOURCES
@@ -12,6 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES
13add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
12add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
14+pkg_check_modules(DDLADAPTER REQUIRED udm-common)
15+add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
15−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
16+target_link_libraries(DownloadDaemonListener
16−
17+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core
18+ ${DDLADAPTER_LIBRARIES}
17add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
20add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60
@@ -1,60 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 plugins'
11− name: "DownloadTracker"
13− exports: ["Ubuntu.DownloadDaemonListener/DownloadTracker 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "service"; type: "string" }
16− Property { name: "dbusPath"; type: "string" }
17− Property { name: "serviceReady"; type: "bool"; isReadonly: true }
19− name: "serviceChanged"
20− Parameter { name: "service"; type: "string" }
23− name: "dbusPathChanged"
24− Parameter { name: "dbusPath"; type: "string" }
27− name: "serviceReadyChanged"
28− Parameter { name: "serviceReady"; type: "bool" }
32− Parameter { name: "success"; type: "bool" }
36− Parameter { name: "error"; type: "string" }
40− Parameter { name: "path"; type: "string" }
44− Parameter { name: "success"; type: "bool" }
48− Parameter { name: "received"; type: "qulonglong" }
49− Parameter { name: "total"; type: "qulonglong" }
53− Parameter { name: "success"; type: "bool" }
57− Parameter { name: "success"; type: "bool" }
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+2−1
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 - Canonical Ltd.
2+ * Copyright (C) 2013-2016 Canonical Ltd.
4 * This program is free software: you can redistribute it and/or modify it
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU Lesser General Public License, as
5 * under the terms of the GNU Lesser General Public License, as
@@ -78,6 +78,7 @@ void DownloadTracker::startService()
78 connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
78 connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
79 connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
79 connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
80 connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
80 connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
81+ connect(m_adaptor, &DownloadTrackerAdaptor::processing, this, &DownloadTracker::processing);
82 // FIXME find a better way of determining if the service is ready
83 // FIXME find a better way of determining if the service is ready
83 Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
84 Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+2−1
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 - Canonical Ltd.
2+ * Copyright (C) 2013-2016 Canonical Ltd.
4 * This program is free software: you can redistribute it and/or modify it
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU Lesser General Public License, as
5 * under the terms of the GNU Lesser General Public License, as
@@ -54,6 +54,7 @@ Q_SIGNALS:
54 void error(const QString &error);
54 void error(const QString &error);
55 void finished(const QString &path);
55 void finished(const QString &path);
56 void paused(bool success);
56 void paused(bool success);
57+ void processing(const QString &path);
57 void progress(qulonglong received, qulonglong total);
58 void progress(qulonglong received, qulonglong total);
58 void resumed(bool success);
59 void resumed(bool success);
59 void started(bool success);
60 void started(bool success);
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp+2−2
@@ -1,8 +1,8 @@
2 * This file was generated by qdbusxml2cpp version 0.8
2 * This file was generated by qdbusxml2cpp version 0.8
3− * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
3+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
5− * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
7 * This is an auto-generated file.
7 * This is an auto-generated file.
8 * This file may have been hand-edited. Look for HAND-EDIT comments
8 * This file may have been hand-edited. Look for HAND-EDIT comments
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h+71−4
@@ -1,15 +1,15 @@
2 * This file was generated by qdbusxml2cpp version 0.8
2 * This file was generated by qdbusxml2cpp version 0.8
3− * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
3+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
5− * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
7 * This is an auto-generated file.
7 * This is an auto-generated file.
8 * Do not edit! All changes made to it will be lost.
8 * Do not edit! All changes made to it will be lost.
11−#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
11+#ifndef DOWNLOADTRACKERADAPTOR_H
12−#define DOWNLOADTRACKERADAPTOR_H_1374434371
12+#define DOWNLOADTRACKERADAPTOR_H
14#include <QtCore/QObject>
14#include <QtCore/QObject>
15#include <QtCore/QByteArray>
15#include <QtCore/QByteArray>
@@ -36,6 +36,22 @@ public:
37 ~DownloadTrackerAdaptor();
37 ~DownloadTrackerAdaptor();
39+ Q_PROPERTY(QString ClickPackage READ clickPackage)
40+ inline QString clickPackage() const
41+ { return qvariant_cast< QString >(property("ClickPackage")); }
43+ Q_PROPERTY(QString DestinationApp READ destinationApp)
44+ inline QString destinationApp() const
45+ { return qvariant_cast< QString >(property("DestinationApp")); }
47+ Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
48+ inline bool showInIndicator() const
49+ { return qvariant_cast< bool >(property("ShowInIndicator")); }
51+ Q_PROPERTY(QString Title READ title)
52+ inline QString title() const
53+ { return qvariant_cast< QString >(property("Title")); }
39public Q_SLOTS: // METHODS
55public Q_SLOTS: // METHODS
40 inline QDBusPendingReply<> allowGSMDownload(bool allowed)
56 inline QDBusPendingReply<> allowGSMDownload(bool allowed)
@@ -50,6 +66,24 @@ public Q_SLOTS: // METHODS
50 return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
66 return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
69+ inline QDBusPendingReply<> collected()
71+ QList<QVariant> argumentList;
72+ return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
75+ inline QDBusPendingReply<QString> filePath()
77+ QList<QVariant> argumentList;
78+ return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
81+ inline QDBusPendingReply<StringMap> headers()
83+ QList<QVariant> argumentList;
84+ return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
53 inline QDBusPendingReply<bool> isGSMDownloadAllowed()
87 inline QDBusPendingReply<bool> isGSMDownloadAllowed()
55 QList<QVariant> argumentList;
89 QList<QVariant> argumentList;
@@ -80,6 +114,27 @@ public Q_SLOTS: // METHODS
80 return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
114 return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
117+ inline QDBusPendingReply<> setDestinationDir(const QString &path)
119+ QList<QVariant> argumentList;
120+ argumentList << QVariant::fromValue(path);
121+ return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
124+ inline QDBusPendingReply<> setHeaders(StringMap headers)
126+ QList<QVariant> argumentList;
127+ argumentList << QVariant::fromValue(headers);
128+ return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
131+ inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
133+ QList<QVariant> argumentList;
134+ argumentList << QVariant::fromValue(data);
135+ return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
83 inline QDBusPendingReply<> setThrottle(qulonglong speed)
138 inline QDBusPendingReply<> setThrottle(qulonglong speed)
85 QList<QVariant> argumentList;
140 QList<QVariant> argumentList;
@@ -93,6 +148,12 @@ public Q_SLOTS: // METHODS
93 return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
148 return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
151+ inline QDBusPendingReply<int> state()
153+ QList<QVariant> argumentList;
154+ return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
96 inline QDBusPendingReply<qulonglong> throttle()
157 inline QDBusPendingReply<qulonglong> throttle()
98 QList<QVariant> argumentList;
159 QList<QVariant> argumentList;
@@ -106,10 +167,16 @@ public Q_SLOTS: // METHODS
108Q_SIGNALS: // SIGNALS
169Q_SIGNALS: // SIGNALS
170+ void authError(AuthErrorStruct error);
109 void canceled(bool success);
171 void canceled(bool success);
110 void error(const QString &error);
172 void error(const QString &error);
111 void finished(const QString &path);
173 void finished(const QString &path);
174+ void hashError(HashErrorStruct error);
175+ void httpError(HttpErrorStruct error);
176+ void networkError(NetworkErrorStruct error);
112 void paused(bool success);
177 void paused(bool success);
178+ void processError(ProcessErrorStruct error);
179+ void processing(const QString &path);
113 void progress(qulonglong received, qulonglong total);
180 void progress(qulonglong received, qulonglong total);
114 void resumed(bool success);
181 void resumed(bool success);
115 void started(bool success);
182 void started(bool success);
plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h+3−6
@@ -1,5 +1,5 @@
2− * Copyright 2013 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
4 * This library is free software; you can redistribute it and/or
4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of version 3 of the GNU Lesser General Public
5 * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -19,10 +19,7 @@
19#ifndef DOWNLOADER_LIB_APP_METATYPES_H
19#ifndef DOWNLOADER_LIB_APP_METATYPES_H
20#define DOWNLOADER_LIB_APP_METATYPES_H
20#define DOWNLOADER_LIB_APP_METATYPES_H
22−#include <QMap>
22+// Just include the system file so we're always up to date.
23−
23+#include <ubuntu/download_manager/metatypes.h>
24−typedef QMap<QString, QString> StringMap;
26−Q_DECLARE_METATYPE(StringMap)
28#endif // METATYPES_H
25#endif // METATYPES_H
plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+1−1
@@ -21,7 +21,7 @@
21#include "AxisVelocityCalculator.h"
21#include "AxisVelocityCalculator.h"
22#include <QtCore/QElapsedTimer>
22#include <QtCore/QElapsedTimer>
24−using namespace UbuntuGestures;
24+UG_USE_NAMESPACE
26AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
26AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
27 : AxisVelocityCalculator(SharedTimeSource(new RealTimeSource), parent)
27 : AxisVelocityCalculator(SharedTimeSource(new RealTimeSource), parent)
plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+4−4
@@ -24,7 +24,7 @@
24#include "UbuntuGesturesQmlGlobal.h"
24#include "UbuntuGesturesQmlGlobal.h"
25#include <stdint.h>
25#include <stdint.h>
26#include <QtCore/QObject>
26#include <QtCore/QObject>
27−#include "TimeSource.h"
27+#include <UbuntuGestures/private/timesource_p.h>
30 Estimates the current velocity of a finger based on recent movement along an axis
30 Estimates the current velocity of a finger based on recent movement along an axis
@@ -68,7 +68,7 @@ public:
69 Constructor that takes a TimeSource
69 Constructor that takes a TimeSource
71− AxisVelocityCalculator(const UbuntuGestures::SharedTimeSource &timeSource, QObject *parent = 0);
71+ AxisVelocityCalculator(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource, QObject *parent = 0);
73 virtual ~AxisVelocityCalculator();
73 virtual ~AxisVelocityCalculator();
@@ -90,7 +90,7 @@ public:
91 Replaces the TimeSource with the given one. Useful for testing purposes.
91 Replaces the TimeSource with the given one. Useful for testing purposes.
93− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
93+ void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);
96 The minimum amount of samples needed for a velocity calculation.
96 The minimum amount of samples needed for a velocity calculation.
@@ -138,7 +138,7 @@ private:
138 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
138 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
139 int m_samplesWrite; /* index where the next sample will be written */
139 int m_samplesWrite; /* index where the next sample will be written */
141− UbuntuGestures::SharedTimeSource m_timeSource;
141+ UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource;
143 qreal m_trackedPosition;
143 qreal m_trackedPosition;
plugins/Ubuntu/Gestures/CMakeLists.txt+11−8
@@ -4,27 +4,29 @@ remove_definitions(-DQT_NO_KEYWORDS)
4set(UbuntuGesturesQml_SOURCES
4set(UbuntuGesturesQml_SOURCES
6 AxisVelocityCalculator.cpp
6 AxisVelocityCalculator.cpp
8 Direction.cpp
7 Direction.cpp
9− DirectionalDragArea.cpp
8+ MouseEventGenerator.cpp
10− FloatingFlickable.cpp
11 PressedOutsideNotifier.cpp
9 PressedOutsideNotifier.cpp
12 TouchDispatcher.cpp
10 TouchDispatcher.cpp
13 TouchGate.cpp
11 TouchGate.cpp
14 TouchGestureArea.cpp
12 TouchGestureArea.cpp
17−add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
15+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
19−add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
17+add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
20−target_link_libraries(UbuntuGesturesQml UbuntuGestures)
22−qt5_use_modules(UbuntuGesturesQml Core Quick)
19+add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
20+target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick)
24# So that Foo.cpp can #include "Foo.moc"
22# So that Foo.cpp can #include "Foo.moc"
25include_directories(${CMAKE_CURRENT_BINARY_DIR})
23include_directories(${CMAKE_CURRENT_BINARY_DIR})
27−include_directories(${CMAKE_SOURCE_DIR}/libs/UbuntuGestures)
25+include_directories(
27+ ${UBUNTUGESTURES_INCLUDE_DIRS}
28+ ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}
29# There's no cmake var for v8 include path :-/ so create one
31# There's no cmake var for v8 include path :-/ so create one
30LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
32LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
@@ -32,6 +34,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
33# DANGER! DANGER! Using Qt's private API!
35# DANGER! DANGER! Using Qt's private API!
34include_directories(
36include_directories(
35 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
36 ${Qt5Quick_INCLUDE_DIRS}
39 ${Qt5Quick_INCLUDE_DIRS}
37 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
40 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
plugins/Ubuntu/Gestures/Damper.hdeleted−89
@@ -1,89 +0,0 @@
2− * Copyright (C) 2013 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef UBUNTU_GESTURES_DAMPER_H
18−#define UBUNTU_GESTURES_DAMPER_H
20−#include <QtCore/QPointF>
23− Decreases the oscillations of a value along an axis.
25−template <class Type> class Damper {
27− Damper() : m_value(0), m_maxDelta(0) { }
29− // Maximum delta between the raw value and its dampened counterpart.
30− void setMaxDelta(Type maxDelta) {
31− if (maxDelta < 0) qFatal("Damper::maxDelta must be a positive number.");
32− m_maxDelta = maxDelta;
34− Type maxDelta() const { return m_maxDelta; }
36− void reset(Type value) {
40− Type update(Type value) {
41− Type delta = value - m_value;
42− if (delta > 0 && delta > m_maxDelta) {
43− m_value += delta - m_maxDelta;
44− } else if (delta < 0 && delta < -m_maxDelta) {
45− m_value += delta + m_maxDelta;
51− Type value() const { return m_value; }
59− A point that has its movement dampened.
63− void setMaxDelta(qreal maxDelta) {
64− m_x.setMaxDelta(maxDelta);
65− m_y.setMaxDelta(maxDelta);
68− qreal maxDelta() const { return m_x.maxDelta(); }
70− void reset(const QPointF point) {
71− m_x.reset(point.x());
72− m_y.reset(point.y());
75− void update(const QPointF point) {
76− m_x.update(point.x());
77− m_y.update(point.y());
80− qreal x() const { return m_x.value(); }
81− qreal y() const { return m_y.value(); }
87−QDebug operator<<(QDebug dbg, const DampedPointF &p);
89−#endif // UBUNTU_GESTURES_DAMPER_H
plugins/Ubuntu/Gestures/Direction.h+2−1
@@ -26,9 +26,9 @@
27class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
27class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
31+ // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
32 enum Type {
32 enum Type {
33 Rightwards, // Along the positive direction of the X axis
33 Rightwards, // Along the positive direction of the X axis
34 Leftwards, // Along the negative direction of the X axis
34 Leftwards, // Along the negative direction of the X axis
@@ -37,6 +37,7 @@ public:
37 Horizontal, // Along the X axis, in any direction
37 Horizontal, // Along the X axis, in any direction
38 Vertical // Along the Y axis, in any direction
38 Vertical // Along the Y axis, in any direction
41 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
42 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
42 Q_INVOKABLE static bool isVertical(Direction::Type type);
43 Q_INVOKABLE static bool isVertical(Direction::Type type);
plugins/Ubuntu/Gestures/DirectionalDragArea.cppdeleted−932
@@ -1,932 +0,0 @@
2− * Copyright (C) 2013-2015 Canonical, Ltd.
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.
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.
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/>.
17−#define ACTIVETOUCHESINFO_DEBUG 0
18−#define DIRECTIONALDRAGAREA_DEBUG 0
20−#include "DirectionalDragArea.h"
22−#include <QQuickWindow>
23−#include <QtCore/qmath.h>
27−#pragma GCC diagnostic push
28−#pragma GCC diagnostic ignored "-pedantic"
29−#include <private/qquickwindow_p.h>
30−#pragma GCC diagnostic pop
33−#include "TouchOwnershipEvent.h"
34−#include "TouchRegistry.h"
35−#include "UnownedTouchEvent.h"
37−#include "DirectionalDragArea_p.h"
39−using namespace UbuntuGestures;
41−#if DIRECTIONALDRAGAREA_DEBUG
42−#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params
43−#include "DebugHelpers.h"
46−const char *statusToString(DirectionalDragAreaPrivate::Status status)
48− if (status == DirectionalDragAreaPrivate::WaitingForTouch) {
49− return "WaitingForTouch";
50− } else if (status == DirectionalDragAreaPrivate::Undecided) {
58−#else // DIRECTIONALDRAGAREA_DEBUG
59−#define ddaDebug(params) ((void)0)
60−#endif // DIRECTIONALDRAGAREA_DEBUG
62−DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
64− , d(new DirectionalDragAreaPrivate(this))
66− d->setRecognitionTimer(new Timer(this));
67− d->recognitionTimer->setInterval(d->maxTime);
68− d->recognitionTimer->setSingleShot(true);
70− connect(this, &QQuickItem::enabledChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);
71− connect(this, &QQuickItem::visibleChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);
74−Direction::Type DirectionalDragArea::direction() const
79−void DirectionalDragArea::setDirection(Direction::Type direction)
81− if (direction != d->direction) {
82− d->direction = direction;
83− Q_EMIT directionChanged(d->direction);
87−void DirectionalDragAreaPrivate::setDistanceThreshold(qreal value)
89− if (distanceThreshold != value) {
90− distanceThreshold = value;
91− distanceThresholdSquared = distanceThreshold * distanceThreshold;
95−void DirectionalDragAreaPrivate::setMaxTime(int value)
97− if (maxTime != value) {
99− recognitionTimer->setInterval(maxTime);
103−void DirectionalDragAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
106− bool timerWasRunning = false;
107− bool wasSingleShot = false;
109− // can be null when called from the constructor
110− if (recognitionTimer) {
111− interval = recognitionTimer->interval();
112− timerWasRunning = recognitionTimer->isRunning();
113− if (recognitionTimer->parent() == this) {
114− delete recognitionTimer;
118− recognitionTimer = timer;
119− timer->setInterval(interval);
120− timer->setSingleShot(wasSingleShot);
121− connect(timer, &UbuntuGestures::AbstractTimer::timeout,
122− this, &DirectionalDragAreaPrivate::rejectGesture);
123− if (timerWasRunning) {
124− recognitionTimer->start();
128−void DirectionalDragAreaPrivate::setTimeSource(const SharedTimeSource &timeSource)
130− this->timeSource = timeSource;
131− activeTouches.m_timeSource = timeSource;
134−qreal DirectionalDragArea::distance() const
136− if (Direction::isHorizontal(d->direction)) {
137− return d->publicPos.x() - d->startPos.x();
139− return d->publicPos.y() - d->startPos.y();
143−void DirectionalDragAreaPrivate::updateSceneDistance()
145− QPointF totalMovement = publicScenePos - startScenePos;
146− sceneDistance = projectOntoDirectionVector(totalMovement);
149−qreal DirectionalDragArea::sceneDistance() const
151− return d->sceneDistance;
154−qreal DirectionalDragArea::touchX() const
156− return d->publicPos.x();
159−qreal DirectionalDragArea::touchY() const
161− return d->publicPos.y();
164−qreal DirectionalDragArea::touchSceneX() const
166− return d->publicScenePos.x();
169−qreal DirectionalDragArea::touchSceneY() const
171− return d->publicScenePos.y();
174−bool DirectionalDragArea::dragging() const
176− return d->status == DirectionalDragAreaPrivate::Recognized;
179−bool DirectionalDragArea::pressed() const
181− return d->status != DirectionalDragAreaPrivate::WaitingForTouch;
184−bool DirectionalDragArea::immediateRecognition() const
186− return d->immediateRecognition;
189−void DirectionalDragArea::setImmediateRecognition(bool enabled)
191− if (d->immediateRecognition != enabled) {
192− d->immediateRecognition = enabled;
193− Q_EMIT immediateRecognitionChanged(enabled);
197−bool DirectionalDragArea::monitorOnly() const
199− return d->monitorOnly;
202−void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
204− if (d->monitorOnly != monitorOnly) {
205− d->monitorOnly = monitorOnly;
207− if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
208− TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
209− // We still wanna know when it ends for keeping the composition time window up-to-date
210− TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
213− Q_EMIT monitorOnlyChanged(monitorOnly);
217−void DirectionalDragArea::removeTimeConstraints()
219− d->setMaxTime(60 * 60 * 1000);
220− d->compositionTime = 0;
221− ddaDebug("removed time constraints");
224−bool DirectionalDragArea::event(QEvent *event)
226− if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
227− d->touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
229− } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
230− d->unownedTouchEvent(static_cast<UnownedTouchEvent *>(event));
233− return QQuickItem::event(event);
237−void DirectionalDragAreaPrivate::touchOwnershipEvent(TouchOwnershipEvent *event)
239− if (event->gained()) {
241− ids.append(event->touchId());
242− ddaDebug("grabbing touch");
243− q->grabTouchPoints(ids);
245− // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
246− // emulation it will cause the emulation logic to go nuts.
247− // Thus we have to also grab the mouse in this case.
249− // The fix for this bug has landed in Qt 5.4 (https://codereview.qt-project.org/96887)
250− // TODO: Remove this workaround once we start using Qt 5.4
252− QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(q->window());
253− if (windowPrivate->touchMouseId == event->touchId() && q->window()->mouseGrabberItem()) {
254− ddaDebug("removing mouse grabber");
255− q->window()->mouseGrabberItem()->ungrabMouse();
259− // We still wanna know when it ends for keeping the composition time window up-to-date
260− TouchRegistry::instance()->addTouchWatcher(touchId, q);
262− setStatus(WaitingForTouch);
266−void DirectionalDragAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent)
268− QTouchEvent *event = unownedTouchEvent->touchEvent();
270− Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
272− ddaDebug("Unowned " << timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
275− case WaitingForTouch:
279− Q_ASSERT(q->isEnabled() && q->isVisible());
280− unownedTouchEvent_undecided(unownedTouchEvent);
282− default: // Recognized:
284− // Treat unowned event as if we owned it, but we are really just watching it
285− touchEvent_recognized(event);
290− activeTouches.update(event);
293−void DirectionalDragAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent)
295− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(unownedTouchEvent->touchEvent());
297− qCritical() << "DirectionalDragArea[status=Undecided]: touch " << touchId
298− << "missing from UnownedTouchEvent without first reaching state Qt::TouchPointReleased. "
299− "Considering it as released.";
301− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
302− setStatus(WaitingForTouch);
306− const QPointF &touchScenePos = touchPoint->scenePos();
308− if (touchPoint->state() == Qt::TouchPointReleased) {
309− // touch has ended before recognition concluded
310− ddaDebug("Touch has ended before recognition concluded");
311− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
312− setStatus(WaitingForTouch);
316− previousDampedScenePos.setX(dampedScenePos.x());
317− previousDampedScenePos.setY(dampedScenePos.y());
318− dampedScenePos.update(touchScenePos);
320− if (!movingInRightDirection()) {
321− ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");
322− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
323− // We still wanna know when it ends for keeping the composition time window up-to-date
324− TouchRegistry::instance()->addTouchWatcher(touchId, q);
325− setStatus(WaitingForTouch);
329− if (isWithinTouchCompositionWindow()) {
330− // There's still time for some new touch to appear and ruin our party as it would be combined
331− // with our touchId one and therefore deny the possibility of a single-finger gesture.
332− ddaDebug("Sill within composition window. Let's wait more.");
336− if (movedFarEnoughAlongGestureAxis()) {
338− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
340− setStatus(Recognized);
341− setPublicPos(touchPoint->pos());
342− setPublicScenePos(touchScenePos);
343− } else if (isPastMaxDistance()) {
344− ddaDebug("Rejecting gesture because it went farther than maxDistance without getting recognized.");
345− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
346− // We still wanna know when it ends for keeping the composition time window up-to-date
347− TouchRegistry::instance()->addTouchWatcher(touchId, q);
348− setStatus(WaitingForTouch);
350− ddaDebug("Didn't move far enough yet. Let's wait more.");
354−void DirectionalDragArea::touchEvent(QTouchEvent *event)
356− // TODO: Consider when more than one touch starts in the same event (although it's not possible
357− // with Mir's android-input). Have to track them all. Consider it a plus/bonus.
359− ddaDebug(d->timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
361− if (!isEnabled() || !isVisible()) {
362− QQuickItem::touchEvent(event);
366− switch (d->status) {
367− case DirectionalDragAreaPrivate::WaitingForTouch:
368− d->touchEvent_absent(event);
370− case DirectionalDragAreaPrivate::Undecided:
371− d->touchEvent_undecided(event);
373− default: // Recognized:
374− d->touchEvent_recognized(event);
378− d->activeTouches.update(event);
381−void DirectionalDragAreaPrivate::touchEvent_absent(QTouchEvent *event)
383− // TODO: accept/reject is for the whole event, not per touch id. See how that affects us.
385− if (!event->touchPointStates().testFlag(Qt::TouchPointPressed)) {
386− // Nothing to see here. No touch starting in this event.
390− // to be proven wrong, if that's the case
391− bool allGood = true;
393− if (isWithinTouchCompositionWindow()) {
394− // too close to the last touch start. So we consider them as starting roughly at the same time.
395− // Can't be a single-touch gesture.
396− ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");
400− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
402− const QTouchEvent::TouchPoint *newTouchPoint = nullptr;
403− for (int i = 0; i < touchPoints.count() && allGood; ++i) {
404− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
405− if (touchPoint.state() == Qt::TouchPointPressed) {
406− if (newTouchPoint) {
407− // more than one touch starting in this QTouchEvent. Can't be a single-touch gesture
410− // that's our candidate
411− newTouchPoint = &touchPoint;
417− allGood = sanityCheckRecognitionProperties();
419− qWarning("DirectionalDragArea: recognition properties are wrongly set. Gesture recognition"
425− Q_ASSERT(newTouchPoint);
427− startPos = newTouchPoint->pos();
428− startScenePos = newTouchPoint->scenePos();
429− touchId = newTouchPoint->id();
430− dampedScenePos.reset(startScenePos);
431− setPublicPos(startPos);
433− setPublicScenePos(startScenePos);
434− updateSceneDirectionVector();
436− if (recognitionIsDisabled()) {
437− // Behave like a dumb TouchArea
438− ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
439− setStatus(Recognized);
441− watchPressedTouchPoints(touchPoints);
444− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
448− // just monitor the touch points for now.
450− watchPressedTouchPoints(touchPoints);
452− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
455− setStatus(Undecided);
456− // Let the item below have it. We will monitor it and grab it later if a gesture
461− watchPressedTouchPoints(touchPoints);
466−void DirectionalDragAreaPrivate::touchEvent_undecided(QTouchEvent *event)
468− Q_ASSERT(fetchTargetTouchPoint(event) == nullptr);
470− // We're not interested in new touch points. We already have our candidate (touchId).
471− // But we do want to know when those new touches end for keeping the composition time
472− // window up-to-date
474− watchPressedTouchPoints(event->touchPoints());
476− if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
477− // multi-finger drags are not accepted
478− ddaDebug("Multi-finger drags are not accepted");
480− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
481− // We still wanna know when it ends for keeping the composition time window up-to-date
482− TouchRegistry::instance()->addTouchWatcher(touchId, q);
484− setStatus(WaitingForTouch);
488−void DirectionalDragAreaPrivate::touchEvent_recognized(QTouchEvent *event)
490− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
493− qCritical() << "DirectionalDragArea[status=Recognized]: touch " << touchId
494− << "missing from QTouchEvent without first reaching state Qt::TouchPointReleased. "
495− "Considering it as released.";
496− setStatus(WaitingForTouch);
498− setPublicPos(touchPoint->pos());
499− setPublicScenePos(touchPoint->scenePos());
501− if (touchPoint->state() == Qt::TouchPointReleased) {
502− setStatus(WaitingForTouch);
507−void DirectionalDragAreaPrivate::watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
509− for (int i = 0; i < touchPoints.count(); ++i) {
510− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
511− if (touchPoint.state() == Qt::TouchPointPressed) {
512− TouchRegistry::instance()->addTouchWatcher(touchPoint.id(), q);
517−bool DirectionalDragAreaPrivate::recognitionIsDisabled() const
519− return immediateRecognition || (distanceThreshold <= 0 && compositionTime <= 0);
522−bool DirectionalDragAreaPrivate::sanityCheckRecognitionProperties()
524− return recognitionIsDisabled()
525− || (distanceThreshold < maxDistance && compositionTime < maxTime);
528−const QTouchEvent::TouchPoint *DirectionalDragAreaPrivate::fetchTargetTouchPoint(QTouchEvent *event)
530− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
531− const QTouchEvent::TouchPoint *touchPoint = 0;
532− for (int i = 0; i < touchPoints.size(); ++i) {
533− if (touchPoints.at(i).id() == touchId) {
534− touchPoint = &touchPoints.at(i);
541−bool DirectionalDragAreaPrivate::movingInRightDirection() const
543− if (direction == Direction::Horizontal || direction == Direction::Vertical) {
546− QPointF movementVector(dampedScenePos.x() - previousDampedScenePos.x(),
547− dampedScenePos.y() - previousDampedScenePos.y());
549− qreal scalarProjection = projectOntoDirectionVector(movementVector);
551− return scalarProjection >= 0.;
555−bool DirectionalDragAreaPrivate::movedFarEnoughAlongGestureAxis() const
557− if (distanceThreshold <= 0.) {
558− // distance threshold check is disabled
561− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
562− dampedScenePos.y() - startScenePos.y());
564− qreal scalarProjection = projectOntoDirectionVector(totalMovement);
566− ddaDebug(" movedFarEnoughAlongGestureAxis: scalarProjection=" << scalarProjection
567− << ", distanceThreshold=" << distanceThreshold);
569− if (direction == Direction::Horizontal || direction == Direction::Vertical) {
570− return qAbs(scalarProjection) > distanceThreshold;
572− return scalarProjection > distanceThreshold;
577−bool DirectionalDragAreaPrivate::isPastMaxDistance() const
579− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
580− dampedScenePos.y() - startScenePos.y());
582− qreal squaredDistance = totalMovement.x()*totalMovement.x() + totalMovement.y()*totalMovement.y();
583− return squaredDistance > maxDistance*maxDistance;
586−void DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible()
588− if (!q->isEnabled() || !q->isVisible()) {
589− if (status == Undecided) {
590− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
591− // We still wanna know when it ends for keeping the composition time window up-to-date
592− TouchRegistry::instance()->addTouchWatcher(touchId, q);
595− if (status != WaitingForTouch) {
596− ddaDebug("Resetting status because got disabled or made invisible");
597− setStatus(WaitingForTouch);
602−void DirectionalDragAreaPrivate::rejectGesture()
604− if (status == Undecided) {
605− ddaDebug("Rejecting gesture because it's taking too long to drag beyond the threshold.");
607− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
608− // We still wanna know when it ends for keeping the composition time window up-to-date
609− TouchRegistry::instance()->addTouchWatcher(touchId, q);
611− setStatus(WaitingForTouch);
615−void DirectionalDragAreaPrivate::setStatus(Status newStatus)
617− if (newStatus == status)
620− Status oldStatus = status;
622− if (oldStatus == Undecided) {
623− recognitionTimer->stop();
627− Q_EMIT statusChanged(status);
629− ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
631− switch (newStatus) {
632− case WaitingForTouch:
633− if (oldStatus == Recognized) {
634− Q_EMIT q->draggingChanged(false);
636− Q_EMIT q->pressedChanged(false);
639− recognitionTimer->start();
640− Q_EMIT q->pressedChanged(true);
643− if (oldStatus == WaitingForTouch) { // for immediate recognition
644− Q_EMIT q->pressedChanged(true);
646− Q_EMIT q->draggingChanged(true);
654−void DirectionalDragAreaPrivate::setPublicPos(const QPointF point)
656− bool xChanged = publicPos.x() != point.x();
657− bool yChanged = publicPos.y() != point.y();
659− // Public position should not get updated while the gesture is still being recognized
660− // (ie, Undecided status).
661− Q_ASSERT(status == WaitingForTouch || status == Recognized);
663− if (status == Recognized && !recognitionIsDisabled()) {
664− // When the gesture finally gets recognized, the finger will likely be
665− // reasonably far from the edge. If we made the contentX immediately
666− // follow the finger position it would be visually unpleasant as it
667− // would appear right next to the user's finger out of nowhere (ie,
668− // it would jump). Instead, we make contentX go towards the user's
669− // finger in several steps. ie., in an animated way.
670− QPointF delta = point - publicPos;
671− // the trick is not to go all the way (1.0) as it would cause a sudden jump
672− publicPos.rx() += 0.4 * delta.x();
673− publicPos.ry() += 0.4 * delta.y();
675− // no smoothing when initializing or if gesture recognition was immediate as there will
681− Q_EMIT q->touchXChanged(publicPos.x());
682− if (Direction::isHorizontal(direction))
683− Q_EMIT q->distanceChanged(q->distance());
687− Q_EMIT q->touchYChanged(publicPos.y());
688− if (Direction::isVertical(direction))
689− Q_EMIT q->distanceChanged(q->distance());
693−void DirectionalDragAreaPrivate::setPublicScenePos(const QPointF point)
695− bool xChanged = publicScenePos.x() != point.x();
696− bool yChanged = publicScenePos.y() != point.y();
698− if (!xChanged && !yChanged)
701− // Public position should not get updated while the gesture is still being recognized
702− // (ie, Undecided status).
703− Q_ASSERT(status == WaitingForTouch || status == Recognized);
705− qreal oldSceneDistance = sceneDistance;
707− if (status == Recognized && !recognitionIsDisabled()) {
708− // When the gesture finally gets recognized, the finger will likely be
709− // reasonably far from the edge. If we made the contentX immediately
710− // follow the finger position it would be visually unpleasant as it
711− // would appear right next to the user's finger out of nowhere (ie,
712− // it would jump). Instead, we make contentX go towards the user's
713− // finger in several steps. ie., in an animated way.
714− QPointF delta = point - publicScenePos;
715− // the trick is not to go all the way (1.0) as it would cause a sudden jump
716− publicScenePos.rx() += 0.4 * delta.x();
717− publicScenePos.ry() += 0.4 * delta.y();
719− // no smoothing when initializing or if gesture recognition was immediate as there will
721− publicScenePos = point;
724− updateSceneDistance();
726− if (oldSceneDistance != sceneDistance) {
727− Q_EMIT q->sceneDistanceChanged(sceneDistance);
731− Q_EMIT q->touchSceneXChanged(publicScenePos.x());
735− Q_EMIT q->touchSceneYChanged(publicScenePos.y());
739−bool DirectionalDragAreaPrivate::isWithinTouchCompositionWindow()
742− compositionTime > 0 &&
743− !activeTouches.isEmpty() &&
744− timeSource->msecsSinceReference() <=
745− activeTouches.mostRecentStartTime() + (qint64)compositionTime;
748−void DirectionalDragArea::itemChange(ItemChange change, const ItemChangeData &value)
750− if (change == QQuickItem::ItemSceneChange) {
751− if (value.window != nullptr) {
752− value.window->installEventFilter(TouchRegistry::instance());
754− // TODO: Handle window->screen() changes (ie window changing screens)
756− qreal pixelsPerInch = value.window->screen()->physicalDotsPerInch();
757− if (pixelsPerInch < 0) {
758− // It can return garbage when run in a XVFB server (Virtual Framebuffer 'fake' X server)
762− d->setPixelsPerMm(pixelsPerInch / 25.4);
767−void DirectionalDragAreaPrivate::setPixelsPerMm(qreal pixelsPerMm)
769− dampedScenePos.setMaxDelta(1. * pixelsPerMm);
770− setDistanceThreshold(4. * pixelsPerMm);
771− maxDistance = 10. * pixelsPerMm;
774−//************************** ActiveTouchesInfo **************************
776−ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)
777− : m_timeSource(timeSource)
781−void ActiveTouchesInfo::update(QTouchEvent *event)
783− if (!(event->touchPointStates() & (Qt::TouchPointPressed | Qt::TouchPointReleased))) {
784− // nothing to update
785− #if ACTIVETOUCHESINFO_DEBUG
786− qDebug("[DDA::ActiveTouchesInfo] Nothing to Update");
791− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
792− for (int i = 0; i < touchPoints.count(); ++i) {
793− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
794− if (touchPoint.state() == Qt::TouchPointPressed) {
795− addTouchPoint(touchPoint.id());
796− } else if (touchPoint.state() == Qt::TouchPointReleased) {
797− removeTouchPoint(touchPoint.id());
802−#if ACTIVETOUCHESINFO_DEBUG
803−QString ActiveTouchesInfo::toString()
805− QString string = "(";
808− QTextStream stream(&string);
809− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
810− stream << "(id=" << touchInfo->id << ",startTime=" << touchInfo->startTime << ")";
819−#endif // ACTIVETOUCHESINFO_DEBUG
821−void ActiveTouchesInfo::addTouchPoint(int touchId)
823− ActiveTouchInfo &activeTouchInfo = m_touchInfoPool.getEmptySlot();
824− activeTouchInfo.id = touchId;
825− activeTouchInfo.startTime = m_timeSource->msecsSinceReference();
827− #if ACTIVETOUCHESINFO_DEBUG
828− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
832−qint64 ActiveTouchesInfo::touchStartTime(int touchId)
836− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
837− if (touchId == touchInfo->id) {
838− result = touchInfo->startTime;
845− Q_ASSERT(result != -1);
849−void ActiveTouchesInfo::removeTouchPoint(int touchId)
851− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
852− if (touchId == touchInfo->id) {
853− m_touchInfoPool.freeSlot(touchInfo);
860− #if ACTIVETOUCHESINFO_DEBUG
861− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
865−qint64 ActiveTouchesInfo::mostRecentStartTime()
867− Q_ASSERT(!m_touchInfoPool.isEmpty());
869− qint64 highestStartTime = -1;
871− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &activeTouchInfo) {
872− if (activeTouchInfo->startTime > highestStartTime) {
873− highestStartTime = activeTouchInfo->startTime;
878− return highestStartTime;
881−void DirectionalDragAreaPrivate::updateSceneDirectionVector()
883− QPointF localOrigin(0., 0.);
884− QPointF localDirection;
885− switch (direction) {
886− case Direction::Upwards:
887− localDirection.rx() = 0.;
888− localDirection.ry() = -1.;
890− case Direction::Downwards:
891− case Direction::Vertical:
892− localDirection.rx() = 0.;
893− localDirection.ry() = 1;
895− case Direction::Leftwards:
896− localDirection.rx() = -1.;
897− localDirection.ry() = 0.;
899− default: // Direction::Rightwards || Direction.Horizontal
900− localDirection.rx() = 1.;
901− localDirection.ry() = 0.;
904− QPointF sceneOrigin = q->mapToScene(localOrigin);
905− QPointF sceneDirection = q->mapToScene(localDirection);
906− sceneDirectionVector = sceneDirection - sceneOrigin;
909−qreal DirectionalDragAreaPrivate::projectOntoDirectionVector(const QPointF sceneVector) const
911− // same as dot product as sceneDirectionVector is a unit vector
912− return sceneVector.x() * sceneDirectionVector.x() +
913− sceneVector.y() * sceneDirectionVector.y();
916−DirectionalDragAreaPrivate::DirectionalDragAreaPrivate(DirectionalDragArea *q)
918− , status(WaitingForTouch)
921− , direction(Direction::Rightwards)
922− , distanceThreshold(0)
923− , distanceThresholdSquared(0.)
925− , compositionTime(60)
926− , immediateRecognition(false)
927− , recognitionTimer(nullptr)
928− , timeSource(new RealTimeSource)
929− , activeTouches(timeSource)
930− , monitorOnly(false)
plugins/Ubuntu/Gestures/DirectionalDragArea.hdeleted−143
@@ -1,143 +0,0 @@
2− * Copyright (C) 2013,2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef DIRECTIONAL_DRAG_AREA_H
18−#define DIRECTIONAL_DRAG_AREA_H
20−#include <QtQuick/QQuickItem>
21−#include "UbuntuGesturesQmlGlobal.h"
23−#include "Direction.h"
29−class TouchOwnershipEvent;
30−class UnownedTouchEvent;
31−class DirectionalDragAreaPrivate;
34− An area that detects axis-aligned single-finger drag gestures
36− If a drag deviates too much from the components' direction recognition will
37− fail. It will also fail if the drag or flick is too short. E.g. a noisy or
40− See doc/DirectionalDragArea.svg
42−class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {
45− // The direction in which the gesture should move in order to be recognized.
46− Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)
48− // The distance travelled by the finger along the axis specified by
49− // DirectionalDragArea's direction.
50− Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)
52− // The distance travelled by the finger along the axis specified by
53− // DirectionalDragArea's direction in scene coordinates
54− Q_PROPERTY(qreal sceneDistance READ sceneDistance NOTIFY sceneDistanceChanged)
56− // Position of the touch point performing the drag relative to this item.
57− Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)
58− Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)
60− // Position of the touch point performing the drag, in scene's coordinate system
61− Q_PROPERTY(qreal touchSceneX READ touchSceneX NOTIFY touchSceneXChanged)
62− Q_PROPERTY(qreal touchSceneY READ touchSceneY NOTIFY touchSceneYChanged)
64− // Whether a drag gesture is taking place
65− Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
67− // Whether the drag area is pressed.
68− Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
70− // Whether a gesture should be Recognized as soon a touch lands on the area.
71− // With this property enabled it will work pretty much like a MultiPointTouchArea,
72− // just with a different API.
74− // It's false by default. In most cases you will not want that enabled.
75− Q_PROPERTY(bool immediateRecognition
76− READ immediateRecognition
77− WRITE setImmediateRecognition
78− NOTIFY immediateRecognitionChanged)
80− // Whether we are merely monitoring touch events (in which case, we don't
81− // claim ownership of the touch).
82− Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
86− DirectionalDragArea(QQuickItem *parent = 0);
88− Direction::Type direction() const;
89− void setDirection(Direction::Type);
91− qreal distance() const;
92− qreal sceneDistance() const;
94− qreal touchX() const;
95− qreal touchY() const;
97− qreal touchSceneX() const;
98− qreal touchSceneY() const;
100− bool dragging() const;
102− bool pressed() const;
104− bool immediateRecognition() const;
105− void setImmediateRecognition(bool enabled);
107− bool monitorOnly() const;
108− void setMonitorOnly(bool monitorOnly);
110− bool event(QEvent *e) override;
113− In qmltests, sequences of touch events are sent all at once, unlike in "real life".
114− Also qmltests might run really slowly, e.g. when run from inside virtual machines.
115− Thus to remove a variable that qmltests cannot really control, namely time, this
116− function removes all constraints that are sensible to elapsed time.
118− This effectively makes the DirectionalDragArea easier to fool.
120− Q_INVOKABLE void removeTimeConstraints();
123− void directionChanged(Direction::Type direction);
124− void draggingChanged(bool value);
125− void pressedChanged(bool value);
126− void distanceChanged(qreal value);
127− void sceneDistanceChanged(qreal value);
128− void touchXChanged(qreal value);
129− void touchYChanged(qreal value);
130− void touchSceneXChanged(qreal value);
131− void touchSceneYChanged(qreal value);
132− void immediateRecognitionChanged(bool value);
133− void monitorOnlyChanged(bool value);
136− void touchEvent(QTouchEvent *event) override;
137− void itemChange(ItemChange change, const ItemChangeData &value) override;
139−public: // so tests can access it
140− DirectionalDragAreaPrivate *d;
143−#endif // DIRECTIONAL_DRAG_AREA_H
plugins/Ubuntu/Gestures/DirectionalDragArea_p.hdeleted−169
@@ -1,169 +0,0 @@
2− * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef DIRECTIONAL_DRAG_AREA_PRIV_H
18−#define DIRECTIONAL_DRAG_AREA_PRIV_H
20−// Information about an active touch point
21−struct UBUNTUGESTURESQML_EXPORT ActiveTouchInfo {
22− ActiveTouchInfo() : id(-1), startTime(-1) {}
23− bool isValid() const { return id != -1; }
24− void reset() { id = -1; }
28−class UBUNTUGESTURESQML_EXPORT ActiveTouchesInfo {
30− ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
31− void update(QTouchEvent *event);
32− qint64 touchStartTime(int id);
33− bool isEmpty() const { return m_touchInfoPool.isEmpty(); }
34− qint64 mostRecentStartTime();
35− UbuntuGestures::SharedTimeSource m_timeSource;
37− void addTouchPoint(int touchId);
38− void removeTouchPoint(int touchId);
39− #if ACTIVETOUCHESINFO_DEBUG
43− Pool<ActiveTouchInfo> m_touchInfoPool;
46−class UBUNTUGESTURESQML_EXPORT DirectionalDragAreaPrivate : public QObject {
51− DirectionalDragAreaPrivate(DirectionalDragArea *q);
54− void giveUpIfDisabledOrInvisible();
55− void rejectGesture();
58− // Describes the state of the directional drag gesture.
60− // Waiting for a new touch point to land on this area. No gesture is being processed
64− // A touch point has landed on this area but it's not know yet whether it is
65− // performing a drag in the correct direction.
66− // If it's decided that the touch point is not performing a directional drag gesture,
67− // it will be rejected/ignored and status will return to WaitingForTouch.
68− Undecided, //Recognizing,
70− // There's a touch point in this area and it performed a drag in the correct
73− // Once recognized, the gesture state will move back to WaitingForTouch only once
74− // that touch point ends. The gesture will remain in the Recognized state even if
75− // the touch point starts moving in other directions or halts.
79− void touchEvent_absent(QTouchEvent *event);
80− void touchEvent_undecided(QTouchEvent *event);
81− void touchEvent_recognized(QTouchEvent *event);
82− bool movingInRightDirection() const;
83− bool movedFarEnoughAlongGestureAxis() const;
84− bool isPastMaxDistance() const;
85− const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);
86− void setStatus(Status newStatus);
87− void setPublicPos(const QPointF point);
88− void setPublicScenePos(const QPointF point);
89− bool isWithinTouchCompositionWindow();
90− void updateSceneDirectionVector();
91− // returns the scalar projection between the given vector (in scene coordinates)
92− // and m_sceneDirectionVector
93− qreal projectOntoDirectionVector(const QPointF sceneVector) const;
94− void touchOwnershipEvent(TouchOwnershipEvent *event);
95− void unownedTouchEvent(UnownedTouchEvent *event);
96− void unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent);
97− void watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints);
98− bool recognitionIsDisabled() const;
99− bool sanityCheckRecognitionProperties();
100− void updateSceneDistance();
101− void setMaxTime(int value);
102− void setDistanceThreshold(qreal value);
103− void setPixelsPerMm(qreal pixelsPerMm);
104− QString objectName() const { return q->objectName(); }
106− // Replaces the existing Timer with the given one.
108− // Useful for providing a fake timer when testing.
109− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
111− // Useful for testing, where a fake time source can be supplied
112− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
114− DirectionalDragArea *q;
116− // The current status of the directional drag gesture area.
120− QPointF startScenePos;
121− qreal sceneDistance;
124− // The touch position exposed in the public API.
125− // It only starts to move once the gesture gets recognized.
127− QPointF publicScenePos;
129− // A movement damper is used in some of the gesture recognition calculations
130− // to get rid of noise or small oscillations in the touch position.
131− DampedPointF dampedScenePos;
132− QPointF previousDampedScenePos;
134− // Unit vector in scene coordinates describing the direction of the gesture recognition
135− QPointF sceneDirectionVector;
137− Direction::Type direction;
139− // How far a touch point has to move from its initial position along the gesture axis in order
140− // for it to be recognized as a directional drag.
141− qreal distanceThreshold;
142− qreal distanceThresholdSquared; // it's pow(distanceThreshold, 2)
144− // Maximum time (in milliseconds) the gesture can take to go beyond the distance threshold
147− // Maximum distance the gesture can go without crossing the axis-aligned distance threshold
150− // Maximum time (in milliseconds) after the start of a given touch point where
151− // subsequent touch starts are grouped with the first one into an N-touches gesture
152− // (e.g. a two-fingers tap or drag).
153− int compositionTime;
155− bool immediateRecognition;
157− UbuntuGestures::AbstractTimer *recognitionTimer;
159− UbuntuGestures::SharedTimeSource timeSource;
161− ActiveTouchesInfo activeTouches;
166− void statusChanged(Status value);
169−#endif // DIRECTIONAL_DRAG_AREA_PRIV_H
plugins/Ubuntu/Gestures/FloatingFlickable.cppdeleted−150
@@ -1,150 +0,0 @@
2− * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
17−#include "FloatingFlickable.h"
19−#include <private/qquickflickable_p.h>
20−#include "DirectionalDragArea.h"
24−FloatingFlickable::FloatingFlickable(QQuickItem *parent)
26− , m_mousePressed(false)
28− m_dragArea = new DirectionalDragArea(this);
29− m_dragArea->setWidth(width());
30− m_dragArea->setHeight(height());
31− m_dragArea->setDirection(Direction::Horizontal);
32− connect(m_dragArea, &DirectionalDragArea::touchXChanged,
33− this, &FloatingFlickable::onDragAreaTouchPosChanged);
34− connect(m_dragArea, &DirectionalDragArea::touchYChanged,
35− this, &FloatingFlickable::onDragAreaTouchPosChanged);
36− connect(m_dragArea, &DirectionalDragArea::draggingChanged,
37− this, &FloatingFlickable::onDragAreaDraggingChanged);
38− connect(m_dragArea, &DirectionalDragArea::directionChanged, this, &FloatingFlickable::directionChanged);
40− m_flickable = new QQuickFlickable(this);
41− m_flickable->setEnabled(false);
42− m_flickable->setWidth(width());
43− m_flickable->setHeight(height());
44− connect(m_flickable, &QQuickFlickable::contentWidthChanged, this, &FloatingFlickable::contentWidthChanged);
45− connect(m_flickable, &QQuickFlickable::contentHeightChanged, this, &FloatingFlickable::contentHeightChanged);
46− connect(m_flickable, &QQuickFlickable::contentXChanged, this, &FloatingFlickable::contentXChanged);
47− connect(m_flickable, &QQuickFlickable::contentYChanged, this, &FloatingFlickable::contentYChanged);
49− connect(this, &QQuickItem::widthChanged, this, &FloatingFlickable::updateChildrenWidth);
50− connect(this, &QQuickItem::heightChanged, this, &FloatingFlickable::updateChildrenHeight);
53−qreal FloatingFlickable::contentWidth() const
55− return m_flickable->contentWidth();
58−void FloatingFlickable::setContentWidth(qreal contentWidth)
60− m_flickable->setContentWidth(contentWidth);
63−qreal FloatingFlickable::contentHeight() const
65− return m_flickable->contentHeight();
68−void FloatingFlickable::setContentHeight(qreal contentHeight)
70− m_flickable->setContentHeight(contentHeight);
73−qreal FloatingFlickable::contentX() const
75− return m_flickable->contentX();
78−void FloatingFlickable::setContentX(qreal contentX)
80− m_flickable->setContentX(contentX);
83−qreal FloatingFlickable::contentY() const
85− return m_flickable->contentY();
88−void FloatingFlickable::setContentY(qreal contentY)
90− m_flickable->setContentY(contentY);
93−Direction::Type FloatingFlickable::direction() const
95− return m_dragArea->direction();
98−void FloatingFlickable::setDirection(Direction::Type direction)
100− m_dragArea->setDirection(direction);
101− if (Direction::isHorizontal(direction)) {
102− m_flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);
104− m_flickable->setFlickableDirection(QQuickFlickable::VerticalFlick);
108−void FloatingFlickable::updateChildrenWidth()
110− m_dragArea->setWidth(width());
111− m_flickable->setWidth(width());
114−void FloatingFlickable::updateChildrenHeight()
116− m_dragArea->setHeight(height());
117− m_flickable->setHeight(height());
120−void FloatingFlickable::onDragAreaTouchPosChanged(qreal)
122− if (m_mousePressed) {
123− QMouseEvent mouseEvent(QEvent::MouseMove,
124− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
125− Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
127− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
132−void FloatingFlickable::onDragAreaDraggingChanged(bool dragging)
134− if (dragging && !m_mousePressed) {
135− QMouseEvent mouseEvent(QEvent::MouseButtonPress,
136− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
137− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
139− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
140− m_mousePressed = true;
142− } else if (!dragging && m_mousePressed) {
143− QMouseEvent mouseEvent(QEvent::MouseButtonRelease,
144− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
145− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
147− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
148− m_mousePressed = false;
plugins/Ubuntu/Gestures/FloatingFlickable.hdeleted−86
@@ -1,86 +0,0 @@
2− * Copyright (C) 2015 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef FLOATING_FLICKABLE_H
18−#define FLOATING_FLICKABLE_H
21−#include "UbuntuGesturesQmlGlobal.h"
22−#include "Direction.h"
24−class DirectionalDragArea;
25−class QQuickFlickable;
28− A Flickable that can be put in front of the item to be flicked and
29− still have the item-to-be-flicked receive input events that are not flicks.
31− Ie, it's a Flickable that, input-wise, is transparent to non-flick gestures.
33− With a regular Flickable you would have to make the item-to-be-flicked a child
34− of Flicakble to achieve the same result. FloatingFlickable has no such requirement
37−class UBUNTUGESTURESQML_EXPORT FloatingFlickable : public QQuickItem {
40− Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged)
41− Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
42− Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)
43− Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)
45− Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)
48− void contentWidthChanged();
49− void contentHeightChanged();
50− void contentXChanged();
51− void contentYChanged();
52− void directionChanged();
55− FloatingFlickable(QQuickItem *parent = nullptr);
57− qreal contentWidth() const;
58− void setContentWidth(qreal contentWidth);
60− qreal contentHeight() const;
61− void setContentHeight(qreal contentHeight);
63− qreal contentX() const;
64− void setContentX(qreal contentX);
66− qreal contentY() const;
67− void setContentY(qreal contentY);
69− Direction::Type direction() const;
70− void setDirection(Direction::Type);
73− void updateChildrenWidth();
74− void updateChildrenHeight();
75− void onDragAreaTouchPosChanged(qreal);
76− void onDragAreaDraggingChanged(bool value);
79− DirectionalDragArea *m_dragArea;
80− QQuickFlickable *m_flickable;
83− friend class tst_FloatingFlickable;
86−#endif // FLOATING_FLICKABLE_H
plugins/Ubuntu/Gestures/Gestures.qmltypesdeleted−209
@@ -1,209 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 plugins'
11− name: "AxisVelocityCalculator"
13− exports: ["Ubuntu.Gestures/AxisVelocityCalculator 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "trackedPosition"; type: "double" }
17− name: "trackedPositionChanged"
18− Parameter { name: "value"; type: "double" }
20− Method { name: "calculate"; type: "double" }
21− Method { name: "reset" }
26− exports: ["Ubuntu.Gestures/Direction 0.1"]
29− exportMetaObjectRevisions: [0]
44− Parameter { name: "type"; type: "Direction::Type" }
49− Parameter { name: "type"; type: "Direction::Type" }
54− Parameter { name: "type"; type: "Direction::Type" }
58− name: "DirectionalDragArea"
59− defaultProperty: "data"
60− prototype: "QQuickItem"
61− exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]
62− exportMetaObjectRevisions: [0]
63− Property { name: "direction"; type: "Direction::Type" }
64− Property { name: "distance"; type: "double"; isReadonly: true }
65− Property { name: "sceneDistance"; type: "double"; isReadonly: true }
66− Property { name: "touchX"; type: "double"; isReadonly: true }
67− Property { name: "touchY"; type: "double"; isReadonly: true }
68− Property { name: "touchSceneX"; type: "double"; isReadonly: true }
69− Property { name: "touchSceneY"; type: "double"; isReadonly: true }
70− Property { name: "dragging"; type: "bool"; isReadonly: true }
71− Property { name: "pressed"; type: "bool"; isReadonly: true }
72− Property { name: "immediateRecognition"; type: "bool" }
74− name: "directionChanged"
75− Parameter { name: "direction"; type: "Direction::Type" }
78− name: "draggingChanged"
79− Parameter { name: "value"; type: "bool" }
82− name: "pressedChanged"
83− Parameter { name: "value"; type: "bool" }
86− name: "distanceChanged"
87− Parameter { name: "value"; type: "double" }
90− name: "sceneDistanceChanged"
91− Parameter { name: "value"; type: "double" }
94− name: "touchXChanged"
95− Parameter { name: "value"; type: "double" }
98− name: "touchYChanged"
99− Parameter { name: "value"; type: "double" }
102− name: "touchSceneXChanged"
103− Parameter { name: "value"; type: "double" }
106− name: "touchSceneYChanged"
107− Parameter { name: "value"; type: "double" }
110− name: "immediateRecognitionChanged"
111− Parameter { name: "value"; type: "bool" }
113− Method { name: "removeTimeConstraints" }
116− name: "FloatingFlickable"
117− defaultProperty: "data"
118− prototype: "QQuickItem"
119− exports: ["Ubuntu.Gestures/FloatingFlickable 0.1"]
120− exportMetaObjectRevisions: [0]
121− Property { name: "contentWidth"; type: "double" }
122− Property { name: "contentHeight"; type: "double" }
123− Property { name: "contentX"; type: "double" }
124− Property { name: "contentY"; type: "double" }
125− Property { name: "direction"; type: "Direction::Type" }
128− name: "GestureTouchPoint"
129− prototype: "QObject"
130− exports: ["Ubuntu.Gestures/GestureTouchPoint 0.1"]
132− exportMetaObjectRevisions: [0]
133− Property { name: "pointId"; type: "int"; isReadonly: true }
134− Property { name: "pressed"; type: "bool"; isReadonly: true }
135− Property { name: "x"; type: "double"; isReadonly: true }
136− Property { name: "y"; type: "double"; isReadonly: true }
137− Property { name: "dragging"; type: "bool"; isReadonly: true }
140− name: "PressedOutsideNotifier"
141− defaultProperty: "data"
142− prototype: "QQuickItem"
143− exports: ["Ubuntu.Gestures/PressedOutsideNotifier 0.1"]
144− exportMetaObjectRevisions: [0]
145− Signal { name: "pressedOutside" }
149− defaultProperty: "data"
150− prototype: "QQuickItem"
151− exports: ["Ubuntu.Gestures/TouchGate 0.1"]
152− exportMetaObjectRevisions: [0]
153− Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
155− name: "targetItemChanged"
156− Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
160− name: "TouchGestureArea"
161− defaultProperty: "data"
162− prototype: "QQuickItem"
163− exports: ["Ubuntu.Gestures/TouchGestureArea 0.1"]
164− exportMetaObjectRevisions: [0]
168− "WaitingForTouch": 0,
174− Property { name: "touchPoints"; type: "GestureTouchPoint"; isList: true; isReadonly: true }
175− Property { name: "dragging"; type: "bool"; isReadonly: true }
176− Property { name: "minimumTouchPoints"; type: "int" }
177− Property { name: "maximumTouchPoints"; type: "int" }
179− name: "statusChanged"
180− Parameter { name: "status"; type: "Status" }
182− Signal { name: "touchPointsUpdated" }
184− name: "draggingChanged"
185− Parameter { name: "dragging"; type: "bool" }
188− name: "minimumTouchPointsChanged"
189− Parameter { name: "value"; type: "bool" }
192− name: "maximumTouchPointsChanged"
193− Parameter { name: "value"; type: "bool" }
197− Parameter { name: "points"; type: "QList<QObject*>" }
201− Parameter { name: "points"; type: "QList<QObject*>" }
205− Parameter { name: "points"; type: "QList<QObject*>" }
207− Signal { name: "clicked" }
plugins/Ubuntu/Gestures/MouseEventGenerator.cppnew file+64
@@ -0,0 +1,64 @@
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
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.
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.
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/>.
17+#include "MouseEventGenerator.h"
19+#include <QCoreApplication>
20+#include <QMouseEvent>
23+MouseEventGenerator::MouseEventGenerator(QObject *parent)
28+void MouseEventGenerator::move(const QPointF position)
30+ if (!m_mousePressed || !m_targetItem) {
34+ QMouseEvent mouseEvent(QEvent::MouseMove,
35+ QPointF(position.x(), position.y()), Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
37+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
40+void MouseEventGenerator::press(const QPointF position)
42+ if (m_mousePressed || !m_targetItem) {
46+ QMouseEvent mouseEvent(QEvent::MouseButtonPress,
47+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
49+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
50+ m_mousePressed = true;
53+void MouseEventGenerator::release(const QPointF position)
55+ if (!m_mousePressed || !m_targetItem) {
59+ QMouseEvent mouseEvent(QEvent::MouseButtonRelease,
60+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
62+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
63+ m_mousePressed = false;
plugins/Ubuntu/Gestures/MouseEventGenerator.hnew file+48
@@ -0,0 +1,48 @@
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
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.
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.
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/>.
17+#ifndef MOUSEEVENTGENERATOR_H
18+#define MOUSEEVENTGENERATOR_H
23+#include "UbuntuGesturesQmlGlobal.h"
27+class UBUNTUGESTURESQML_EXPORT MouseEventGenerator : public QObject {
29+ Q_PROPERTY(QQuickItem* targetItem MEMBER m_targetItem NOTIFY targetItemChanged)
32+ MouseEventGenerator(QObject *parent = nullptr);
34+ Q_INVOKABLE void move(const QPointF position);
35+ Q_INVOKABLE void press(const QPointF position);
36+ Q_INVOKABLE void release(const QPointF position);
39+ void targetItemChanged(QQuickItem *);
42+ bool m_mousePressed {false};
43+ QQuickItem *m_targetItem {nullptr};
45+ friend class tst_FloatingFlickable;
48+#endif // MOUSEEVENTGENERATOR_H
plugins/Ubuntu/Gestures/PressedOutsideNotifier.h+1−1
@@ -23,7 +23,7 @@
23#include <QPointer>
23#include <QPointer>
24#include <QTimer>
24#include <QTimer>
26−#include "UbuntuGesturesGlobal.h"
26+#include <ubuntugesturesglobal.h>
29 Notifies when a point, mouse or touch, is pressed outside its area.
29 Notifies when a point, mouse or touch, is pressed outside its area.
plugins/Ubuntu/Gestures/TouchDispatcher.cpp+1−5
@@ -19,11 +19,7 @@
19#include <QGuiApplication>
19#include <QGuiApplication>
20#include <QScopedPointer>
20#include <QScopedPointer>
21#include <QStyleHints>
21#include <QStyleHints>
23−#pragma GCC diagnostic push
24−#pragma GCC diagnostic ignored "-pedantic"
25#include <private/qquickitem_p.h>
22#include <private/qquickitem_p.h>
26−#pragma GCC diagnostic pop
28#define TOUCHDISPATCHER_DEBUG 0
24#define TOUCHDISPATCHER_DEBUG 0
@@ -225,7 +221,7 @@ void TouchDispatcher::dispatchAsMouse(
225 QEvent::Type eventType;
221 QEvent::Type eventType;
226 if (touchMouse->state() == Qt::TouchPointPressed) {
222 if (touchMouse->state() == Qt::TouchPointPressed) {
227 eventType = QEvent::MouseButtonPress;
223 eventType = QEvent::MouseButtonPress;
228− } if (touchMouse->state() == Qt::TouchPointReleased) {
224+ } else if (touchMouse->state() == Qt::TouchPointReleased) {
229 eventType = QEvent::MouseButtonRelease;
225 eventType = QEvent::MouseButtonRelease;
230 m_touchMouseId = -1;
226 m_touchMouseId = -1;
plugins/Ubuntu/Gestures/TouchGate.cpp+10−5
@@ -20,16 +20,18 @@
20#include <QDebug>
20#include <QDebug>
21#include <QQuickWindow>
21#include <QQuickWindow>
23−#include <TouchOwnershipEvent.h>
23+#include <UbuntuGestures/private/touchownershipevent_p.h>
24−#include <TouchRegistry.h>
24+#include <UbuntuGestures/private/touchregistry_p.h>
26#if TOUCHGATE_DEBUG
26#if TOUCHGATE_DEBUG
27#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params
27#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params
28−#include <DebugHelpers.h>
28+#include <UbuntuGestures/private/debughelpers_p.h>
29#else // TOUCHGATE_DEBUG
29#else // TOUCHGATE_DEBUG
30#define ugDebug(params) ((void)0)
30#define ugDebug(params) ((void)0)
31#endif // TOUCHGATE_DEBUG
31#endif // TOUCHGATE_DEBUG
33TouchGate::TouchGate(QQuickItem *parent)
35TouchGate::TouchGate(QQuickItem *parent)
34 : QQuickItem(parent)
36 : QQuickItem(parent)
@@ -40,7 +42,7 @@ TouchGate::TouchGate(QQuickItem *parent)
40bool TouchGate::event(QEvent *e)
42bool TouchGate::event(QEvent *e)
42 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
44 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
43− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));
45+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(e));
44 return true;
46 return true;
46 return QQuickItem::event(e);
48 return QQuickItem::event(e);
@@ -59,7 +61,10 @@ void TouchGate::touchEvent(QTouchEvent *event)
59 const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
61 const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
61 if (touchPoint.state() == Qt::TouchPointPressed) {
63 if (touchPoint.state() == Qt::TouchPointPressed) {
64+// FIXME: This assert triggers frequently in make trySomething. We have verified
65+// that it's a bug in the mouse to touch conversion of the test environment
66+// and not in the actual product. Still, it probably should be cleaned up eventually.
62− Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
67+// Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
63 m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
68 m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
64 m_touchInfoMap[touchPoint.id()].ended = false;
69 m_touchInfoMap[touchPoint.id()].ended = false;
65 TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
70 TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
plugins/Ubuntu/Gestures/TouchGate.h+3−2
@@ -19,6 +19,7 @@
20#include "UbuntuGesturesQmlGlobal.h"
20#include "UbuntuGesturesQmlGlobal.h"
21#include "TouchDispatcher.h"
21#include "TouchDispatcher.h"
22+#include <UbuntuGestures/ubuntugesturesglobal.h>
23#include <QQuickItem>
24#include <QQuickItem>
24#include <QList>
25#include <QList>
@@ -26,7 +27,7 @@
27#define TOUCHGATE_DEBUG 0
28#define TOUCHGATE_DEBUG 0
29−class TouchOwnershipEvent;
30+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)
32 Blocks the passage of events until ownership over the related touch points is granted.
33 Blocks the passage of events until ownership over the related touch points is granted.
@@ -82,7 +83,7 @@ private:
82 ulong timestamp;
83 ulong timestamp;
85− void touchOwnershipEvent(TouchOwnershipEvent *event);
86+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);
86 bool isTouchPointOwned(int touchId) const;
87 bool isTouchPointOwned(int touchId) const;
87 void storeTouchEvent(QTouchDevice *device,
88 void storeTouchEvent(QTouchDevice *device,
88 Qt::KeyboardModifiers modifiers,
89 Qt::KeyboardModifiers modifiers,
plugins/Ubuntu/Gestures/TouchGestureArea.cpp+28−24
@@ -16,15 +16,18 @@
17#include "TouchGestureArea.h"
17#include "TouchGestureArea.h"
19−// local
19+#include <UbuntuGestures/private/touchownershipevent_p.h>
20−#include "TouchOwnershipEvent.h"
20+#include <UbuntuGestures/private/touchregistry_p.h>
21+#include <UbuntuGestures/private/unownedtouchevent_p.h>
21−#include "TouchRegistry.h"
22+// #include "TouchRegistry.h"
22−#include "UnownedTouchEvent.h"
23+// #include "UnownedTouchEvent.h"
24#include <QGuiApplication>
25#include <QGuiApplication>
25#include <QStyleHints>
26#include <QStyleHints>
26#include <private/qquickwindow_p.h>
27#include <private/qquickwindow_p.h>
28#define TOUCHGESTUREAREA_DEBUG 0
31#define TOUCHGESTUREAREA_DEBUG 0
30// TODO - understand more about why we lose touch event releases.
33// TODO - understand more about why we lose touch event releases.
@@ -134,7 +137,7 @@ TouchGestureArea::TouchGestureArea(QQuickItem* parent)
134 , m_recognitionPeriod(50)
137 , m_recognitionPeriod(50)
135 , m_releaseRejectPeriod(100)
138 , m_releaseRejectPeriod(100)
137− setRecognitionTimer(new UbuntuGestures::Timer(this));
140+ setRecognitionTimer(new Timer(this));
138 m_recognitionTimer->setInterval(m_recognitionPeriod);
141 m_recognitionTimer->setInterval(m_recognitionPeriod);
139 m_recognitionTimer->setSingleShot(true);
142 m_recognitionTimer->setSingleShot(true);
@@ -152,10 +155,10 @@ bool TouchGestureArea::event(QEvent *event)
153 // Process unowned touch events (handles update/release for incomplete gestures)
156 // Process unowned touch events (handles update/release for incomplete gestures)
154 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
157 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
155− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
158+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(event));
156 return true;
159 return true;
157 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
160 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
158− unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());
161+ unownedTouchEvent(static_cast<UnownedTouchEvent*>(event)->touchEvent());
159 return true;
162 return true;
@@ -325,6 +328,12 @@ void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)
332+ // If this event is a new touch, ignore it and let the item below have it.
333+ // We won't recognize any new touch until the whole current gesture is done
334+ // i.e. we're in WaitingForTouch state.
335+ // And even if it isn't, just ignore it anyway; we don't care about it.
330void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
339void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
@@ -374,7 +383,7 @@ void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *even
377− if (m_candidateTouches.count() == 0) {
386+ if (m_candidateTouches.isEmpty()) {
378 setInternalStatus(InternalStatus::WaitingForTouch);
387 setInternalStatus(InternalStatus::WaitingForTouch);
@@ -438,7 +447,7 @@ void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)
441− if (m_watchedTouches.count() == 0) {
450+ if (m_watchedTouches.isEmpty()) {
442 setInternalStatus(InternalStatus::WaitingForTouch);
451 setInternalStatus(InternalStatus::WaitingForTouch);
@@ -526,7 +535,7 @@ void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)
526 if (updateable) {
535 if (updateable) {
527 if (!dragging() && m_status == InternalStatus::Recognized) {
536 if (!dragging() && m_status == InternalStatus::Recognized) {
528 bool allWantDrag = !m_liveTouchPoints.isEmpty();
537 bool allWantDrag = !m_liveTouchPoints.isEmpty();
529− Q_FOREACH(auto point, m_liveTouchPoints) {
538+ Q_FOREACH(const auto &point, m_liveTouchPoints) {
530 allWantDrag &= point->dragging();
539 allWantDrag &= point->dragging();
532 // only dragging if all points are dragging.
541 // only dragging if all points are dragging.
@@ -588,13 +597,15 @@ void TouchGestureArea::setInternalStatus(uint newStatus)
588 resyncCachedTouchPoints();
597 resyncCachedTouchPoints();
590 case InternalStatus::WaitingForMoreTouches:
599 case InternalStatus::WaitingForMoreTouches:
591− m_recognitionTimer->start(m_recognitionPeriod);
600+ m_recognitionTimer->setInterval(m_recognitionPeriod);
601+ m_recognitionTimer->start();
593 case InternalStatus::Recognized:
603 case InternalStatus::Recognized:
594 resyncCachedTouchPoints();
604 resyncCachedTouchPoints();
596 case InternalStatus::WaitingForRejection:
606 case InternalStatus::WaitingForRejection:
597− m_recognitionTimer->start(m_releaseRejectPeriod);
607+ m_recognitionTimer->setInterval(m_releaseRejectPeriod);
608+ m_recognitionTimer->start();
599 case InternalStatus::Rejected:
610 case InternalStatus::Rejected:
600 resyncCachedTouchPoints();
611 resyncCachedTouchPoints();
@@ -605,7 +616,7 @@ void TouchGestureArea::setInternalStatus(uint newStatus)
608−void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
619+void TouchGestureArea::setRecognitionTimer(AbstractTimer *timer)
610 int interval = 0;
621 int interval = 0;
611 bool timerWasRunning = false;
622 bool timerWasRunning = false;
@@ -643,11 +654,9 @@ bool TouchGestureArea::dragging() const
643QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()
654QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()
645 return QQmlListProperty<GestureTouchPoint>(this,
656 return QQmlListProperty<GestureTouchPoint>(this,
647− nullptr,
657+ nullptr,
648− TouchGestureArea::touchPoint_count,
658+ TouchGestureArea::touchPoint_count,
649− TouchGestureArea::touchPoint_at,
659+ TouchGestureArea::touchPoint_at);
653int TouchGestureArea::minimumTouchPoints() const
662int TouchGestureArea::minimumTouchPoints() const
@@ -718,7 +727,7 @@ void TouchGestureArea::rejectGesture()
719 m_candidateTouches.clear();
728 m_candidateTouches.clear();
721− if (m_watchedTouches.count() == 0) {
730+ if (m_watchedTouches.isEmpty()) {
722 setInternalStatus(InternalStatus::WaitingForTouch);
731 setInternalStatus(InternalStatus::WaitingForTouch);
724 setInternalStatus(InternalStatus::Rejected);
733 setInternalStatus(InternalStatus::Rejected);
@@ -732,7 +741,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
732 bool added = false;
741 bool added = false;
733 bool ended = false;
742 bool ended = false;
734 bool moved = false;
743 bool moved = false;
735− bool wantsDrag = false;
737 // list of deletes
745 // list of deletes
738 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
746 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
@@ -762,10 +770,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
765− if (wantsDrag && !dragging()) {
769 if (ended) {
773 if (ended) {
770 if (m_cachedTouchPoints.isEmpty()) {
774 if (m_cachedTouchPoints.isEmpty()) {
771 if (!dragging()) Q_EMIT clicked();
775 if (!dragging()) Q_EMIT clicked();
plugins/Ubuntu/Gestures/TouchGestureArea.h+18−18
@@ -21,11 +21,11 @@
22#include <QQuickItem>
22#include <QQuickItem>
24−// lib UbuntuGestures
24+#include <UbuntuGestures/ubuntugesturesglobal.h>
25−#include <Timer.h>
25+#include <UbuntuGestures/private/timer_p.h>
27−class TouchOwnershipEvent;
27+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)
28−class UnownedTouchEvent;
28+UG_FORWARD_DECLARE_CLASS(UnownedTouchEvent)
30class GestureTouchPoint : public QObject
30class GestureTouchPoint : public QObject
@@ -76,7 +76,7 @@ public:
76 return *this;
76 return *this;
79− bool operator=(const GestureTouchPoint& rhs) const {
79+ bool operator==(const GestureTouchPoint& rhs) const {
80 if (&rhs == this) return true;
80 if (&rhs == this) return true;
81 return m_id == rhs.m_id &&
81 return m_id == rhs.m_id &&
82 m_pressed == rhs.m_pressed &&
82 m_pressed == rhs.m_pressed &&
@@ -84,7 +84,7 @@ public:
84 m_y == rhs.m_y &&
84 m_y == rhs.m_y &&
85 m_dragging == rhs.m_dragging;
85 m_dragging == rhs.m_dragging;
87− bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
89 void setPos(const QPointF &pos);
89 void setPos(const QPointF &pos);
@@ -106,15 +106,14 @@ private:
107 An area that detects multi-finger gestures.
107 An area that detects multi-finger gestures.
109− We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.
109+ We can use this to detect gestures constrained by a minimum and/or maximum number of touch points.
110− This components uses the touch registry to apply for ownership of touch points.
110+ This component uses the touch registry to apply for ownership of touch points.
111 This way we can use the component in conjuntion with the directional drag area to compete for ownwership
111 This way we can use the component in conjuntion with the directional drag area to compete for ownwership
112 or gestures; unlike the MultiPointTouchArea.
112 or gestures; unlike the MultiPointTouchArea.
114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
119 Q_PROPERTY(int status READ status NOTIFY statusChanged)
118 Q_PROPERTY(int status READ status NOTIFY statusChanged)
120 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
119 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
@@ -137,12 +136,13 @@ public:
137 Recognized,
136 Recognized,
140− TouchGestureArea(QQuickItem* parent = NULL);
140+ TouchGestureArea(QQuickItem* parent = nullptr);
141 ~TouchGestureArea();
141 ~TouchGestureArea();
143 bool event(QEvent *e) override;
143 bool event(QEvent *e) override;
145− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
145+ void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);
147 int status() const;
147 int status() const;
148 bool dragging() const;
148 bool dragging() const;
@@ -165,10 +165,10 @@ Q_SIGNALS:
166 void touchPointsUpdated();
166 void touchPointsUpdated();
167 void draggingChanged(bool dragging);
167 void draggingChanged(bool dragging);
168− void minimumTouchPointsChanged(bool value);
168+ void minimumTouchPointsChanged(int value);
169− void maximumTouchPointsChanged(bool value);
169+ void maximumTouchPointsChanged(int value);
170− void recognitionPeriodChanged(bool value);
170+ void recognitionPeriodChanged(int value);
171− void releaseRejectPeriodChanged(bool value);
171+ void releaseRejectPeriodChanged(int value);
173 void pressed(const QList<QObject*>& points);
173 void pressed(const QList<QObject*>& points);
174 void released(const QList<QObject*>& points);
174 void released(const QList<QObject*>& points);
@@ -176,7 +176,7 @@ Q_SIGNALS:
176 void clicked();
176 void clicked();
178protected:
178protected:
179− void itemChange(ItemChange change, const ItemChangeData &value);
179+ void itemChange(ItemChange change, const ItemChangeData &value) override;
181private Q_SLOTS:
181private Q_SLOTS:
182 void rejectGesture();
182 void rejectGesture();
@@ -195,7 +195,7 @@ private:
195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
198− void touchOwnershipEvent(TouchOwnershipEvent *event);
198+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);
199 void updateTouchPoints(QTouchEvent *event);
199 void updateTouchPoints(QTouchEvent *event);
201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
@@ -210,7 +210,7 @@ private:
210 uint m_status;
210 uint m_status;
211 QSet<int> m_candidateTouches;
211 QSet<int> m_candidateTouches;
212 QSet<int> m_watchedTouches;
212 QSet<int> m_watchedTouches;
213− UbuntuGestures::AbstractTimer *m_recognitionTimer;
213+ UG_PREPEND_NAMESPACE(AbstractTimer) *m_recognitionTimer;
215 bool m_dragging;
215 bool m_dragging;
216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;
216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;
plugins/Ubuntu/Gestures/plugin.cpp+3−5
@@ -1,5 +1,5 @@
2− * Copyright (C) 2013,2015 Canonical, Ltd.
2+ * Copyright (C) 2013,2015,2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
17#include "plugin.h"
17#include "plugin.h"
18#include "AxisVelocityCalculator.h"
18#include "AxisVelocityCalculator.h"
19#include "Direction.h"
19#include "Direction.h"
20−#include "DirectionalDragArea.h"
20+#include "MouseEventGenerator.h"
21−#include "FloatingFlickable.h"
22#include "PressedOutsideNotifier.h"
21#include "PressedOutsideNotifier.h"
23#include "TouchGate.h"
22#include "TouchGate.h"
24#include "TouchGestureArea.h"
23#include "TouchGestureArea.h"
@@ -34,9 +33,8 @@ static QObject* directionSingleton(QQmlEngine* engine, QJSEngine* scriptEngine)
34void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
33void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
36 qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
35 qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
37− qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
38 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
36 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
39− qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
37+ qmlRegisterType<MouseEventGenerator>(uri, 0, 1, "MouseEventGenerator");
40 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
38 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
41 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
39 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
42 qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");
40 qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");
plugins/Ubuntu/Payments/CMakeLists.txtdeleted−20
@@ -1,20 +0,0 @@
2− ${CMAKE_CURRENT_SOURCE_DIR}
3− ${CMAKE_CURRENT_BINARY_DIR}
11−add_library(Payments MODULE ${PAYMENTS_SOURCES})
13−qt5_use_modules(Payments Qml Quick DBus Core)
15−add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
17−pkg_check_modules(LIBPAY REQUIRED pay-2)
18−add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
20−target_link_libraries(Payments ${LIBPAY_LDFLAGS})
plugins/Ubuntu/Payments/Payments.cppdeleted−136
@@ -1,136 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
21−#include <libpay/pay-package.h>
24−// The observer callback for the package we are watching.
25−static void observer(PayPackage* /* package */, const char* itemid, PayPackageItemStatus status, void* user_data) {
26− // This function is called in libpay's thread, so be careful what you call
27− // Emitting signals should be fine as long as they use Queued or Auto
28− // connections (the default)
29− // http://qt-project.org/doc/qt-5/threads-qobject.html#signals-and-slots-across-threads
31− Payments *self = static_cast<Payments*>(user_data);
33− // If the item ID is different, ignore it.
34− if (itemid != self->storeItemId()) {
38− // FIXME: No error reporting from libpay, but we need to show some
39− // types of errors to the user. https://launchpad.net/bugs/1333403
41− case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
42− Q_EMIT self->purchaseCompleted();
44− case PAY_PACKAGE_ITEM_STATUS_PURCHASING:
45− self->setPurchasing(true);
47− case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
48− if (self->purchasing()) {
49− self->setPurchasing(false);
50− Q_EMIT self->purchaseCancelled();
58−Payments::Payments(QObject *parent)
62− m_package = pay_package_new("click-scope");
63− pay_package_item_observer_install(m_package, observer, this);
68− pay_package_item_observer_uninstall(m_package, observer, this);
69− pay_package_delete(m_package);
72−QString Payments::currency() const
77−double Payments::price() const
82−QString Payments::storeItemId() const
84− return m_store_item_id;
87−QString Payments::formattedPrice() const
90− return locale.toCurrencyString(m_price, m_currency);
93−bool Payments::purchasing() const
98−void Payments::setCurrency(const QString ¤cy)
100− if(m_currency != currency) {
101− m_currency = currency;
102− Q_EMIT currencyChanged(currency);
103− Q_EMIT formattedPriceChanged(formattedPrice());
107−void Payments::setPrice(const double price)
109− if(m_price != price) {
111− Q_EMIT priceChanged(price);
112− Q_EMIT formattedPriceChanged(formattedPrice());
116−void Payments::setStoreItemId(const QString &store_item_id)
118− if (m_store_item_id != store_item_id) {
119− m_store_item_id = store_item_id;
120− Q_EMIT storeItemIdChanged(m_store_item_id);
123− if (m_store_item_id.isEmpty()) {
128−void Payments::setPurchasing(bool is_purchasing)
130− m_purchasing = is_purchasing;
133−void Payments::start()
135− pay_package_item_start_purchase(m_package, m_store_item_id.toLocal8Bit().data());
plugins/Ubuntu/Payments/Payments.hdeleted−69
@@ -1,69 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
22−#include <libpay/pay-package.h>
25−class Payments : public QObject
28− Q_DISABLE_COPY(Payments)
29− Q_PROPERTY(QString currency READ currency WRITE setCurrency NOTIFY currencyChanged)
30− Q_PROPERTY(double price READ price WRITE setPrice NOTIFY priceChanged)
31− Q_PROPERTY(QString storeItemId READ storeItemId WRITE setStoreItemId NOTIFY storeItemIdChanged)
32− Q_PROPERTY(QString formattedPrice READ formattedPrice NOTIFY formattedPriceChanged)
35− explicit Payments(QObject *parent = 0);
38− QString currency() const;
39− double price() const;
40− QString storeItemId() const;
41− QString formattedPrice() const;
42− bool purchasing() const;
44− void setCurrency(const QString& currency);
45− void setPrice(const double price);
46− void setStoreItemId(const QString& store_item_id);
47− void setPurchasing(bool is_purchasing);
48− Q_INVOKABLE void start();
51− void currencyChanged(const QString& currency);
52− void priceChanged(const double price);
53− void storeItemIdChanged(const QString &store_item_id);
54− void formattedPriceChanged(const QString &formatted_price);
56− void purchaseError(const QString &error);
57− void purchaseCompleted();
58− void purchaseCancelled();
63− QString m_store_item_id;
66− PayPackage *m_package;
plugins/Ubuntu/Payments/Payments.qmltypesdeleted−43
@@ -1,43 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Payments 0.1 plugins'
13− exports: ["Ubuntu.Payments/Payments 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "currency"; type: "string" }
16− Property { name: "price"; type: "double" }
17− Property { name: "storeItemId"; type: "string" }
18− Property { name: "formattedPrice"; type: "string"; isReadonly: true }
20− name: "currencyChanged"
21− Parameter { name: "currency"; type: "string" }
25− Parameter { name: "price"; type: "double" }
28− name: "storeItemIdChanged"
29− Parameter { name: "store_item_id"; type: "string" }
32− name: "formattedPriceChanged"
33− Parameter { name: "formatted_price"; type: "string" }
36− name: "purchaseError"
37− Parameter { name: "error"; type: "string" }
39− Signal { name: "purchaseCompleted" }
40− Signal { name: "purchaseCancelled" }
41− Method { name: "start" }
plugins/Ubuntu/Payments/qmldirdeleted−3
@@ -1,3 +0,0 @@
3−typeinfo Payments.qmltypes
plugins/Ubuntu/SystemImage/CMakeLists.txtdeleted−10
@@ -1,10 +0,0 @@
1−set(SYSTEMIMAGE_SOURCES
6−add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})
8−qt5_use_modules(SystemImage Qml DBus Core)
10−add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)
plugins/Ubuntu/SystemImage/SystemImage.cppdeleted−33
@@ -1,33 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "SystemImage.h"
18−#include <QDBusConnection>
19−#include <QDBusPendingCall>
21−SystemImage::SystemImage(QObject *parent)
26−void SystemImage::factoryReset()
28− const QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("com.canonical.SystemImage"),
29− QStringLiteral("/Service"),
30− QStringLiteral("com.canonical.SystemImage"),
31− QStringLiteral("FactoryReset"));
32− QDBusConnection::systemBus().asyncCall(msg);
plugins/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−19
@@ -1,19 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'
13− exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
16− exportMetaObjectRevisions: [0]
17− Method { name: "factoryReset" }
plugins/Ubuntu/SystemImage/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module Ubuntu.SystemImage
3−typeinfo SystemImage.qmltypes
plugins/Unity/ApplicationMenu/CMakeLists.txtnew file+19
@@ -0,0 +1,19 @@
1+find_package(Qt5DBus REQUIRED)
4+ ${CMAKE_CURRENT_SOURCE_DIR}
5+ ${CMAKE_CURRENT_BINARY_DIR}
8+set(applicationMenu_SRCS
9+ applicationmenuregistry.cpp
10+ dbusapplicationmenuregistry.cpp
13+qt5_add_dbus_adaptor(applicationMenu_SRCS com.ubuntu.MenuRegistrar.xml dbusapplicationmenuregistry.h DBusApplicationMenuRegistry)
15+add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})
17+target_link_libraries(ApplicationMenu-qml Qt5::DBus Qt5::Qml)
19+add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)
plugins/Unity/ApplicationMenu/applicationmenuregistry.cppnew file+141
@@ -0,0 +1,141 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#include "applicationmenuregistry.h"
22+Q_LOGGING_CATEGORY(UNITY_APPMENU, "unity.appmenu", QtDebugMsg)
24+#define DEBUG_MSG qCDebug(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
25+#define WARNING_MSG qCWarning(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
27+ApplicationMenuRegistry::ApplicationMenuRegistry(QObject *parent)
32+ApplicationMenuRegistry::~ApplicationMenuRegistry()
34+ qDeleteAll(m_appMenus);
37+ qDeleteAll(m_surfaceMenus);
38+ m_surfaceMenus.clear();
41+void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
42+ const QDBusObjectPath &menuObjectPath,
43+ const QDBusObjectPath &actionObjectPath,
44+ const QString &service)
46+ DEBUG_MSG << "(pid=" << processId
47+ << ", menuPath=" << menuObjectPath.path()
48+ << ", actionPath=" << actionObjectPath.path()
49+ << ", service=" << service;
51+ auto i = m_appMenus.find(processId);
52+ while (i != m_appMenus.end() && i.key() == processId) {
53+ if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
54+ WARNING_MSG << "Already have a menu for application (pid= " << processId
55+ << ", service=" << service
56+ << ", menuPath=" << menuObjectPath.path() << ")";
62+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
63+ QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
65+ m_appMenus.insert(processId, menu);
66+ Q_EMIT appMenuRegistered(processId);
69+void ApplicationMenuRegistry::UnregisterAppMenu(pid_t processId, const QDBusObjectPath &menuObjectPath)
71+ DEBUG_MSG << "(pid=" << processId
72+ << ", menuPath=" << menuObjectPath.path();
74+ auto i = m_appMenus.find(processId);
75+ while (i != m_appMenus.end() && i.key() == processId) {
76+ if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
77+ i.value()->deleteLater();
79+ Q_EMIT appMenuUnregistered(processId);
86+void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
87+ const QDBusObjectPath &menuObjectPath,
88+ const QDBusObjectPath &actionObjectPath,
89+ const QString &service)
91+ DEBUG_MSG << "(surfaceId=" << surfaceId
92+ << ", menuPath=" << menuObjectPath.path()
93+ << ", actionPath=" << actionObjectPath.path()
94+ << ", service=" << service;
96+ auto i = m_surfaceMenus.find(surfaceId);
97+ while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
98+ if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
99+ WARNING_MSG << "Already have a menu for surface (surfaceId= " << surfaceId
100+ << ", service=" << service
101+ << ", menuPath=" << menuObjectPath.path() << ")";
107+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
108+ QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
110+ m_surfaceMenus.insert(surfaceId, menu);
111+ Q_EMIT surfaceMenuRegistered(surfaceId);
114+void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)
116+ DEBUG_MSG << "(surfaceId=" << surfaceId
117+ << ", menuPath=" << menuObjectPath.path();
119+ auto i = m_surfaceMenus.find(surfaceId);
120+ while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
121+ if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
122+ i.value()->deleteLater();
123+ m_surfaceMenus.erase(i);
124+ Q_EMIT surfaceMenuUnregistered(surfaceId);
131+QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId) const
133+ QList<QObject*> list;
135+ auto i = m_surfaceMenus.find(surfaceId);
136+ while (i != m_surfaceMenus.constEnd() && i.key() == surfaceId) {
plugins/Unity/ApplicationMenu/applicationmenuregistry.hnew file+83
@@ -0,0 +1,83 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#ifndef APPLICATIONMENUREGISTRY_H
18+#define APPLICATIONMENUREGISTRY_H
21+#include <QDBusContext>
22+#include <QDBusObjectPath>
25+Q_DECLARE_LOGGING_CATEGORY(UNITY_APPMENU)
27+class MenuServicePath : public QObject
30+ Q_PROPERTY(QByteArray service MEMBER m_service CONSTANT)
31+ Q_PROPERTY(QByteArray menuPath MEMBER m_menuPath CONSTANT)
32+ Q_PROPERTY(QByteArray actionPath MEMBER m_actionPath CONSTANT)
34+ explicit MenuServicePath(const QString &service,
35+ const QDBusObjectPath &menuPath,
36+ const QDBusObjectPath &actionPath)
37+ : m_service(service.toUtf8())
38+ , m_menuPath(menuPath.path().toUtf8())
39+ , m_actionPath(actionPath.path().toUtf8())
42+ const QByteArray m_service;
43+ const QByteArray m_menuPath;
44+ const QByteArray m_actionPath;
47+class ApplicationMenuRegistry : public QObject
51+ virtual ~ApplicationMenuRegistry();
54+ Q_INVOKABLE QList<QObject*> getMenusForSurface(const QString &surfaceId) const;
57+ void RegisterAppMenu(pid_t processId,
58+ const QDBusObjectPath &menuObjectPath,
59+ const QDBusObjectPath &actionObjectPath,
60+ const QString &service);
61+ void UnregisterAppMenu(pid_t processId, const QDBusObjectPath &menuObjectPath);
63+ void RegisterSurfaceMenu(const QString &surfaceId,
64+ const QDBusObjectPath &menuObjectPath,
65+ const QDBusObjectPath &actionObjectPath,
66+ const QString &service);
67+ void UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath);
70+ void appMenuRegistered(uint processId);
71+ void appMenuUnregistered(uint processId);
73+ void surfaceMenuRegistered(const QString& surfaceId);
74+ void surfaceMenuUnregistered(const QString& surfaceId);
77+ explicit ApplicationMenuRegistry(QObject *parent = 0);
79+ QMultiMap<pid_t, MenuServicePath*> m_appMenus;
80+ QMultiMap<QString, MenuServicePath*> m_surfaceMenus;
83+#endif // APPLICATIONMENUREGISTRY_H
plugins/Unity/ApplicationMenu/com.ubuntu.MenuRegistrar.xmlnew file+83
@@ -0,0 +1,83 @@
1+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2+<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
6+ An interface to register menus that are associated with a window in an application. The
7+ main interface is documented here: @ref com::ubuntu::MenuRegistrar.
9+ The actual menus are transported using the gmenumodel protocol
11+ <interface name="com.ubuntu.MenuRegistrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
13+ An interface to register a menu from an application to be displayed in another
14+ window. This manages that association between processes and/or Mir surface IDs and the dbus
15+ address and object that provides the menus using the org.gtk.Menus interface.
17+ <method name="RegisterAppMenu">
19+ Associates a gmenumodel with an application
21+ /note this method assumes that the connection from the caller is the DBus connection
22+ to use for the object. Applications that use multiple DBus connections will need to
23+ ensure this method is called with the same connection that implements the object.
25+ <arg name="pid" type="u" direction="in">
26+ <dox:d>The process ID of the application for which the menu is associated</dox:d>
28+ <arg name="menuObjectPath" type="o" direction="in">
29+ <dox:d>The dbus path where the gmenumodel interface for the application menu has been exported</dox:d>
31+ <arg name="actionObjectPath" type="o" direction="in">
32+ <dox:d>The dbus path where the gactionmenu interface for the application menu actions has been exported</dox:d>
34+ <arg name="service" type="s" direction="in">
35+ <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>
38+ <method name="UnregisterAppMenu">
40+ A method to allow removing an application menu from the database.
42+ <arg name="pid" type="u" direction="in">
43+ <dox:d>The process id of the application</dox:d>
45+ <arg name="menuObjectPath" type="o" direction="in">
46+ <dox:d>The dbus path for the registered application menu to be unregistered</dox:d>
50+ <method name="RegisterSurfaceMenu">
52+ Associates a gmenumodel with a surface
54+ /note this method assumes that the connection from the caller is the DBus connection
55+ to use for the object. Applications that use multiple DBus connections will need to
56+ ensure this method is called with the same connection that implements the object.
58+ <arg name="surface" type="s" direction="in">
59+ <dox:d>The surface ID of the surface</dox:d>
61+ <arg name="menuObjectPath" type="o" direction="in">
62+ <dox:d>The dbus path where the gmenumodel interface for the surface menu has been exported</dox:d>
64+ <arg name="actionObjectPath" type="o" direction="in">
65+ <dox:d>The dbus path where the gactionmenu interface for the surface menu actions has been exported</dox:d>
67+ <arg name="service" type="s" direction="in">
68+ <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>
71+ <method name="UnregisterSurfaceMenu">
73+ A method to allow removing a surface menu from the database.
75+ <arg name="surfaceId" type="s" direction="in">
76+ <dox:d>The surface id of the surface</dox:d>
78+ <arg name="menuObjectPath" type="o" direction="in">
79+ <dox:d>The dbus path for the registered surface menu to be unregistered</dox:d>
plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cppnew file+44
@@ -0,0 +1,44 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#include "dbusapplicationmenuregistry.h"
18+#include "menuregistraradaptor.h"
20+DBusApplicationMenuRegistry::DBusApplicationMenuRegistry(QObject *parent)
21+ : ApplicationMenuRegistry(parent)
23+ new MenuRegistrarAdaptor(this);
25+ QDBusConnection connection = QDBusConnection::sessionBus();
26+ if (!connection.registerObject("/com/ubuntu/MenuRegistrar", this)) {
27+ qCWarning(UNITY_APPMENU) << "Unable to register DBus object /com/ubuntu/MenuRegistrar";
29+ if (!connection.registerService("com.ubuntu.MenuRegistrar")) {
30+ qCWarning(UNITY_APPMENU) << "Unable to register DBus service com.ubuntu.MenuRegistrar";
34+DBusApplicationMenuRegistry::~DBusApplicationMenuRegistry()
36+ QDBusConnection connection = QDBusConnection::sessionBus();
37+ connection.unregisterObject("/com/ubuntu/MenuRegistrar");
40+ApplicationMenuRegistry *DBusApplicationMenuRegistry::instance()
42+ static ApplicationMenuRegistry* reg(new DBusApplicationMenuRegistry());
plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hnew file+34
@@ -0,0 +1,34 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
17+#ifndef DBUSAPPLICATIONMENUREGISTRY_H
18+#define DBUSAPPLICATIONMENUREGISTRY_H
20+#include "applicationmenuregistry.h"
22+class DBusApplicationMenuRegistry : public ApplicationMenuRegistry,
23+ protected QDBusContext
27+ ~DBusApplicationMenuRegistry();
28+ static ApplicationMenuRegistry* instance();
31+ explicit DBusApplicationMenuRegistry(QObject *parent = 0);
34+#endif // DBUSAPPLICATIONMENUREGISTRY_H
plugins/Unity/ApplicationMenu/plugin.cppnew file+42
@@ -0,0 +1,42 @@
2+ * Copyright (C) 2016 Canonical, Ltd.
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.
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.
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/>.
18+#include "dbusapplicationmenuregistry.h"
22+static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)
25+ Q_UNUSED(scriptEngine)
26+ return DBusApplicationMenuRegistry::instance();
29+void ApplicationMenuPlugin::registerTypes(const char *uri)
31+ Q_ASSERT(uri == QLatin1String("Unity.ApplicationMenu"));
33+ qmlRegisterUncreatableType<MenuServicePath>(uri, 0, 1, "MenuServicePath", "You cannot create a MenuServicePath");
34+ qmlRegisterSingletonType<DBusApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);
37+void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
39+ QQmlExtensionPlugin::initializeEngine(engine, uri);
41+ menuRegistry(nullptr, nullptr);
plugins/Ubuntu/SystemImage/plugin.h → plugins/Unity/ApplicationMenu/plugin.hrenamed+6−5
@@ -1,5 +1,5 @@
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,18 +14,19 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−#ifndef SYSTEMIMAGE_PLUGIN_H
17+#ifndef APPLICATIONMENU_PLUGIN_H
18−#define SYSTEMIMAGE_PLUGIN_H
18+#define APPLICATIONMENU_PLUGIN_H
20#include <QQmlExtensionPlugin>
20#include <QQmlExtensionPlugin>
22−class BackendPlugin : public QQmlExtensionPlugin
22+class ApplicationMenuPlugin : public QQmlExtensionPlugin
25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
28 void registerTypes(const char *uri) override;
28 void registerTypes(const char *uri) override;
29+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
31−#endif // SYSTEMIMAGE_PLUGIN_H
32+#endif // APPLICATIONMENU_PLUGIN_H
plugins/Unity/ApplicationMenu/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Unity.ApplicationMenu
2+plugin ApplicationMenu-qml
3+typeinfo ApplicationMenu.qmltypes
plugins/Unity/CMakeLists.txt+1−1
@@ -1,7 +1,7 @@
1+add_subdirectory(ApplicationMenu)
1add_subdirectory(Connectivity)
2add_subdirectory(Connectivity)
2add_subdirectory(Indicators)
3add_subdirectory(Indicators)
3add_subdirectory(Launcher)
4add_subdirectory(Launcher)
4add_subdirectory(Session)
5add_subdirectory(Session)
5−add_subdirectory(DashCommunicator)
6add_subdirectory(InputInfo)
6add_subdirectory(InputInfo)
7add_subdirectory(Platform)
7add_subdirectory(Platform)
plugins/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(CONNECTIVITY_SOURCES
6add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
6add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
8−qt5_use_modules(Connectivity Qml DBus Core)
8+target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)
10add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
10add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Unity/Connectivity/Connectivity.qmltypesdeleted−19
@@ -1,19 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
13− exports: ["Unity.Connectivity/Connectivity 0.1"]
16− exportMetaObjectRevisions: [0]
17− Method { name: "unlockAllModems" }
plugins/Unity/DashCommunicator/CMakeLists.txtdeleted−25
@@ -1,25 +0,0 @@
2− ${CMAKE_CURRENT_SOURCE_DIR}
3− ${libunity8-private_SOURCE_DIR}
6−set(QMLDASHCOMMUNICATORPLUGIN_SRC
8− dbusdashcommunicatorservice.cpp
9− dashcommunicatorservice.cpp
14−add_library(DashCommunicator-qml MODULE
15− ${QMLDASHCOMMUNICATORPLUGIN_SRC}
18−qt5_use_modules(DashCommunicator-qml DBus Qml)
20−target_link_libraries(DashCommunicator-qml
24−# export the qmldir and qmltypes files
25−add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)
plugins/Unity/DashCommunicator/DashCommunicator.qmltypesdeleted−47
@@ -1,47 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'
11− name: "DashCommunicator"
13− exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
14− exportMetaObjectRevisions: [0]
16− name: "setCurrentScope"
17− Parameter { name: "index"; type: "int" }
18− Parameter { name: "animate"; type: "bool" }
19− Parameter { name: "isSwipe"; type: "bool" }
23− name: "DashCommunicatorService"
25− exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
26− exportMetaObjectRevisions: [0]
28− name: "setCurrentScopeRequested"
29− Parameter { name: "index"; type: "int" }
30− Parameter { name: "animate"; type: "bool" }
31− Parameter { name: "isSwipe"; type: "bool" }
37− Signal { name: "started" }
38− Signal { name: "finished" }
41− Parameter { type: "Priority" }
43− Method { name: "start" }
44− Method { name: "terminate" }
45− Method { name: "quit" }
plugins/Unity/DashCommunicator/dashcommunicator.cppdeleted−58
@@ -1,58 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "dashcommunicator.h"
18−#include "dashconnection.h"
22−DashCommunicator::DashCommunicator(QObject *parent):
24− m_dashConnection(nullptr),
30−DashCommunicator::~DashCommunicator()
36−void DashCommunicator::setCurrentScope(int index, bool animate, bool isSwipe)
40− QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",
42− Q_ARG(bool, animate),
43− Q_ARG(bool, isSwipe));
48−void DashCommunicator::run()
50− m_dashConnection = new DashConnection(QStringLiteral("com.canonical.UnityDash"),
51− QStringLiteral("/com/canonical/UnityDash"),
52− QLatin1String(""), this);
plugins/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−38
@@ -1,38 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef DASHCOMMUNICATORSERVICE_H
18−#define DASHCOMMUNICATORSERVICE_H
20−#include "dbusdashcommunicatorservice.h"
24−class DashCommunicatorService: public QObject
28− DashCommunicatorService(QObject *parent = 0);
29− ~DashCommunicatorService();
32− void setCurrentScopeRequested(int index, bool animate, bool isSwipe);
35− DBusDashCommunicatorService *m_dbusService;
38−#endif // DBUSUNITYSESSIONSERVICE_H
plugins/Unity/DashCommunicator/dashconnection.cppdeleted−63
@@ -1,63 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "dashconnection.h"
19−#include <QDBusInterface>
20−#include <QDBusPendingCall>
22−/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service
23− * appears on the bus.
25− * On construction QDBusInterface synchronously introspects the service, which will block the GUI
26− * thread of this process if the service is busy. QDBusAbstractInterface does not perform this
27− * introspection, so let's subclass that and avoid the blocking scenario.
29− * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we
30− * cannot easily connect to DBus signals with the usual connect() calls. So this approach only
31− * suited to push communication with the DBus service.
33−class AsyncDBusInterface : public QDBusAbstractInterface
36− AsyncDBusInterface(const QString &service, const QString &path,
37− const QString &interface, const QDBusConnection &connection,
39− : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
41− ~AsyncDBusInterface() = default;
45−DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
46− AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
51−/* Override the default implementation to create a non-blocking DBus interface (see note above). */
52−QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,
53− const QString &interface, const QDBusConnection &connection)
55− return new AsyncDBusInterface(service, path, interface, connection);
58−void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
60− if (dbusInterface()) {
61− dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);
plugins/Unity/DashCommunicator/dashconnection.hdeleted−37
@@ -1,37 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef THREADEDDASHCONNECTION_H
18−#define THREADEDDASHCONNECTION_H
21−#include "abstractdbusservicemonitor.h"
23−class DashConnection: public AbstractDBusServiceMonitor
27− DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);
30− void setCurrentScope(int index, bool animate, bool isSwipe);
33− QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
34− const QString &interface, const QDBusConnection &connection) override;
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppdeleted−35
@@ -1,35 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#include "dbusdashcommunicatorservice.h"
19−#include <QDBusConnection>
20−#include <QDBusInterface>
23−DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):
24− UnityDBusObject(QStringLiteral("/com/canonical/UnityDash"), QStringLiteral("com.canonical.UnityDash"), false, parent)
28−DBusDashCommunicatorService::~DBusDashCommunicatorService()
32−void DBusDashCommunicatorService::SetCurrentScope(int index, bool animate, bool isSwipe)
34− Q_EMIT setCurrentScopeRequested(index, animate, isSwipe);
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hdeleted−39
@@ -1,39 +0,0 @@
2− * Copyright (C) 2014 Canonical, Ltd.
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.
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.
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/>.
17−#ifndef DBUSDASHCOMMUNICATORSERVICE_H
18−#define DBUSDASHCOMMUNICATORSERVICE_H
20−#include "unitydbusobject.h"
22−class DBusDashCommunicatorService: public UnityDBusObject
25− Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
28− DBusDashCommunicatorService(QObject *parent = 0);
29− ~DBusDashCommunicatorService();
32− void setCurrentScopeRequested(int index, bool animate, bool isSwipe);
35− Q_SCRIPTABLE void SetCurrentScope(int index, bool animate, bool isSwipe);
39−#endif // DBUSDASHCOMMUNICATORSERVICE_H
plugins/Unity/DashCommunicator/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module Unity.DashCommunicator
2−plugin DashCommunicator-qml
3−typeinfo DashCommunicator.qmltypes
plugins/Unity/Indicators/CMakeLists.txt+8−2
@@ -6,7 +6,14 @@ find_package(Qt5Quick REQUIRED)
6include_directories(
6include_directories(
7 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
9 ${GLIB_INCLUDE_DIRS}
13 ${GLIB_INCLUDE_DIRS}
10 ${GIO_INCLUDE_DIRS}
17 ${GIO_INCLUDE_DIRS}
11 ${QMENUMODEL_INCLUDE_DIRS}
18 ${QMENUMODEL_INCLUDE_DIRS}
@@ -37,8 +44,7 @@ target_link_libraries(IndicatorsQml
37 ${GLIB_LIBRARIES}
44 ${GLIB_LIBRARIES}
38 ${GIO_LIBRARIES}
45 ${GIO_LIBRARIES}
39 ${QMENUMODEL_LDFLAGS}
46 ${QMENUMODEL_LDFLAGS}
47+ Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus
42−qt5_use_modules(IndicatorsQml Core Qml Quick DBus)
44add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
50add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
plugins/Unity/Indicators/Indicators.qmltypesdeleted−264
@@ -1,264 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
11− name: "ActionRootState"
12− prototype: "RootStateObject"
13− exports: ["Unity.Indicators/ActionRootState 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }
16− Property { name: "actionName"; type: "string" }
21− exports: ["Unity.Indicators/ActionState 0.1"]
23− exportMetaObjectRevisions: [0]
35− name: "FlatMenuProxyModelRole"
37− exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]
39− exportMetaObjectRevisions: [0]
53− name: "IndicatorsManager"
55− exports: ["Unity.Indicators/IndicatorsManager 0.1"]
56− exportMetaObjectRevisions: [0]
57− Property { name: "loaded"; type: "bool"; isReadonly: true }
58− Property { name: "profile"; type: "string" }
60− name: "loadedChanged"
61− Parameter { type: "bool" }
64− name: "profileChanged"
65− Parameter { type: "string" }
68− name: "indicatorLoaded"
69− Parameter { name: "indicator_name"; type: "string" }
72− name: "indicatorAboutToBeUnloaded"
73− Parameter { name: "indicator_name"; type: "string" }
75− Method { name: "load" }
76− Method { name: "unload" }
79− name: "IndicatorsModel"
80− prototype: "QAbstractListModel"
81− exports: ["Unity.Indicators/IndicatorsModel 0.1"]
82− exportMetaObjectRevisions: [0]
83− Property { name: "count"; type: "int"; isReadonly: true }
84− Property { name: "profile"; type: "string" }
86− name: "indicatorDataChanged"
87− Parameter { name: "data"; type: "QVariant" }
89− Method { name: "load" }
90− Method { name: "unload" }
94− Parameter { name: "row"; type: "int" }
95− Parameter { name: "role"; type: "int" }
99− name: "IndicatorsModelRole"
100− prototype: "QObject"
101− exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]
103− exportMetaObjectRevisions: [0]
109− "IndicatorProperties": 2
114− name: "MenuContentActivator"
115− prototype: "QObject"
116− exports: ["Unity.Indicators/MenuContentActivator 0.1"]
117− exportMetaObjectRevisions: [0]
118− Property { name: "baseIndex"; type: "int" }
119− Property { name: "running"; type: "bool" }
120− Property { name: "count"; type: "int" }
121− Property { name: "content"; type: "MenuContentState"; isList: true; isReadonly: true }
123− name: "baseIndexChanged"
124− Parameter { name: "baseIndex"; type: "int" }
127− name: "deltaChanged"
128− Parameter { name: "delta"; type: "int" }
131− name: "runningChanged"
132− Parameter { name: "running"; type: "bool" }
135− name: "countChanged"
136− Parameter { name: "count"; type: "int" }
138− Method { name: "restart" }
139− Method { name: "stop" }
140− Method { name: "clear" }
142− name: "isMenuContentActive"
144− Parameter { name: "index"; type: "int" }
148− name: "MenuContentState"
149− prototype: "QObject"
150− exports: ["Unity.Indicators/MenuContentState 0.1"]
152− exportMetaObjectRevisions: [0]
153− Property { name: "active"; type: "bool"; isReadonly: true }
156− name: "ModelActionRootState"
157− prototype: "RootStateObject"
158− exports: ["Unity.Indicators/ModelActionRootState 0.1"]
159− exportMetaObjectRevisions: [0]
160− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
161− Signal { name: "indexChanged" }
164− name: "ModelPrinter"
165− prototype: "QObject"
166− exports: ["Unity.Indicators/ModelPrinter 0.1"]
167− exportMetaObjectRevisions: [0]
168− Property { name: "model"; type: "UnityMenuModel"; isPointer: true }
169− Property { name: "text"; type: "string"; isReadonly: true }
170− Method { name: "text"; type: "string" }
173− name: "NetworkActionState"
174− prototype: "QObject"
175− exports: ["Unity.Indicators/NetworkActionState 0.1"]
177− exportMetaObjectRevisions: [0]
179− name: "NetworkActionStates"
187− name: "NetworkConnection"
188− prototype: "QObject"
189− exports: ["Unity.Indicators/NetworkConnection 0.1"]
191− exportMetaObjectRevisions: [0]
193− name: "NetworkConnectionStates"
203− name: "RootStateObject"
204− prototype: "QObject"
205− Property { name: "valid"; type: "bool"; isReadonly: true }
206− Property { name: "title"; type: "string"; isReadonly: true }
207− Property { name: "leftLabel"; type: "string"; isReadonly: true }
208− Property { name: "rightLabel"; type: "string"; isReadonly: true }
209− Property { name: "icons"; type: "QStringList"; isReadonly: true }
210− Property { name: "accessibleName"; type: "string"; isReadonly: true }
211− Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }
212− Signal { name: "updated" }
215− name: "SharedUnityMenuModel"
216− prototype: "QObject"
217− exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
218− exportMetaObjectRevisions: [0]
219− Property { name: "busName"; type: "QByteArray" }
220− Property { name: "menuObjectPath"; type: "QByteArray" }
221− Property { name: "actions"; type: "QVariantMap" }
222− Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
225− name: "UnityMenuModelCache"
226− prototype: "QObject"
227− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
230− exportMetaObjectRevisions: [0]
234− Parameter { name: "path"; type: "QByteArray" }
238− name: "UnityMenuModelStack"
239− prototype: "QObject"
240− exports: ["Unity.Indicators/UnityMenuModelStack 0.1"]
241− exportMetaObjectRevisions: [0]
242− Property { name: "head"; type: "UnityMenuModel"; isPointer: true }
243− Property { name: "tail"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
244− Property { name: "count"; type: "int"; isReadonly: true }
247− Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }
251− Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }
254− name: "countChanged"
255− Parameter { name: "count"; type: "int" }
259− Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }
260− Parameter { name: "menuIndex"; type: "int" }
262− Method { name: "pop"; type: "UnityMenuModel*" }
plugins/Unity/Indicators/actionrootstate.cpp+1−1
@@ -44,7 +44,7 @@ void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
44 connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
44 connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
45 connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
45 connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
46 connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
46 connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
47− connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });
47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](const QVariant&) { updateActionState(); });
49 connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
49 connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
plugins/Unity/Indicators/indicators.h+5−5
@@ -27,13 +27,13 @@ class UNITYINDICATORS_EXPORT ActionState : public QObject
30− Q_ENUMS(ActionStates)
31 enum ActionStates {
30 enum ActionStates {
32 Label = 0x00,
31 Label = 0x00,
33 IconSource = 0x01,
32 IconSource = 0x01,
34 AccessableName = 0x02,
33 AccessableName = 0x02,
35 Visible = 0x03,
34 Visible = 0x03,
38 ActionState(QObject*parent=0):QObject(parent) {}
38 ActionState(QObject*parent=0):QObject(parent) {}
@@ -42,11 +42,11 @@ class UNITYINDICATORS_EXPORT NetworkActionState : public QObject
45− Q_ENUMS(NetworkActionStates)
46 enum NetworkActionStates {
45 enum NetworkActionStates {
47 Connection = 0x01,
46 Connection = 0x01,
48 SignalStrength = 0x02,
47 SignalStrength = 0x02,
49+ Q_ENUM(NetworkActionStates)
51 NetworkActionState(QObject*parent=0):QObject(parent) {}
51 NetworkActionState(QObject*parent=0):QObject(parent) {}
@@ -55,13 +55,13 @@ class UNITYINDICATORS_EXPORT NetworkConnection : public QObject
58− Q_ENUMS(NetworkConnectionStates)
59 enum NetworkConnectionStates {
58 enum NetworkConnectionStates {
60 Initial = 0x00,
59 Initial = 0x00,
61 Activating = 0x01,
60 Activating = 0x01,
62 Activated = 0x02,
61 Activated = 0x02,
63 Deactivating = 0x03,
62 Deactivating = 0x03,
64+ Q_ENUM(NetworkConnectionStates)
66 NetworkConnection(QObject*parent=0):QObject(parent) {}
66 NetworkConnection(QObject*parent=0):QObject(parent) {}
@@ -70,12 +70,12 @@ class UNITYINDICATORS_EXPORT IndicatorsModelRole : public QObject
74 enum Roles {
73 enum Roles {
75 Identifier = 0,
74 Identifier = 0,
77 IndicatorProperties
76 IndicatorProperties
80 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
80 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
@@ -84,7 +84,6 @@ class UNITYINDICATORS_EXPORT FlatMenuProxyModelRole : public QObject
88 enum Roles {
87 enum Roles {
89 Action = Qt::DisplayRole + 1,
88 Action = Qt::DisplayRole + 1,
@@ -93,6 +92,7 @@ public:
93 hasSection,
92 hasSection,
94 hasSubMenu
93 hasSubMenu
97 FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
97 FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
plugins/Unity/Indicators/indicatorsmanager.cpp+3−8
@@ -114,10 +114,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
117− if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
118− return; // convergence: skip this indicator until it works in Mir
121 auto iter = m_indicatorsData.constFind(name);
117 auto iter = m_indicatorsData.constFind(name);
122 if (iter != m_indicatorsData.constEnd())
118 if (iter != m_indicatorsData.constEnd())
@@ -285,13 +281,12 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
286 // convergence:
282 // convergence:
287 // 1) enable session indicator
283 // 1) enable session indicator
288− // 2) on a PC, switch the battery/power indicator to desktop mode,
284+ // 2) enable keyboard indicator
289− // can't control brightness for now and phone-on-desktop broken (FIXME)
291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
286 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
292 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
287 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
293− || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
288+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
294− new_indicator->setProfile(QStringLiteral("desktop"));
289+ new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
296 new_indicator->setProfile(m_profile);
291 new_indicator->setProfile(m_profile);
plugins/Unity/Indicators/indicatorsmanager.h−2
@@ -76,8 +76,6 @@ private:
76 QSharedPointer<QFileSystemWatcher> m_fsWatcher;
76 QSharedPointer<QFileSystemWatcher> m_fsWatcher;
77 bool m_loaded;
77 bool m_loaded;
78 QString m_profile;
78 QString m_profile;
83#endif // INDICATORS_MANAGER_H
81#endif // INDICATORS_MANAGER_H
plugins/Unity/Indicators/indicatorsmodel.cpp+13
@@ -103,6 +103,19 @@ void IndicatorsModel::setProfile(const QString &profile)
103 m_manager->setProfile(profile);
103 m_manager->setProfile(profile);
106+bool IndicatorsModel::light() const
111+void IndicatorsModel::setLight(const bool &light)
113+ if (m_light != light) {
115+ Q_EMIT lightChanged();
107 \qmlmethod IndicatorsModel::unload()
120 \qmlmethod IndicatorsModel::unload()
plugins/Unity/Indicators/indicatorsmodel.h+9−1
@@ -32,10 +32,12 @@ class IndicatorsManager;
32class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
32class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
36 Q_PROPERTY(int count READ count NOTIFY countChanged)
35 Q_PROPERTY(int count READ count NOTIFY countChanged)
37 Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
36 Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
39+ Q_PROPERTY(bool light READ light WRITE setLight NOTIFY lightChanged)
41 IndicatorsModel(QObject *parent=nullptr);
43 IndicatorsModel(QObject *parent=nullptr);
@@ -49,6 +51,9 @@ public:
49 QString profile() const;
51 QString profile() const;
50 void setProfile(const QString& profile);
52 void setProfile(const QString& profile);
55+ void setLight(const bool &light);
52 /* QAbstractItemModel */
57 /* QAbstractItemModel */
53 QHash<int, QByteArray> roleNames() const override;
58 QHash<int, QByteArray> roleNames() const override;
54 int columnCount(const QModelIndex &parent = QModelIndex()) const override;
59 int columnCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -61,6 +66,7 @@ Q_SIGNALS:
61 void countChanged();
66 void countChanged();
62 void profileChanged();
67 void profileChanged();
63 void indicatorDataChanged(const QVariant& data);
68 void indicatorDataChanged(const QVariant& data);
65private Q_SLOTS:
71private Q_SLOTS:
66 void onIdentifierChanged();
72 void onIdentifierChanged();
@@ -75,6 +81,8 @@ private:
76 void notifyDataChanged(QObject *sender, int role);
82 void notifyDataChanged(QObject *sender, int role);
77 int count() const;
83 int count() const;
80#endif // INDICATORSMODEL_H
88#endif // INDICATORSMODEL_H
plugins/Unity/Indicators/modelprinter.cpp+19−4
@@ -105,12 +105,25 @@ QString ModelPrinter::getRowSring(UnityMenuModel* sourceModel, int row, int dept
106 Q_FOREACH(int role, roles) {
106 Q_FOREACH(int role, roles) {
107 const QByteArray& roleName = roleNames[role];
107 const QByteArray& roleName = roleNames[role];
108− stream << tabify(depth) << getVariantString(roleName, sourceModel->get(row, roleName));
108+ stream << getVariantString(roleName, sourceModel->get(row, roleName), depth);
110 return str;
110 return str;
113−QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData) const
113+QString ModelPrinter::getVariantString(const QVariant& vData) const
115+ if (vData.type() == QVariant::List) {
116+ QStringList strList;
117+ for (const auto& v : vData.toList())
118+ strList.append(getVariantString(v));
120+ return '[' + strList.join(", ") + ']';
123+ return vData.toString();
126+QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData, int depth) const
115 QString str;
128 QString str;
116 QTextStream stream(&str);
129 QTextStream stream(&str);
@@ -119,18 +132,20 @@ QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &
119 QMapIterator<QString, QVariant> iter(vData.toMap());
132 QMapIterator<QString, QVariant> iter(vData.toMap());
120 while (iter.hasNext()) {
133 while (iter.hasNext()) {
121 iter.next();
134 iter.next();
135+ stream << tabify(depth);
122 stream << roleName
136 stream << roleName
124 << iter.key()
138 << iter.key()
126− << iter.value().toString()
140+ << getVariantString(iter.value())
145+ stream << tabify(depth);
131 stream << roleName
146 stream << roleName
133− << vData.toString()
148+ << getVariantString(vData)
136 return str;
151 return str;
plugins/Unity/Indicators/modelprinter.h+2−1
@@ -46,7 +46,8 @@ Q_SIGNALS:
47 QString getModelDataString(UnityMenuModel* sourceModel, int level);
47 QString getModelDataString(UnityMenuModel* sourceModel, int level);
48 QString getRowSring(UnityMenuModel* sourceModel, int index, int depth) const;
48 QString getRowSring(UnityMenuModel* sourceModel, int index, int depth) const;
49− QString getVariantString(const QString& roleName, const QVariant &vData) const;
49+ QString getVariantString(const QString& roleName, const QVariant &vData, int depth) const;
50+ QString getVariantString(const QVariant&) const;
51 UnityMenuModel* m_model;
52 UnityMenuModel* m_model;
52 QList<UnityMenuModel*> m_children;
53 QList<UnityMenuModel*> m_children;
plugins/Unity/Indicators/sharedunitymenumodel.cpp+4
@@ -81,12 +81,16 @@ void SharedUnityMenuModel::initialize()
83 QSharedPointer<UnityMenuModel> model = UnityMenuModelCache::singleton()->model(m_menuObjectPath);
83 QSharedPointer<UnityMenuModel> model = UnityMenuModelCache::singleton()->model(m_menuObjectPath);
84 if (model != m_model) {
85 if (model != m_model) {
85 if (model->busName() != m_busName) model->setBusName(m_busName);
86 if (model->busName() != m_busName) model->setBusName(m_busName);
86 if (model->actions() != m_actions) model->setActions(m_actions);
87 if (model->actions() != m_actions) model->setActions(m_actions);
88 m_model = model;
89 m_model = model;
89 Q_EMIT modelChanged();
90 Q_EMIT modelChanged();
91+ } else if (m_model) {
92+ if (m_model->busName() != m_busName) m_model->setBusName(m_busName);
93+ if (m_model->actions() != m_actions) m_model->setActions(m_actions);
plugins/Unity/InputInfo/CMakeLists.txt+1−2
@@ -32,8 +32,7 @@ add_library(InputInfo SHARED
32target_link_libraries(InputInfo
32target_link_libraries(InputInfo
33 ${LIBUDEV_LDFLAGS}
33 ${LIBUDEV_LDFLAGS}
34 ${LIBEVDEV_LDFLAGS}
34 ${LIBEVDEV_LDFLAGS}
35+ Qt5::Core Qt5::Qml Qt5::Quick
37−qt5_use_modules(InputInfo Core Qml Quick)
39add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)
38add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)
plugins/Unity/InputInfo/InputInfo.qmltypesdeleted−71
@@ -1,71 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'
11− name: "QDeclarativeInputDeviceModel"
12− prototype: "QAbstractListModel"
13− exports: ["Unity.InputInfo/InputDeviceModel 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "deviceFilter"; type: "QInputDevice::InputType" }
16− Property { name: "count"; type: "int"; isReadonly: true }
19− Parameter { name: "devicePath"; type: "string" }
22− name: "deviceRemoved"
23− Parameter { name: "devicePath"; type: "string" }
26− name: "deviceFilterChanged"
27− Parameter { name: "filter"; type: "QInputDevice::InputType" }
29− Method { name: "updateDeviceList" }
33− Parameter { name: "devicePath"; type: "string" }
37− type: "QInputDevice*"
38− Parameter { name: "index"; type: "int" }
44− exports: ["Unity.InputInfo/InputInfo 0.1"]
45− exportMetaObjectRevisions: [0]
59− name: "InputTypeFlags"
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+7−2
@@ -44,6 +44,7 @@
44#include <libudev.h>
44#include <libudev.h>
45#include <libevdev/libevdev.h>
45#include <libevdev/libevdev.h>
46#include <fcntl.h>
46#include <fcntl.h>
47#include <QDebug>
48#include <QDebug>
48#include <QSocketNotifier>
49#include <QSocketNotifier>
49#include <QTimer>
50#include <QTimer>
@@ -52,6 +53,7 @@
52QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
53QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
53 QObject(parent),
54 QObject(parent),
54 currentFilter(QInputDevice::Unknown),
55 currentFilter(QInputDevice::Unknown),
55 udevice(0)
57 udevice(0)
57 QTimer::singleShot(250,this,SLOT(init()));
59 QTimer::singleShot(250,this,SLOT(init()));
@@ -83,9 +85,9 @@ void QInputDeviceManagerPrivate::init()
83 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
85 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
85 udev_monitor_enable_receiving(udevMonitor);
87 udev_monitor_enable_receiving(udevMonitor);
86− notifierFd = udev_monitor_get_fd(udevMonitor);
88+ int notifierFd = udev_monitor_get_fd(udevMonitor);
88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
89 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
91 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
91 udev_enumerate_scan_devices(enumerate);
93 udev_enumerate_scan_devices(enumerate);
@@ -168,6 +170,7 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
168 rc = libevdev_new_from_fd(fd, &dev);
170 rc = libevdev_new_from_fd(fd, &dev);
169 if (rc < 0) {
171 if (rc < 0) {
170 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
172 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
171 return Q_NULLPTR;
174 return Q_NULLPTR;
@@ -195,6 +198,8 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
198 return inputDevice;
203 return inputDevice;
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2
@@ -83,8 +83,6 @@ private:
84 QInputDevice *addDevice(const QString &path);
84 QInputDevice *addDevice(const QString &path);
85 void removeDevice(const QString &path);
85 void removeDevice(const QString &path);
86− QSocketNotifier *notifier;
88 struct udev_monitor *udevMonitor;
86 struct udev_monitor *udevMonitor;
89 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
87 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
90 struct udev *udevice;
88 struct udev *udevice;
plugins/Unity/InputInfo/plugin.h+1−1
@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin
25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27− void registerTypes(const char *uri);
27+ void registerTypes(const char *uri) override;
30#endif // INPUTINFO_PLUGIN_H
30#endif // INPUTINFO_PLUGIN_H
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3
@@ -69,8 +69,8 @@ public:
69 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
69 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
70 virtual ~QDeclarativeInputDeviceModel();
70 virtual ~QDeclarativeInputDeviceModel();
72− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
72+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
73− int rowCount(const QModelIndex &parent = QModelIndex()) const;
73+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
75 void setDeviceFilter(QInputDevice::InputType filter);
75 void setDeviceFilter(QInputDevice::InputType filter);
76 QInputDevice::InputType deviceFilter();
76 QInputDevice::InputType deviceFilter();
@@ -78,7 +78,7 @@ public:
78 Q_INVOKABLE int indexOf(const QString &devicePath) const;
78 Q_INVOKABLE int indexOf(const QString &devicePath) const;
80 Q_INVOKABLE QInputDevice *get(int index) const;
80 Q_INVOKABLE QInputDevice *get(int index) const;
81− QHash<int, QByteArray> roleNames() const;
81+ QHash<int, QByteArray> roleNames() const override;
84 void deviceAdded(const QString &devicePath);
84 void deviceAdded(const QString &devicePath);
plugins/Unity/InputInfo/qinputinfo.h+2−3
@@ -57,8 +57,6 @@ class QInputDeviceManager;
57class QInputDevice : public QObject
57class QInputDevice : public QObject
61− Q_FLAGS(InputType InputTypeFlags)
62 friend class QInputDeviceManagerPrivate;
60 friend class QInputDeviceManagerPrivate;
@@ -72,8 +70,9 @@ public:
72 Keyboard = 16,
70 Keyboard = 16,
73 Switch = 32
71 Switch = 32
75− Q_ENUMS(InputType)
73+ Q_FLAG(InputType)
76 Q_DECLARE_FLAGS(InputTypeFlags, InputType)
74 Q_DECLARE_FLAGS(InputTypeFlags, InputType)
75+ Q_FLAG(InputTypeFlags)
78 explicit QInputDevice(QObject *parent = 0);
77 explicit QInputDevice(QObject *parent = 0);
79 QString name() const;
78 QString name() const;
plugins/Unity/Launcher/CMakeLists.txt+15−6
@@ -1,4 +1,3 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4add_definitions(-DSM_BUSNAME=systemBus)
3add_definitions(-DSM_BUSNAME=systemBus)
@@ -6,11 +5,16 @@ add_definitions(-DSM_BUSNAME=systemBus)
6include_directories(
5include_directories(
7 ${CMAKE_CURRENT_SOURCE_DIR}
6 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
7 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
9− ${GSETTINGS_QT_INCLUDE_DIRS}
11 ${libunity8-private_SOURCE_DIR}
8 ${libunity8-private_SOURCE_DIR}
13+ ${GSETTINGS_QT_INCLUDE_DIRS}
14set(QMLLAUNCHERPLUGIN_SRC
18set(QMLLAUNCHERPLUGIN_SRC
15 plugin.cpp
19 plugin.cpp
16 launchermodel.cpp
20 launchermodel.cpp
@@ -19,15 +23,20 @@ set(QMLLAUNCHERPLUGIN_SRC
19 quicklistentry.cpp
23 quicklistentry.cpp
20 dbusinterface.cpp
24 dbusinterface.cpp
21 gsettings.cpp
25 gsettings.cpp
22− desktopfilehandler.cpp
23 asadapter.cpp
26 asadapter.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
30 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
25 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
31 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
26 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
32 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
27 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
33 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
34+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
35+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
28 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
36 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
29 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
37 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
30 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
38 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
39+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
33add_library(UnityLauncher-qml MODULE
42add_library(UnityLauncher-qml MODULE
@@ -38,8 +47,8 @@ target_link_libraries(UnityLauncher-qml
38 unity8-private
47 unity8-private
39 ${GSETTINGS_QT_LDFLAGS}
48 ${GSETTINGS_QT_LDFLAGS}
40 ${GLIB_LIBRARIES}
49 ${GLIB_LIBRARIES}
51+ Qt5::DBus Qt5::Qml Qt5::Gui Qt5::Concurrent
43−qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
45add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
54add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/Launcher.qmltypesdeleted−182
@@ -1,182 +0,0 @@
1−import QtQuick.tooling 1.1
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'
12− prototype: "unity::shell::launcher::LauncherItemInterface"
13− exports: ["Unity.Launcher/LauncherItem 0.1"]
15− exportMetaObjectRevisions: [0]
18− name: "LauncherModel"
19− prototype: "unity::shell::launcher::LauncherModelInterface"
20− exports: ["Unity.Launcher/LauncherModel 0.1"]
23− exportMetaObjectRevisions: [0]
25− name: "requestRemove"
26− Parameter { name: "appId"; type: "string" }
28− Method { name: "refresh" }
31− type: "unity::shell::launcher::LauncherItemInterface*"
32− Parameter { name: "index"; type: "int" }
36− Parameter { name: "oldIndex"; type: "int" }
37− Parameter { name: "newIndex"; type: "int" }
41− Parameter { name: "appId"; type: "string" }
42− Parameter { name: "index"; type: "int" }
46− Parameter { name: "appId"; type: "string" }
49− name: "quickListActionInvoked"
50− Parameter { name: "appId"; type: "string" }
51− Parameter { name: "actionIndex"; type: "int" }
55− Parameter { name: "username"; type: "string" }
58− name: "getUrlForAppId"
60− Parameter { name: "appId"; type: "string" }
64− name: "QuickListModel"
65− prototype: "unity::shell::launcher::QuickListModelInterface"
66− exports: ["Unity.Launcher/QuickListModel 0.1"]
68− exportMetaObjectRevisions: [0]
71− name: "unity::shell::launcher::LauncherItemInterface"
73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
75− exportMetaObjectRevisions: [0]
76− Property { name: "appId"; type: "string"; isReadonly: true }
77− Property { name: "name"; type: "string"; isReadonly: true }
78− Property { name: "icon"; type: "string"; isReadonly: true }
79− Property { name: "pinned"; type: "bool"; isReadonly: true }
80− Property { name: "running"; type: "bool"; isReadonly: true }
81− Property { name: "recent"; type: "bool"; isReadonly: true }
82− Property { name: "progress"; type: "int"; isReadonly: true }
83− Property { name: "count"; type: "int"; isReadonly: true }
84− Property { name: "countVisible"; type: "bool"; isReadonly: true }
85− Property { name: "focused"; type: "bool"; isReadonly: true }
88− type: "unity::shell::launcher::QuickListModelInterface"
94− Parameter { name: "name"; type: "string" }
98− Parameter { name: "icon"; type: "string" }
101− name: "pinnedChanged"
102− Parameter { name: "pinned"; type: "bool" }
105− name: "runningChanged"
106− Parameter { name: "running"; type: "bool" }
109− name: "recentChanged"
110− Parameter { name: "running"; type: "bool" }
113− name: "progressChanged"
114− Parameter { name: "progress"; type: "int" }
117− name: "countChanged"
118− Parameter { name: "count"; type: "int" }
121− name: "countVisibleChanged"
122− Parameter { name: "countVisible"; type: "bool" }
125− name: "focusedChanged"
126− Parameter { name: "focused"; type: "bool" }
130− name: "unity::shell::launcher::LauncherModelInterface"
131− prototype: "QAbstractListModel"
132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
134− exportMetaObjectRevisions: [0]
136− name: "applicationManager"
137− type: "unity::shell::application::ApplicationManagerInterface"
140− Property { name: "onlyPinned"; type: "bool" }
141− Signal { name: "hint" }
144− Parameter { name: "oldIndex"; type: "int" }
145− Parameter { name: "newIndex"; type: "int" }
149− type: "unity::shell::launcher::LauncherItemInterface*"
150− Parameter { name: "index"; type: "int" }
154− Parameter { name: "appId"; type: "string" }
155− Parameter { name: "index"; type: "int" }
159− Parameter { name: "appId"; type: "string" }
162− name: "requestRemove"
163− Parameter { name: "appId"; type: "string" }
166− name: "quickListActionInvoked"
167− Parameter { name: "appId"; type: "string" }
168− Parameter { name: "actionIndex"; type: "int" }
172− Parameter { name: "username"; type: "string" }
176− name: "unity::shell::launcher::QuickListModelInterface"
177− prototype: "QAbstractListModel"
178− exports: ["Unity.Launcher/QuickListInterface 0.1"]
180− exportMetaObjectRevisions: [0]
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/desktopfilehandler.cppdeleted−155
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/launcheritem.cpp+57−16
This diff is too big to show here.
plugins/Unity/Launcher/launcheritem.h+10−2
This diff is too big to show here.
plugins/Unity/Launcher/launchermodel.cpp+104−69
This diff is too big to show here.
plugins/Unity/Launcher/launchermodel.h+6−10
This diff is too big to show here.
plugins/Unity/Launcher/plugin.cpp+2−1
This diff is too big to show here.
plugins/Unity/Launcher/quicklistentry.cpp+22
This diff is too big to show here.
plugins/Unity/Launcher/quicklistentry.h+8
This diff is too big to show here.
plugins/Unity/Launcher/quicklistmodel.cpp+11
This diff is too big to show here.
plugins/Unity/Launcher/quicklistmodel.h+1
This diff is too big to show here.
plugins/Unity/Launcher/ualwrapper.cppnew file+74
This diff is too big to show here.
plugins/IntegratedLightDM/plugin.h → plugins/Unity/Launcher/ualwrapper.hrenamed+16−13
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.txt+1−1
This diff is too big to show here.
plugins/Unity/Platform/Platform.qmltypesdeleted−20
This diff is too big to show here.
plugins/Unity/Platform/platform.cpp+16−2
This diff is too big to show here.
plugins/Unity/Session/CMakeLists.txt+3−1
This diff is too big to show here.
plugins/Unity/Session/Session.qmltypesdeleted−85
This diff is too big to show here.
plugins/Unity/Session/dbusunitysessionservice.cpp+132−22
This diff is too big to show here.
plugins/Unity/Session/dbusunitysessionservice.h+25−4
This diff is too big to show here.
plugins/Unity/Session/plugin.cpp+1
This diff is too big to show here.
plugins/Utils/CMakeLists.txt+16−4
This diff is too big to show here.
plugins/Utils/ElapsedTimer.h+1−1
This diff is too big to show here.
plugins/Utils/Timer.cpp+5−2
This diff is too big to show here.
plugins/Utils/Timer.h+5−6
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−175
This diff is too big to show here.
plugins/Utils/WindowInputMonitor.cpp+11−8
This diff is too big to show here.
plugins/Utils/WindowInputMonitor.h+8−2
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/constants.cpp+6−1
This diff is too big to show here.
plugins/Utils/constants.h+5−5
This diff is too big to show here.
plugins/Utils/deviceconfigparser.cpp+19−1
This diff is too big to show here.
plugins/Utils/deviceconfigparser.h+3
This diff is too big to show here.
plugins/Utils/easingcurve.h−1
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.cpp+6−4
This diff is too big to show here.
plugins/Utils/globalfunctions.h+2
This diff is too big to show here.
plugins/Utils/plugin.cpp+11−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/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/timezoneFormatter.cpp+1−1
This diff is too big to show here.
plugins/Utils/unitysortfilterproxymodelqml.h+5
This diff is too big to show here.
plugins/Utils/windowstatestorage.cpp+316−121
This diff is too big to show here.
plugins/Utils/windowstatestorage.h+37−20
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.txt+15−2
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/TopLevelSurfaceList.cppdeleted−486
This diff is too big to show here.
plugins/WindowManager/TopLevelSurfaceList.hdeleted−223
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.cpp+19−3
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/Wizard/CMakeLists.txt+9−3
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/PageList.cpp+16−1
This diff is too big to show here.
plugins/Wizard/System.cpp+79−8
This diff is too big to show here.
plugins/Wizard/System.h+22−1
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−33
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+4
This diff is too big to show here.
This diff is too big to show here.
plugins/Wizard/test.shdeleted−18
This diff is too big to show here.
plugins/Wizard/timezonemodel.cpp+5−5
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
po/ca@valencia.po+517−359
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.
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.
This diff is too big to show here.
qml/Components/Background.qml+1−1
This diff is too big to show here.
qml/Components/BlurLayer.qml+10−40
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−336
This diff is too big to show here.
qml/Components/Dialogs.qml+103−32
This diff is too big to show here.
qml/Components/DragHandle.qml+44−25
This diff is too big to show here.
qml/Components/EdgeBarrier.qml+3
This diff is too big to show here.
qml/Components/EdgeBarrierController.qml+1
This diff is too big to show here.
qml/Components/FadingLabel.qmlnew file+42
This diff is too big to show here.
qml/Components/Header.qml → qml/Components/Flickable.qmlrenamed+7−11
This diff is too big to show here.
qml/Components/FloatingFlickable.qmlnew file+63
This diff is too big to show here.
qml/Dash/Previews/PreviewActionButton.qml → qml/Components/GridView.qmlrenamed+7−10
This diff is too big to show here.
qml/Panel/Handle.qml → qml/Components/Handle.qmlrenamed+1
This diff is too big to show here.
qml/Components/InputMethod.qml+15−49
This diff is too big to show here.
qml/Components/ItemGrabber.qml+1−1
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.qml+40−3
This diff is too big to show here.
qml/Components/LazyImage.qml+5−1
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/ThinDivider.qmldeleted−27
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/Lockscreen.qml+6−21
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.qml+9−3
This diff is too big to show here.
qml/Components/NotificationAudio.qml+20−3
This diff is too big to show here.
qml/Components/PanelState/PanelState.qml+9−6
This diff is too big to show here.
qml/Components/PhysicalKeysMapper.qml+6−26
This diff is too big to show here.
qml/Components/Rating.qml+1
This diff is too big to show here.
qml/Components/RatingStyle.qml+3
This diff is too big to show here.
qml/Components/ResponsiveGridView.qmldeleted−97
This diff is too big to show here.
qml/Components/ResponsiveVerticalJournal.qmldeleted−81
This diff is too big to show here.
qml/Components/ScrollCalculator.qml+21−2
This diff is too big to show here.
qml/Dash/Previews/PreviewSharing.qml → qml/Components/SharingPicker.qmlrenamed+2−14
This diff is too big to show here.
qml/Components/ShellDialog.qml+27−12
This diff is too big to show here.
qml/Components/Showable.qml+15−12
This diff is too big to show here.
qml/Components/UbuntuShapeForItem.qmldeleted−47
This diff is too big to show here.
qml/Components/VirtualTouchPad.qml+269−1
This diff is too big to show here.
qml/Components/VolumeControl.qml+3−3
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.qml+34−37
This diff is too big to show here.
qml/Components/WindowControlButtons.qml+45−34
This diff is too big to show here.
qml/Components/ZoomableImage.qml+1−1
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.svg+164−14
This diff is too big to show here.
qml/Components/graphics/window-maximize.svg+164−12
This diff is too big to show here.
qml/Components/graphics/window-minimize.svg+164−13
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−74
This diff is too big to show here.
qml/Dash/CardGrid.qmldeleted−86
This diff is too big to show here.
qml/Dash/CardHorizontalList.qmldeleted−66
This diff is too big to show here.
qml/Dash/CardTool.qmldeleted−237
This diff is too big to show here.
qml/Dash/CardVerticalJournal.qmldeleted−85
This diff is too big to show here.
qml/Dash/Dash.qmldeleted−381
This diff is too big to show here.
qml/Dash/DashBackground.qmldeleted−30
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−213
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−198
This diff is too big to show here.
qml/Dash/DashNavigationHeader.qmldeleted−73
This diff is too big to show here.
qml/Dash/DashNavigationList.qmldeleted−115
This diff is too big to show here.
qml/Dash/DashPageHeader.qmldeleted−457
This diff is too big to show here.
qml/Dash/DashRenderer.qmldeleted−66
This diff is too big to show here.
qml/Dash/Filters/FilterExpandableWidget.qmldeleted−96
This diff is too big to show here.
qml/Dash/Filters/FilterOptionSelector.qmldeleted−91
This diff is too big to show here.
qml/Dash/Filters/FilterRangeInput.qmldeleted−136
This diff is too big to show here.
qml/Dash/Filters/FilterValueSlider.qmldeleted−87
This diff is too big to show here.
qml/Dash/Filters/FilterWidgetFactory.qmldeleted−81
This diff is too big to show here.
qml/Dash/FiltersPopover.qmldeleted−105
This diff is too big to show here.
qml/Dash/GenericScopeView.qmldeleted−844
This diff is too big to show here.
qml/Dash/PageHeaderExtraPanel.qmldeleted−176
This diff is too big to show here.
qml/Dash/PreviewView.qmldeleted−76
This diff is too big to show here.
qml/Dash/Previews/Preview.qmldeleted−116
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−72
This diff is too big to show here.
qml/Dash/Previews/PreviewAudioPlayback.qmldeleted−150
This diff is too big to show here.
qml/Dash/Previews/PreviewComment.qmldeleted−83
This diff is too big to show here.
qml/Dash/Previews/PreviewCommentInput.qmldeleted−73
This diff is too big to show here.
qml/Dash/Previews/PreviewExpandable.qmldeleted−104
This diff is too big to show here.
qml/Dash/Previews/PreviewHeader.qmldeleted−168
This diff is too big to show here.
qml/Dash/Previews/PreviewIconActions.qmldeleted−87
This diff is too big to show here.
qml/Dash/Previews/PreviewImageGallery.qmldeleted−147
This diff is too big to show here.
qml/Dash/Previews/PreviewOverlay.qmldeleted−166
This diff is too big to show here.
qml/Dash/Previews/PreviewPayments.qmldeleted−81
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−117
This diff is too big to show here.
qml/Dash/Previews/PreviewRatingEdit.qmldeleted−80
This diff is too big to show here.
qml/Dash/Previews/PreviewRatingInput.qmldeleted−181
This diff is too big to show here.
qml/Dash/Previews/PreviewRatingSingleDisplay.qmldeleted−70
This diff is too big to show here.
qml/Dash/Previews/PreviewTable.qmldeleted−85
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−87
This diff is too big to show here.
qml/Dash/Previews/PreviewWidget.qmldeleted−57
This diff is too big to show here.
qml/Dash/Previews/PreviewWidgetFactory.qmldeleted−92
This diff is too big to show here.
qml/Dash/Previews/PreviewZoomableImage.qmldeleted−102
This diff is too big to show here.
qml/Dash/ScopeListView.qmldeleted−26
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSetting.qmldeleted−46
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−89
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qmldeleted−61
This diff is too big to show here.
qml/Dash/ScopeSettingsPage.qmldeleted−72
This diff is too big to show here.
qml/Dash/ScopesList.qmldeleted−134
This diff is too big to show here.
qml/Dash/ScopesListCategory.qmldeleted−180
This diff is too big to show here.
qml/Dash/ScopesListCategoryItem.qmldeleted−112
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.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.qml+12
This diff is too big to show here.
qml/DisabledScreenNotice.qml+3−48
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.
This diff is too big to show here.
qml/Greeter/CoverPage.qml+61−18
This diff is too big to show here.
qml/Components/DelayedLockscreen.qml → qml/Greeter/DelayedLockscreen.qmlrenamed+6−14
This diff is too big to show here.
qml/Dash/Filters/FilterWidget.qml → qml/Greeter/FullLightDMImpl.qmlrenamed+10−11
This diff is too big to show here.
qml/Greeter/Greeter.qml+273−114
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+44−23
This diff is too big to show here.
qml/Greeter/IntegratedLightDMImpl.qml+4−2
This diff is too big to show here.
qml/Greeter/LightDM.qml → qml/Greeter/LightDMService.qmlrenamed+16−3
This diff is too big to show here.
qml/Dash/Previews/PreviewMediaToolbar.qml → qml/Greeter/LoginAreaContainer.qmlrenamed+15−14
This diff is too big to show here.
qml/Greeter/LoginList.qml+147−157
This diff is too big to show here.
qml/Greeter/NarrowView.qmldeleted−184
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.qml+2
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−135
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/Launcher.qml+258−73
This diff is too big to show here.
qml/Launcher/LauncherDelegate.qml+13−21
This diff is too big to show here.
qml/Launcher/LauncherPanel.qml+182−46
This diff is too big to show here.
qml/Dash/PullToRefreshScopeStyle.qml → qml/Launcher/PullToRefreshScopeStyle.qmlrenamed+1
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/launcher-app-focus-ring.svgdeleted−12
This diff is too big to show here.
qml/Launcher/graphics/quicklist_tooltip@30.png
Binary file not shown.
qml/Notifications/Notification.qml+52−32
This diff is too big to show here.
qml/Notifications/NotificationButton.qml+2−1
This diff is too big to show here.
qml/Notifications/NotificationMenuItemFactory.qml+1
This diff is too big to show here.
qml/Notifications/Notifications.qml+14−15
This diff is too big to show here.
qml/Notifications/ShapedIcon.qml+1
This diff is too big to show here.
qml/Notifications/SwipeToAct.qml+4
This diff is too big to show here.
qml/OrientedShell.qml+36−10
This diff is too big to show here.
qml/Panel/ActiveCallHint.qml+3
This diff is too big to show here.
tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp → qml/Panel/FakePanelMenu.qmlrenamed+8−9
This diff is too big to show here.
qml/Panel/IndicatorPage.qmldeleted−187
This diff is too big to show here.
qml/Panel/IndicatorItem.qml → qml/Panel/Indicators/IndicatorItem.qmlrenamed+16−3
This diff is too big to show here.
qml/Panel/Indicators/MenuItemFactory.qml → qml/Panel/Indicators/IndicatorMenuItemFactory.qmlrenamed+185−94
This diff is too big to show here.
qml/Panel/Indicators/IndicatorsLight.qml+185−12
This diff is too big to show here.
qml/Panel/Indicators/MessageMenuItemFactory.qml+1−5
This diff is too big to show here.
qml/Panel/Indicators/client/IndicatorRepresentation.qml+45−28
This diff is too big to show here.
qml/Panel/Indicators/client/IndicatorsClient.qml+8−2
This diff is too big to show here.
qml/Panel/Indicators/client/IndicatorsList.qml+19−17
This diff is too big to show here.
qml/Panel/Indicators/client/IndicatorsTree.qml+6−8
This diff is too big to show here.
qml/Panel/MenuContent.qml+12−12
This diff is too big to show here.
qml/Panel/Panel.qml+389−112
This diff is too big to show here.
qml/Panel/IndicatorsBar.qml → qml/Panel/PanelBar.qmlrenamed+87−36
This diff is too big to show here.
qml/Panel/IndicatorItemRow.qml → qml/Panel/PanelItemRow.qmlrenamed+65−95
This diff is too big to show here.
qml/Panel/IndicatorsMenu.qml → qml/Panel/PanelMenu.qmlrenamed+97−47
This diff is too big to show here.
qml/Panel/PanelMenuPage.qmlnew file+226
This diff is too big to show here.
qml/Panel/graphics/rectangular_dropshadow@30.png
Binary file not shown.
qml/Rotation/HalfLoopRotationAnimation.qml+1−1
This diff is too big to show here.
qml/Rotation/ImmediateRotationAction.qml+1−1
This diff is too big to show here.
qml/Rotation/NinetyRotationAnimation.qml+1−1
This diff is too big to show here.
qml/Rotation/RotationStates.qml+2−11
This diff is too big to show here.
qml/Rotation/UpdateShellTransformations.qml+4−4
This diff is too big to show here.
qml/ScopeTool.qmldeleted−165
This diff is too big to show here.
This diff is too big to show here.
qml/Stages/ApplicationWindow.qml → qml/Stage/ApplicationWindow.qmlrenamed+80−39
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
The content is the same.
qml/Stage/MoveHandler.qmlnew file+201
This diff is too big to show here.
qml/Stages/OrientationChangeAnimation.qml → qml/Stage/OrientationChangeAnimation.qmlrenamed+30−6
This diff is too big to show here.
qml/Stages/PromptSurfaceAnimations.qml → qml/Stage/PromptSurfaceAnimations.qmlrenamed+2−3
This diff is too big to show here.
qml/Components/BaseCarouselDelegate.qml → qml/Stage/ResizeGrip.qmlrenamed+27−23
This diff is too big to show here.
qml/Stages/SideStage.qml → qml/Stage/SideStage.qmlrenamed+11−8
This diff is too big to show here.
qml/Stages/Splash.qml → qml/Stage/Splash.qmlrenamed+13−27
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/Stages/StagedFullscreenPolicy.qml → qml/Stage/StagedFullscreenPolicy.qmlrenamed+7−13
This diff is too big to show here.
qml/Stage/SurfaceContainer.qmlnew file+108
This diff is too big to show here.
qml/Stages/TabletSideStageTouchGesture.qml → qml/Stage/TabletSideStageTouchGesture.qmlrenamed+3
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/Stages/WindowResizeArea.qml → qml/Stage/WindowResizeArea.qmlrenamed+46−91
This diff is too big to show here.
qml/Stage/WindowStateSaver.qmlnew file+64
This diff is too big to show here.
qml/Stages/WindowedFullscreenPolicy.qml → qml/Stage/WindowedFullscreenPolicy.qmlrenamed+4−12
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/Stages/graphics/sidestage_drag.svg → qml/Stage/graphics/sidestage_drag.svgrenamed
The content is the same.
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/Stages/graphics/sidestage_open.svg → qml/Stage/graphics/sidestage_open.svgrenamed
The content is the same.
qml/Stages/graphics/window-close.svg → qml/Stage/graphics/window-close.svgrenamed
The content is the same.
qml/Stages/AbstractStage.qmldeleted−80
This diff is too big to show here.
qml/Stages/DecoratedWindow.qmldeleted−105
This diff is too big to show here.
qml/Stages/DesktopSpread.qmldeleted−574
This diff is too big to show here.
qml/Stages/DesktopSpreadDelegate.qmldeleted−126
This diff is too big to show here.
qml/Stages/DesktopStage.qmldeleted−672
This diff is too big to show here.
qml/Stages/PhoneStage.qmldeleted−800
This diff is too big to show here.
qml/Stages/SpreadDelegate.qmldeleted−437
This diff is too big to show here.
qml/Stages/SpreadMaths.qmldeleted−164
This diff is too big to show here.
qml/Stages/SurfaceContainer.qmldeleted−211
This diff is too big to show here.
qml/Stages/TabletStage.qmldeleted−1185
This diff is too big to show here.
qml/Stages/TopLevelSurfaceRepeater.qmldeleted−52
This diff is too big to show here.
qml/Stages/TransformedSpreadDelegate.qmldeleted−391
This diff is too big to show here.
qml/Stages/TransformedTabletSpreadDelegate.qmldeleted−437
This diff is too big to show here.
qml/Stages/WindowDecoration.qmldeleted−105
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/dropshadow2gu@30.pngdeleted
Binary file not shown.
qml/Stages/graphics/sidestage_handle@20.pngdeleted
Binary file not shown.
qml/Tutorial/InactivityTimer.qml+26−10
This diff is too big to show here.
qml/Tutorial/Tutorial.qml+8−6
This diff is too big to show here.
qml/Tutorial/TutorialBottom.qmldeleted−124
This diff is too big to show here.
qml/Tutorial/TutorialContent.qml+85−150
This diff is too big to show here.
qml/Tutorial/TutorialLeft.qml+3−3
This diff is too big to show here.
qml/Tutorial/TutorialLeftLong.qml+5−3
This diff is too big to show here.
qml/Tutorial/TutorialPage.qml+2−2
This diff is too big to show here.
qml/Tutorial/TutorialRight.qml+4−5
This diff is too big to show here.
qml/Tutorial/TutorialTop.qml+4−5
This diff is too big to show here.
qml/Tutorial/graphics/background1.png
Binary file not shown.
qml/Tutorial/graphics/background2.png
Binary file not shown.
qml/Wizard/Components/InputMethod.qml+9−9
This diff is too big to show here.
This diff is too big to show here.
qml/Wizard/Pages.qml+90−16
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+23−5
This diff is too big to show here.
qml/Wizard/Pages/11-changelog.qmlnew file+95
This diff is too big to show here.
qml/Wizard/Pages/20-keyboard.qmlnew file+161
This diff is too big to show here.
qml/Wizard/Pages/30-wifi.qml+20−11
This diff is too big to show here.
qml/Wizard/Pages/40-location.qmldeleted−290
This diff is too big to show here.
qml/Wizard/Pages/50-timezone.qml+17−14
This diff is too big to show here.
qml/Wizard/Pages/60-account.qml+12−10
This diff is too big to show here.
qml/Wizard/Pages/70-passwd-type.qml+2
This diff is too big to show here.
qml/Wizard/Pages/75-report-check.qmldeleted−91
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+4−2
This diff is too big to show here.
qml/Wizard/Pages/data/Desktop_header_bkg.png
Binary file not shown.
qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png
Binary file not shown.
qml/Wizard/Pages/data/Phone_header_bkg.png
Binary file not shown.
qml/Wizard/Pages/data/Phone_splash_screen_bkg.png
Binary file not shown.
qml/Wizard/Pages/data/Tick@30.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/map.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/pin.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-1.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-10.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-11.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-2.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-3.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-4.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-6.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-7.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-8.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_-9.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_0.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_1.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_10.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_10.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_11.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_12.75.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_12.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_13.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_2.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_3.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_3.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_4.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_4.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_5.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_5.75.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_6.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_6.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_7.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_8.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_8.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_9.5.png
Binary file not shown.
qml/Wizard/Pages/data/timezonemap/timezone_9.png
Binary file not shown.
qml/Wizard/Pages/here-terms.qmldeleted−126
This diff is too big to show here.
qml/Wizard/Pages/passcode-confirm.qml+2−2
This diff is too big to show here.
qml/Wizard/Pages/passcode-desktop.qml+42−15
This diff is too big to show here.
qml/Wizard/Pages/passcode-set.qml+2−2
This diff is too big to show here.
qml/Wizard/Pages/password-set.qml+13−4
This diff is too big to show here.
qml/Wizard/PasswordMeter.qml+3−1
This diff is too big to show here.
qml/Wizard/Wizard.qml+11−4
This diff is too big to show here.
qml/Wizard/WizardItemSelector.qmlnew file+129
This diff is too big to show here.
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.
This diff is too big to show here.
run_on_device.shdeleted−164
This diff is too big to show here.
src/ApplicationArguments.h+5
This diff is too big to show here.
This diff is too big to show here.
src/Dash/CMakeLists.txtdeleted−28
This diff is too big to show here.
src/Dash/main.cppdeleted−130
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+28−1
This diff is too big to show here.
src/MouseTouchAdaptor.h+1
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.cpp+1−1
This diff is too big to show here.
src/ShellApplication.cpp+33−6
This diff is too big to show here.
src/ShellApplication.h+1−3
This diff is too big to show here.
This diff is too big to show here.
tools/unix-signal-handler.cpp → src/UnixSignalHandler.cpprenamed+4−6
This diff is too big to show here.
tools/unix-signal-handler.h → src/UnixSignalHandler.hrenamed
The content is the same.
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.
This diff is too big to show here.
tests/CMakeLists.txt+43−24
This diff is too big to show here.
tests/autopilot/unity8/dash.pydeleted−264
This diff is too big to show here.
tests/autopilot/unity8/fixture_setup.py+1−1
This diff is too big to show here.
tests/autopilot/unity8/greeter/__init__.py+1−1
This diff is too big to show here.
tests/autopilot/unity8/greeter/tests/test_args.py−5
This diff is too big to show here.
tests/autopilot/unity8/shell/__init__.py+2
This diff is too big to show here.
tests/autopilot/unity8/shell/fixture_setup.py+1−27
This diff is too big to show here.
tests/autopilot/unity8/shell/tests/__init__.py+5−2
This diff is too big to show here.
tests/autopilot/unity8/shell/tests/test_helpers.py−122
This diff is too big to show here.
tests/autopilot/unity8/shell/tests/test_notifications.py+9−9
This diff is too big to show here.
tests/autopilot/unity8/shell/tests/test_rotation.py+3−3
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.png
Binary file not shown.
tests/graphics/applicationIcons/calendar@18.png
Binary file not shown.
tests/graphics/applicationIcons/camera@18.png
Binary file not shown.
tests/graphics/applicationIcons/contacts-app@18.png
Binary file not shown.
tests/graphics/applicationIcons/dash.pngdeleted
Binary file not shown.
tests/graphics/applicationIcons/dash@18.pngnew file
Binary file not shown.
tests/graphics/applicationIcons/dialer-app@18.png
Binary file not shown.
tests/graphics/applicationIcons/evernote@18.png
Binary file not shown.
tests/graphics/applicationIcons/facebook@18.png
Binary file not shown.
tests/graphics/applicationIcons/gallery@18.png
Binary file not shown.
tests/graphics/applicationIcons/gmail@18.png
Binary file not shown.
tests/graphics/applicationIcons/libreoffice@18.png
Binary file not shown.
tests/graphics/applicationIcons/map@18.png
Binary file not shown.
tests/graphics/applicationIcons/messages-app@18.png
Binary file not shown.
tests/graphics/applicationIcons/notepad@18.png
Binary file not shown.
tests/graphics/applicationIcons/pinterest@18.png
Binary file not shown.
tests/graphics/applicationIcons/soundcloud@18.png
Binary file not shown.
tests/graphics/applicationIcons/system-settings@18.png
Binary file not shown.
tests/graphics/applicationIcons/twitter@18.png
Binary file not shown.
tests/graphics/applicationIcons/weather@18.png
Binary file not shown.
tests/graphics/applicationIcons/wikipedia@18.png
Binary file not shown.
tests/graphics/applicationIcons/youtube@18.png
Binary file not shown.
tests/graphics/avatars/amanda@12.png
Binary file not shown.
tests/graphics/avatars/anna_olsson@12.png
Binary file not shown.
tests/graphics/avatars/funky@12.png
Binary file not shown.
tests/graphics/clock@18.png
Binary file not shown.
tests/graphics/screenshots/gallery@12.pngnew file
Binary file not shown.
tests/imports/CMakeLists.txt+1−1
This diff is too big to show here.
tests/imports/check_imports.py+58
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−16
This diff is too big to show here.
tests/libs/UbuntuGestures/tst_TouchRegistry.cppdeleted−974
This diff is too big to show here.
tests/mocks/AccountsService/AccountsService.cpp+35−32
This diff is too big to show here.
tests/mocks/AccountsService/AccountsService.h+22−26
This diff is too big to show here.
tests/mocks/AccountsService/AccountsService.qmltypesdeleted−41
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/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/IntegratedLightDM/MockUsersModel.h → tests/mocks/Biometryd/MockDevice.hrenamed+16−13
This diff is too big to show here.
plugins/Ubuntu/Gestures/Damper.cpp → tests/mocks/Biometryd/MockIdentifier.cpprenamed+10−6
This diff is too big to show here.
plugins/Ubuntu/SystemImage/SystemImage.h → tests/mocks/Biometryd/MockIdentifier.hrenamed+11−9
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.
tests/mocks/Ubuntu/SystemImage/plugin.cpp → tests/mocks/Biometryd/plugin.cpprenamed+14−7
This diff is too big to show here.
plugins/Ubuntu/Payments/plugin.h → tests/mocks/Biometryd/plugin.hrenamed+4−4
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+18−16
This diff is too big to show here.
tests/mocks/Cursor/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Cursor/Cursor.qml+12−1
This diff is too big to show here.
tests/mocks/Cursor/qmldir+1−1
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+65
This diff is too big to show here.
tests/mocks/GSettings.1.0/fake_gsettings.h+20−2
This diff is too big to show here.
tests/mocks/IntegratedLightDM/CMakeLists.txtdeleted−49
This diff is too big to show here.
tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypesdeleted−269
This diff is too big to show here.
tests/mocks/IntegratedLightDM/MockUsersModel.cppdeleted−39
This diff is too big to show here.
tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txtdeleted−18
This diff is too big to show here.
tests/mocks/IntegratedLightDM/liblightdm/Greeter.cppdeleted−199
This diff is too big to show here.
tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cppdeleted−120
This diff is too big to show here.
tests/mocks/IntegratedLightDM/plugin.cppdeleted−68
This diff is too big to show here.
tests/mocks/IntegratedLightDM/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−11
This diff is too big to show here.
tests/mocks/Ubuntu/Payments/plugin.h → tests/mocks/LightDMController/plugin.hrenamed+4−6
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/MeeGo/QOfono/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/MeeGo/QOfono/QOfono.qmltypesdeleted−30
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.h+2−2
This diff is too big to show here.
tests/mocks/Powerd/Powerd.qmltypesdeleted−39
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/QMenuModel.qmltypesdeleted−111
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/unitymenumodel.cpp+78−13
This diff is too big to show here.
tests/mocks/QMenuModel/unitymenumodel.h+12−1
This diff is too big to show here.
tests/mocks/QtMultimedia/CMakeLists.txt+8−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−132
This diff is too big to show here.
tests/mocks/QtMultimedia/audio.hdeleted−97
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+7−3
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.
plugins/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/IntegratedLightDM/MockGreeter.cpp → tests/mocks/SessionBroadcast/plugin.cpprenamed+10−14
This diff is too big to show here.
plugins/Dash/plugin.h → tests/mocks/SessionBroadcast/plugin.hrenamed+4−5
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.txt+1−1
This diff is too big to show here.
tests/mocks/UInput/mockuinput.h+1−1
This diff is too big to show here.
tests/mocks/Ubuntu/CMakeLists.txt−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/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/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+1
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypesdeleted−10
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+3−2
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+2−2
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+1−1
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypesdeleted−39
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml+15−3
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir+1−1
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.
tests/mocks/Ubuntu/Payments/plugin.cpp → tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qmlrenamed+11−9
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/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/Thumbnailer/Thumbnailer.qmltypesdeleted−17
This diff is too big to show here.
tests/mocks/Unity/Application/Application.qmltypesdeleted−517
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationInfo.cpp+71−36
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationInfo.h+10−13
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationManager.cpp+134−75
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationManager.h+32−10
This diff is too big to show here.
tests/mocks/Unity/Application/CMakeLists.txt+5−5
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/fake_valueslidervalues.h → tests/mocks/Unity/Application/MirMock.hrenamed+17−10
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurface.cpp+143−97
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurface.h+57−32
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceItem.cpp+89−24
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceItem.h+4−3
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceListModel.cpp+27−12
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceListModel.h+7−9
This diff is too big to show here.
tests/mocks/Unity/Application/SurfaceManager.cpp+186−31
This diff is too big to show here.
tests/mocks/Unity/Application/SurfaceManager.h+32−10
This diff is too big to show here.
tests/mocks/Unity/Application/UbuntuKeyboardInfo.cppdeleted−58
This diff is too big to show here.
tests/mocks/Unity/Application/UbuntuKeyboardInfo.hdeleted−57
This diff is too big to show here.
tests/mocks/Unity/Application/VirtualKeyboard.cpp+27−5
This diff is too big to show here.
tests/mocks/Unity/Application/VirtualKeyboard.h+4−1
This diff is too big to show here.
tests/mocks/Unity/Application/plugin.cpp+6−35
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.
qml/Stages/ShimStage.qml → tests/mocks/Unity/Application/resources/KateMenu.qmlrenamed+17−19
This diff is too big to show here.
tests/mocks/Unity/Application/resources/MirSurfaceItem.qml+2−5
This diff is too big to show here.
tests/mocks/Unity/Application/resources/VirtualKeyboard.qml+1−6
This diff is too big to show here.
tests/mocks/Unity/Application/resources/screenshots/browser@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/camera@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/dialer@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/facebook@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/gallery@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/map@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/music@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/twitter@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png
Binary file not shown.
tests/mocks/Unity/Application/resources/surfaces.qrc+3
This diff is too big to show here.
tests/mocks/Unity/Application/resources/vkb_portrait.png
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/Ubuntu/SystemImage/plugin.h → tests/mocks/Unity/ApplicationMenu/plugin.hrenamed+6−5
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+2−63
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/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−42
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.cppdeleted−46
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−41
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/plugin.cppdeleted−31
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/plugin.hdeleted−34
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/CMakeLists.txt+5−1
This diff is too big to show here.
tests/mocks/Unity/Indicators/Indicators.qmltypesdeleted−232
This diff is too big to show here.
tests/mocks/Unity/Indicators/IndicatorsModel.qml+97−14
This diff is too big to show here.
tests/mocks/Unity/Indicators/fakeindicatorsmodel.h−1
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/InputInfo/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Unity/InputInfo/plugin.h+1−1
This diff is too big to show here.
tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp+6−2
This diff is too big to show here.
tests/mocks/Unity/Launcher/CMakeLists.txt+5−3
This diff is too big to show here.
tests/mocks/Unity/Launcher/Launcher.qmltypesdeleted−187
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/fake_optionselectoroptions.h → tests/mocks/Unity/Launcher/MockAppDrawerModel.hrenamed+14−18
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherItem.cpp+27−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherItem.h+9
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+7−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherModel.h+2−2
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockQuickListModel.cpp+5−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockQuickListModel.h+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/Notifications/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Unity/Notifications/MockActionModel.h+1−1
This diff is too big to show here.
tests/mocks/Unity/Notifications/MockNotification.cpp+15
This diff is too big to show here.
tests/mocks/Unity/Notifications/MockNotification.h+7−1
This diff is too big to show here.
tests/mocks/Unity/Notifications/MockNotificationModel.cpp+4−6
This diff is too big to show here.
tests/mocks/Unity/Notifications/MockNotificationModel.h+2−4
This diff is too big to show here.
tests/mocks/Unity/Notifications/Notifications.qmltypesdeleted−149
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.txt+2−2
This diff is too big to show here.
tests/mocks/Unity/Screens/plugin.h+1−1
This diff is too big to show here.
tests/mocks/Unity/Screens/screens.cpp+1−1
This diff is too big to show here.
tests/mocks/Unity/Screens/screens.h+1−1
This diff is too big to show here.
tests/mocks/Unity/Unity.qmltypesdeleted−469
This diff is too big to show here.
tests/mocks/Unity/fake_categories.cppdeleted−161
This diff is too big to show here.
tests/mocks/Unity/fake_categories.hdeleted−54
This diff is too big to show here.
tests/mocks/Unity/fake_expandablefilterwidget.cppdeleted−53
This diff is too big to show here.
tests/mocks/Unity/fake_expandablefilterwidget.hdeleted−48
This diff is too big to show here.
tests/mocks/Unity/fake_filters.cppdeleted−136
This diff is too big to show here.
tests/mocks/Unity/fake_navigation.cppdeleted−123
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_optionselectorfilter.cppdeleted−65
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectorfilter.hdeleted−52
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectoroptions.cppdeleted−77
This diff is too big to show here.
tests/mocks/Unity/fake_previewmodel.cppdeleted−95
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_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_rangeinputfilter.cppdeleted−167
This diff is too big to show here.
tests/mocks/Unity/fake_rangeinputfilter.hdeleted−79
This diff is too big to show here.
tests/mocks/Unity/fake_resultsmodel.cppdeleted−92
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−360
This diff is too big to show here.
tests/mocks/Unity/fake_scope.hdeleted−127
This diff is too big to show here.
tests/mocks/Unity/fake_scopes.cppdeleted−268
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−340
This diff is too big to show here.
tests/mocks/Unity/fake_scopesoverview.hdeleted−117
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−62
This diff is too big to show here.
tests/mocks/Unity/fake_valuesliderfilter.cppdeleted−84
This diff is too big to show here.
tests/mocks/Unity/fake_valuesliderfilter.hdeleted−55
This diff is too big to show here.
tests/mocks/Unity/fake_valueslidervalues.cppdeleted−51
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.txt+18−4
This diff is too big to show here.
qml/Dash/DashApplication.qml → tests/mocks/Utils/URLDispatcher.cpprenamed+18−11
This diff is too big to show here.
tests/mocks/Utils/URLDispatcher.hnew file+47
This diff is too big to show here.
tests/mocks/Utils/Utils.qmltypesdeleted−178
This diff is too big to show here.
tests/mocks/Utils/constants.cpp+2−1
This diff is too big to show here.
tests/mocks/Utils/constants.h+5−5
This diff is too big to show here.
tests/mocks/Utils/plugin.cpp+11−1
This diff is too big to show here.
tests/mocks/Utils/plugin.h+1−1
This diff is too big to show here.
tests/mocks/Utils/windowstatestorage.cpp+28−4
This diff is too big to show here.
tests/mocks/Utils/windowstatestorage.h+29−7
This diff is too big to show here.
tests/mocks/Wizard/CMakeLists.txt+6−3
This diff is too big to show here.
tests/mocks/Wizard/MockSystem.cpp+24−1
This diff is too big to show here.
tests/mocks/Wizard/MockSystem.h+15−1
This diff is too big to show here.
tests/mocks/Wizard/Wizard.qmltypesdeleted−37
This diff is too big to show here.
tests/mocks/Wizard/mockplugin.cpp+4
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/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/liblightdm/GreeterPrivate.cpprenamed
The content is the same.
tests/mocks/IntegratedLightDM/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/IntegratedLightDM/liblightdm/Greeter.h → tests/mocks/liblightdm/MockGreeter.hrenamed+10−24
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/IntegratedLightDM/liblightdm/UsersModel.h → tests/mocks/liblightdm/MockUsersModel.hrenamed+11−19
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/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/liblightdm/UsersModelPrivate.cpprenamed+43−23
This diff is too big to show here.
tests/mocks/IntegratedLightDM/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/UserMetrics.cpp+39−14
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/CMakeLists.txt+8−7
This diff is too big to show here.
tests/plugins/AccountsService/PropertiesServer.cpp+1−1
This diff is too big to show here.
tests/plugins/AccountsService/client.cpp+6−34
This diff is too big to show here.
tests/plugins/CMakeLists.txt+5−3
This diff is too big to show here.
tests/plugins/Cursor/CMakeLists.txtnew file+8
This diff is too big to show here.
plugins/Unity/DashCommunicator/dashcommunicatorservice.cpp → tests/plugins/Cursor/TextEntry.qmlrenamed+17−13
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−75
This diff is too big to show here.
tests/plugins/Dash/cardcreator/1.resdeleted−113
This diff is too big to show here.
tests/plugins/Dash/cardcreator/1.res.cardcreatordeleted−112
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/10.resdeleted−139
This diff is too big to show here.
tests/plugins/Dash/cardcreator/10.res.cardcreatordeleted−137
This diff is too big to show here.
tests/plugins/Dash/cardcreator/10.tstdeleted−3
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.resdeleted−207
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.res.cardcreatordeleted−203
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.tstdeleted−3
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.resdeleted−139
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.res.cardcreatordeleted−138
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.tstdeleted−3
This diff is too big to show here.
tests/plugins/Dash/cardcreator/2.resdeleted−138
This diff is too big to show here.
tests/plugins/Dash/cardcreator/2.res.cardcreatordeleted−136
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−132
This diff is too big to show here.
tests/plugins/Dash/cardcreator/3.res.cardcreatordeleted−130
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−111
This diff is too big to show here.
tests/plugins/Dash/cardcreator/4.res.cardcreatordeleted−109
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−150
This diff is too big to show here.
tests/plugins/Dash/cardcreator/5.res.cardcreatordeleted−149
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−127
This diff is too big to show here.
tests/plugins/Dash/cardcreator/6.res.cardcreatordeleted−126
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−151
This diff is too big to show here.
tests/plugins/Dash/cardcreator/7.res.cardcreatordeleted−149
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/cardcreator/8.resdeleted−109
This diff is too big to show here.
tests/plugins/Dash/cardcreator/8.res.cardcreatordeleted−107
This diff is too big to show here.
tests/plugins/Dash/cardcreator/8.tstdeleted−3
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.resdeleted−120
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.res.cardcreatordeleted−119
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.tstdeleted−3
This diff is too big to show here.
tests/plugins/Dash/cardcreatortest.cppdeleted−118
This diff is too big to show here.
tests/plugins/Dash/cardcreatortest.qmldeleted−29
This diff is too big to show here.
tests/plugins/Dash/horizontaljournaltest.cppdeleted−490
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−89
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−246
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadersectiontest.cppdeleted−2207
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertest.cppdeleted−2004
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertest.qmldeleted−96
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertestsection.qmldeleted−107
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qmldeleted−75
This diff is too big to show here.
tests/plugins/Dash/organicgridtest.cppdeleted−533
This diff is too big to show here.
tests/plugins/Dash/organicgridtest.qmldeleted−44
This diff is too big to show here.
tests/plugins/Dash/organicgridtry.cppdeleted−97
This diff is too big to show here.
tests/plugins/Dash/organicgridtry.qmldeleted−114
This diff is too big to show here.
tests/plugins/Dash/tst_CardAttributes.qmldeleted−57
This diff is too big to show here.
tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qmldeleted−56
This diff is too big to show here.
tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qmldeleted−138
This diff is too big to show here.
tests/plugins/Dash/tst_ScopeStyle.qmldeleted−188
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltest.cppdeleted−502
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltest.qmldeleted−45
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltry.cppdeleted−89
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltry.qmldeleted−121
This diff is too big to show here.
tests/plugins/GlobalShortcut/CMakeLists.txt+12−7
This diff is too big to show here.
tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp+3−2
This diff is too big to show here.
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+5−23
This diff is too big to show here.
tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+4−1
This diff is too big to show here.
tests/plugins/IntegratedLightDM/CMakeLists.txtdeleted−93
This diff is too big to show here.
tests/plugins/IntegratedLightDM/usersmodel.cppdeleted−84
This diff is too big to show here.
tests/plugins/LightDM/CMakeLists.txtnew file+1
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+157
This diff is too big to show here.
tests/plugins/IntegratedLightDM/dbus.cpp → tests/plugins/LightDM/IntegratedLightDM/dbus.cpprenamed+22−12
This diff is too big to show here.
tests/plugins/IntegratedLightDM/greeter.qml → tests/plugins/LightDM/IntegratedLightDM/greeter.qmlrenamed+2−7
This diff is too big to show here.
tests/plugins/IntegratedLightDM/integrated.cpp → tests/plugins/LightDM/IntegratedLightDM/integrated.cpprenamed
The content is the same.
tests/plugins/IntegratedLightDM/pam.cpp → tests/plugins/LightDM/IntegratedLightDM/pam.cpprenamed
The content is the same.
tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cppnew file+175
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cppnew file+134
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/usersmodel.cppnew file+168
This diff is too big to show here.
tests/plugins/SessionBroadcast/BroadcastServer.cppnew file+33
This diff is too big to show here.
tests/plugins/SessionBroadcast/BroadcastServer.hnew file+40
This diff is too big to show here.
tests/plugins/SessionBroadcast/CMakeLists.txtnew file+51
This diff is too big to show here.
tests/plugins/SessionBroadcast/interfaces.xmlnew file+18
This diff is too big to show here.
tests/plugins/SessionBroadcast/server.cppnew file+37
This diff is too big to show here.
tests/plugins/SessionBroadcast/sessionbroadcasttest.cppnew file+111
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+18−10
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qmldeleted−72
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/GestureTest.cpp+15−5
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/GestureTest.h+4−5
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qmldeleted−76
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qmldeleted−76
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qmldeleted−76
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+1−1
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_Damper.cppdeleted−40
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cppdeleted−1250
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qmldeleted−76
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+26−19
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml+1
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+17−4
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cpp+30
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+12−2
This diff is too big to show here.
tests/plugins/Unity/Indicators/IndicatorsManagerTest.cpp+1−1
This diff is too big to show here.
tests/plugins/Unity/Indicators/IndicatorsModelTest.cpp+1−1
This diff is too big to show here.
tests/plugins/Unity/Indicators/MenuContentActivatorTest.cpp+1
This diff is too big to show here.
tests/plugins/Unity/Launcher/CMakeLists.txt+57−21
This diff is too big to show here.
tests/plugins/Unity/Launcher/appdrawermodeltest.cppnew file+68
This diff is too big to show here.
tests/plugins/Unity/Launcher/abs-icon.desktop → tests/plugins/Unity/Launcher/applications/abs-icon.desktoprenamed+1
This diff is too big to show here.
tests/plugins/Unity/Launcher/click-icon.desktop → tests/plugins/Unity/Launcher/applications/click-icon.desktoprenamed+1
This diff is too big to show here.
tests/plugins/Unity/Launcher/click-icon.svg → tests/plugins/Unity/Launcher/applications/click-icon.svgrenamed
The content is the same.
tests/plugins/Unity/Launcher/no-name.desktop → tests/plugins/Unity/Launcher/applications/no-name.desktoprenamed+1
This diff is too big to show here.
tests/plugins/Unity/Launcher/rel-icon.desktop → tests/plugins/Unity/Launcher/applications/rel-icon.desktoprenamed+1
This diff is too big to show here.
tests/plugins/Unity/Launcher/rel-icon.svg → tests/plugins/Unity/Launcher/applications/rel-icon.svgrenamed
The content is the same.
tests/plugins/Unity/Launcher/launchermodeltest.cpp+157−30
This diff is too big to show here.
tests/plugins/Unity/Launcher/no-icon.desktopdeleted−2
This diff is too big to show here.
tests/plugins/Unity/Launcher/ualwrapper.cppnew file+58
This diff is too big to show here.
tests/plugins/Unity/Launcher/ualwrapper.hnew file+55
This diff is too big to show here.
libs/UbuntuGestures/UnownedTouchEvent.cpp → tests/plugins/Unity/Launcher/xdgwatcher.cpprenamed+19−13
This diff is too big to show here.
tests/mocks/IntegratedLightDM/MockGreeter.h → tests/plugins/Unity/Launcher/xdgwatcher.hrenamed+18−16
This diff is too big to show here.
tests/plugins/Unity/Platform/CMakeLists.txtnew file+30
This diff is too big to show here.
tests/plugins/Unity/Platform/platformtest.cppnew file+142
This diff is too big to show here.
tests/plugins/Unity/Session/CMakeLists.txt+48−2
This diff is too big to show here.
tests/plugins/Unity/Session/LightDMServer.cppnew file+29
This diff is too big to show here.
tests/plugins/Unity/Session/LightDMServer.hnew file+38
This diff is too big to show here.
tests/plugins/Unity/Session/LogindServer.cppnew file+43
This diff is too big to show here.
tests/plugins/Unity/Session/LogindServer.hnew file+48
This diff is too big to show here.
tests/plugins/Unity/Session/interfaces.xmlnew file+29
This diff is too big to show here.
tests/plugins/Unity/Session/preload.cnew file+43
This diff is too big to show here.
tests/plugins/Unity/Session/server.cppnew file+50
This diff is too big to show here.
tests/plugins/Unity/Session/sessionbackendtest.cpp+138−20
This diff is too big to show here.
tests/plugins/Utils/CMakeLists.txt+20−3
This diff is too big to show here.
tests/plugins/Utils/DeviceConfigParserTest.cpp+7−1
This diff is too big to show here.
tests/plugins/Utils/ModelTest.cpp+2−1
This diff is too big to show here.
tests/plugins/Utils/URLDispatcherTest.cppnew file+78
This diff is too big to show here.
tests/plugins/Utils/WindowInputMonitorTest.cpp+158−20
This diff is too big to show here.
tests/plugins/Utils/WindowStateStorageTest.cppnew file+121
This diff is too big to show here.
tests/plugins/WindowManager/CMakeLists.txtnew file+36
This diff is too big to show here.
tests/plugins/WindowManager/UnityApplicationMocks.hnew file+211
This diff is too big to show here.
tests/plugins/WindowManager/tst_TopLevelWindowModel.cppnew file+193
This diff is too big to show here.
tests/plugins/Wizard/CMakeLists.txt+8−2
This diff is too big to show here.
tests/plugins/Wizard/tst_pagelist.cpp+30−1
This diff is too big to show here.
tests/qmltests/ApplicationMenuDataLoader.qmlnew file+99
This diff is too big to show here.
tests/qmltests/ApplicationMenus/tst_MenuBar.qmlnew file+437
This diff is too big to show here.
tests/qmltests/ApplicationMenus/tst_MenuPopup.qmlnew file+361
This diff is too big to show here.
tests/qmltests/CMakeLists.txt+45−68
This diff is too big to show here.
tests/qmltests/Components/CMakeLists.txt+34−8
This diff is too big to show here.
tests/qmltests/Components/tst_Carousel.qmldeleted−293
This diff is too big to show here.
tests/qmltests/Components/tst_Dialogs.qml−1
This diff is too big to show here.
tests/qmltests/Components/tst_DragHandle.cpp+52−29
This diff is too big to show here.
tests/qmltests/Components/tst_DragHandle.qml+22−4
This diff is too big to show here.
tests/qmltests/Components/tst_DragHandle/BottomEdgeShowable.qmlnew file+108
This diff is too big to show here.
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml → tests/qmltests/Components/tst_DragHandle/LeftEdgeShowable.qmlrenamed
The content is the same.
tests/qmltests/Components/tst_DragHandle/RightEdgeShowable.qmlnew file+108
This diff is too big to show here.
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml → tests/qmltests/Components/tst_DragHandle/TopEdgeShowable.qmlrenamed+7−7
This diff is too big to show here.
tests/qmltests/Components/tst_DraggingArea.qml+6−6
This diff is too big to show here.
tests/qmltests/Components/tst_EdgeDragEvaluator.cpp+6−4
This diff is too big to show here.
tests/qmltests/Components/tst_LazyImage/portrait.png
Binary file not shown.
tests/qmltests/Components/tst_LazyImage/square.png
Binary file not shown.
tests/qmltests/Components/tst_LazyImage/wide.png
Binary file not shown.
tests/qmltests/Components/tst_Lockscreen.qml+14−32
This diff is too big to show here.
tests/qmltests/Components/tst_MediaServices.qmlnew file+231
This diff is too big to show here.
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+19−27
This diff is too big to show here.
tests/qmltests/Components/tst_Rating.qml+1−1
This diff is too big to show here.
tests/qmltests/Components/tst_ResponsiveGridView.qmldeleted−157
This diff is too big to show here.
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qmldeleted−183
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml → tests/qmltests/Components/tst_SharingPicker.qmlrenamed+11−11
This diff is too big to show here.
tests/qmltests/Components/tst_Showable.qml+13
This diff is too big to show here.
tests/qmltests/Components/tst_VirtualTouchPad.qml+55−1
This diff is too big to show here.
tests/qmltests/Components/tst_Wallpaper.qmlnew file+118
This diff is too big to show here.
tests/qmltests/Components/tst_WallpaperResolver.qml+115−43
This diff is too big to show here.
tests/qmltests/Components/tst_ZoomableImage.qml+2−2
This diff is too big to show here.
tests/qmltests/Dash/CardHelpers.jsdeleted−115
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qmldeleted−99
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qmldeleted−96
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterRangeInput.qmldeleted−247
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterValueSlider.qmldeleted−101
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qmldeleted−59
This diff is too big to show here.
tests/qmltests/Dash/Previews/MockPreviewWidget.qmldeleted−27
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_Preview.qmldeleted−135
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewActions.qmldeleted−231
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qmldeleted−184
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewComment.qmldeleted−84
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qmldeleted−85
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qmldeleted−339
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewHeader.qmldeleted−187
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewIconActions.qmldeleted−136
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qmldeleted−147
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewMediaToolbar.qmldeleted−69
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewPayments.qmldeleted−203
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewProgress.qmldeleted−87
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qmldeleted−123
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qmldeleted−94
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qmldeleted−80
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qmldeleted−202
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewTable.qmldeleted−126
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qmldeleted−87
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qmldeleted−61
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qmldeleted−103
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmldeleted−133
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qmldeleted−62
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qmldeleted−84
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qmldeleted−98
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qmldeleted−88
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qmldeleted−65
This diff is too big to show here.
tests/qmltests/Dash/artwork/avatar@12.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/background.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/checkers.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/emblem.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/music-player-design.pngdeleted
Binary file not shown.
tests/qmltests/Dash/tst_Card.qmldeleted−680
This diff is too big to show here.
tests/qmltests/Dash/tst_CardBenchmark.qmldeleted−95
This diff is too big to show here.
tests/qmltests/Dash/tst_CardCarousel.qmldeleted−87
This diff is too big to show here.
tests/qmltests/Dash/tst_CardTool.qmldeleted−379
This diff is too big to show here.
tests/qmltests/Dash/tst_Dash.qmldeleted−658
This diff is too big to show here.
tests/qmltests/Dash/tst_DashContent.qmldeleted−629
This diff is too big to show here.
tests/qmltests/Dash/tst_DashPageHeader.qmldeleted−340
This diff is too big to show here.
tests/qmltests/Dash/tst_DashShell.qmldeleted−139
This diff is too big to show here.
tests/qmltests/Dash/tst_GenericScopeView.qml−664
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_PreviewView.qml−122
This diff is too big to show here.
tests/qmltests/Greeter/TestView.qml+24−22
This diff is too big to show here.
tests/qmltests/Greeter/tst_Greeter.qml+278−152
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+78−24
This diff is too big to show here.
tests/qmltests/Greeter/tst_NarrowView.qml−533
This diff is too big to show here.
tests/qmltests/Greeter/tst_WideView.qml−537
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+440−86
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+191−46
This diff is too big to show here.
tests/qmltests/Notifications/tst_OptionToggle.qml+13−22
This diff is too big to show here.
tests/qmltests/Notifications/tst_SwipeToAct.qml+19−26
This diff is too big to show here.
tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+10−26
This diff is too big to show here.
tests/qmltests/Panel/Indicators/tst_IndicatorItem.qml+5−4
This diff is too big to show here.
tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qml+96−89
This diff is too big to show here.
tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+168−8
This diff is too big to show here.
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+1
This diff is too big to show here.
tests/qmltests/Panel/PanelTest.qml−5
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+29−10
This diff is too big to show here.
tests/qmltests/Panel/tst_MenuContent.qml+16−4
This diff is too big to show here.
tests/qmltests/Panel/tst_Panel.qml+434−233
This diff is too big to show here.
tests/qmltests/Panel/tst_PanelBar.qml+25−34
This diff is too big to show here.
tests/qmltests/Panel/tst_PanelItemRow.qml+41−12
This diff is too big to show here.
tests/qmltests/Panel/tst_PanelMenu.qml+137−34
This diff is too big to show here.
tests/qmltests/Panel/tst_PanelMenuPage.qml+53−49
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/Stage/ApplicationCheckBox.qml+37−7
This diff is too big to show here.
tests/qmltests/Stage/SizeHintField.qml
This diff is too big to show here.
tests/qmltests/Stage/SurfaceManagerControls.qml+1−1
This diff is too big to show here.
tests/qmltests/Stage/SurfaceManagerField.qml
This diff is too big to show here.
tests/qmltests/Stage/tst_ApplicationWindow.qml+123−46
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+239−285
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+16−2
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+346−276
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+86−117
This diff is too big to show here.
tests/qmltests/Stages/RecursingChildSessionControl.qml−94
This diff is too big to show here.
tests/qmltests/Stages/tst_DesktopStage.qml−628
This diff is too big to show here.
tests/qmltests/Stages/tst_SpreadDelegate.qml−320
This diff is too big to show here.
tests/qmltests/Stages/tst_SurfaceContainer.qml−380
This diff is too big to show here.
tests/qmltests/Tutorial/tst_Tutorial.qml+320−333
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+145−150
This diff is too big to show here.
tests/qmltests/tst_DisabledScreenNotice.qml+24−10
This diff is too big to show here.
tests/qmltests/tst_OrientedShell.qml+513−489
This diff is too big to show here.
tests/qmltests/tst_Shell.qml+1773−822
This diff is too big to show here.
tests/qmltests/tst_ShellWithPin.qml+167−231
This diff is too big to show here.
tests/qmltests/utils/Unity/Test/tst_UnityTest.qml+31
This diff is too big to show here.
tests/scripts/alert-launcher-icon.sh+16
This diff is too big to show here.
tests/scripts/get-progress.sh+16
This diff is too big to show here.
tests/scripts/list-launcher-icons.sh+16
This diff is too big to show here.
tests/scripts/set-count-visible.sh+16
This diff is too big to show here.
tests/scripts/set-count.sh+16
This diff is too big to show here.
tests/scripts/set-progress.sh+16
This diff is too big to show here.
tests/uqmlscene/CMakeLists.txt+14−2
This diff is too big to show here.
tests/uqmlscene/main.cpp+7−4
This diff is too big to show here.
tests/utils/modules/Unity/Test/CMakeLists.txt+14−7
This diff is too big to show here.
tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+5−1
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−60
This diff is too big to show here.
tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+18−4
This diff is too big to show here.
tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+4−2
This diff is too big to show here.
tests/utils/modules/Unity/Test/UnityTestCase.qml+43−34
This diff is too big to show here.
tests/utils/modules/Unity/Test/qmldir+2−1
This diff is too big to show here.
tests/utils/modules/Unity/Test/testutil.cpp+33−5
This diff is too big to show here.
tests/utils/modules/Unity/Test/testutil.h+1
This diff is too big to show here.
tools/CMakeLists.txt+2−12
This diff is too big to show here.
tools/indicatorsclient/CMakeLists.txt+1−1
This diff is too big to show here.
tools/indicatorsclient/indicatorsclient.cpp+10−8
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.
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−146
This diff is too big to show here.
tools/registry-tracker.h−49
This diff is too big to show here.
This diff is too big to show here.
This diff is too big to show here.