1449 files changed+104399−101232
.bazaar/Makefiledeleted−6
@@ -1,6 +0,0 @@
1−install:
2− mkdir -p ~/.bazaar/plugins
3− cp plugins/* ~/.bazaar/plugins
4−
5−uninstall:
6− rm ~/.bazaar/plugins/makecheck_unity_phablet.py*
.bazaar/plugins/makecheck_unity_phablet.pydeleted−51
@@ -1,51 +0,0 @@
1−#!/usr/bin/python
2−# Copyright 2013, 2014 Canonical Ltd.
3−#
4−# This program is free software; you can redistribute it and/or modify
5−# it under the terms of the GNU Lesser General Public License as published by
6−# the Free Software Foundation; version 3.
7−#
8−# This program is distributed in the hope that it will be useful,
9−# but WITHOUT ANY WARRANTY; without even the implied warranty of
10−# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11−# GNU Lesser General Public License for more details.
12−#
13−# You should have received a copy of the GNU Lesser General Public License
14−# along with this program. If not, see <http://www.gnu.org/licenses/>.
15−
16−import os
17−import subprocess
18−from bzrlib import branch
19−from bzrlib.urlutils import local_path_from_url
20−
21−
22−def execute_makecheck(
23− local_branch, master_branch, old_revision_number, old_revision_id,
24− future_revision_number, future_revision_id, tree_delta, future_tree):
25− if not master_branch.basis_tree().has_filename("qml/Shell.qml"):
26− return
27−
28− os.chdir(local_path_from_url(master_branch.base))
29−
30− print "Executing 'make -C builddir test'.."
31− os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"
32− if (subprocess.call("make -C builddir test", shell=True) != 0):
33−
34− print("\n\n*** Warning ***\n\n"
35− "Basic tests failed. This commit will not pass continuous "
36− "integration.")
37−
38− branch = local_branch or master_branch
39− revision = branch.repository.get_revision(future_revision_id)
40− msg_file = open('message.txt', 'w')
41− msg_file.write(revision.message)
42− msg_file.close()
43−
44− print("\n\nSaved commit message to $SRC_DIR/message.txt.")
45− print("You can uncommit this revision, fix the tests and reuse your "
46− "message running:\n\nbzr commit -F message.txt\n\n")
47− elif os.path.isfile("message.txt"):
48− os.remove("message.txt")
49−
50−branch.Branch.hooks.install_named_hook(
51− 'pre_commit', execute_makecheck, 'make check pre-commit')
.bzr-builddeb/default.confdeleted−2
@@ -1,2 +0,0 @@
1−[BUILDDEB]
2−split = True
.bzrignoredeleted−7
@@ -1,7 +0,0 @@
1−# default build dir
2−/builddir
3−# QtCreator project files
4−/*.user
5−# Eclipse project files
6−.settings
7−message.txt
.crossbuilder/post_deploynew file+1
@@ -0,0 +1 @@
1+restart unity8
.gitignore+7
@@ -2,8 +2,15 @@
22/builddir
33# QtCreator project files
44/*.user
5+*.qmlc
6+*.jsc
57# Eclipse project files
68/.project
79/.cproject
810/.settings
911/.pydevproject
12+# KDevelop project Files
13+/.kdev4/
14+/build/
15+/*.kdev4
16+.clickable/
CMakeLists.txt+45−14
@@ -40,6 +40,19 @@ if(cmake_build_type_lower MATCHES coverage)
4040 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
4141endif()
4242
43+find_package (ECM 1.7.0 QUIET NO_MODULE)
44+if (ECM_FOUND)
45+ # Provides us with -DECM_ENABLE_SANITIZERS='X'
46+ # Where X can be address, thread, memory, leak, undefined
47+ include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
48+endif()
49+
50+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
51+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
52+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
53+ endif()
54+endif()
55+
4356# Make sure we have all the needed symbols
4457set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
4558set(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
4962 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
5063
5164include(FindPkgConfig)
52−find_package(Qt5Core 5.4 REQUIRED)
53−find_package(Qt5Qml 5.4 REQUIRED)
54−find_package(Qt5Quick 5.4 REQUIRED)
55−find_package(Qt5Gui 5.4 REQUIRED)
56−find_package(Qt5DBus 5.4 REQUIRED)
57−find_package(Qt5Concurrent 5.4 REQUIRED)
58−find_package(Qt5Sql 5.4 REQUIRED)
59−
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=15)
65+find_package(Qt5Core 5.6 REQUIRED)
66+find_package(Qt5Qml 5.6 REQUIRED)
67+find_package(Qt5Quick 5.6 REQUIRED)
68+find_package(Qt5Gui 5.6 REQUIRED)
69+find_package(Qt5DBus 5.6 REQUIRED)
70+find_package(Qt5Concurrent 5.6 REQUIRED)
71+find_package(Qt5Sql 5.6 REQUIRED)
72+find_package(Qt5Test 5.6 REQUIRED)
73+find_package(Qt5Svg 5.6 REQUIRED)
74+find_package(Qt5Network 5.6 REQUIRED)
75+find_package(Qt5Xml 5.6 REQUIRED)
76+
77+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
6178pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
6279pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
6380pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
81+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)
6482pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
83+pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
84+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)
85+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
86+pkg_check_modules(QTDBUSTEST REQUIRED
87+ libqtdbustest-1
88+ libqtdbusmock-1
89+ )
90+
91+### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them
92+find_path(UBUNTUGESTUREPRIV
93+ NAMES UbuntuGestures/private/damper_p.h UbuntuGestures/private/ucswipearea_p.h UbuntuGestures/private/ucswipearea_p_p.h
94+ PATHS ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}
95+ NO_DEFAULT_PATH)
96+if (${UBUNTUGESTUREPRIV} STREQUAL UBUNTUGESTUREPRIV-NOTFOUND)
97+ message(FATAL_ERROR "UbuntuGestures private headers not found.")
98+endif()
99+# end of UbuntuGesture private headers check
65100
66101# Standard install paths
67102include(GNUInstallDirs)
@@ -113,9 +148,8 @@ include(autopilot)
113148declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
114149
115150set(SHELL_APP unity8)
116−set(DASH_APP unity8-dash)
117−set(SCOPE_TOOL unity-scope-tool)
118151set(INDICATORS_CLIENT_APP indicators-client)
152+set(GREETER_APP unity8-greeter)
119153set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
120154
121155include_directories(
@@ -124,8 +158,6 @@ include_directories(
124158 ${APPLICATION_API_INCLUDE_DIRS}
125159)
126160
127−set(ARTIFACTS_DIR "" CACHE PATH "Store test artifacts in this directory.")
128−
129161# Quiet logger
130162set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")
131163if(NOT QUIET_LOGGER)
@@ -144,7 +176,6 @@ endif()
144176
145177# add subdirectories to build
146178add_subdirectory(include)
147−add_subdirectory(libs)
148179add_subdirectory(src)
149180add_subdirectory(tools)
150181add_subdirectory(qml)
CODING+44−59
@@ -15,23 +15,17 @@ download source
1515 $ bzr branch lp:unity8 ~/unity8/trunk
1616 $ cd ~/unity8/trunk
1717
18−install dependencies
18+install dependencies and build Unity 8
1919--------------------
20−If its your first time, install build dependencies
2120
2221$ cd ~/unity8/trunk
23−$ ./build.sh --setup
24−
25− this will:
26− - install the required dependencies to build, as well as run on the desktop
27− - it should also install unity-scope-home and unity-lens-application which
28− are technically "recommends", not strict dependencies
22+$ ./build.sh
2923
30−build Unity 8
31−-------------
24+ If its your first time, this will install the required dependencies to build and
25+ build it.
3226
33−$ cd ~/unity8/trunk
34−$ ./build.sh
27+ You might want to also install unity-scope-home and unity-scope-click which
28+ are technically "recommends", not strict dependencies
3529
3630You may also rebuild with the -c for clean, which just deletes the build
3731directory.
@@ -43,13 +37,15 @@ Running Unity 8 on your desktop
4337run the Unity 8 shell
4438---------------------
4539$ cd ~/unity8/trunk
46−$ ./run.sh
40+$ cd builddir
4741
48−Options can be passed to test the lock screen
49−$ ./run.sh -p OR -k
42+Each component of unity8 can be ran independently for development and testing
43+For example:
44+$ make tryShell
45+$ make tryLauncher
46+$ make tryLockscreen
5047
51−-p is for pin lock, for which the default prompt answer is "1234"
52−-k is for keylock passphrase, for which the default prompt answer is "password"
48+Check out the tests/qmltests/ directory for a list of things that can be ran.
5349
5450Notes
5551-----
@@ -70,50 +66,15 @@ Notes
7066
7167Running Unity 8 on devices
7268==========================
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)
81−
82−$ cd ~/unity/trunk
83−$ ./run_on_device.sh --setup
84− this will:
85− - install your public SSH key on the device
86− - install the needed dependencies
8769
88−$ ./run_on_device.sh
89− this will:
90− - rsync the code to the device
91− - build on the device
92− - replace the running shell
93−
94−Options can be passed to test the lock screen
95−$ ./run_on_device.sh -p OR -k
96−
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"
99−
100−Notes
101−-----
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
108− the screen
109−- exporting ANDROID_SERIAL=$your_device_serial or
110− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
111− multiple devices
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)
70+Running unity8 on a device should be done using crossbuilder.
71+Go to
72+* https://launchpad.net/crossbuilder and
73+* https://wiki.ubuntu.com/Touch/Crossbuilder
74+for more details on crossbuilder.
11675
76+unity8 will automatically restart on the phone once deployment
77+has finished due to post-build-steps set up in this repository.
11778
11879Coding guidelines
11980=================
@@ -201,3 +162,27 @@ $ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name
201162or run them all with
202163
203164$ PYTHONPATH=../tests/autopilot autopilot3 run unity8
165+
166+Debugging techniques
167+====================
168+
169+Unity8 heavily uses Qt and with that Qt debugging techniques mostly apply in the
170+same fashion. There are, however, some additional unity8-specific notes:
171+
172+* Enable/disable Qt scenegraph visualizer on the fly:
173+
174+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSceneGraphVisualizer <mode>
175+
176+ This is equivalent to exporting QSG_VISUALIZE=<mode> before running unity8, except it does it on the
177+ fly.
178+
179+* Toggle slow animations on the fly:
180+
181+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSlowAnimations <true|false>
182+
183+* Change logging filter rules on the fly:
184+
185+ $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetLoggingFilterRules <filter>
186+
187+ This is equivalent to exporting QT_LOGGING_RULES or defining them in QT_LOGGING_CONF, except it does
188+ it on the fly.
Jenkinsfilenew file+2
@@ -0,0 +1,2 @@
1+@Library('ubports-build-tools') _
2+buildAndProvideDebianPackage()
README.mdnew file+31
@@ -0,0 +1,31 @@
1+# Lomiri
2+
3+Lomiri is the operating environment for everywhere. It is able to span the gaps between touch, mouse, and keyboard; between phones, tablets, and workstations; and look good doing it.
4+
5+If you want to contribute to Lomiri on Ubuntu Touch, you've come to the right place. If you want to package Lomiri for other operating systems, you'll be better served by the main branch on the repository that we're migrating to: https://gitlab.com/ubports/core/lomiri
6+
7+Lomiri has been renamed from Unity8. Most of the software on-device in Ubuntu Touch based on Ubuntu 16.04 is still called `unity8`.
8+
9+## Where to report issues
10+
11+Issues related to the version of Lomiri that currently runs on Ubuntu Touch devices may still be reported on this repository. We will move these reports to the GitLab repository as part of our final migration.
12+
13+## Developing Lomiri on Ubuntu Touch
14+
15+This repository contains the code for Lomiri currently running on Ubuntu Touch. If you would like to modify this version of Lomiri, follow the steps below. If you would like to modify Lomiri in another operating system, check out our new repository: https://gitlab.com/ubports/core/lomiri
16+
17+Lomiri can be built and its test suite run using [`clickable`](https://clickable-ut.dev). This is a convenient method to try out most graphical changes to Lomiri without an annoying redeployment process. If you wish to test your changes on your device or make changes that are more difficult to test without real hardware, check out [Making changes and testing locally on the UBports documentation](https://docs.ubports.com/en/latest/systemdev/testing-locally.html). If not, read on.
18+
19+Before you start, [install Clickable](https://clickable-ut.dev/en/latest/install.html).
20+
21+Now, clone this repository to your computer: `git clone https://github.com/ubports/unity8.git`
22+
23+Move into this directory: `cd unity8`
24+
25+Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:
26+
27+* `clickable ide qtcreator` will open QtCreator with this repository open as a project. You can edit and build the project this way, but running the tests will be a bit difficult.
28+* `clickable build --libs --verbose` will build Lomiri in the same environment as it would receive in Ubuntu Touch.
29+* `clickable test --libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...
30+* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make tryShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow trying out some Lomiri components in a mock environment. You can use this to try out your changes to Lomiri as you develop.
31+* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make xvfbtestShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow running a single TestCase. You can remove the `xvfb` part of the make target to run the test case graphically, which might help you see what is causing the test to fail.
build.sh+22−37
@@ -1,5 +1,21 @@
11#!/bin/sh
22
3+#
4+# Copyright (C) 2017 Canonical Ltd
5+#
6+# This program is free software: you can redistribute it and/or modify
7+# it under the terms of the GNU General Public License version 3 as
8+# published by the Free Software Foundation.
9+#
10+# This program is distributed in the hope that it will be useful,
11+# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+# GNU General Public License for more details.
14+#
15+# You should have received a copy of the GNU General Public License
16+# along with this program. If not, see <http://www.gnu.org/licenses/>.
17+#
18+
319SETUP=false
420CLEAN=false
521NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
@@ -9,7 +25,6 @@ usage() {
925 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
1026 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2
1127 echo "OPTIONS:" >&2
12− echo " -s, --setup Setup the build environment and branch Unity" >&2
1328 echo " -c, --clean Clean the build tree before building" >&2
1429 echo >&2
1530 exit 1
@@ -22,7 +37,6 @@ eval set -- "$ARGS"
2237while [ $# -gt 0 ]
2338do
2439 case "$1" in
25− -s|--setup) SETUP=true;;
2640 -c|--clean) CLEAN=true;;
2741 -h|--help) usage;;
2842 --) shift;break;;
@@ -35,31 +49,6 @@ done
3549BUILD_TYPE="debug"
3650[ $# -eq 1 ] && BUILD_TYPE="$1"
3751
38−install_dependencies() {
39− sudo apt-get update || exit 4
40− echo "Installing Unity 8 dependencies.."
41− sudo apt-get install devscripts \
42− equivs \
43− gsettings-desktop-schemas \
44− gsettings-ubuntu-schemas \
45− pay-service \
46− qmenumodel-qml \
47− qml-module-qtquick-layouts \
48− qml-module-qtquick-xmllistmodel \
49− qtdeclarative5-gsettings1.0 \
50− qtdeclarative5-ubuntu-ui-toolkit-plugin \
51− qtdeclarative5-ubuntu-settings-components \
52− qtdeclarative5-ubuntu-telephony0.1 \
53− qtdeclarative5-ubuntu-thumbnailer0.1 \
54− qtdeclarative5-unity-notifications-plugin \
55− qml-module-ubuntu-connectivity \
56− ubuntu-mobile-icons \
57− ubuntu-system-settings \
58− unity-plugin-scopes \
59− xvfb \
60− || exit 5
61−}
62−
6352mk_build_deps() {
6453 if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
6554 sed 's/\:native//g' $CODE_DIR/debian/control > control
@@ -85,13 +74,9 @@ else
8574 BUILD_COMMAND="make -j$NUM_JOBS"
8675fi
8776
88−if $SETUP; then
89− install_dependencies
90−else
91− if $CLEAN; then rm -rf builddir; fi
92− mkdir -p builddir
93− cd builddir
94− mk_build_deps
95− cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
96− ${BUILD_COMMAND} || exit 7
97−fi
77+if $CLEAN; then rm -rf builddir; fi
78+mkdir -p builddir
79+cd builddir
80+mk_build_deps
81+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
82+${BUILD_COMMAND} || exit 7
clickable.yamlnew file+153
@@ -0,0 +1,153 @@
1+clickable_minimum_required: '7'
2+builder: custom
3+build: echo Run \'clickable build --libs --verbose\' to build && false
4+restrict_arch: amd64
5+libraries:
6+ unity8:
7+ builder: cmake
8+ src_dir: "${ROOT}"
9+ test: make xvfballtests -j${NUM_PROCS}
10+ dependencies_host:
11+ - android-headers
12+ - cmake
13+ - cmake-extras
14+ - dbus-test-runner
15+ - debhelper
16+ - dh-apparmor
17+ - doxyqml
18+ - g++:native
19+ - gdb
20+ - graphviz
21+ - gsettings-ubuntu-schemas
22+ - libandroid-properties-dev
23+ - libconnectivity-qt1-dev
24+ - libevdev-dev
25+ - libgeonames-dev
26+ - libgl1-mesa-dev
27+ - libgl1-mesa-dri
28+ - libgles2-mesa-dev
29+ - libglib2.0-dev
30+ - libgnome-desktop-3-12
31+ - libgnome-desktop-3-dev
32+ - libgsettings-qt-dev
33+ - libhardware-dev
34+ - liblightdm-qt5-3-dev
35+ - libpam0g-dev
36+ - libpulse-dev
37+ - libqmenumodel-dev
38+ - libqt5sql5-sqlite
39+ - libqt5svg5-dev
40+ - libqt5xmlpatterns5-dev
41+ - libqtdbusmock1-dev
42+ - libqtdbustest1-dev
43+ - libsystemsettings-dev
44+ - libubuntu-app-launch2-dev
45+ - libubuntu-download-manager-common-dev
46+ - libubuntugestures5-dev
47+ - libubuntugestures5-private-dev
48+ - libudev-dev
49+ - libudm-common-dev
50+ - libunity-api-dev
51+ - libusermetricsoutput1-dev
52+ - libx11-dev
53+ - libxcb1-dev
54+ - libxi-dev
55+ - pkg-config
56+ - python3-all:any
57+ - python3-setuptools:native
58+ - qml-module-qt-labs-folderlistmodel
59+ - qml-module-qt-labs-settings
60+ - qml-module-qtmultimedia
61+ - qml-module-qtqml-statemachine
62+ - qml-module-qtquick-layouts
63+ - qml-module-qtquick-xmllistmodel
64+ - qml-module-qtquick2
65+ - qml-module-qtsysteminfo
66+ - qml-module-qttest
67+ - qml-module-ubuntu-components
68+ - qml-module-ubuntu-layouts
69+ - qml-module-ubuntu-settings-components
70+ - qml-module-ubuntu-test
71+ - qtbase5-dev
72+ - qtbase5-dev-tools
73+ - qtbase5-private-dev
74+ - qtdbustest-runner
75+ - qtdeclarative5-dev
76+ - qtdeclarative5-dev-tools
77+ - qtdeclarative5-private-dev
78+ - qtdeclarative5-ubuntu-content1
79+ - ttf-ubuntu-font-family
80+ - ubports-wallpapers
81+ - xvfb
82+dependencies_target:
83+ - android-headers
84+ - cmake
85+ - cmake-extras
86+ - dbus-test-runner
87+ - debhelper
88+ - dh-apparmor
89+ - doxyqml
90+ - g++:native
91+ - gdb
92+ - graphviz
93+ - gsettings-ubuntu-schemas
94+ - libandroid-properties-dev
95+ - libconnectivity-qt1-dev
96+ - libevdev-dev
97+ - libgeonames-dev
98+ - libgl1-mesa-dev
99+ - libgl1-mesa-dri
100+ - libgles2-mesa-dev
101+ - libglib2.0-dev
102+ - libgnome-desktop-3-12
103+ - libgnome-desktop-3-dev
104+ - libgsettings-qt-dev
105+ - libhardware-dev
106+ - liblightdm-qt5-3-dev
107+ - libpam0g-dev
108+ - libpulse-dev
109+ - libqmenumodel-dev
110+ - libqt5sql5-sqlite
111+ - libqt5svg5-dev
112+ - libqt5xmlpatterns5-dev
113+ - libqtdbusmock1-dev
114+ - libqtdbustest1-dev
115+ - libsystemsettings-dev
116+ - libubuntu-app-launch2-dev
117+ - libubuntu-download-manager-common-dev
118+ - libubuntugestures5-dev
119+ - libubuntugestures5-private-dev
120+ - libudev-dev
121+ - libudm-common-dev
122+ - libunity-api-dev
123+ - libusermetricsoutput1-dev
124+ - libx11-dev
125+ - libxcb1-dev
126+ - libxi-dev
127+ - pkg-config
128+ - python3-all:any
129+ - python3-setuptools:native
130+ - qml-module-qt-labs-folderlistmodel
131+ - qml-module-qt-labs-settings
132+ - qml-module-qtmultimedia
133+ - qml-module-qtqml-statemachine
134+ - qml-module-qtquick-layouts
135+ - qml-module-qtquick-xmllistmodel
136+ - qml-module-qtquick2
137+ - qml-module-qtsysteminfo
138+ - qml-module-qttest
139+ - qml-module-ubuntu-components
140+ - qml-module-ubuntu-layouts
141+ - qml-module-ubuntu-settings-components
142+ - qml-module-ubuntu-test
143+ - qtbase5-dev
144+ - qtbase5-dev-tools
145+ - qtbase5-private-dev
146+ - qtdbustest-runner
147+ - qtdeclarative5-dev
148+ - qtdeclarative5-dev-tools
149+ - qtdeclarative5-private-dev
150+ - qtdeclarative5-ubuntu-content1
151+ - ttf-ubuntu-font-family
152+ - ubports-wallpapers
153+ - xvfb
cmake/modules/QmlPlugins.cmakedeleted−148
@@ -1,148 +0,0 @@
1−# If you need to override the qmlplugindump binary, create the qmlplugin executable
2−# target before loading this plugin.
3−
4−if(NOT TARGET qmlplugindump)
5− find_program(qmlplugindump_exe qmlplugindump)
6−
7− if(NOT qmlplugindump_exe)
8− msg(FATAL_ERROR "Could not locate qmlplugindump.")
9− endif()
10−
11− add_executable(qmlplugindump IMPORTED)
12− set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
13−endif()
14−
15−#
16−# A custom target for building the qmltypes files manually.
17−#
18−if (NOT TARGET qmltypes)
19− add_custom_target(qmltypes)
20−endif()
21−
22−# Creates a target for copying resource files into build dir and optionally installing them.
23−#
24−# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
25−# into ${DESTINATION}/${path}.
26−#
27−# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
28−#
29−# export_qmlfiles(plugin path
30−# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
31−# [BINARY_DIR path]
32−# [DESTINATION path]
33−# [TARGET_PREFIX string] # Will be prefixed to the target name
34−# )
35−#
36−# Created target:
37−# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
38−
39−macro(export_qmlfiles PLUGIN PATH)
40− set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
41− cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
42−
43− if(NOT QMLFILES_SEARCH_PATH)
44− set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
45− endif()
46−
47− if(QMLFILES_BINARY_DIR)
48− set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
49− else()
50− set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
51− endif()
52−
53− file(GLOB QMLFILES
54− ${QMLFILES_SEARCH_PATH}/*.qml
55− ${QMLFILES_SEARCH_PATH}/*.js
56− ${QMLFILES_SEARCH_PATH}/*.jpg
57− ${QMLFILES_SEARCH_PATH}/*.png
58− ${QMLFILES_SEARCH_PATH}/*.sci
59− ${QMLFILES_SEARCH_PATH}/*.svg
60− ${QMLFILES_SEARCH_PATH}/*.qmltypes
61− ${QMLFILES_SEARCH_PATH}/qmldir
62− )
63−
64− execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
65−
66− # copy the files
67− add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
68− COMMAND cp ${QMLFILES} ${qmlfiles_dir}
69− DEPENDS ${QMLFILES}
70− SOURCES ${QMLFILES}
71− )
72−
73− if(QMLFILES_DESTINATION)
74− # install the qmlfiles file.
75− install(FILES ${QMLFILES}
76− DESTINATION ${QMLFILES_DESTINATION}/${PATH}
77− )
78− endif()
79−endmacro()
80−
81−
82−# Creates a target for generating the typeinfo file for a QML plugin and/or installs the plugin
83−# targets.
84−#
85−# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
86−# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
87−# path ends with ${path}.
88−#
89−# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
90−#
91−# export_qmlplugin(plugin version path
92−# [BINARY_DIR path]
93−# [DESTINATION path]
94−# [TARGET_PREFIX string] # Will be prefixed to the target name
95−# [ENVIRONMENT string] # Will be added to qmlplugindump's env
96−# [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
97−# [NO_TYPES] # Do not create the qmltypes target
98−# )
99−#
100−# Created target:
101−# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the source dir.
102−# It will be made a dependency of the "qmltypes" target.
103−
104−macro(export_qmlplugin PLUGIN VERSION PATH)
105− set(options NO_TYPES)
106− set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
107− set(multi TARGETS)
108− cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
109−
110− if(QMLPLUGIN_BINARY_DIR)
111− set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
112− else()
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})
116− endif()
117−
118− if(NOT QMLPLUGIN_NO_TYPES)
119− # Relative path for the module
120− string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")
121−
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)
126−
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}
131− )
132− add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
133− add_dependencies(qmltypes ${target_prefix}-qmltypes)
134− endif()
135−
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}
140− )
141−
142− if (QMLPLUGIN_DESTINATION)
143− # Install additional targets
144− install(TARGETS ${QMLPLUGIN_TARGETS}
145− DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
146− )
147− endif()
148−endmacro()
cmake/modules/QmlTest.cmake+188−12
@@ -55,6 +55,55 @@ function(add_qml_test PATH COMPONENT_NAME)
5555endfunction()
5656
5757
58+# add_qml_test_data(path component_name
59+# [...]
60+# )
61+#
62+# Install file called ${component_name} (or ${component_name}.qml) under
63+# ${path}.
64+
65+function(add_qml_test_data PATH COMPONENT_NAME)
66+ cmake_parse_arguments(TEST "" "DESTINATION" "" ${ARGN})
67+
68+ set(filename "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/${COMPONENT_NAME}")
69+
70+ if (IS_DIRECTORY "${filename}")
71+ # As a convenience, allow specifying a directory and we will install
72+ # all files in the dir. We do it this way rather than passing
73+ # DIRECTORY to install() because we want to process any qml files.
74+ file(GLOB subfiles RELATIVE "${filename}" "${filename}/*")
75+ foreach(subfile ${subfiles})
76+ add_qml_test_data("${PATH}/${COMPONENT_NAME}" "${subfile}")
77+ endforeach()
78+ return()
79+ endif()
80+
81+ if (NOT EXISTS "${filename}")
82+ set(filename "${filename}.qml")
83+ set(COMPONENT_NAME "${COMPONENT_NAME}.qml")
84+ endif()
85+
86+ if ("${filename}" MATCHES "\\.qml$")
87+ file(READ "${filename}" contents)
88+ string(REGEX REPLACE "(\"[./]*)/qml(/|\")" "\\1\\2" contents "${contents}")
89+ # this is for (at least) cardcreatortest which pulls in an architecture-specific
90+ # import into the plugins directory (which is a 'qml' once installed).
91+ string(REGEX REPLACE "(import \"[./]*)/plugins(/|\")" "\\1/qml\\2" contents "${contents}")
92+ set(filename "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${COMPONENT_NAME}")
93+ file(WRITE "${filename}" "${contents}")
94+ endif()
95+
96+ if (TEST_DESTINATION)
97+ set(DESTINATION "${TEST_DESTINATION}")
98+ else()
99+ file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
100+ set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")
101+ endif()
102+
103+ install(FILES "${filename}" DESTINATION "${DESTINATION}")
104+endfunction()
105+
106+
58107# add_qml_unittest(path component_name
59108# [...]
60109# )
@@ -71,6 +120,10 @@ function(add_qml_unittest PATH COMPONENT_NAME)
71120 ${ARGN}
72121 ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
73122 )
123+
124+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")
125+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")
126+ endif()
74127endfunction()
75128
76129
@@ -91,6 +144,10 @@ function(add_manual_qml_test PATH COMPONENT_NAME)
91144 ${ARGN}
92145 ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
93146 )
147+
148+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")
149+ add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")
150+ endif()
94151endfunction()
95152
96153
@@ -108,8 +165,7 @@ endfunction()
108165#
109166# Logging options in the standard form of "-o filename,format"
110167# will be appended to the arguments list, prefixed with ARG_PREFIX.
111−# XUnitXML files will be stored in current binary dir or under
112−# ARTIFACTS_DIR, if set.
168+# XUnitXML files will be stored in current binary dir.
113169#
114170# Three targets will be created:
115171# - test${component_name} - Runs the test
@@ -122,14 +178,8 @@ function(add_executable_test COMPONENT_NAME TARGET)
122178 cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
123179 mangle_arguments()
124180
125− if(ARTIFACTS_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)
129− else()
130− file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
131− set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
132− endif()
181+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
182+ set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
133183
134184 bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})
135185
@@ -151,7 +201,7 @@ function(add_executable_test COMPONENT_NAME TARGET)
151201 add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
152202 COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
153203 ${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}
155205 TARGETS ${xvfb_targets}
156206 )
157207 endif()
@@ -207,8 +257,129 @@ function(add_manual_test COMPONENT_NAME TARGET)
207257endfunction()
208258
209259
260+# add_meta_test(target)
261+#
262+# Adds a test target that will run one of our "meta" test targets, like
263+# xvfbuitests. This script will run the specified suite of tests on an
264+# installed system.
265+
266+function(add_meta_test TARGET_NAME)
267+ cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})
268+
269+ add_custom_target(${TARGET_NAME})
270+
271+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
272+ if(TEST_SERIAL)
273+ file(WRITE "${filename}" "#!/bin/sh\n\n")
274+ else()
275+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
276+ endif()
277+
278+ add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
279+ # else we will write the rest of the script as we add cmake targets
280+
281+ install(FILES "${filename}"
282+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
283+ GROUP_EXECUTE GROUP_READ
284+ WORLD_EXECUTE WORLD_READ
285+ DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"
286+ )
287+endfunction()
288+
289+
210290################### INTERNAL ####################
211291
292+function(install_test_script TARGET_NAME)
293+ cmake_parse_arguments(TEST "" "" "COMMAND;ENVIRONMENT" ${ARGN})
294+
295+ # Now write the above test into a shell script that we can run on an
296+ # installed system.
297+ set(script "#!/bin/sh\n\nset -x\n\n")
298+ foreach(ONE_ENV ${TEST_ENVIRONMENT})
299+ set(script "${script}export ${ONE_ENV}\n")
300+ endforeach()
301+ set(script "${script}export UNITY_TESTING_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}\"\n")
302+ set(script "${script}export UNITY_TESTING_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\"\n")
303+ set(script "${script}\n")
304+ set(script "${script}XML_ARGS=\n")
305+ set(script "${script}if [ -n \"\$ARTIFACTS_DIR\" ]; then\n")
306+ set(script "${script} XML_ARGS=\"@XML_ARGS@\"\n")
307+ set(script "${script} mkdir -p \"@XML_DIR@\"\n")
308+ set(script "${script} touch \"@XML_FILE@\"\n")
309+ set(script "${script}fi\n")
310+ set(script "${script}\n")
311+ foreach(ONE_CMD ${TEST_COMMAND})
312+ set(script "${script}'${ONE_CMD}' ")
313+ endforeach()
314+ set(script "${script}\"\$@\"") # Allow passing arguments if desired
315+
316+ set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
317+
318+ # Generate script to file then read it back to resolve any generator
319+ # expressions before we try to replace paths.
320+ file(GENERATE
321+ OUTPUT "${filename}"
322+ CONTENT "${script}"
323+ )
324+
325+ # Do replacement at install time to save needless work and to make sure
326+ # we are modifying file after generate step above (which doesn't happen
327+ # immediately). We can't use a custom-defined function or macro here...
328+ # So instead we use a giant ugly code block.
329+
330+ # START OF CODE BLOCK --------------------------------------------------
331+ install(CODE "
332+ file(READ \"${filename}\" replacestr)
333+
334+ # Now some replacements...
335+ # tests like to write xml output to our builddir; we don't need that, but we do want them in ARTIFACTS_DIR
336+ string(REGEX MATCH \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" xmlargs \"\${replacestr}\")
337+ string(REGEX REPLACE \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" \" \\\$XML_ARGS \" replacestr \"\${replacestr}\")
338+ string(REGEX REPLACE \"'[^']*/tests/\" \"'\\\$ARTIFACTS_DIR/tests/\" xmlargs \"\${xmlargs}\")
339+ string(REGEX REPLACE \".*'([^']*),xunitxml'.*\" \"\\\\1\" xmlfile \"\${xmlargs}\")
340+ string(REGEX REPLACE \"(.*)/[^/]*\" \"\\\\1\" xmldir \"\${xmlfile}\")
341+ string(REGEX REPLACE \"'\" \"\" xmlargs \"\${xmlargs}\") # strip single quotes
342+ string(REGEX REPLACE \"@XML_ARGS@\" \"\${xmlargs}\" replacestr \"\${replacestr}\")
343+ string(REGEX REPLACE \"@XML_DIR@\" \"\${xmldir}\" replacestr \"\${replacestr}\")
344+ string(REGEX REPLACE \"@XML_FILE@\" \"\${xmlfile}\" replacestr \"\${replacestr}\")
345+ # replace build/source roots with their install paths
346+ string(REPLACE \"${CMAKE_BINARY_DIR}/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")
347+ string(REPLACE \"${CMAKE_BINARY_DIR}/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}\" replacestr \"\${replacestr}\")
348+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/libs\" replacestr \"\${replacestr}\")
349+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/mocks\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks\" replacestr \"\${replacestr}\")
350+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/plugins\" replacestr \"\${replacestr}\")
351+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/qmltests\" replacestr \"\${replacestr}\")
352+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/uqmlscene\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")
353+ string(REPLACE \"${CMAKE_BINARY_DIR}/tests/utils/modules\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/utils\" replacestr \"\${replacestr}\")
354+ string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/plugins\" replacestr \"\${replacestr}\")
355+ string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/qmltests\" replacestr \"\${replacestr}\")
356+
357+ file(WRITE \"${filename}\" \"\${replacestr}\")
358+ ")
359+ # END OF CODE BLOCK --------------------------------------------------
360+
361+ install(FILES "${filename}"
362+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
363+ GROUP_EXECUTE GROUP_READ
364+ WORLD_EXECUTE WORLD_READ
365+ DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"
366+ )
367+endfunction()
368+
369+function(add_meta_dependencies UPSTREAM_TARGET)
370+ cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})
371+
372+ foreach(depend ${TEST_DEPENDS})
373+ add_dependencies(${UPSTREAM_TARGET} ${depend})
374+
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")
379+ endif()
380+ endforeach()
381+endfunction()
382+
212383# add_qmltest_target(target_name target
213384# COMMAND test_exe [arg1 [...]] # execute this test with arguments
214385# [...] # see above for available arguments:
@@ -231,6 +402,11 @@ function(add_qmltest_target TARGET_NAME TARGET)
231402 DEPENDS ${TARGET} ${QMLTEST_DEPENDS}
232403 )
233404
405+ install_test_script(${TARGET_NAME}
406+ ENVIRONMENT ${QMLTEST_ENVIRONMENT}
407+ COMMAND ${QMLTEST_COMMAND}
408+ )
409+
234410 if(QMLTEST_ADD_TEST)
235411 add_test(
236412 NAME ${TARGET_NAME}
@@ -248,7 +424,7 @@ function(add_qmltest_target TARGET_NAME TARGET)
248424 endif()
249425
250426 foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})
251− add_dependencies(${UPSTREAM_TARGET} ${TARGET_NAME})
427+ add_meta_dependencies(${UPSTREAM_TARGET} DEPENDS ${TARGET_NAME})
252428 endforeach()
253429endfunction()
254430
data/51-unity8-greeter.confnew file+2
@@ -0,0 +1,2 @@
1+[Seat:*]
2+greeter-session=unity8-greeter
data/CMakeLists.txt+9−6
@@ -1,24 +1,27 @@
11# generate desktop files
22configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
3−configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
43configure_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)
55
66# install desktop files
77install(FILES
88 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
9− ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop
109 ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop
1110 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
1211 )
1312
14−# install dash icon
1513install(FILES
16− ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png
17− DESTINATION ${SHELL_APP_DIR}/Dash/
14+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
15+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
16+ )
17+
18+install(FILES
19+ 51-unity8-greeter.conf
20+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
1821 )
1922
2023add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)
2124
2225install(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)
2427install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)
data/com.canonical.Unity.gschema.xmlnew file+255
@@ -0,0 +1,255 @@
1+<schemalist>
2+ <enum id="form-factor-enum">
3+ <value nick="Automatic" value="0" />
4+ <value nick="Desktop" value="1" />
5+ <value nick="Netbook" value="2" />
6+ <value nick="TV" value="3" />
7+ </enum>
8+ <enum id="home-expanded-enum">
9+ <value nick="Not Expanded" value="0" />
10+ <value nick="Expanded" value="1" />
11+ </enum>
12+ <enum id="launcher-position-enum">
13+ <value nick="Left" value="0" />
14+ <value nick="Bottom" value="1" />
15+ </enum>
16+ <enum id="desktop-type-enum">
17+ <value nick="Ubuntu" value="0" />
18+ <value nick="UbuntuKylin" value="1" />
19+ </enum>
20+
21+ <schema path="/com/canonical/unity/" id="com.canonical.Unity" gettext-domain="unity">
22+ <key enum="form-factor-enum" name="form-factor">
23+ <default>"Automatic"</default>
24+ <summary>The form factor Unity should target.</summary>
25+ <description>The form factor chosen will affect the size and appearance of the Dash, Launcher and also the Window Management behaviour.</description>
26+ </key>
27+ <key enum="home-expanded-enum" name="home-expanded">
28+ <default>"Expanded"</default>
29+ <summary>Whether the home screen should be expanded.</summary>
30+ <description>Whether the home screen should be expanded.</description>
31+ </key>
32+ <key enum="desktop-type-enum" name="desktop-type">
33+ <default>"Ubuntu"</default>
34+ <summary>The current desktop name.</summary>
35+ <description>The current desktop name.</description>
36+ </key>
37+ <key type="i" name="minimize-count">
38+ <default>0</default>
39+ <summary>Number of times a normal window has been minimized.</summary>
40+ <description>This is used to adjust the animation speed by making it progressively faster the more it is used.</description>
41+ </key>
42+ <key type="i" name="minimize-fast-duration">
43+ <default>300</default>
44+ <summary>The duration for the minimize animation when it is at its fastest setting.</summary>
45+ <description>This is the duration that the minimize animation will have when it has been used more than an number of times equal minimize-speed-threshold.</description>
46+ </key>
47+ <key type="i" name="minimize-slow-duration">
48+ <default>800</default>
49+ <summary>The duration for the minimize animation when it is at its slowest setting.</summary>
50+ <description>This is the duration that the minimize animation will have when it has never been used.</description>
51+ </key>
52+ <key type="i" name="minimize-speed-threshold">
53+ <default>100</default>
54+ <summary>The number of minimizations required to reach maximum speed.</summary>
55+ <description>The speed of the minimize animation will progressively get faster as minimize-count approaches this value.</description>
56+ </key>
57+ <key type="b" name="double-click-activate">
58+ <default>true</default>
59+ <summary>Enable/Disable dash result double-click activation.</summary>
60+ <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>
61+ </key>
62+ <key type="b" name="integrated-menus">
63+ <default>false</default>
64+ <summary>Enable/Disable the integrated menus in Unity.</summary>
65+ <description>When this is enabled, the application menus will be shown
66+ on the window decoration, otherwise they will be always shown on the
67+ unity top panel</description>
68+ </key>
69+ <key type="u" name="show-menus-now-delay">
70+ <default>180</default>
71+ <range min="0" max="5000"/>
72+ <summary>Delay (in ms) before showing the menus when pressing Alt</summary>
73+ <description>This allows tune the delay before presenting unity menus
74+ (in non always-show-menus mode).</description>
75+ </key>
76+ <key type="b" name="always-show-menus">
77+ <default>false</default>
78+ <summary>Toggle the menu visibility based on mouse hovering.</summary>
79+ <description>When this is enabled, the application menus will be always
80+ shown (on the window decoration or in the unity panel, depending whether
81+ integrated menus are enabled), otherwise they will be shown only when
82+ the mouse cursor is over the relative mouse area.</description>
83+ </key>
84+ <key type="as" name="whitelist-repeated-keys">
85+ <default>[
86+ 'XF86KbdBrightnessUp',
87+ 'XF86KbdBrightnessDown',
88+ 'XF86MonBrightnessUp',
89+ 'XF86MonBrightnessDown',
90+ 'XF86AudioRaiseVolume',
91+ 'XF86AudioLowerVolume'
92+ ]</default>
93+ <summary>List of keycodes that should be processed even if auto-repated.</summary>
94+ <description>These keycodes are processed even if they are auto-repeated.</description>
95+ </key>
96+ <key type="b" name="pam-check-account-type">
97+ <default>false</default>
98+ <summary>Enable/Disable PAM account checking</summary>
99+ <description>Whether PAM should check the result of account modules
100+ when authenticating. Only do this if you have account
101+ configured properly on your system.</description>
102+ </key>
103+ <key type="b" name="lowgfx">
104+ <default>false</default>
105+ <summary>Enable/Disable Low Graphics Mode</summary>
106+ <description>Whether Unity runs in Low Graphics Mode.</description>
107+ </key>
108+ </schema>
109+ <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">
110+ <key type="d" name="text-scale-factor">
111+ <default>1.0</default>
112+ <range min="0.5" max="3.0"/>
113+ <summary>Font scaling for unity and applications.</summary>
114+ <description>This value defines the global font scaling used by both
115+ unity and applications. It will match the current system font scaling.</description>
116+ </key>
117+ <key type="d" name="cursor-scale-factor">
118+ <default>1.0</default>
119+ <range min="0.5" max="3.0"/>
120+ <summary>Mouse cursor scaling.</summary>
121+ <description>This value defines the global mouse cursor scaling used by both
122+ unity and applications. Changing this value allows to use a custom scaling
123+ for the mouse cursor.</description>
124+ </key>
125+ <key type="s" name="app-scale-factor-monitor">
126+ <default>''</default>
127+ <summary>The name of the monitor that controls the global app scaling factor.</summary>
128+ <description>This value defines the monitor that unity will use (if found) as reference
129+ for scaling all the applications.</description>
130+ </key>
131+ <key type="b" name="app-fallback-to-maximum-scale-factor">
132+ <default>true</default>
133+ <summary>Use the maximum per-monitor scale-factor as application scale factor if no target monitor is found.</summary>
134+ <description>When this is enabled, the applications scale factor will match
135+ the scale factor of the monitor with the greater value, in case the monitor
136+ defined in 'app-scale-factor-monitor' is not provided or available.</description>
137+ </key>
138+ </schema>
139+ <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
140+ <key type="as" name="favorites">
141+ <default>[
142+ 'application://ubiquity.desktop',
143+ 'application://org.gnome.Nautilus.desktop',
144+ 'application://firefox.desktop',
145+ 'application://libreoffice-writer.desktop',
146+ 'application://libreoffice-calc.desktop',
147+ 'application://libreoffice-impress.desktop',
148+ 'application://org.gnome.Software.desktop',
149+ 'application://ubuntu-amazon-default.desktop',
150+ 'application://unity-control-center.desktop',
151+ 'unity://running-apps',
152+ 'unity://expo-icon',
153+ 'unity://devices'
154+ ]</default>
155+ <summary>List of items that should be shown by default in the launcher</summary>
156+ <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description>
157+ </key>
158+ <key type="as" name="items">
159+ <default>[
160+ 'application:///dialer-app.desktop',
161+ 'application:///messaging-app.desktop',
162+ 'application:///address-book-app.desktop',
163+ 'application:///ubuntu-system-settings.desktop',
164+ 'appid://openstore.openstore-team/openstore/current-user-version',
165+ 'appid://com.ubuntu.camera/camera/current-user-version',
166+ 'appid://com.ubuntu.gallery/gallery/current-user-version',
167+ 'application:///morph-browser.desktop'
168+ ]</default>
169+ <summary>List of items that should be shown by default in the launcher</summary>
170+ <description>These items can be: application:///desktop-id.desktop or appid://package/app/current-user-version.</description>
171+ </key>
172+ <key type="s" name="favorite-migration">
173+ <default>''</default>
174+ <summary>Version of last migration done</summary>
175+ <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description>
176+ </key>
177+ <key enum="launcher-position-enum" name="launcher-position">
178+ <default>"Left"</default>
179+ <summary>The position of launcher.</summary>
180+ <description>The position of launcher.</description>
181+ </key>
182+ </schema>
183+ <schema path="/com/canonical/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
184+ <key type="as" name="blacklist">
185+ <default>[]</default>
186+ <summary>List of device uuid blacklist from the launcher.</summary>
187+ <description>These devices are not shown in the launcher by default.</description>
188+ </key>
189+ </schema>
190+ <schema path="/com/canonical/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">
191+ <key type="as" name="scopes">
192+ <default>[ 'home.scope', 'applications.scope', 'files.scope', 'video.scope', 'music.scope', 'photos.scope', 'social.scope' ]</default>
193+ <summary>List of scope ids specifying which scopes should be created and the order to display them in.</summary>
194+ <description>The scopes listed in the scope bar will be ordered according to this list.</description>
195+ </key>
196+ <key type="as" name="favorite-scopes">
197+ <default>[ 'scope://clickscope', 'scope://musicaggregator', 'scope://videoaggregator' ]</default>
198+ <summary>List of scope queries specifying what should be displayed in the dash.</summary>
199+ <description>List of favorite scopes displayed in the dash.</description>
200+ </key>
201+ </schema>
202+ <schema path="/com/canonical/unity/decorations/" id="com.canonical.Unity.Decorations" gettext-domain="unity">
203+ <key type="u" name="grab-wait">
204+ <default>175</default>
205+ <range min="0" max="1000"/>
206+ <summary>Milliseconds to wait before considering a mouse pressure a grab</summary>
207+ <description>The number of ms to wait before starting the window movement (and then
208+ showing the proper mouse cursor, and grabbing the window)</description>
209+ </key>
210+ </schema>
211+ <schema path="/com/canonical/unity/integrated-menus/" id="com.canonical.Unity.IntegratedMenus" gettext-domain="unity">
212+ <key type="u" name="click-movement-threshold">
213+ <default>15</default>
214+ <range min="0" max="30"/>
215+ <summary>Number of pixels to ignore on mouse pressure</summary>
216+ <description>This value define how many pixels the user can move the mouse
217+ when holding the mouse button, before we consider his action a movement
218+ (to grab the window).</description>
219+ </key>
220+ <key type="u" name="double-click-wait">
221+ <default>0</default>
222+ <range min="0" max="300"/>
223+ <summary>Milliseconds to wait before activating a menu after mouse release</summary>
224+ <description>The number of ms to wait after a mouse button release event before considering
225+ it a click. When this value is greater than 0, then it's possible to maximize
226+ a window by double-clicking on its menus if the second click happens before the
227+ specified value of ms is elapsed</description>
228+ </key>
229+ <key type="b" name="unfocused-windows-popup">
230+ <default>true</default>
231+ <summary>Whether to pop-up a menu when clicking over unfocused windows entries</summary>
232+ <description>By disabling this setting you can make unity to only focus a window
233+ when clicking over unfocused menu entries</description>
234+ </key>
235+ </schema>
236+ <schema path="/com/canonical/unity/gestures/" id="com.canonical.Unity.Gestures" gettext-domain="unity">
237+ <key type="b" name="launcher-drag">
238+ <default>true</default>
239+ <summary>Multi-touch gesture to reveal the launcher.</summary>
240+ <description>When this is enabled, a 4 finger swipe from left to right will reveal launcher,
241+ provided that the launcher is set to auto-hide.</description>
242+ </key>
243+ <key type="b" name="dash-tap">
244+ <default>true</default>
245+ <summary>Multi-touch gesture to open the dash.</summary>
246+ <description>When this is enabled, a 4 finger tap will open the dash.</description>
247+ </key>
248+ <key type="b" name="windows-drag-pinch">
249+ <default>true</default>
250+ <summary>Multi-touch gestures to manage the windows.</summary>
251+ <description>When this is enabled, 3 finger gestures such as drag, and pinch, will
252+ help manage the windows.</description>
253+ </key>
254+ </schema>
255+</schemalist>
data/com.canonical.Unity8.gschema.xml+24−4
@@ -11,8 +11,8 @@
1111 <summary>The usage mode.</summary>
1212 <description>The usage mode chosen will affect the Window Management behaviour.</description>
1313 </key>
14− <key type="y" name="edge-barrier-sensitivity">
15− <default>35</default>
14+ <key type="u" name="edge-barrier-sensitivity">
15+ <default>50</default>
1616 <range min="1" max="100"/>
1717 <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>
1818 <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 @@
2323 <description>How much you have to push (in grid units)the mouse against an edge barrier when sensibility is 100.</description>
2424 </key>
2525 <key type="u" name="edge-barrier-max-push">
26− <default>60</default>
26+ <default>120</default>
2727 <summary>Maximum push needed to overcome edge barrier</summary>
2828 <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
2929 </key>
@@ -33,7 +33,7 @@
3333 <description>How big (in grid units) the edge-drag sensitive area should be.</description>
3434 </key>
3535 <key type="b" name="autohide-launcher">
36− <default>true</default>
36+ <default>false</default>
3737 <summary>Autohide the launcher</summary>
3838 <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
3939 </key>
@@ -43,6 +43,26 @@
4343 <summary>Width of the launcher in grid units.</summary>
4444 <description>Changes the width of the launcher in all usage modes.</description>
4545 </key>
46+ <key type="b" name="enable-indicator-menu">
47+ <default>true</default>
48+ <summary>Enable or disable the indicator pull down menus</summary>
49+ <description>Toggle the availability of the indicator pull down menus</description>
50+ </key>
51+ <key type="s" name="appstore-uri">
52+ <default>'appid://openstore.openstore-team/openstore/current-user-version'</default>
53+ <summary>The uri to the app store</summary>
54+ <description>This will be used whenever the user triggers an action to open the app store.</description>
55+ </key>
56+ <key type="b" name="always-show-osk">
57+ <default>false</default>
58+ <summary>Force showing/hiding the OSK</summary>
59+ <description>Toggle the visibility of the On Screen Keyboard unconditionally</description>
60+ </key>
61+ <key type="b" name="osk-switch-visible">
62+ <default>false</default>
63+ <summary>Whether the OSK switch should be visible</summary>
64+ <description>Toggle the visibility of the OSK switch</description>
65+ </key>
4666 </schema>
4767
4868 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
data/test.sensorsnew file+12
@@ -0,0 +1,12 @@
1+create light 0 10 1
2+create accel 0 1000 0.1
3+create proximity
4+
5+200 proximity near
6+500 light 5
7+# simulate crash on the ground
8+500 accel 0.2 0.1 10
9+100 accel 0.2 0.2 1000
10+20 accel 0 0 0
11+10 proximity far
12+10 light 10
data/unity8-dash.confdeleted−25
@@ -1,25 +0,0 @@
1−description "Unity Shell v8 Dash"
2−author "Michael Zanetti <michael.zanetti@canonical.com>"
3−
4−emits scope-ui-starting
5−
6−start on started unity8
7−stop on stopping unity8
8−
9−kill timeout 120
10−
11−# Focused app is 100 so we want to be less likely to get
12−# killed than the focused app but more than Unity8
13−
14−oom score 50
15−
16−respawn
17−respawn limit unlimited
18−
19−env APP_ID=unity8-dash
20−
21−pre-start script
22− initctl emit scope-ui-starting
23−end script
24−
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 @@
1−[Desktop Entry]
2−Type=Application
3−Name=Scopes
4−Comment=An interface for using the Scopes system
5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash
6−Terminal=false
7−Icon=@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/Dash/unity8-dash.png
8−NoDisplay=true
9−X-Ubuntu-Touch=true
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/) -->
3−
4−<svg
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"
20− version="1.1"
21− id="svg3336"
22− height="512"
23− width="512">
24− <sodipodi:namedview
25− inkscape:snap-global="false"
26− fit-margin-bottom="18"
27− fit-margin-right="0"
28− fit-margin-left="0"
29− fit-margin-top="18"
30− inkscape:snap-grids="true"
31− inkscape:guide-bbox="true"
32− showguides="false"
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"
45− showborder="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"
53− showgrid="false"
54− inkscape:current-layer="layer3"
55− inkscape:document-units="px"
56− inkscape:cy="204.04409"
57− inkscape:cx="-384.5809"
58− inkscape:zoom="0.64"
59− inkscape:pageshadow="2"
60− inkscape:pageopacity="0"
61− borderopacity="1.0"
62− bordercolor="#666666"
63− pagecolor="#4f4f4f"
64− id="base">
65− <inkscape:grid
66− type="xygrid"
67− id="grid811"
68− originx="0"
69− originy="15.999999"
70− visible="true"
71− enabled="true" />
72− <sodipodi:guide
73− orientation="1,0"
74− position="104,176"
75− id="guide819" />
76− <sodipodi:guide
77− orientation="1,0"
78− position="120,160"
79− id="guide821" />
80− <sodipodi:guide
81− orientation="1,0"
82− position="392,144"
83− id="guide823" />
84− <sodipodi:guide
85− orientation="1,0"
86− position="408,144"
87− id="guide825" />
88− <sodipodi:guide
89− orientation="0,1"
90− position="328,408"
91− id="guide827" />
92− <sodipodi:guide
93− orientation="0,1"
94− position="336,392"
95− id="guide829" />
96− <sodipodi:guide
97− orientation="0,1"
98− position="176,120"
99− id="guide831" />
100− <sodipodi:guide
101− orientation="0,1"
102− position="216,104"
103− id="guide833" />
104− <inkscape:grid
105− type="axonomgrid"
106− id="grid835"
107− units="px"
108− empspacing="60"
109− gridanglex="42.9"
110− gridanglez="42.9"
111− spacingy="3.522px"
112− enabled="false"
113− originx="0"
114− originy="16.999996" />
115− <sodipodi:guide
116− orientation="0,1"
117− position="344,376"
118− id="guide4126" />
119− <sodipodi:guide
120− orientation="0,1"
121− position="160,136"
122− id="guide4128" />
123− <sodipodi:guide
124− orientation="1,0"
125− position="136,96"
126− id="guide4130" />
127− <sodipodi:guide
128− orientation="1,0"
129− position="376,136"
130− id="guide4134" />
131− <sodipodi:guide
132− orientation="-0.70710678,0.70710678"
133− position="544,544"
134− id="guide4136" />
135− <sodipodi:guide
136− orientation="1,0"
137− position="256,-32.000001"
138− id="guide4138" />
139− <sodipodi:guide
140− orientation="0,1"
141− position="544,256"
142− id="guide4140" />
143− <sodipodi:guide
144− orientation="0.70710678,0.70710678"
145− position="544,-32.000001"
146− id="guide4142" />
147− <sodipodi:guide
148− orientation="0,1"
149− position="248,15.999999"
150− id="guide4152" />
151− <sodipodi:guide
152− orientation="0,1"
153− position="336,496"
154− id="guide4154" />
155− <sodipodi:guide
156− position="344,96"
157− orientation="1,0"
158− id="guide4361" />
159− <sodipodi:guide
160− position="576,168"
161− orientation="0,1"
162− id="guide4363" />
163− <sodipodi:guide
164− position="168,192"
165− orientation="1,0"
166− id="guide4229" />
167− <sodipodi:guide
168− position="312,344"
169− orientation="0,1"
170− id="guide4233" />
171− <sodipodi:guide
172− position="180.48,-96"
173− orientation="0,1"
174− id="guide4235" />
175− </sodipodi:namedview>
176− <defs
177− id="defs3338">
178− <linearGradient
179− inkscape:collect="always"
180− id="linearGradient4203">
181− <stop
182− style="stop-color:#ea5420;stop-opacity:1"
183− offset="0"
184− id="stop4205" />
185− <stop
186− style="stop-color:#f37e40;stop-opacity:1"
187− offset="1"
188− id="stop4207" />
189− </linearGradient>
190− <clipPath
191− clipPathUnits="userSpaceOnUse"
192− id="clipPath4755">
193− <path
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"
196− id="path4757"
197− inkscape:connector-curvature="0" />
198− </clipPath>
199− <clipPath
200− clipPathUnits="userSpaceOnUse"
201− id="clipPath4767">
202− <path
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"
205− id="path4769"
206− inkscape:connector-curvature="0" />
207− </clipPath>
208− <linearGradient
209− inkscape:collect="always"
210− xlink:href="#linearGradient4203"
211− id="linearGradient4209"
212− x1="167.5"
213− y1="17.25"
214− x2="343.25"
215− y2="491"
216− gradientUnits="userSpaceOnUse" />
217− <filter
218− inkscape:collect="always"
219− style="color-interpolation-filters:sRGB"
220− id="filter4220"
221− x="-0.012"
222− width="1.024"
223− y="-0.012"
224− height="1.024">
225− <feGaussianBlur
226− inkscape:collect="always"
227− stdDeviation="1.4390401"
228− id="feGaussianBlur4222" />
229− </filter>
230− <linearGradient
231− inkscape:collect="always"
232− xlink:href="#linearGradient4226"
233− id="linearGradient4232"
234− x1="255.99998"
235− y1="-255.99998"
236− x2="405.35773"
237− y2="-255.99998"
238− gradientUnits="userSpaceOnUse"
239− spreadMethod="reflect" />
240− <linearGradient
241− inkscape:collect="always"
242− id="linearGradient4226">
243− <stop
244− style="stop-color:#a73812;stop-opacity:1"
245− offset="0"
246− id="stop4228" />
247− <stop
248− style="stop-color:#973310;stop-opacity:0"
249− offset="1"
250− id="stop4230" />
251− </linearGradient>
252− <filter
253− inkscape:collect="always"
254− style="color-interpolation-filters:sRGB"
255− id="filter4234"
256− x="-0.096000001"
257− width="1.192"
258− y="-0.096000001"
259− height="1.192">
260− <feGaussianBlur
261− inkscape:collect="always"
262− stdDeviation="11.512321"
263− id="feGaussianBlur4236" />
264− </filter>
265− </defs>
266− <metadata
267− id="metadata3341">
268− <rdf:RDF>
269− <cc:Work
270− rdf:about="">
271− <dc:format>image/svg+xml</dc:format>
272− <dc:type
273− rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
274− <dc:title></dc:title>
275− </cc:Work>
276− </rdf:RDF>
277− </metadata>
278− <g
279− inkscape:groupmode="layer"
280− id="layer3"
281− inkscape:label="Background">
282− <path
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 "
285− id="rect4158" />
286− <path
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 "
289− id="rect4286" />
290− </g>
291− <g
292− inkscape:groupmode="layer"
293− id="layer1"
294− inkscape:label="Pictogram"
295− style="display:inline"
296− transform="translate(-32,-32)">
297− <circle
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"
299− id="circle4218"
300− cx="258"
301− cy="-256"
302− r="143.90401"
303− transform="rotate(90,-7.1132638e-7,31.999996)" />
304− <circle
305− transform="rotate(90,-7.1132638e-7,31.999996)"
306− r="143.90401"
307− cy="-256"
308− cx="258"
309− id="circle4224"
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" />
311− <circle
312− transform="rotate(90)"
313− r="143.90401"
314− cy="-288"
315− cx="288"
316− id="circle4206"
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" />
318− <path
319− style="display:inline;fill:#ea5420;fill-opacity:1;stroke-width:2.9398191;enable-background:new"
320− id="path4258"
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" />
325− </g>
326−</svg>
data/unity8-dash.url-dispatcherdeleted−6
@@ -1,6 +0,0 @@
1−[
2− {
3− "protocol": "scope"
4− }
5−]
6−
data/unity8-filewatcher.conf+5
@@ -1,6 +1,11 @@
11description "File system watcher for unity8"
22author "Michael Zanetti <michael.zanetti@canonical.com>"
33
4+# This method of updating the launcher will not work in our new snappy world,
5+# neither for snaps installed in the system nor if we are running inside a snap.
6+# Plus it hardcodes the phablet user... To be replaced once bug 1630997 is
7+# fixed in ubuntu-app-launch.
8+
49# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
510start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
611
data/unity8-greeter-init.confnew file+12
@@ -0,0 +1,12 @@
1+description "Unity 8 Greeter initialization"
2+author "Michael Terry <mterry@ubuntu.com>"
3+
4+start on unity8-greeter-started
5+task
6+emits indicator-services-start
7+
8+script
9+ start --no-wait ofono-setup || true
10+ initctl emit --no-wait indicator-services-start || true
11+ start --no-wait maliit-server || true
12+end script
data/unity8-greeter-wrappernew file+109
@@ -0,0 +1,109 @@
1+#!/bin/sh
2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
3+#
4+# Copyright (C) 2011,2013,2016 Canonical Ltd
5+#
6+# This program is free software: you can redistribute it and/or modify it under
7+# the terms of the GNU General Public License as published by the Free Software
8+# Foundation, version 3 of the License.
9+#
10+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
11+
12+# This wrapper merely ensures that init and friends live only as long as this
13+# script does. Otherwise, it's very easy for some processes to not notice that
14+# the session died. We could try to do this in-process, but we want to do this
15+# cleanup even if the greeter aborts.
16+
17+trap cleanup TERM EXIT
18+
19+cleanup()
20+{
21+ trap - TERM EXIT
22+ # Kill upstart and indicators
23+ if [ -n "$INIT_PID" ]; then
24+ kill "$INIT_PID"
25+ fi
26+ if [ -n "$CMD_PID" ]; then
27+ kill "$CMD_PID"
28+ fi
29+ exit 0
30+}
31+
32+set_greeter_var()
33+{
34+ export "$1=$2"
35+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"
36+ if [ -n "$INIT_PID" ]; then
37+ initctl set-env --global "$1=$2"
38+ fi
39+}
40+
41+SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
42+rm -f $SUB_SOCKET # clear socket in case we were hard shut down
43+
44+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"
45+
46+# If touch session script (which sets up grid units and mir variables) is available, use it
47+TOUCH_WRAPPER=
48+if which ubuntu-touch-session >/dev/null; then
49+ TOUCH_WRAPPER=ubuntu-touch-session
50+fi
51+
52+# Advertise as a unity8 session, so that indicator-network will start.
53+export XDG_SESSION_DESKTOP=unity8
54+export DESKTOP_SESSION=$XDG_SESSION_DESKTOP
55+
56+set_greeter_var QT_IM_MODULE maliitphablet
57+set_greeter_var QT_QPA_PLATFORM ubuntumirclient
58+
59+# We disable ofono using pulse. It causes problems with racing with the user's
60+# pulse. We need to come up with a better long-term fix for this, because we
61+# eventually need the greeter to play ringtones for users that aren't logged in.
62+set_greeter_var PA_DISABLED 1
63+
64+# Normal unity8 sessions are entirely driven by Upstart. But greeters
65+# are special. They need access to the file descriptors that lightdm
66+# creates for them and don't want to start all the services that a normal
67+# session would. So it's inconvenient to live within an upstart session.
68+# But... we still want to use Upstart for some services. So launch here.
69+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event &
70+INIT_PID=$!
71+while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
72+. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"
73+export UPSTART_SESSION
74+
75+# Connect upstart to system, but do first command in a loop to avoid any
76+# race condition between the session file above being written and upstart being
77+# ready to handle requests.
78+while ! initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
79+initctl start notify-cgmanager
80+
81+# Start any pre-greeter tasks if needed (like wizard)
82+initctl emit unity8-greeter-starting
83+
84+# Define language here for phone if available. When phone user switches their
85+# language, they expect that to affect the greeter too. But the user doesn't
86+# have permission to switch system language, only their own. So we notice if
87+# the phablet user exists and use their language if so. TODO: talk to design
88+# about whether we should switch language on fly as users are selected (this
89+# is very hard to do technically).
90+#
91+# Do this after unity8-greeter-starting, in case a customization upstart job
92+# changes language.
93+if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
94+ USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
95+ if [ -n "$USER_LANG" ]; then
96+ set_greeter_var LANGUAGE "$USER_LANG"
97+ fi
98+ USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
99+ if [ -n "$USER_LOCALE" ]; then
100+ set_greeter_var LANG "$USER_LOCALE"
101+ set_greeter_var LC_ALL "$USER_LOCALE"
102+ fi
103+fi
104+
105+# And finally actually start the greeter
106+exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
107+CMD_PID=$!
108+wait $CMD_PID
109+CMD_PID=
data/unity8-greeter.desktop.innew file+7
@@ -0,0 +1,7 @@
1+[Desktop Entry]
2+Type=Application
3+Name=Unity 8 Greeter
4+Comment=The converged Unity shell's Greeter
5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
6+X-LightDM-Session-Type=mir
7+X-Ubuntu-Touch=true
data/unity8-greeter.pklanew file+44
@@ -0,0 +1,44 @@
1+# DO NOT EDIT THIS FILE, it will be overwritten on update
2+# Place your local configurations under /etc/polkit-1/localauthority/
3+
4+[Disable Controlling of Network Devices]
5+Identity=unix-user:lightdm
6+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;
7+ResultActive=no
8+ResultInactive=no
9+ResultsAny=no
10+
11+[Disable Sleep and Wake]
12+Identity=unix-user:lightdm
13+Action=org.freedesktop.NetworkManager.sleep-wake
14+ResultActive=no
15+ResultInactive=no
16+ResultsAny=no
17+
18+[Disable WiFi Sharing]
19+Identity=unix-user:lightdm
20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open
21+ResultActive=no
22+ResultInactive=no
23+ResultsAny=no
24+
25+[Disable Settings Modifications]
26+Identity=unix-user:lightdm
27+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname
28+ResultActive=no
29+ResultInactive=no
30+ResultsAny=no
31+
32+[Disable User Connections]
33+Identity=unix-user:lightdm
34+Action=org.freedesktop.NetworkManager.use-user-connections
35+ResultActive=no
36+ResultInactive=no
37+ResultsAny=no
38+
39+[Enable Controlling of Network Connections]
40+Identity=unix-user:lightdm
41+Action=org.freedesktop.NetworkManager.network-control
42+ResultActive=yes
43+ResultInactive=no
44+ResultsAny=no
data/unity8.conf+51−18
@@ -2,37 +2,51 @@ description "Unity Shell v8"
22author "Ricardo Mendoza <ricmm@ubuntu.com>"
33
44emits indicator-services-start
5+emits indicator-services-end
56
6−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus
7+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus
78stop on desktop-end
89
910kill timeout 120
1011
12+#
13+# Ensure the shell always gets unthrottled touch events, so that applications
14+# who want full speed low-latency input can get it (LP: #1497105) and so that
15+# apps can use QML touch compression safely (the QML touch compression
16+# algorithm does not support nesting well - LP: #1486341, LP: #1556763 - so
17+# must be fed by the raw input event stream from Unity8).
18+#
19+env QML_NO_TOUCH_COMPRESSION=1
20+
1121respawn
1222expect stop
1323
24+# FIXME Create an autopilot test that makes sure start+stop and restart
25+# work fine at least 2 times
26+
1427pre-start script
1528 # Tell unity-mir to raise SIGSTOP after we start
1629 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
1730
18− if [ -n "$MIR_SOCKET" ]; then
19− # 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,
22− # 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
31+ # Save original value of MIR_SOCKET so that we can restore it when stopped,
32+ # as we modify the variable for future jobs, including ourself.
33+ initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET
2534
26− # Point unity8 at unity-system-compositor
35+ # Decide where we are going to put our own socket file
36+ if [ -n "$SNAP" ]; then
37+ # In snappy, we want to hard code our path because our apparmor profile
38+ # only lets us put the socket in one place. And consumers expect it
39+ # there.
40+ MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket
41+ else
2742 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
28− initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
29− initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
30−
31− # Point all future jobs in this session to our Mir socket instead of
32− # unity-system-compositor's socket.
33− initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
34− gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
3543 fi
44+ initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
45+
46+ # Point all future jobs in this session to our Mir socket instead of
47+ # unity-system-compositor's socket.
48+ initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
49+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
3650
3751 # Remove the normal and trusted sockets if still there
3852 if [ -S "$MIR_SERVER_FILE" ]; then
@@ -50,9 +64,28 @@ pre-start script
5064 # the lag seen in the indicator panel pull-down (LP: #1488327) and also
5165 # reduces lag seen in apps:
5266 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1
67+
68+ # Workaround for text not rendering correctly
69+ initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1
70+
71+ if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then
72+ # On Ubuntu Touch, we currently use a trick where we auto-login the
73+ # user without a LightDM greeter at all. In this case, we want to
74+ # start with the lockscreen visible. Once we switch to using a
75+ # proper greeter for the first login, we can remove this code path.
76+ initctl set-env MODE=full-greeter
77+ else
78+ initctl set-env MODE=full-shell
79+ fi
80+
81+ # HACK! WORKAROUND FOR HALIUM MISSING UBUNTU_PLATFORM_API
82+ if [ ! -f /system/lib/libubuntu_application_api.so ]; then
83+ initctl set-env --global UBUNTU_PLATFORM_API_BACKEND=test.so.3
84+ initctl set-env --global UBUNTU_PLATFORM_API_SENSOR_TEST=/etc/ubuntusensors/test.sensors
85+ fi
5386end script
5487
55−exec ${BINARY:-unity8} $ARGS
88+exec ${BINARY:-unity8} --mode=$MODE $ARGS
5689
5790post-start script
5891 initctl emit --no-wait indicator-services-start
@@ -60,7 +93,7 @@ end script
6093
6194post-stop script
6295 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
63− initctl unset-env --global UNITY_MIR_SOCKET
6496 initctl unset-env --global MIR_SERVER_PROMPT_FILE
6597 initctl emit application-end
98+ initctl emit indicator-services-end
6699end script
debian/changelog+1134−20
@@ -1,3 +1,1112 @@
1+unity8 (8.20+ubports) xenial; urgency=medium
2+
3+ * Replace dependency on ubuntu-wallpapers with ubports-wallpapers
4+
5+ -- Dalton Durst <dalton@ubports.com> Fri, 5 Oct 2018 13:28:20 -0500
6+
7+unity8 (8.17+ubports3) xenial; urgency=medium
8+
9+ * Imported to UBports
10+
11+ -- UBports auto importer <infra@ubports.com> Mon, 31 Jul 2017 03:12:43 +0200
12+
13+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium
14+
15+ [ Michael Zanetti ]
16+ * Make the default store uri point to gnome software center
17+
18+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 06 Apr 2017 10:49:29 +0300
19+
20+unity8 (8.15+17.04.20170404.7-0ubuntu1) zesty; urgency=medium
21+
22+ [ Albert Astals Cid ]
23+ * Tweak app drawer a bit (LP: #1667570)
24+
25+ [ Josh Arenson ]
26+ * Make some small changes to the greeter's session list
27+ * Handle a user in the greeter having never selected a session better
28+ (LP: #1673199)
29+
30+ [ Lukáš Tinkl ]
31+ * Do not occlude windows with an ongoing unmaximize transition (LP:
32+ #1666363)
33+ * Show and implement close buttons for child windows (LP: #1668053)
34+ * Sanitize the logic for pointer vs. touch menus, fixes hiding the
35+ window title in staged mode, when hovering the panel with mouse and
36+ no menus available.
37+
38+ [ Michael Zanetti ]
39+ * Don't hide the launcher on super press if it's locked visible (LP:
40+ #1675373)
41+ * fix searchfield selection in drawer (LP: #1677259)
42+ * make sure the stage has focus when going to spread (LP: #1672053,
43+ #1672673, #1676995)
44+ * don't autostart the dash app, but show its .desktop file instead
45+
46+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Apr 2017 22:56:06 +0000
47+
48+unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium
49+
50+ [ Albert Astals Cid ]
51+ * mock: Remove empty property and move invokable
52+ * Tune quicklist item selection
53+ * Fix unminimizing going to the wrong position the second time (LP:
54+ #1671458)
55+ * Remove unclickable gaps on the menubar (LP: #1672722)
56+ * indicators client is a tool
57+ * Make sure we destroy the popups when the item goes away (LP:
58+ #1670338)
59+ * UnityApplicationMocks: Initialize m_state and m_requestedState
60+ * Don't use appInfo after checking it if is null
61+ * Initialize m_privateMode
62+ * Hook up aboutToShow for overflow menus (LP: #1676016)
63+
64+ [ Daniel d'Andrada ]
65+ * Give active focus to child surface qml items (LP: #1671072)
66+ * Satellite child windows (LP: #1673415)
67+ * Tell qtmir/miral about the available desktop area
68+
69+ [ Florian Boucault ]
70+ * WindowStateStorage: use a private QThreadPool to ensure that
71+ WindowStateStorage::saveValue always has a thread available to
72+ execute the query in. (LP: #1675424)
73+
74+ [ Lukáš Tinkl ]
75+ * Protect against loading invalid window geometry (LP: #1674262)
76+ * Remove usage of the deprecated (and non-functional) system-image-
77+ dbus service.
78+ * Implement Ctrl+Alt+T to launch the terminal app (LP: #1673500)
79+ * Only take normal and dialog surface types into account for launcher
80+ items (LP: #1669047)
81+ * Fix the shutdown dialog after recent refactoring in
82+ DBusUnitySessionService (LP: #1676426)
83+
84+ [ Michael Zanetti ]
85+ * drop the grey background behind icons in the drawer (LP: #1675688)
86+
87+ [ Pete Woods ]
88+ * Fix Unity/Platform::isPC, and add tests (LP: #1670657)
89+
90+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 28 Mar 2017 21:50:20 +0000
91+
92+unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium
93+
94+ [ Albert Astals Cid ]
95+ * Signal aboutToShow (LP: #1664578)
96+ * Support Panel top level items to be disabled (LP: #1670694)
97+ * Improve Launcher ←→ touch menu interaction (LP: #1667620, #1671069)
98+ * Fix real world submenus (e.g. kate) not getting their first item
99+ selected on open (LP: #1666859)
100+
101+ [ Daniel d'Andrada ]
102+ * Really disable the window decoration when in staged mode (LP:
103+ #1670361)
104+ * Don't let clients resize their surfaces while in staged
105+ (phone/tablet) mode (LP: #1670390)
106+ * TopLevelWindowModel: don't put hidden windows in the model (LP:
107+ #1665286)
108+
109+ [ Lukáš Tinkl ]
110+ * Reset always-show-osk gsetting on startup to default value (false
111+ atm)
112+ * Fix the restored-to position with Miral due to the state changes
113+ being async (LP: #1669819)
114+ * Add a cursor name fallback mapping "grabbing" -> "closedhand" for
115+ Breeze
116+ * Fix unsnapping a maximized window from the panel (LP: #1671721)
117+ * Disable altDrag feature outside windowed mode
118+
119+ [ Michael Terry ]
120+ * Don't lock the screen for guest users or users in the nopasswdlogin
121+ group. (LP: #1644237)
122+ * Support GNOME-style logout DBus API (making the Logout, Reboot, and
123+ Shutdown launcher commands work) (LP: #1673229)
124+
125+ [ Michael Zanetti ]
126+ * Add support for closing apps from the spread with "Q" (LP: #1670327)
127+ * hide "private" launcher quicklist entries when the greeter is locked
128+ (LP: #1667649)
129+ * add surface titles to launcher's quicklist (LP: #1661668)
130+ * properly reset the drawer state when cancelling a horizontal drag
131+ (LP: #1669536)
132+ * fix the focus moving correctly between launcher and drawer (LP:
133+ #1669880)
134+ * unfocus the drawer's textfield when it is moved (LP: #1669839)
135+
136+ [ Pete Woods ]
137+ * Fix up indicators-client after refactoring (LP: #1672797)
138+
139+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 21 Mar 2017 10:58:13 +0000
140+
141+unity8 (8.15+17.04.20170308-0ubuntu1) zesty; urgency=medium
142+
143+ [ Albert Astals Cid ]
144+ * Let's follow the keyboard order
145+ * Enable the license check (LP: #1590044)
146+ * Show a barebones error message if loading the QML doesn't work
147+ * Make sure cursor is back to normal when closing the window (LP:
148+ #1666158)
149+ * Fix small warning when sensitive is undefined
150+ * Remove unused member variable
151+ * Initialize m_msecsSinceReference
152+ * Add warning if registerService fails
153+ * Move menus Component {} out of the repeater
154+ * Add tool to browse menus of a running app
155+
156+ [ Daniel d'Andrada ]
157+ * Drag child windows with Alt+LeftMouseButton (LP: #1664947)
158+
159+ [ Gerry Boland ]
160+ * TopLevelWindowModel: connect to the OSK surface to know when it goes
161+ away so we can clean up after it. (LP: #1670681)
162+
163+ [ Josh Arenson ]
164+ * Initialize sessionMode to single when mock is reset (LP: #1667463)
165+
166+ [ Lukáš Tinkl ]
167+ * Make the menu string "Back" translatable
168+ * Let the OSK be driven by a switch in indicator-keyboard (LP:
169+ #1521518)
170+ * Disable the tutorial when there's no touchscreen (LP: #1661557)
171+ * Shell chrome fixes (LP: #1658117, #1665723, #1665724, #1669010)
172+ * Cancel the drag as soon as we're entering the spread (LP: #1668642)
173+ * Fix being unable to use window control buttons or menus with touch
174+ (LP: #1667604, #1668387)
175+
176+ [ Michael Terry ]
177+ * Set QT_IM_MODULE in the greeter so that the OSK can come up. (LP:
178+ #1670383)
179+ * Simplify our startup handling of Mir environment variables and set
180+ the right socket path in snappy.
181+
182+ [ Michael Zanetti ]
183+ * Cancel the home key activation if something else is pressed along
184+ with Meta (LP: #1670678)
185+ * close the drawer when something is launched from the launcher (LP:
186+ #1660367)
187+ * use a svg instead of a png for the Launcher's BFB (LP: #1668057)
188+ * change the default setting for the launcher autohiding (LP:
189+ #1670655)
190+
191+ [ Nick Dedekind ]
192+ * Split up Shell::test_spreadDisabled to ensure initial state for each
193+ test.
194+
195+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 08 Mar 2017 09:56:46 +0000
196+
197+unity8 (8.15+17.04.20170221-0ubuntu1) zesty; urgency=medium
198+
199+ * Handle ubuntu-app-launch API/ABI break
200+
201+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2017 13:23:23 +0000
202+
203+unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium
204+
205+ [ Albert Astals Cid ]
206+ * Make menus items close the menu when clicking on them (LP: #1657082,
207+ #1657399)
208+ * Clicking on an open menu closes it + test
209+ * Make the menus and submenus do not go outside the screen when
210+ popping out
211+ * Auto open submenus on hover (LP: #1657085)
212+ * Make the double click on a menu not be maximize the window below
213+ (LP: #1657079)
214+ * Make the MenuBar InverseMouseArea eat hover events when there's a
215+ popup open (LP: #1657763)
216+ * Make double click on the window decoration maximize (LP: #1657758)
217+ * Eat hover events when the launcher quicklist is open (LP: #1640776)
218+ * Remove TODO now that we require Qt > 5.5
219+ * Serialize two make targets that want to cp to the same target file
220+ (LP: #1660576)
221+ * Remove variable that is always false (LP: #1585910)
222+
223+ [ Daniel d'Andrada ]
224+ * Consolidate launcher API checks
225+
226+ [ Lukáš Tinkl ]
227+ * Fixes for activating minimized windows and restoring fullscreen ones
228+ (LP: #1656808, #1658937, #1658938)
229+
230+ [ Michael Zanetti ]
231+ * move right edge push area up some levels so it can be used on top of
232+ the indicators
233+ * fix minimizing/restoring transitions (LP: #1658936)
234+ * fix some glitches with spread positioning
235+ * fix jumpy animation when closing an item from the spread
236+ * Show the wallpaper while the focused app is moving in staged mode
237+ (LP: #1648251)
238+ * Update the tutorial to mention the app drawer instead of the dash on
239+ long left edge swipe (LP: #1658932)
240+ * prevent hiding the launcher when the mouse hover event is eaten by
241+ the EdgePushArea (LP: #1657045)
242+ * properly invalidate the whole model (LP: #1658190)
243+ * stabilize OrientedShell test (LP: #1658994)
244+
245+ [ Nick Dedekind ]
246+ * Added overflow support to application menus.
247+ * Updated menu colors
248+
249+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 16 Feb 2017 13:49:18 +0000
250+
251+unity8 (8.15+17.04.20170206-0ubuntu1) zesty; urgency=medium
252+
253+ [ Daniel d'Andrada ]
254+ * Initial support for child windows (menus, dialogs, tooltips) (LP:
255+ #1543467, #1591384, #1656727)
256+
257+ -- Albert Astals Cid <albert.astals@canonical.com> Mon, 06 Feb 2017 09:12:23 +0000
258+
259+unity8 (8.15+17.04.20170131.1-0ubuntu1) zesty; urgency=medium
260+
261+ [ Rodney Dawes ]
262+ * Remove dependencies on clickscope.
263+
264+ -- Albert Astals Cid <albert.astals@canonical.com> Tue, 31 Jan 2017 14:40:33 +0000
265+
266+unity8 (8.15+17.04.20170124-0ubuntu1) zesty; urgency=medium
267+
268+ [ Albert Astals Cid ]
269+ * Limit tab-focus travelling on dialogs with a fence
270+ * Restore focus to where it was when our ShellDialogs get unloaded
271+ * Update current session after changing the user
272+ * Add keyboard navigation for Indicators
273+ * a window -> the current window
274+ * There's no spreadDelegate_ anymore
275+
276+ [ Daniel d'Andrada ]
277+ * Simplify DecoratedWindow
278+ * Remove unnecessary warning message
279+
280+ [ Josh Arenson ]
281+ * Add a test for the session chooser icon in the greeter's sessions
282+ list
283+
284+ [ Lukáš Tinkl ]
285+ * Fix keymap not being applied on the shell itself (LP: #1626435)
286+ * Shell dialog improvements (kbd focus, mouse eater)
287+ * Start searching directly as you type, w/o having to first
288+ focus/click the search field.
289+ * Add a test for the real implementation of WindowStateStorage
290+ * Use a four finger gesture to open the drawer, much like in u7
291+
292+ [ Michael Terry ]
293+ * Simplify the lightdm mock to make future greeter improvements easier
294+ to test.
295+ * Add support for guest sessions in unity8-greeter.
296+ * Use a model for PAM prompts, supporting more possible interactions.
297+ * Fix grouping of autopkg output and allow optionally passing
298+ arguments to installed test scripts.
299+ * Add support for LightDM hints for manual logins and hiding normal
300+ users.
301+
302+ [ Michael Zanetti ]
303+ * hint the launcher to indicate a successful size change to the user
304+ (LP: #1646457)
305+ * Improvements for the appdrawer (LP: #1648173)
306+ * Adjust home key to still focus the dash instead of messing with the
307+ drawer
308+ * allow 4 finger simulation with mousetouchadaptor
309+
310+ [ Nick Dedekind ]
311+ * Added Alt+F10 shortcut to open app menus. (LP: #1656896)
312+ * Fixed menu layout width calculations. (LP: #1657050)
313+ * Skip Panel::test_drag_indicator_item_down_shows_menu
314+
315+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 24 Jan 2017 07:46:58 +0000
316+
317+unity8 (8.15+17.04.20170110.4-0ubuntu1) zesty; urgency=medium
318+
319+ [ Albert Astals Cid ]
320+ * Give focus to one of the buttons of the dialog
321+ * tst_WindowResizeArea: Use default values for mouseFlick speed and
322+ iterations (LP: #1651580)
323+ * Require Qt 5.6 & misc fixes
324+
325+ [ Daniel van Vugt ]
326+ * Deprecate usage of Mir's input resampling, instead opting for: (LP:
327+ #1497105, #1591328)
328+
329+ [ Josh Arenson ]
330+ * Allow the scopes list to automatically scroll when a scope is being
331+ dragged past the bounds of the screen. (LP: #1575319)
332+
333+ [ Lukáš Tinkl ]
334+ * Fix touch window controls being unreachable when the overlay is
335+ being displayed (LP: #1648167)
336+ * Fixup paths for window state storage in snappy environment
337+ * Add Unity.Platform mock for our tests (LP: #1655336)
338+
339+ [ Michael Zanetti ]
340+ * PreviewRatingInput: Use displayText instead of text to
341+ enable/disable the Send button (LP: #1595910)
342+ * Add a D-Bus interface to control some debug facilities on the fly
343+ * some launcher workarounds for the snapping
344+
345+ [ Michał Sawicz ]
346+ * Nuke leftover Platform in IndicatorsManager
347+
348+ [ Nick Dedekind ]
349+ * Added registry for application menus
350+
351+ [ Michael Terry, Nick Dedekind ]
352+ * Run the qmluitests.sh autopkg test against the installed package.
353+
354+ [ Michał Sawicz, Nick Dedekind ]
355+ * Application menus
356+
357+ [ Rodney Dawes ]
358+ * Remove the payments widget and dependency on libpay as no longer
359+ needed.
360+
361+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 10 Jan 2017 14:48:42 +0000
362+
363+unity8 (8.15+17.04.20161215-0ubuntu2~1) zesty; urgency=medium
364+
365+ * No change rebuild
366+
367+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 04 Jan 2017 10:54:32 +0200
368+
369+unity8 (8.15+17.04.20161215-0ubuntu1) zesty; urgency=medium
370+
371+ * Let the model deal with some window management decisions (LP:
372+ #1346633)
373+
374+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Thu, 15 Dec 2016 16:17:29 +0000
375+
376+unity8 (8.15+17.04.20161207.1-0ubuntu1) zesty; urgency=medium
377+
378+ [ Albert Astals Cid ]
379+ * Add the Wsuggest-override flag to gcc
380+ * Add support for compiler sanitizers via ECM
381+ * Use timeStep as delay time (LP: #1642919)
382+ * Bring back fix for 1517830 (LP: #1517830)
383+ * Fix compile warnings in mocks
384+ * Do not hide panel when launching an application if the mouse is on
385+ the panel (LP: #1591311)
386+
387+ [ Daniel d'Andrada ]
388+ * Fix "make tryApplicationWindow"
389+ * Take save/restore functions out of WindowResizeArea
390+
391+ [ Josh Arenson ]
392+ * Enable the greeter to remember which session the user last logged
393+ into (LP: #1631365)
394+
395+ [ Lukáš Tinkl ]
396+ * Fix the Super key not invoking the dash scope home (LP: #1607427)
397+
398+ [ Michael Zanetti ]
399+ * Add the ApplicationDrawer
400+ * tune right edge push (LP: #1646094)
401+ * improve close button visiblity when hovering with the mouse
402+ * Update virtual touchpad visuals and add a tutorial. (LP: #1585220)
403+
404+ [ Pete Woods ]
405+ * MenuItemFactory: Add subtitle support to SwitchItem widget
406+
407+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 07 Dec 2016 13:49:24 +0000
408+
409+unity8 (8.15+17.04.20161129-0ubuntu1) zesty; urgency=medium
410+
411+ [ Albert Astals Cid ]
412+ * Fix PreviewProgress implicitHeight (LP: #1641943)
413+ * Adapt to dummy notification being gone
414+ * Fix autopilot test_lock_screen tests
415+ * Autopilot: Add more applications to the list for wider screens
416+ * Fix autopilot DashHelperTestCase.test_search
417+ * Also install the Screens mock
418+ * Give default value to gu-px size
419+
420+ [ Andrea Azzarone ]
421+ * Set Mir.cursorName to "grabbing" on first mouse press on a window
422+ decoration. Don't wait for press+motion. (LP: #1618078)
423+ * Do not show a divider between each quicklist entry but just between
424+ each section, similar to how unity7 does. (LP: #1637478)
425+
426+ [ Andrea Cimitan ]
427+ * Fix white text (LP: #1644468)
428+ * Make MascotLoader in CardCreator flat
429+ * Make the remaining UbuntuShape flat
430+ * added dropshadow from panel indicators to dash page header extra
431+ panel, so there is right shadow when the extra panel is narrow
432+ * Look up for expandable template dash category flag
433+
434+ [ Brian Douglass ]
435+ * Added a setting to enable/disable the indicator dropdown menu.
436+
437+ [ Daniel d'Andrada ]
438+ * There's no need for WindowDecoration to access the appDelegate
439+
440+ [ Lukáš Tinkl ]
441+ * Enable brightness (laptop backlight) handling on desktop/laptop PCs
442+ (LP: #1595947)
443+
444+ [ Michael Zanetti ]
445+ * disable spread interaction while locked (LP: #1641578)
446+
447+ [ Andrea Azzarone, Michał Sawicz ]
448+ * Implement launcher tooltips.
449+
450+ [ Olivier Tilloy ]
451+ * Remove dependency on transitional package. (LP: #1583079)
452+
453+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 29 Nov 2016 09:43:33 +0000
454+
455+unity8 (8.15+17.04.20161116.1-0ubuntu1) zesty; urgency=medium
456+
457+ [ Marco Trevisan (Treviño) ]
458+ * MenuItemFactory: bind calendar backend properties to calendarMenu item
459+
460+ Adds support for showing the calendar at the requested date, marking days
461+ with events properly and toggling the visibility of the week number.
462+
463+ * MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu
464+
465+ * Bump version as USC breaks with unity8 << 8.14
466+
467+ [ Albert Astals Cid ]
468+ * [Hopefully] Fix infinite loop in some of the GSV tests (LP:
469+ #1599301)
470+
471+ [ Marco Trevisan (Treviño) ]
472+ * testLauncher: use tryCompare to check launcher contentY
473+
474+ [ Michael Zanetti ]
475+ * Stabilize OrientedShell tests
476+
477+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Wed, 16 Nov 2016 10:44:59 +0000
478+
479+unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium
480+
481+ [ Albert Astals Cid ]
482+ * Make more CardTool properties readonly
483+ * Make the > in Dash Section Header be after text (LP: #1508905)
484+ * Rework Dash Preview column margins
485+ * Improve LVWPH <-> GenericScopeView interaction (LP: #1508905,
486+ #1622423)
487+ * Make the PreviewButtons be of the width of the button and not half
488+ the total width
489+ * Fix first column of the preview table to be 25%
490+
491+ [ Andrea Cimitan ]
492+ * Remove background under header pagination dots, update dots assets,
493+ remove dash paper background, update bottom edge asset
494+ * Few styling changes for cards
495+ * various tweaks to fonts inside previews
496+ * More visual tweaks
497+
498+ [ Brian Douglass ]
499+ * Add a new setting to enable/disable the launcher
500+
501+ [ Lukáš Tinkl ]
502+ * Stabilize test_doubleTapToMaximizeWindow()
503+ * Enable loading the main Qt catalog which in turn allows for using
504+ RTL languages
505+ * Fix the pixelated notification icon by setting sourceSize (LP:
506+ #1637712)
507+
508+ [ Michael Terry ]
509+ * More path lookup fixes for running inside of a snap. (LP: #1629009)
510+
511+ [ Michael Zanetti ]
512+ * Added blur and darkening to wallpaper while in spread
513+ * Fixes in the spread after design review (LP: #1637502, #1638848)
514+ * More fixes to the unified stages code (LP: #1637205, #1637249,
515+ #1637258)
516+ * Delay alt tab for tiny bit in order to avoid flickering on quick alt-
517+ tabs
518+
519+ [ Tomás Tormo ]
520+ * Reload Infographics userdata when the day changes (LP: #1378814)
521+
522+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 09 Nov 2016 15:10:32 +0000
523+
524+unity8 (8.14+17.04.20161027-0ubuntu1) zesty; urgency=medium
525+
526+ * MenuItemFactory: activate item on calendar selection change (LP:
527+ #1541125)
528+
529+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000
530+
531+unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium
532+
533+ [ Albert Astals Cid ]
534+ * Make PreviewProgress be thicker again (LP: #1629382)
535+ * tst_PreviewZoomableImage: Wait for LazyImage transitions on init()
536+ (LP: #1630136)
537+
538+ [ Andrea Azzarone ]
539+ * Remove UbuntuShapeForItem and replace its use with the more standard
540+ Ubuntu.Components.UbuntuShape.
541+
542+ [ Lukáš Tinkl ]
543+ * Restore the double tap decoration to maximize feature (LP: #1627281)
544+ * Hide the cursor for fullscreen apps after 3 seconds of inactivity
545+ * Implement moving windows by Alt + left mouse button
546+
547+ [ Marco Trevisan (Treviño) ]
548+ * MenuItemFactory: use more features from SlotsLayout based settings
549+ components
550+
551+ [ Michael Terry ]
552+ * Grab launcher icon information from ubuntu-app-launch, not directly
553+ from desktop files.
554+ * Adjust root paths if we're running inside a snap. (LP: #1629009)
555+
556+ [ Michael Zanetti ]
557+ * Merge all Stages into one single codebase. Apply new spread visuals.
558+ (LP: #1489517, #1603914, #1635800)
559+
560+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 24 Oct 2016 11:37:28 +0000
561+
562+unity8 (8.14+16.10.20160922-0ubuntu2) yakkety; urgency=medium
563+
564+ * debian/control:
565+ - Drop unity-scope-mediascanner2 to a Suggests rather than a Recommends,
566+ to ease our transition to main. It's already seeded directly in
567+ Touch, so this will only affect the Desktop variant of unity8.
568+
569+ -- Michael Terry <mterry@ubuntu.com> Mon, 03 Oct 2016 10:43:25 -0400
570+
571+unity8 (8.14+16.10.20160922-0ubuntu1) yakkety; urgency=medium
572+
573+ [ Albert Astals Cid ]
574+ * LVWPH: update clipItem height when list height changes (LP:
575+ #1606935)
576+ * Put the touchdown shape inside a loader
577+ * No need for the touchdown in the card for the cardtool
578+ * Add bottom gradient to the Show Less floating button
579+ * Remove artShapeSize from non cardtool cards
580+ * LVWPH: Fix case in which header was shown incorrectly
581+ * LVWPH: Fix items cut on top in the dash (or at least some instances
582+ of it)
583+ * Reduce calls to CardCreatorCache.getCardComponent while the
584+ component is being created (LP: #1615675)
585+ * Dash::test_cardIconStyle change compare into tryCompareFunction
586+ * Make PreviewActionsTest::test_comboButton more stable
587+ * Adapt onShiftedContentXChanged to work when the content changes very
588+ abruptly
589+ * Make tryGenericScopeView show the scope correctly
590+ * Make sure the spinner does not get too close to the title text (LP:
591+ #1597392)
592+ * Show "Pull to refresh" in white when overlaid in low luminance
593+ colors (LP: #1596849)
594+ * Make test_Shell non ultra slow again (LP: #1597366)
595+ * Improve findChild calls inside tryCompareFunction.
596+
597+ [ Andrea Cimitan ]
598+ * override some Qt Components definitions so we can have sane default
599+ values for flick speeds
600+ * Elide the label text inside recent searches panel (LP: #1611796)
601+ * Add a PreviewSingleton module to store some data for previews (LP:
602+ #1595235)
603+ * Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput
604+ (LP: #1595235)
605+ * rework GenericScopeView PullToRefresh test
606+ * use mouseFlick instead touchFlick for manage_dash_move_current
607+ * add a couple of waiting tricks for a flaky dash test
608+
609+ [ Daniel d'Andrada ]
610+ * Set progress bar indeterminate when processing signal received. (LP:
611+ #1249349)
612+ * Implement cursor confinement (LP: #1590099)
613+
614+ [ Josh Arenson ]
615+ * Add a frontend to the sessions model and enable a session chooser in
616+ the greeter.
617+
618+ [ Lukáš Tinkl ]
619+ * Implement edge maximizing (aka window snapping) (LP: #1602628)
620+ * On the PC platform (as opposed to running on $devices), use the
621+ "mute" action instead of silent mode
622+ * Respect Fitt's law wrt the window control buttons in panel (LP:
623+ #1611959)
624+ * Fix 2 failing color-related tests
625+
626+ [ Marco Trevisan (Treviño) ]
627+ * Indicators, mocks: add fake indicators menuitem to populate mocks
628+ with different menu types
629+ * IndicatorsClient: use PageHeader and ListItemLayout's
630+
631+ [ Michael Terry ]
632+ * Support launching apps inside a unity8 session from the greeter and
633+ support emergency dialing inside the greeter.
634+ * Fix tryShell to actually show appropriate backgrounds for each mock
635+ user.
636+ * Add an indicator to the greeter when a user is logged in (only shown
637+ if we have more than one user)
638+ * Hide the greeter OSK if indicators are open and don't show the edge
639+ tutorial during an emergency call.
640+ * Switch from lockscreen PIN pad to a passcode entry box that uses the
641+ OSK.
642+ * Use the default system wallpaper instead of our custom one.
643+ * Update look of infographic a bit
644+ * Make infographic bubbles white even on the default wallpaper.
645+
646+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 22 Sep 2016 07:46:57 +0000
647+
648+unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
649+
650+ [ Daniel d'Andrada ]
651+ * Added implementation for MirSurfaceInterface::persistentId
652+
653+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 31 Aug 2016 11:56:09 +0000
654+
655+unity8 (8.14+16.10.20160826-0ubuntu1) yakkety; urgency=medium
656+
657+ * Make sure we emit sounds when taking a screenshot even after media-
658+ hub (LP: #1544477)
659+
660+ -- Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com> Fri, 26 Aug 2016 08:14:14 +0000
661+
662+unity8 (8.14+16.10.20160819-0ubuntu1) yakkety; urgency=medium
663+
664+ [ Lukáš Tinkl ]
665+ * Reset topmostIsFullscreen to correctly rotate the shell when
666+ dismissing SIM PIN screen (LP: #1614070)
667+
668+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 19 Aug 2016 14:16:54 +0000
669+
670+unity8 (8.14+16.10.20160811.1-0ubuntu1) yakkety; urgency=medium
671+
672+ [ Albert Astals Cid ]
673+ * Take into account carousel selectedItemScaleFactor when setting card
674+ fixedArtShapeSize (LP: #1599238)
675+ * Remove unused LimitProxyModel
676+ * Do not calculate implicitHeight for Cards in a CardGrid
677+ * Small clazy fixes
678+
679+ [ Daniel d'Andrada ]
680+ * Remove stage property from Application
681+
682+ [ Larry Price ]
683+ * Allow libertine-scope to show empty search result hint unmodified.
684+ (LP: #1606693)
685+
686+ [ Lukáš Tinkl ]
687+ * Open the quicklist (context) menu also using the Menu key (LP:
688+ #1608265)
689+ * Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:
690+ #1596076)
691+ * Apply the correct keymap also on prompt surfaces (LP: #1610124)
692+ * Implement an optional system update feature during OOBE wizard (LP:
693+ #1580785)
694+ * Implement a page for choosing HW keyboard layout in OOBE wizard
695+
696+ [ Michael Zanetti ]
697+ * Clean up some build script legacy
698+ * Add a crossbuilder_post file to make crossbuilder restart unity8
699+ after deploying
700+ * fixes for the automatic switching between usage modes (LP: #1590944)
701+
702+ [ Omer Akram ]
703+ * Add object names for setup wizard
704+
705+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 11 Aug 2016 06:28:20 +0000
706+
707+unity8 (8.14+16.10.20160803-0ubuntu1) yakkety; urgency=medium
708+
709+ [ Albert Astals Cid ]
710+ * Fix DisabledScreenNotice::test_rotation
711+ * Make the delegate of DashNavigationList an async Loader
712+ * unity-scope-tool: Use parse instead of process
713+ * VerticalJournal improvements regarding model insertions and item
714+ height changes (LP: #1599754)
715+ * Add math.h includes for compilation in yakkety (LP: #1605502)
716+
717+ [ Andrea Cimitan ]
718+ * Unfocus the search text field in the dash page header when requested
719+ (LP: #1590820)
720+ * Use binding for filter popover contentWidth (LP: #1595116)
721+ * Add few sourceSize for Image we forgot (LP: #1595113)
722+ * Replace Flickable with an Item inside DashPageHeader for
723+ headerContainer (LP: #1599235)
724+
725+ [ Albert Astals Cid, Andrea Cimitan ]
726+ * Unbox the artshapeLoader
727+
728+ [ Daniel d'Andrada ]
729+ * Fix splashscreen orientation when app rotates own contents (LP:
730+ #1586050)
731+ * tst_PreviewIconActions: Make test name match filename
732+ * Cursor: make its size grid unit based (LP: #1604014)
733+ * TouchEventSequenceWrapper: item might get deleted when touch
734+ sequence is committed (LP: #1607686)
735+
736+ [ Lukáš Tinkl ]
737+ * Implement frontend support for running keyboard indicator
738+ * Provide window/surface close shortcuts across all the stages (LP:
739+ #1578392, #1606528)
740+ * Restart the location trust prompt service when exiting the wizard
741+ (LP: #1594430)
742+ * Implement clearing the search and closing the panel on pressing
743+ Escape key in the dash header
744+ * Fix log timestamps (LP: #1602196)
745+ * Don't display the mode switch warning dialog on tablets (LP:
746+ #1600290)
747+
748+ [ Michael Terry ]
749+ * Fix indicator profile bug that caused sound indicator to say Mute
750+ instead of Silent Mode. (LP: #1604205)
751+ * Fix lockscreen appearing right after unlocking a locked session on
752+ the desktop. (LP: #1604374)
753+
754+ [ Michał Sawicz ]
755+ * Add arm64 support, drop unnecessary B-D on web plugin
756+
757+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 03 Aug 2016 15:56:27 +0000
758+
759+unity8 (8.14+16.10.20160728-0ubuntu1) yakkety; urgency=medium
760+
761+ [ Zoltán Balogh ]
762+ * Bump the version to secure UITK compatibility
763+
764+ [ Albert Astals Cid ]
765+ * Pass the correct number of arguments to mapToItem (LP: #1606835)
766+
767+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 28 Jul 2016 08:17:13 +0000
768+
769+unity8 (8.13+16.10.20160714+fix1-0ubuntu2~1) yakkety; urgency=medium
770+
771+ * Rebuild against Qt 5.6.
772+ * Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850
773+
774+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 22 Jul 2016 09:03:54 +0300
775+
776+unity8 (8.13+16.10.20160714-0ubuntu1) yakkety; urgency=medium
777+
778+ [ Daniel d'Andrada ]
779+ * Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack
780+
781+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 14 Jul 2016 07:09:29 +0000
782+
783+unity8 (8.12+16.10.20160711-0ubuntu1) yakkety; urgency=medium
784+
785+ [ Josh Arenson ]
786+ * Add a SessionsModel to lightdm to support the greeter's session
787+ chooser
788+ * Add unity8-greeter package which contains a basic, but usable
789+ LightDM greeter. (LP: #1324602)
790+
791+ [ Michael Terry ]
792+ * Make sure indicators and launcher hide when power button is pressed
793+ on greeter. (LP: #1595569)
794+ * Fix tablet greeter focus to be always-on, no longer hiding the OSK
795+ or forcing a mouse click to type a password. (LP: #1435923)
796+
797+ -- Michael Terry <michael.terry@canonical.com> Mon, 11 Jul 2016 17:24:20 +0000
798+
799+unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium
800+
801+ [ Michael Zanetti ]
802+ * emit the correct role changed signal on count visible changed (LP:
803+ #1599925)
804+
805+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 07 Jul 2016 16:49:32 +0000
806+
807+unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium
808+
809+ [ Michael Zanetti ]
810+ * don't displace windows if the OSK is on another screen (LP:
811+ #1598917)
812+
813+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 05 Jul 2016 10:00:57 +0000
814+
815+unity8 (8.12+16.10.20160627.5-0ubuntu1) yakkety; urgency=medium
816+
817+ [ Albert Astals Cid ]
818+ * Stop watching the old header item height once it's not our header
819+ anymore
820+ * LVWPH: cull the header item when not on view to save some painting
821+ * Adapt test to new mock behaviour
822+ * Don't let the mouse go outside the parentItem (LP: #1525350)
823+ * Use non deprecated package names
824+ * Mark system includes as such
825+ * Fix initialization order warning
826+ * Do not rely on deleteLater not crashing on null pointers
827+ * Add more headers of classes we use for automoc to be run
828+ * CardTool: Fix the fallback value to be a size and not an integer
829+ * CardTool: Include Ubuntu Components since we're using units.gu
830+ * Rework tst_PreviewRatingDisplayCreationRanges
831+
832+ [ Daniel d'Andrada ]
833+ * Cursor: Let AnimatedSprite run only on animated cursors and while
834+ the display is on (LP: #1588873, #1594358)
835+ * Fix missing screenshot when orientation changes while shell rotation
836+ ongoing (LP: #1587796)
837+
838+ [ Josh Arenson ]
839+ * Make PreviewRatingSingleDisplay visible again after editing a
840+ review. (LP: #1587097)
841+ * Correct errors in all png images to prevent libpng warnings.
842+
843+ [ Lukáš Tinkl ]
844+ * Fix some smaller issues with OOBE wizard password pages (LP:
845+ #1590467)
846+ * Prevent mouse wheel events from going through shell elements (LP:
847+ #1536268)
848+ * Do not let mouse and wheel events pass thru the titlebar (LP:
849+ #1588424)
850+ * Hide the maximize window button based on size restrictions (LP:
851+ #1541982)
852+
853+ [ Marco Trevisan (Treviño) ]
854+ * Unity8.conf: ensure MIR_SOCKET is set for future customers (such as
855+ the dash)
856+ * ClientIndicator: be more informative about loading failures for
857+ dynamically created objects
858+
859+ [ Michael Terry ]
860+ * Stop unity8 from getting in a "switch-to-greeter" loop when locking
861+ on a desktop. (LP: #1593718)
862+
863+ [ Michael Zanetti ]
864+ * set minimum window sizes on dash
865+ * displace application windows when the OSK would cover them
866+
867+ [ Nick Dedekind ]
868+ * Force dash to always stay in the main stage. (lp:#1592404) (LP:
869+ #1592404)
870+ * Save the last surface stage on stage drop. (LP: #1579003)
871+ * Default portrait only apps to the side stage. (LP: #1573153)
872+
873+ [ Albert Astals Cid, Andrea Cimitan, Michał Sawicz, Nick Dedekind ]
874+ * Added live video playback in dash previews
875+
876+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 27 Jun 2016 18:48:59 +0000
877+
878+unity8 (8.12+16.10.20160620.3-0ubuntu1) yakkety; urgency=medium
879+
880+ [ Michael Terry, Michał Sawicz ]
881+ * Support unlocking via fingerprint, if one is registered.
882+
883+ -- Michael Terry <michael.terry@canonical.com> Mon, 20 Jun 2016 20:25:25 +0000
884+
885+unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium
886+
887+ [ Michael Terry ]
888+ * Do not create Label/Icon if we don't need it
889+ * Fix Z-ordering of prompt surfaces (LP: #1586219)
890+ * Drop bottom edge tutorials completely and small fixes for other
891+ edges. (LP: #1565103)
892+ * Redo visuals for greeter prompt box. (LP: #1435923)
893+ * Make tutorial qmltests more robust. (LP: #1590810)
894+ * Stop showing an extra lockscreen in desktop unity8 sessions. (LP:
895+ #1582987)
896+
897+ [ Albert Astals Cid ]
898+ * Improve dash plugin mock
899+ * Stabilize PreviewExpandableTest::test_all_widgets_height
900+ * Workaround QTBUG-53460
901+ * Split artShape code for cardTool card and regular card
902+ * Simplify the code since fixedArtSize code is mandatory for regular
903+ cards
904+ * Desktop stage: Support rotatesWindowContents (LP: #1547481)
905+ * Turn if if else into if elseif else
906+ * Fix leaks in QInputDeviceManagerPrivate::addDevice
907+ * Do not call |= on uninitialized sigterm.sa_flags
908+ * initialize udevMonitor
909+ * Make notifier and notifierFd function local variables
910+ * Fix crash if a component that is not an Item is given to
911+ sectionDelegate
912+ * Tests: Do not use dynamic_cast if we're not going to test it anyway
913+ * Minor coverity fixes
914+ * Fix warning about anchors.fill in ProportionalShape (LP: #1590963)
915+ * Make wait in cleanup() wait for snapTo animation to have finished
916+
917+ [ Alexandros Frantzis ]
918+ * Improve the way notifications interact with power management (LP:
919+ #1570922)
920+
921+ [ Andrea Cimitan ]
922+ * Correctly refresh cardcreator cache on artshapestyle changes (LP:
923+ #1588335)
924+ * Same tweaks we have for click scope now for libertine
925+ * add a timer to pull to refresh to work on small windows (LP:
926+ #1589060)
927+
928+ [ Daniel d'Andrada ]
929+ * Clean up debug leftovers
930+ * Ensure mouse and window movement are pixel-aligned (LP: #1510382)
931+ * Fix SpreadDelegate rotation animations
932+ * No point in version-controlling files that are automatically
933+ generated
934+ * Center cursor on screen when it's first shown
935+ * Custom cursor name just have to start with "custom"
936+ * Work around AnimatedSprite infinite loop bug (LP: #1588929)
937+
938+ [ Josh Arenson ]
939+ * Disable showDash when it is already shown. (LP: #1506708)
940+ * Add a timestamp to the dash log (LP: #1580074)
941+ * Add timestamp to unity8 log (LP: #1498169)
942+
943+ [ Lukáš Tinkl ]
944+ * Implement keyboard shortcuts info panel
945+ * Implement window controls overlay activatable with 3 fingers tap
946+ (LP: #1489020)
947+ * Select correct Chinese input method for OSK in the wizard (LP:
948+ #1588633)
949+
950+ [ Michael Zanetti ]
951+ * Add support for the launcher surface pips displaying the correct
952+ number of surfaces
953+ * Add support for the persistent alert state. (LP: #1575147, #1584348,
954+ #1586621)
955+ * send a Alt-release event on alt+tab instead of delaying it
956+ completely and invoking it later (LP: #1565236)
957+
958+ [ Stephen M. Webb ]
959+ * added a new upstart $SESSION for unity8-desktop-session (LP:
960+ #1376715)
961+
962+ -- Michael Terry <michael.terry@canonical.com> Fri, 17 Jun 2016 01:22:57 +0000
963+
964+unity8 (8.12+16.10.20160601.1-0ubuntu1) yakkety; urgency=medium
965+
966+ [ Pawel Stolowski ]
967+ * Added apparmor profile for unity8-dash.
968+
969+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 01 Jun 2016 20:59:03 +0000
970+
971+unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium
972+
973+ [ Albert Astals Cid ]
974+ * Activate on click for SimpleMessages (LP: #1421696)
975+ * Add override
976+ * Change the art back to the cardData value if it changes from broken
977+ to valid image (LP: #1533577)
978+ * Concierge mode generated code optimization
979+ * Don't use context properties but properties of the delegates
980+ * Listen to contentItem::widthChanged instead of
981+ Flickable::contentWidthChanged (LP: #1565763)
982+ * Make some AP code faster
983+ * Make tests a bit more stable
984+ * Make unity8 and unity8-dash handle termination signals
985+ * Remove workaround not needed anymore (LP: #1475643)
986+ * Resolve cardArtStyle on compile time
987+ * Set the theme earlier (LP: #1574048)
988+
989+ [ Albert Astals Cid, Daniel d'Andrada ]
990+ * Remove DirectionalDragArea and libs/UbuntuGestures and port to SDK
991+ equivalents
992+
993+ [ Andrea Cimitan ]
994+ * Hide the preview review input field when a rating is required (LP:
995+ #1541971)
996+
997+ [ CI Train Bot ]
998+ * Resync trunk.
999+
1000+ [ Daniel d'Andrada ]
1001+ * Fix DragHandle so it works in all directions
1002+ * Support animated cursors
1003+ * WindowInputMonitor - also map Qt::Key_HomePage to our home key
1004+ * plugins/Cursor: properly register to the screen's QPlatformCursor
1005+ when screen changes (LP: #1579742)
1006+
1007+ [ Josh Arenson ]
1008+ * Close the PageHeaderExtraPanel when a filter option is selected (LP:
1009+ #1569498)
1010+ * Wrap primaryFilter in a flickable to make it behave nicely. (LP:
1011+ #1569492)
1012+
1013+ [ Lukáš Tinkl ]
1014+ * First snap decision should always be expanded, unless user decides
1015+ otherwise (LP: #1580090, #1575045)
1016+ * Fullscreen notification bug fixes (LP: #1583944, #1581498, #1422711)
1017+ * Implement maximizing windows horizontally/vertically
1018+ * Lock the session when putting the laptop into sleep (LP: #1581063)
1019+
1020+ [ Lukáš Tinkl, Michael Terry ]
1021+ * With a maximized window, "dragging" the panel down should restore it
1022+
1023+ [ Michael Terry ]
1024+ * Change some dash button colors from orange to green. (LP: #1581047)
1025+ * Use PageHeader instead Ambiance's PageHeadStyle
1026+ * Use new setTimeZone method to set user-friendly timezone name in the
1027+ wizard. (LP: #1566295)
1028+
1029+ [ Michael Zanetti ]
1030+ * Remove the background dimming when the launcher is revealed by a
1031+ drag (LP: #1575137)
1032+ * reenable or drop disabled tests
1033+
1034+ -- Michael Terry <michael.terry@canonical.com> Fri, 27 May 2016 13:54:44 +0000
1035+
1036+unity8 (8.12+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium
1037+
1038+ [ Lukáš Tinkl ]
1039+ * Don't dim screen when the indicators are open (LP: #1564342)
1040+ * Fix upcoming alarms ETA labels (LP: #1576741)
1041+ * Stabilize flaky wizard tests (LP: #1582994)
1042+
1043+ [ Michael Zanetti ]
1044+ * fix the SIM PIN darkening after it got removed accidentally (LP:
1045+ #1577147)
1046+
1047+ [ Michał Sawicz, Nick Dedekind ]
1048+ * Fixed saving current stage and loss of surface focus when switching
1049+ stages
1050+
1051+ [ Nick Dedekind ]
1052+ * Fixed incorrect osk surface item resizing the surface.
1053+
1054+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 20 May 2016 08:44:19 +0000
1055+
1056+unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium
1057+
1058+ [ CI Train Bot ]
1059+ * Resync trunk.
1060+
1061+ [ Daniel d'Andrada, Michał Sawicz ]
1062+ * Move prompt surfaces from MirSurface to Application
1063+
1064+ -- Nick Dedekind <ci-train-bot@canonical.com> Wed, 18 May 2016 11:20:04 +0000
1065+
1066+unity8 (8.12+16.04.20160504.2-0ubuntu1) xenial; urgency=medium
1067+
1068+ [ Albert Astals Cid ]
1069+ * Expandable Filter Widget
1070+ * Pass the category correctly
1071+
1072+ [ Albert Astals Cid, CI Train Bot ]
1073+ * Make the previewActions react to the actions model changing (LP:
1074+ #1485887)
1075+ * Reload Preview Zoomable Image source if it gets updated
1076+ * Update the icon also to the original one if that's what the scope
1077+ wants
1078+
1079+ [ Andrea Cimitan ]
1080+ * Add social actions to cards
1081+
1082+ [ CI Train Bot ]
1083+ * Resync trunk.
1084+
1085+ -- Pawel Stolowski <ci-train-bot@canonical.com> Wed, 04 May 2016 18:09:33 +0000
1086+
1087+unity8 (8.12+16.04.20160429.2-0ubuntu1) xenial; urgency=medium
1088+
1089+ [ CI Train Bot ]
1090+ * Resync trunk.
1091+
1092+ [ Daniel d'Andrada ]
1093+ * Ensure shell transformations use bindings as OrientedShell can get
1094+ resized
1095+ * Make shell rotation animation work on multimonitor scenarios.
1096+ * Refactor screenshotting code and make it work in multimonitor
1097+ scenarios
1098+
1099+ [ Gerry Boland, Nick Dedekind ]
1100+ * Indicators: set menu height binding while fully open/closed, fixes
1101+ dynamic grid unit bug.
1102+
1103+ [ Michael Zanetti ]
1104+ * Call the dash sizing hack when units.gu changes
1105+ * Temporary means to override GUs on the internal screen
1106+ * reduce some paint layers.
1107+
1108+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 29 Apr 2016 20:07:37 +0000
1109+
11110unity8 (8.12+16.04.20160427.3-0ubuntu1) xenial; urgency=medium
21111
31112 [ Albert Astals Cid ]
@@ -115,7 +1224,7 @@ unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium
1151224unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
1161225
1171226 [ Michael Terry ]
118− *
1227+ *
1191228 * Fix setting OSK layout in OOBE wizard
1201229 * Stop the left edge tutorial from being shown when the bottom edge
1211230 tutorial wants to be shown after receiving a call.
@@ -2827,7 +3936,7 @@ unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium
28273936 * Re-architecture unity8 to use the QtMirCompositor library so that
28283937 the Qt scenegraph renderer is used as the Mir compositor, and
28293938 application surfaces are added to the QML scene as items.
2830−
3939+
28313940 [ Michael Zanetti ]
28323941 * Port phone right-edge spread code to use QtCompositor
28333942 * Add right-edge spread animation for tablet
@@ -3101,8 +4210,8 @@ unity8 (7.90+14.10.20140703.1-0ubuntu1) utopic; urgency=low
31014210
31024211unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
31034212
3104− * debian/control:
3105− list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
4213+ * debian/control:
4214+ list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
31064215 choice, since provides are not versionned, should restore installability
31074216 on amd64 and i386
31084217
@@ -6204,7 +7313,7 @@ unity8 (7.81.2) saucy; urgency=low
62047313 [ Michał Sawicz ]
62057314 * Fix icons in ApplicationsFilterGrid.qml.
62067315 * Support flipped image in run_on_device.
6207−
7316+
62087317 [ Michael Zanetti ]
62097318 * Don't clear lockscreen when it's fading out.
62107319 * Reworked Launcher folding.
@@ -6289,7 +7398,7 @@ qml-phone-shell (1.79) raring; urgency=low
62897398
62907399 [ Michael Terry ]
62917400 * Make greeter look like the desktop one
6292−
7401+
62937402 [ Gerry Boland ]
62947403 * Fix a bug where a minimized app gets focus after closing another app
62957404 * Applied a workaround to reduce flickering when launching apps
@@ -6305,7 +7414,7 @@ qml-phone-shell (1.79) raring; urgency=low
63057414qml-phone-shell (1.78) raring; urgency=low
63067415
63077416 [ Sergio Schvezov ]
6308− * 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
63097418 the launcher (LP: #1178262).
63107419
63117420 [ Daniel d'Andrada ]
@@ -6347,7 +7456,7 @@ qml-phone-shell (1.77) raring; urgency=low
63477456 [ Mathieu Trudel-Lapierre ]
63487457 * debian/control:
63497458 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.
6350− - 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.
63517460 * debian/copyright: fix syntax.
63527461
63537462 [ Michał Sawicz ]
@@ -6357,7 +7466,7 @@ qml-phone-shell (1.77) raring; urgency=low
63577466 * Renamed Media player files to match with new application name.
63587467
63597468 [ Daniel d'Andrada ]
6360− * New: DirectionalDragArea component. An area that detects axis-aligned
7469+ * New: DirectionalDragArea component. An area that detects axis-aligned
63617470 single-finger drag gestures.
63627471 * Make it possible to send touch events from within QML test code.
63637472
@@ -6794,7 +7903,7 @@ qml-phone-shell (1.39) quantal; urgency=low
67947903
67957904qml-phone-shell (1.38) quantal; urgency=low
67967905
6797− * fix launching of notepad
7906+ * fix launching of notepad
67987907
67997908 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500
68007909
@@ -6807,14 +7916,14 @@ qml-phone-shell (1.37) quantal; urgency=low
68077916
68087917qml-phone-shell (1.36) quantal; urgency=low
68097918
6810− * launch real notepad app
7919+ * launch real notepad app
68117920 * fix launching of mock apps
68127921
68137922 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500
68147923
68157924qml-phone-shell (1.35) quantal; urgency=low
68167925
6817− * integrate ubuntu-browser instead of snowshoe
7926+ * integrate ubuntu-browser instead of snowshoe
68187927
68197928 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500
68207929
@@ -6898,7 +8007,7 @@ qml-phone-shell (1.22) quantal; urgency=low
68988007
68998008qml-phone-shell (1.21) quantal; urgency=low
69008009
6901− * New release with fullscreen launcher fixes
8010+ * New release with fullscreen launcher fixes
69028011
69038012 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000
69048013
@@ -6910,7 +8019,7 @@ qml-phone-shell (1.20) quantal; urgency=low
69108019
69118020qml-phone-shell (1.19) quantal; urgency=low
69128021
6913− * enable multi-threaded render for apps
8022+ * enable multi-threaded render for apps
69148023
69158024 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000
69168025
@@ -6918,7 +8027,7 @@ qml-phone-shell (1.18) quantal; urgency=low
69188027
69198028 [ Bill Filler ]
69208029 * update launcher to use wk2-render (chromeless webkit) for facebook
6921− and twitter
8030+ and twitter
69228031
69238032 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000
69248033
@@ -6930,7 +8039,7 @@ qml-phone-shell (1.17) quantal; urgency=low
69308039
69318040qml-phone-shell (1.16) quantal; urgency=low
69328041
6933− * fix to launch new gallery with correct args
8042+ * fix to launch new gallery with correct args
69348043
69358044 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500
69368045
@@ -6992,7 +8101,7 @@ qml-phone-shell (1.2) quantal; urgency=low
69928101
69938102qml-phone-shell (1.1) quantal; urgency=low
69948103
6995− * comment out console.log() to prevent crash
8104+ * comment out console.log() to prevent crash
69968105
69978106 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100
69988107
@@ -7020,19 +8129,19 @@ qml-phone-shell (0.7) quantal; urgency=low
70208129 * qml-phone-shell.conf: better setup of env vars and launch
70218130 via dbus-luanch to properly setup session bus
70228131 * shellapplication.cpp: don't setup custom env before launching
7023− processes
8132+ processes
70248133
70258134 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200
70268135
70278136qml-phone-shell (0.6) quantal; urgency=low
70288137
7029− * added additional Android env vars to upstart script
8138+ * added additional Android env vars to upstart script
70308139
70318140 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400
70328141
70338142qml-phone-shell (0.5) quantal; urgency=low
70348143
7035− * added support to launch telephony-app
8144+ * added support to launch telephony-app
70368145
70378146 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400
70388147
@@ -7059,3 +8168,8 @@ qml-phone-shell (0.1) quantal; urgency=low
70598168 * Initial release
70608169
70618170 -- Bill Filler <bill.filler@canonical.com> Wed, 10 Oct 2012 10:19:53 -0400
8171+unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium
8172+
8173+ [ Michael Zanetti ]
8174+ * Make the default store uri point to gnome software center
8175+
debian/control+223−166
@@ -2,214 +2,271 @@ Source: unity8
22Section: x11
33Priority: optional
44Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5−Build-Depends: cmake,
6− dbus-test-runner,
7− debhelper (>= 9),
8− doxyqml,
9−# 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− libandroid-properties-dev,
14− graphviz,
15− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
16− libconnectivity-qt1-dev (>= 0.7.1),
17− libevdev-dev,
18− libgeonames-dev (>= 0.2),
19− libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
20− libgl1-mesa-dri,
21− libgles2-mesa-dev[armhf],
22− libglib2.0-dev,
23− libgsettings-qt-dev,
24− libhardware-dev,
25− libpam0g-dev,
26− libpay2-dev,
27− libpulse-dev,
28− libqmenumodel-dev (>= 0.2.9),
29− libqt5svg5-dev,
30− libqt5xmlpatterns5-dev,
31− libsystemsettings-dev,
32− libudev-dev,
33− libunity-api-dev (>= 7.110),
34− libusermetricsoutput1-dev,
35−# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
36− libx11-dev[!armhf],
37− libxcb1-dev[!armhf],
38− libxi-dev[!armhf],
39−# End of X11 libs
40− pkg-config,
41− python3-all:any,
42− python3-setuptools,
43− qml-module-qt-labs-folderlistmodel,
44− qml-module-qtquick-layouts,
45− qml-module-qtquick-xmllistmodel,
46− qml-module-qtquick2,
47− qml-module-qtsysteminfo,
48− qml-module-qttest,
49− qt5-default,
50− qtbase5-dev (>= 5.4),
51− qtbase5-dev-tools,
52− qtbase5-private-dev (>= 5.4),
53− qtdeclarative5-dev (>= 5.4),
54− qtdeclarative5-dev-tools,
55− qtdeclarative5-private-dev (>= 5.4),
56− qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
57− 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,
5+Build-Depends:
6+ android-headers,
7+ cmake,
8+ cmake-extras,
9+ dbus-test-runner,
10+ debhelper (>= 9),
11+ dh-apparmor,
12+ doxyqml,
13+ g++:native,
14+ gdb,
15+ graphviz,
16+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
17+ libandroid-properties-dev,
18+ libconnectivity-qt1-dev (>= 0.7.1),
19+ libevdev-dev,
20+ libgeonames-dev (>= 0.2),
21+ libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
22+ libgl1-mesa-dri,
23+ libgles2-mesa-dev[arm64 armhf],
24+ libglib2.0-dev,
25+ libgnome-desktop-3-dev,
26+ libgsettings-qt-dev,
27+ libhardware-dev,
28+ liblightdm-qt5-3-dev,
29+ libpam0g-dev,
30+ libpulse-dev,
31+ libqmenumodel-dev (>= 0.2.12),
32+ libqt5sql5-sqlite,
33+ libqt5svg5-dev,
34+ libqt5xmlpatterns5-dev,
35+ libqtdbusmock1-dev (>= 0.7),
36+ libqtdbustest1-dev,
37+ libsystemsettings-dev,
38+ libubuntu-app-launch2-dev,
39+ libubuntu-download-manager-common-dev,
40+ libubuntugestures5-dev (>= 1.3.2030),
41+ libubuntugestures5-private-dev (>= 1.3.2030),
42+ libudev-dev,
43+ libudm-common-dev,
44+ libunity-api-dev (>= 8.7),
45+ libusermetricsoutput1-dev,
46+ libx11-dev[!arm64 !armhf],
47+ libxcb1-dev[!arm64 !armhf],
48+ libxi-dev[!arm64 !armhf],
49+ pkg-config,
50+ python3-all:any,
51+ python3-setuptools,
52+ qml-module-qt-labs-folderlistmodel,
53+ qml-module-qt-labs-settings,
54+ qml-module-qtmultimedia (>= 5.6),
55+ qml-module-qtqml-statemachine,
56+ qml-module-qtquick-layouts,
57+ qml-module-qtquick-xmllistmodel,
58+ qml-module-qtquick2,
59+ qml-module-qtsysteminfo,
60+ qml-module-qttest,
61+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
62+ qml-module-ubuntu-layouts,
63+ qml-module-ubuntu-settings-components,
64+ qml-module-ubuntu-test,
65+ qtbase5-dev (>= 5.6),
66+ qtbase5-dev-tools,
67+ qtbase5-private-dev (>= 5.6),
68+ qtdbustest-runner,
69+ qtdeclarative5-dev (>= 5.6),
70+ qtdeclarative5-dev-tools,
71+ qtdeclarative5-private-dev (>= 5.6),
72+ qtdeclarative5-ubuntu-content1,
73+ ttf-ubuntu-font-family,
74+ ubports-wallpapers,
75+ xvfb,
6276Standards-Version: 3.9.4
63−Homepage: http://launchpad.net/unity
64−# If you aren't a member of ~unity-team but need to upload
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
77+Homepage: https://github.com/ubports/unity8
78+Vcs-Git: https://github.com/ubports/unity8
6979XS-Testsuite: autopkgtest
7080X-Ubuntu-Use-Langpack: yes
7181
7282Package: indicators-client
73−Architecture: amd64 armhf i386
74−Depends: qmenumodel-qml (>= 0.2.9),
75− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
76− unity8 (= ${binary:Version}),
77− ${misc:Depends},
78− ${shlibs:Depends},
83+Architecture: any
84+Depends:
85+ qmenumodel-qml (>= 0.2.11),
86+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
87+ unity8 (= ${binary:Version}),
88+ ${misc:Depends},
89+ ${shlibs:Depends},
7990Description: Indicators client test application
8091 This package contains the client application for indicators used by autopilot
8192
82−Package: unity-scope-tool
93+Package: unity8-greeter
8394Architecture: any
84−Depends: unity8-common (= ${source:Version}),
85− unity8-private (= ${binary:Version}),
86− ${misc:Depends},
87− ${shlibs:Depends},
88−# We do call pkg-config libunity-scopes from the code
89− pkg-config,
90− libunity-scopes-dev,
91−Description: Development tool for Unity scopes
92− This package contains the development tool for new generation Unity scopes, based
93− on Unity8.
95+Depends:
96+ unity-system-compositor,
97+ unity8 (= ${binary:Version}),
98+ ${misc:Depends},
99+ ${shlibs:Depends},
100+Recommends:
101+ lightdm,
102+Provides:
103+ lightdm-greeter,
104+Description: The Unity8 Greeter
105+ The Unity 8 greeter is the primary login greeter for Ubuntu devices.
94106
95107Package: unity8
96108Architecture: any
97−Provides: indicator-renderer,
98−Depends: dmz-cursor-theme,
99− gsettings-desktop-schemas,
100− libcap2-bin,
101− libglib2.0-bin,
102− qmenumodel-qml (>= 0.2.9),
103− qml-module-qt-labs-folderlistmodel,
104− qml-module-qtquick-xmllistmodel,
105− qml-module-qtsysteminfo,
106− qtdeclarative5-qtmir-plugin (>= 0.4.8),
107− qtdeclarative5-ubuntu-telephony0.1,
108− qtdeclarative5-ubuntu-web-plugin,
109− ubuntu-system-settings,
110− unity-launcher-impl-7,
111− unity8-common (= ${source:Version}),
112− unity8-private (= ${binary:Version}),
113− unity8-private | unity-launcher-impl,
114− ${misc:Depends},
115− ${shlibs:Depends},
116−Recommends: indicator-session,
117− unity-scope-click,
118− unity-scope-mediascanner2,
119−Breaks: indicator-network (<< 0.5.1+14.10.20141014),
120− ubuntu-touch-session (<< 0.107),
121− unity8-greeter (<< 7.89),
122−Replaces: ubuntu-touch-session (<< 0.82~),
123− unity8-greeter (<< 7.89),
124−Conflicts: ubuntu-system-settings-wizard,
109+Provides:
110+ indicator-renderer,
111+Depends:
112+ dmz-cursor-theme,
113+ gsettings-desktop-schemas,
114+ libcap2-bin,
115+ libglib2.0-bin,
116+ qmenumodel-qml (>= 0.2.11),
117+ qml-module-biometryd,
118+ qml-module-qt-labs-folderlistmodel,
119+ qml-module-qt-labs-settings,
120+ qml-module-qtqml-statemachine,
121+ qml-module-qtquick-xmllistmodel,
122+ qml-module-qtsysteminfo,
123+ qtdeclarative5-qtmir-plugin (>= 0.4.8),
124+ qtdeclarative5-ubuntu-telephony0.1,
125+ ubuntu-system-settings (>= 0.4),
126+ unity-launcher-impl-13,
127+ unity8-common (= ${source:Version}),
128+ unity8-private (= ${binary:Version}),
129+ unity8-private | unity-launcher-impl,
130+ ${misc:Depends},
131+ ${shlibs:Depends},
132+Recommends:
133+ indicator-keyboard,
134+ indicator-session,
135+ unity-greeter-session-broadcast,
136+Breaks:
137+ indicator-network (<< 0.5.1+14.10.20141014),
138+ ubuntu-keyboard (<< 0.100),
139+ ubuntu-touch-session (<< 0.107),
140+ unity-scope-tool,
141+ unity8-greeter (<< 7.89),
142+Replaces:
143+ ubuntu-touch-session (<< 0.82~),
144+ unity-scope-tool,
145+ unity8-greeter (<< 7.89),
146+Conflicts:
147+ ubuntu-system-settings-wizard,
125148Description: Unity 8 shell
126149 The Unity 8 shell is the primary user interface for Ubuntu devices.
127150
128151Package: unity8-common
129152Architecture: all
130−Depends: qml-module-qtquick-layouts,
131− qtdeclarative5-ubuntu-settings-components (>= 0.7),
132− qtdeclarative5-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,
135− ubuntu-thumbnailer-impl-0,
136− unity-application-impl-15,
137− unity-notifications-impl-3,
138− unity-plugin-scopes | unity-scopes-impl,
139− unity-scopes-impl-11,
140− unity8-fake-env | unity-application-impl,
141− ${misc:Depends},
142−Breaks: unity8 (<< 7.86),
143−Replaces: unity8 (<< 7.86),
153+Depends:
154+ qml-module-qtquick-layouts,
155+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
156+ qml-module-ubuntu-settings-components,
157+ qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
158+ qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
159+ qttranslations5-l10n,
160+ ubuntu-thumbnailer-impl-0,
161+ unity-application-impl-27,
162+ unity-notifications-impl-3,
163+ unity8-schemas,
164+ unity8-tests | unity-application-impl,
165+ ${misc:Depends},
166+Breaks:
167+ unity8 (<< 7.86),
168+Replaces:
169+ unity8 (<< 7.86),
144170Description: Unity 8 shell (common files)
145171 The Unity 8 shell is the primary user interface for Ubuntu devices.
146172 .
147− This package contains the QML, graphics and locale files shared between
148− unity8 and unity-scope-tool.
173+ This package contains the QML, graphics and locale files for unity8.
149174
150175Package: unity8-autopilot
151176Architecture: all
152−Depends: autopilot-qt5 (>= 1.4),
153− gir1.2-glib-2.0,
154− gir1.2-notify-0.7,
155− libqt5test5,
156− libqt5widgets5,
157− ofono-phonesim,
158− python3-autopilot,
159− python3-evdev,
160− python3-fixtures,
161− python3-gi,
162− qttestability-autopilot (>= 1.4),
163− ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
164− unity-scope-click,
165− unity8 (= ${source:Version}),
166− unity8-fake-env (= ${source:Version}),
167− url-dispatcher-tools,
168− xvfb,
169− ${misc:Depends},
170− ${python3:Depends},
171− ${shlibs:Depends},
177+Depends:
178+ autopilot-qt5 (>= 1.4),
179+ gir1.2-glib-2.0,
180+ gir1.2-notify-0.7,
181+ libqt5test5,
182+ libqt5widgets5,
183+ ofono-phonesim,
184+ python3-autopilot,
185+ python3-evdev,
186+ python3-fixtures,
187+ python3-gi,
188+ qttestability-autopilot (>= 1.4),
189+ ubuntu-ui-toolkit-autopilot (>= 1.3.2030),
190+ unity8 (= ${source:Version}),
191+ unity8-tests (= ${source:Version}),
192+ url-dispatcher-tools,
193+ xvfb,
194+ ${misc:Depends},
195+ ${python3:Depends},
172196Description: Test package for Unity 8 shell
173197 Autopilot tests for the unity8 package
174198
175−Package: unity8-fake-env
199+Package: unity8-tests
176200Architecture: any
177201Multi-Arch: same
178−Pre-Depends: ${misc:Pre-Depends},
179−Depends: ${misc:Depends},
180− ${shlibs:Depends},
181−Provides: unity-application-impl,
182− unity-application-impl-15,
183−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
184−Description: Fake environment for running Unity 8 shell
202+Pre-Depends:
203+ ${misc:Pre-Depends},
204+Depends:
205+ dbus-test-runner,
206+ parallel,
207+ qt5-default,
208+ qtdbustest-runner,
209+ qtdeclarative5-dev-tools,
210+ unity8 (= ${source:Version}),
211+ xvfb,
212+ ${misc:Depends},
213+ ${shlibs:Depends},
214+Provides:
215+ unity-application-impl,
216+ unity-application-impl-27,
217+ unity8-fake-env,
218+Replaces:
219+ unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
220+ unity8-fake-env,
221+Conflicts:
222+ unity8-fake-env,
223+Description: Scripts and mocks for running Unity 8 shell tests
185224 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.
187227
188228Package: unity8-private
189229Architecture: any
190230Multi-Arch: same
191−Pre-Depends: ${misc:Pre-Depends},
192−Depends: accountsservice-ubuntu-schemas (>= 0.0.5),
193− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
194− libhardware2,
195− pay-service,
196− unity-schemas (>= 7.3.1+14.10.20140915),
197− qtdeclarative5-gsettings1.0,
198− qml-module-qtmultimedia,
199− ${misc:Depends},
200− ${shlibs:Depends},
201−Provides: unity-launcher-impl,
202− unity-launcher-impl-7,
231+Pre-Depends:
232+ ${misc:Pre-Depends},
233+Depends:
234+ accountsservice-ubuntu-schemas (>= 0.0.7),
235+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
236+ libhardware2,
237+ qml-module-qtmultimedia,
238+ qtdeclarative5-gsettings1.0,
239+ unity8-schemas,
240+ ${misc:Depends},
241+ ${shlibs:Depends},
242+Provides:
243+ unity-launcher-impl,
244+ unity-launcher-impl-13,
203245Description: Unity 8 private libs
204246 The Unity 8 shell is the primary user interface for Ubuntu devices.
205247 .
206248 This package contains the private libraries for QML and other components
207249 only used by the shell.
208250
251+Package: unity8-schemas
252+Architecture: all
253+Multi-Arch: foreign
254+Depends:
255+ ${misc:Depends},
256+Replaces:
257+ unity-schemas (>= 7.3.1+14.10.20140915),
258+Breaks:
259+ unity-schemas (>= 7.3.1+14.10.20140915),
260+Description: Unity 8 schemas
261+ The Unity 8 shell is the primary user interface for Ubuntu devices.
262+ .
263+ This package contains the configuration schemas used by unity.
264+
209265Package: unity8-doc
210266Section: doc
211267Architecture: all
212268Multi-Arch: foreign
213−Depends: ${misc:Depends},
269+Depends:
270+ ${misc:Depends},
214271Description: Documentation for Unity8
215272 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
debian/rules+23−4
@@ -7,6 +7,12 @@ include /usr/share/dpkg/default.mk
77#export DH_VERBOSE=1
88export DPKG_GENSYMBOLS_CHECK_LEVEL=4
99export NO_PNG_PKG_MANGLE=1
10+export QT_SELECT=qt5
11+
12+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
13+
14+# Skip tests on the archs they are known to be flaky with current configuration
15+testskip_architectures := arm64 powerpc ppc64el s390x
1016
1117%:
1218 dh $@ --parallel --fail-missing --with python3
@@ -18,7 +24,19 @@ override_dh_auto_configure:
1824
1925override_dh_auto_build:
2026 # doc is not a default target
21− dh_auto_build -- all doc
27+ dh_auto_build -- -O all doc
28+
29+override_dh_auto_test:
30+ # Run the entire test battery
31+ # Parallel tests have a risk of starting xvfb on the same DISPLAY multiple times,
32+ # causing the whole battery to fail.
33+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
34+ifneq (,$(filter $(DEB_HOST_ARCH),$(testskip_architectures)))
35+ -dh_auto_test --no-parallel -- -O -k xvfballtests
36+else
37+ dh_auto_test --no-parallel -- -O -k xvfballtests
38+endif
39+endif
2240
2341override_dh_install:
2442 # install autopilot tests
@@ -31,8 +49,9 @@ override_dh_install:
3149
3250# use private lib directories
3351override_dh_makeshlibs:
34− dh_makeshlibs -Nunity8-private -Nunity8-fake-env
52+ dh_makeshlibs -Nunity8-private -Nunity8-tests
3553
36−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
3754override_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
debian/tests/control+5−4
@@ -1,10 +1,11 @@
11Tests: qmluitests.sh
22Restrictions: allow-stderr
3−Depends: @,
4− @builddeps@,
5− xvfb,
3+Depends:
4+ dpkg-dev,
5+ unity8-tests,
66
77Tests: autopilot.sh
88Restrictions: allow-stderr,
99 isolation-machine,
10−Depends: unity8-autopilot,
10+Depends:
11+ unity8-autopilot,
debian/tests/qmluitests.sh+4−14
@@ -1,21 +1,11 @@
11#!/bin/sh
2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
23
34# log all commands and abort on error
45set -xe
56
6−SHELL_QML_PATH=$(pkg-config --variable=plugindir unity-shell-api)
7−UNITY_SOURCE_DIR=$(readlink -f $(dirname $(readlink -f $0))/../..)
7+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
88
9−dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
10− -DARTIFACTS_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
9+export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
1810
19−export UNITY_SOURCE_DIR
20−
21−dh_auto_build --parallel -- -k xvfballtests
11+/usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh
debian/unity-scope-tool.installdeleted−2
@@ -1,2 +0,0 @@
1−usr/bin/unity-scope-tool
2−usr/share/unity8/ScopeTool.qml
debian/unity8-common.install−2
@@ -1,7 +1,5 @@
1−usr/share/glib-2.0/schemas
21usr/share/locale
32usr/share/unity8/Components
4−usr/share/unity8/Dash
53usr/share/unity8/Notifications
64usr/share/unity8/graphics
75var/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+3−5
@@ -1,18 +1,16 @@
11usr/lib/*/libunity8-private.*
2−usr/lib/*/unity8/libUbuntuGestures*
32usr/lib/*/unity8/qml/AccountsService
43usr/lib/*/unity8/qml/Cursor
5−usr/lib/*/unity8/qml/Dash
64usr/lib/*/unity8/qml/GlobalShortcut
75usr/lib/*/unity8/qml/Greeter
8−usr/lib/*/unity8/qml/IntegratedLightDM
6+usr/lib/*/unity8/qml/LightDM
97usr/lib/*/unity8/qml/Lights
108usr/lib/*/unity8/qml/Powerd
11−usr/lib/*/unity8/qml/ScreenGrabber
9+usr/lib/*/unity8/qml/ScreenshotDirectory
1210usr/lib/*/unity8/qml/SessionBroadcast
11+usr/lib/*/unity8/qml/UInput
1312usr/lib/*/unity8/qml/Ubuntu
1413usr/lib/*/unity8/qml/Unity
15−usr/lib/*/unity8/qml/UInput
1614usr/lib/*/unity8/qml/Utils
1715usr/lib/*/unity8/qml/WindowManager
1816usr/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/
22usr/bin/unity-mock-indicator-service
33usr/lib/*/unity8/qml/mocks
44usr/lib/*/unity8/qml/nonmirplugins
5−usr/lib/*/unity8/qml/scopefakes
5+usr/lib/*/unity8/qml/utils
6+usr/lib/*/unity8/tests
7+usr/lib/*/unity8/uqmlscene
68usr/share/unity8/mocks
9+usr/share/unity8/tests
debian/unity8-tests.lintian-overridesnew file+1
@@ -0,0 +1 @@
1+unity8-tests: unusual-interpreter usr/lib/*/unity8/tests/scripts/*.sh #!/usr/bin/parallel
debian/unity8.install+8−10
@@ -1,21 +1,19 @@
1−var/lib/unity8/version
2−data/unity8-dash.conf usr/share/upstart/sessions/
1+data/devices.conf etc/ubuntu/
2+data/test.sensors etc/ubuntusensors/
33data/unity8-filewatcher.conf usr/share/upstart/sessions/
44data/unity8.conf usr/share/upstart/sessions/
5−data/devices.conf etc/ubuntu/
65usr/bin/unity8
7−usr/bin/unity8-dash
8−usr/share/applications/unity8-dash.desktop
96usr/share/applications/unity8.desktop
7+usr/share/unity8/ApplicationMenus
8+usr/share/unity8/DeviceConfiguration.qml
9+usr/share/unity8/DisabledScreenNotice.qml
1010usr/share/unity8/Greeter
1111usr/share/unity8/Launcher
12+usr/share/unity8/OrientedShell.qml
1213usr/share/unity8/Panel
1314usr/share/unity8/Rotation
14−usr/share/unity8/DeviceConfiguration.qml
15−usr/share/unity8/OrientedShell.qml
16−usr/share/unity8/DisabledScreenNotice.qml
1715usr/share/unity8/Shell.qml
18−usr/share/unity8/Stages
16+usr/share/unity8/Stage
1917usr/share/unity8/Tutorial
2018usr/share/unity8/Wizard
21−usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
19+var/lib/unity8/version
include/paths.h.in+59−25
@@ -1,8 +1,5 @@
11/*
2− * Copyright (C) 2012 Canonical, Ltd.
3− *
4− * Authors:
5− * Ugo Riboni <ugo.riboni@canonical.com>
2+ * Copyright (C) 2012-2016 Canonical, Ltd.
63 *
74 * This program is free software; you can redistribute it and/or modify
85 * it under the terms of the GNU General Public License as published by
@@ -17,8 +14,7 @@
1714 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1815 */
1916
20−#ifndef PATHS_H
21−#define PATHS_H
17+#pragma once
2218
2319// Qt
2420#include <QtCore/QCoreApplication>
@@ -27,10 +23,28 @@
2723#include <QtQml/QQmlEngine>
2824#include <QStandardPaths>
2925
26+inline QString installRoot() {
27+ static QString installRoot;
28+ static bool installRootSet = false;
29+ if (!installRootSet) {
30+ QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
31+ if (!snapRoot.isEmpty() && QCoreApplication::applicationDirPath() ==
32+ QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
33+ installRoot = snapRoot;
34+ } else if (QCoreApplication::applicationDirPath() ==
35+ QDir(QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
36+ installRoot = QStringLiteral("");
37+ }
38+ installRootSet = true;
39+ }
40+ return installRoot;
41+}
42+
3043inline bool isRunningInstalled() {
31− static bool installed = (QCoreApplication::applicationDirPath() ==
32− QDir(QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
33− return installed;
44+ // Tests don't use the normal binary, so we want to check binary *and*
45+ // the environment. Installed tests have UNITY_TESTING_DATADIR set.
46+ static bool installed_test_env = !qgetenv("UNITY_TESTING_DATADIR").isEmpty();
47+ return !installRoot().isNull() || installed_test_env;
3448}
3549
3650inline QString buildDirectory() {
@@ -45,24 +59,46 @@ inline QString sourceDirectory() {
4559
4660inline QString translationDirectory() {
4761 if (isRunningInstalled()) {
48− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
62+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
63+ } else {
64+ return buildDirectory() + QStringLiteral("/po/locale");
65+ }
66+}
67+
68+inline QString testDataDir() {
69+ // Can't use isRunningInstalled, since tests don't use the normal unity8
70+ // executable. $UNITY_TESTING_DATADIR is set by installed tests.
71+ QString datadir(qgetenv("UNITY_TESTING_DATADIR"));
72+ if (datadir.isEmpty()) {
73+ return sourceDirectory() + "/tests";
74+ } else {
75+ return datadir + "/tests";
76+ }
77+}
78+
79+inline QString testLibDir() {
80+ // Can't use isRunningInstalled, since tests don't use the normal unity8
81+ // executable. $UNITY_TESTING_DATADIR is set by installed tests.
82+ QString libdir(qgetenv("UNITY_TESTING_LIBDIR"));
83+ if (libdir.isEmpty()) {
84+ return buildDirectory() + "/tests";
4985 } else {
50− return QString(buildDirectory() + "/po/locale");
86+ return libdir + "/tests";
5187 }
5288}
5389
5490inline QString qmlDirectory() {
5591 if (isRunningInstalled()) {
56− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
92+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
5793 } else {
58− return QString(sourceDirectory() + "/qml");
94+ return sourceDirectory() + QStringLiteral("/qml");
5995 }
6096}
6197
6298inline QStringList overrideImportPaths() {
6399 QStringList paths;
64100 if (!isRunningInstalled()) {
65− paths << QString(buildDirectory() + "/plugins");
101+ paths << buildDirectory() + QStringLiteral("/plugins");
66102 }
67103 return paths;
68104}
@@ -70,9 +106,9 @@ inline QStringList overrideImportPaths() {
70106inline QStringList nonMirImportPaths() {
71107 QStringList paths;
72108 if (isRunningInstalled()) {
73− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
109+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
74110 } else {
75− paths << QString(buildDirectory() + "/nonmirplugins");
111+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");
76112 }
77113 return paths;
78114}
@@ -80,23 +116,23 @@ inline QStringList nonMirImportPaths() {
80116inline QStringList fallbackImportPaths() {
81117 QStringList paths;
82118 if (isRunningInstalled()) {
83− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
84− paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
85− paths << QStringLiteral("@SHELL_PLUGINDIR@");
86− paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
119+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
120+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
121+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");
122+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
87123 } else {
88124 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
89125 paths << QStringLiteral("@SHELL_PLUGINDIR@");
90− paths << QString(buildDirectory() + "/tests/mocks");
126+ paths << buildDirectory() + QStringLiteral("/tests/mocks");
91127 }
92128 return paths;
93129}
94130
95131inline QString mockPluginsDir() {
96132 if (isRunningInstalled()) {
97− return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
133+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
98134 } else {
99− return QString(buildDirectory() + "/tests/mocks");
135+ return buildDirectory() + QStringLiteral("/tests/mocks");
100136 }
101137}
102138
@@ -137,5 +173,3 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
137173 }
138174 engine->setImportPathList(importPathList);
139175}
140−
141−#endif
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)
3−
4−set(UbuntuGestures_SOURCES
5− CandidateInactivityTimer.cpp
6− DebugHelpers.cpp
7− Timer.cpp
8− TimeSource.cpp
9− TouchOwnershipEvent.cpp
10− TouchRegistry.cpp
11− UnownedTouchEvent.cpp
12−)
13−
14−add_definitions(-DUBUNTUGESTURES_LIBRARY)
15−
16−add_library(UbuntuGestures SHARED ${UbuntuGestures_SOURCES})
17−
18−qt5_use_modules(UbuntuGestures Core Quick)
19−
20−# So that Foo.cpp can #include "Foo.moc"
21−include_directories(${CMAKE_CURRENT_BINARY_DIR})
22−
23−install(TARGETS UbuntuGestures
24− DESTINATION ${SHELL_PRIVATE_LIBDIR})
25−
26−
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)
31−else()
32− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
33−endif()
34−
35−# DANGER! DANGER! Using Qt's private API!
36−include_directories(
37− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
38− ${Qt5Quick_INCLUDE_DIRS}
39− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
40− ${Qt5V8_PRIVATE_INCLUDE_DIR}
41−)
libs/UbuntuGestures/CandidateInactivityTimer.cppdeleted−46
@@ -1,46 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "CandidateInactivityTimer.h"
18−
19−namespace UbuntuGestures {
20−
21−CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
22− AbstractTimer *timer, QObject *parent)
23− : QObject(parent)
24− , m_timer(timer)
25− , m_touchId(touchId)
26− , m_candidate(candidate)
27−{
28− connect(m_timer, &AbstractTimer::timeout,
29− this, &CandidateInactivityTimer::onTimeout);
30− m_timer->setInterval(durationMs);
31− m_timer->setSingleShot(true);
32− m_timer->start();
33−}
34−
35−CandidateInactivityTimer::~CandidateInactivityTimer()
36−{
37− delete m_timer;
38−}
39−
40−void CandidateInactivityTimer::onTimeout()
41−{
42− qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
43− Q_EMIT candidateDefaulted(m_touchId, m_candidate);
44−}
45−
46−} // namespace UbuntuGestures
libs/UbuntuGestures/CandidateInactivityTimer.hdeleted−51
@@ -1,51 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
18−#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
19−
20−#include <QObject>
21−
22−class QQuickItem;
23−
24−#include "Timer.h"
25−
26−namespace UbuntuGestures {
27−
28−class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
29− Q_OBJECT
30−public:
31− CandidateInactivityTimer(int touchId, QQuickItem *candidate,
32− AbstractTimer *timer,
33− QObject *parent = nullptr);
34−
35− virtual ~CandidateInactivityTimer();
36−
37− const int durationMs = 1000;
38−
39−Q_SIGNALS:
40− void candidateDefaulted(int touchId, QQuickItem *candidate);
41−private Q_SLOTS:
42− void onTimeout();
43−private:
44− AbstractTimer *m_timer;
45− int m_touchId;
46− QQuickItem *m_candidate;
47−};
48−
49−} // namespace UbuntuGestures
50−
51−#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
libs/UbuntuGestures/DebugHelpers.cppdeleted−95
@@ -1,95 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "DebugHelpers.h"
18−#include <QTouchEvent>
19−#include <QMouseEvent>
20−
21−QString touchPointStateToString(Qt::TouchPointState state)
22−{
23− switch (state) {
24− case Qt::TouchPointPressed:
25− return 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");
32− default:
33− return QStringLiteral("INVALID_STATE");
34− }
35−}
36−
37−QString touchEventToString(const QTouchEvent *ev)
38−{
39− QString message;
40−
41− switch (ev->type()) {
42− case QEvent::TouchBegin:
43− message.append("TouchBegin ");
44− break;
45− case QEvent::TouchUpdate:
46− message.append("TouchUpdate ");
47− break;
48− case QEvent::TouchEnd:
49− message.append("TouchEnd ");
50− break;
51− case QEvent::TouchCancel:
52− message.append("TouchCancel ");
53− break;
54− default:
55− message.append("INVALID_TOUCH_EVENT_TYPE ");
56− }
57−
58− foreach(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {
59− message.append(
60− 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())
65− );
66− }
67−
68− return message;
69−}
70−
71−QString mouseEventToString(const QMouseEvent *ev)
72−{
73− QString message;
74−
75− switch (ev->type()) {
76− case QEvent::MouseButtonPress:
77− message.append("MouseButtonPress ");
78− break;
79− case QEvent::MouseButtonRelease:
80− message.append("MouseButtonRelease ");
81− break;
82− case QEvent::MouseButtonDblClick:
83− message.append("MouseButtonDblClick ");
84− break;
85− case QEvent::MouseMove:
86− message.append("MouseMove ");
87− break;
88− default:
89− message.append("INVALID_MOUSE_EVENT_TYPE ");
90− }
91−
92− message.append(QStringLiteral("pos(%1, %2)").arg(ev->x()).arg(ev->y()));
93−
94− return message;
95−}
libs/UbuntuGestures/DebugHelpers.hdeleted−31
@@ -1,31 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTUGESTURES_DEBUG_HELPER_H
18−#define UBUNTUGESTURES_DEBUG_HELPER_H
19−
20−#include <QString>
21−
22−#include "UbuntuGesturesGlobal.h"
23−
24−class QMouseEvent;
25−class QTouchEvent;
26−
27−UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);
28−UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);
29−UBUNTUGESTURES_EXPORT QString mouseEventToString(const QMouseEvent *ev);
30−
31−#endif // UBUNTUGESTURES_DEBUG_HELPER_H
libs/UbuntuGestures/Pool.hdeleted−124
@@ -1,124 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTUGESTURES_POOL_H
18−#define UBUNTUGESTURES_POOL_H
19−
20−#include <QVector>
21−
22−#include "UbuntuGesturesGlobal.h"
23−
24−/*
25− An object pool.
26− Avoids unnecessary creations/initializations and deletions/destructions of items. Useful
27− in a scenario where items are created and destroyed very frequently but the total number
28− of items at any given time remains small. They're stored in a unordered fashion.
29−
30− To be used in Pool, ItemType needs to have the following methods:
31−
32− - ItemType();
33−
34− A constructor that takes no parameters. An object contructed with it must return false if
35− isValid() is called.
36−
37− - bool isValid() const;
38−
39− Returns wheter the object holds a valid , "filled" state or is empty.
40− Used by Pool to check if the slot occupied by this object is actually available.
41−
42− - void reset();
43−
44− Resets the object to its initial, empty, state. After calling this method, isValid() must
45− return false.
46− */
47−template <class ItemType> class Pool
48−{
49−public:
50− Pool() : m_lastUsedIndex(-1) {
51− }
52−
53− class Iterator {
54− public:
55− Iterator() : index(-1), item(nullptr) {}
56− Iterator(int index, ItemType *item)
57− : index(index), item(item) {}
58−
59− ItemType *operator->() const { return item; }
60− ItemType &operator*() const { return *item; }
61− ItemType &value() const { return *item; }
62−
63− operator bool() const { return item != nullptr; }
64−
65− int index;
66− ItemType *item;
67− };
68−
69− ItemType &getEmptySlot() {
70− Q_ASSERT(m_lastUsedIndex < m_slots.size());
71−
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()) {
76− return item;
77− }
78− }
79−
80− ++m_lastUsedIndex;
81− if (m_lastUsedIndex >= m_slots.size()) {
82− m_slots.resize(m_lastUsedIndex + 1);
83− }
84−
85− return m_slots[m_lastUsedIndex];
86− }
87−
88− void freeSlot(Iterator &iterator) {
89− m_slots[iterator.index].reset();
90− if (iterator.index == m_lastUsedIndex) {
91− do {
92− --m_lastUsedIndex;
93− } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());
94− }
95− }
96−
97− // Iterates through all valid items (i.e. the occupied slots)
98− // calling the given function, with the option of ending the loop early.
99− //
100− // bool Func(Iterator& item)
101− //
102− // Returning true means it wants to continue the "for" loop, false
103− // terminates the loop.
104− template<typename Func> void forEach(Func func) {
105− Iterator it;
106− for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {
107− it.item = &m_slots[it.index];
108− if (!it.item->isValid())
109− continue;
110−
111− if (!func(it))
112− break;
113− }
114− }
115−
116− bool isEmpty() const { return m_lastUsedIndex == -1; }
117−
118−
119−private:
120− QVector<ItemType> m_slots;
121− int m_lastUsedIndex;
122−};
123−
124−#endif // UBUNTUGESTURES_POOL_H
libs/UbuntuGestures/TimeSource.cppdeleted−49
@@ -1,49 +0,0 @@
1−/*
2− * Copyright (C) 2013 - Canonical Ltd.
3− *
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
7− * of the License.
8− *
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.
14− *
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/>
17− *
18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
19− */
20−
21−#include "TimeSource.h"
22−
23−#include <QElapsedTimer>
24−
25−namespace UbuntuGestures {
26−class RealTimeSourcePrivate {
27−public:
28− QElapsedTimer timer;
29−};
30−}
31−
32−using namespace UbuntuGestures;
33−
34−RealTimeSource::RealTimeSource()
35− : UbuntuGestures::TimeSource()
36− , d(new RealTimeSourcePrivate)
37−{
38− d->timer.start();
39−}
40−
41−RealTimeSource::~RealTimeSource()
42−{
43− delete d;
44−}
45−
46−qint64 RealTimeSource::msecsSinceReference()
47−{
48− return d->timer.elapsed();
49−}
libs/UbuntuGestures/TimeSource.hdeleted−64
@@ -1,64 +0,0 @@
1−/*
2− * Copyright (C) 2013,2015 Canonical Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it
5− * under the terms of the GNU Lesser General Public License, as
6− * published by the Free Software Foundation; either version 2.1 or 3.0
7− * of the License.
8− *
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.
14− *
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/>
17− *
18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
19− */
20−
21−#ifndef UBUNTUGESTURES_TIMESOURCE_H
22−#define UBUNTUGESTURES_TIMESOURCE_H
23−
24−#include "UbuntuGesturesGlobal.h"
25−#include <QSharedPointer>
26−
27−namespace UbuntuGestures {
28−/*
29− Interface for a time source.
30− */
31−class UBUNTUGESTURES_EXPORT TimeSource {
32−public:
33− virtual ~TimeSource() {}
34− /* Returns the current time in milliseconds since some reference time in the past. */
35− virtual qint64 msecsSinceReference() = 0;
36−};
37−typedef QSharedPointer<TimeSource> SharedTimeSource;
38−
39−/*
40− Implementation of a time source
41− */
42−class RealTimeSourcePrivate;
43−class UBUNTUGESTURES_EXPORT RealTimeSource : public TimeSource {
44−public:
45− RealTimeSource();
46− virtual ~RealTimeSource();
47− qint64 msecsSinceReference() override;
48−private:
49− RealTimeSourcePrivate *d;
50−};
51−
52−/*
53− A fake time source, useful for tests
54− */
55−class FakeTimeSource : public TimeSource {
56−public:
57− FakeTimeSource() { m_msecsSinceReference = 0; }
58− qint64 msecsSinceReference() override { return m_msecsSinceReference; }
59− qint64 m_msecsSinceReference;
60−};
61−
62−} // namespace UbuntuGestures
63−
64−#endif // UBUNTUGESTURES_TIMESOURCE_H
libs/UbuntuGestures/Timer.cppdeleted−152
@@ -1,152 +0,0 @@
1−/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "Timer.h"
18−
19−namespace UbuntuGestures {
20−
21−Timer::Timer(QObject *parent) : AbstractTimer(parent)
22−{
23− m_timer.setSingleShot(false);
24− connect(&m_timer, &QTimer::timeout, this, &AbstractTimer::timeout);
25−}
26−
27−int Timer::interval() const
28−{
29− return m_timer.interval();
30−}
31−
32−void Timer::setInterval(int msecs)
33−{
34− m_timer.setInterval(msecs);
35−}
36−
37−void Timer::start()
38−{
39− m_timer.start();
40− AbstractTimer::start();
41−}
42−
43−void Timer::stop()
44−{
45− m_timer.stop();
46− AbstractTimer::stop();
47−}
48−
49−bool Timer::isSingleShot() const
50−{
51− return m_timer.isSingleShot();
52−}
53−
54−void Timer::setSingleShot(bool value)
55−{
56− m_timer.setSingleShot(value);
57−}
58−
59−/////////////////////////////////// FakeTimer //////////////////////////////////
60−
61−FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent)
62− : UbuntuGestures::AbstractTimer(parent)
63− , m_interval(0)
64− , m_singleShot(false)
65− , m_timeSource(timeSource)
66−{
67−}
68−
69−void FakeTimer::update()
70−{
71− if (!isRunning()) {
72− return;
73− }
74−
75− if (m_nextTimeoutTime <= m_timeSource->msecsSinceReference()) {
76− if (isSingleShot()) {
77− stop();
78− } else {
79− m_nextTimeoutTime += interval();
80− }
81− Q_EMIT timeout();
82− }
83−}
84−
85−void FakeTimer::start()
86−{
87− AbstractTimer::start();
88− m_nextTimeoutTime = m_timeSource->msecsSinceReference() + (qint64)interval();
89−}
90−
91−int FakeTimer::interval() const
92−{
93− return m_interval;
94−}
95−
96−void FakeTimer::setInterval(int msecs)
97−{
98− m_interval = msecs;
99−}
100−
101−bool FakeTimer::isSingleShot() const
102−{
103− return m_singleShot;
104−}
105−
106−void FakeTimer::setSingleShot(bool value)
107−{
108− m_singleShot = value;
109−}
110−
111−/////////////////////////////////// FakeTimerFactory //////////////////////////////////
112−
113−FakeTimerFactory::FakeTimerFactory()
114−{
115− m_timeSource.reset(new FakeTimeSource);
116−}
117−
118−void FakeTimerFactory::updateTime(qint64 targetTime)
119−{
120− qint64 minTimeoutTime = targetTime;
121−
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();
126− }
127− }
128−
129− m_timeSource->m_msecsSinceReference = minTimeoutTime;
130−
131− for (int i = 0; i < timers.count(); ++i) {
132− FakeTimer *timer = timers[i].data();
133− if (timer) {
134− timer->update();
135− }
136− }
137−
138− if (m_timeSource->msecsSinceReference() < targetTime) {
139− updateTime(targetTime);
140− }
141−}
142−
143−AbstractTimer *FakeTimerFactory::createTimer(QObject *parent)
144−{
145− FakeTimer *fakeTimer = new FakeTimer(m_timeSource, parent);
146−
147− timers.append(fakeTimer);
148−
149− return fakeTimer;
150−}
151−
152−} // namespace UbuntuGestures
libs/UbuntuGestures/Timer.hdeleted−122
@@ -1,122 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTUGESTURES_TIMER_H
18−#define UBUNTUGESTURES_TIMER_H
19−
20−#include "UbuntuGesturesGlobal.h"
21−#include "TimeSource.h"
22−
23−#include <QObject>
24−#include <QPointer>
25−#include <QTimer>
26−
27−namespace UbuntuGestures {
28−
29−/* Defines an interface for a Timer. Useful for tests. */
30−class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
31−{
32− Q_OBJECT
33−public:
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)
39− {
40− setInterval(msecs);
41− start();
42− }
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;
47−Q_SIGNALS:
48− void timeout();
49−private:
50− bool m_isRunning;
51−};
52−
53−/* Essentially a QTimer wrapper */
54−class UBUNTUGESTURES_EXPORT Timer : public AbstractTimer
55−{
56− Q_OBJECT
57−public:
58− Timer(QObject *parent = nullptr);
59−
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;
66−private:
67− QTimer m_timer;
68−};
69−
70−/* For tests */
71−class UBUNTUGESTURES_EXPORT FakeTimer : public AbstractTimer
72−{
73− Q_OBJECT
74−public:
75− FakeTimer(const SharedTimeSource &timeSource, QObject *parent = nullptr);
76−
77− void update();
78− qint64 nextTimeoutTime() const { return m_nextTimeoutTime; }
79−
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;
85−private:
86− int m_interval;
87− bool m_singleShot;
88− SharedTimeSource m_timeSource;
89− qint64 m_nextTimeoutTime;
90−};
91−
92−class UBUNTUGESTURES_EXPORT AbstractTimerFactory
93−{
94−public:
95− virtual ~AbstractTimerFactory() {}
96− virtual AbstractTimer *createTimer(QObject *parent = nullptr) = 0;
97−};
98−
99−class UBUNTUGESTURES_EXPORT TimerFactory : public AbstractTimerFactory
100−{
101−public:
102− AbstractTimer *createTimer(QObject *parent = nullptr) override { return new Timer(parent); }
103−};
104−
105−class UBUNTUGESTURES_EXPORT FakeTimerFactory : public AbstractTimerFactory
106−{
107−public:
108− FakeTimerFactory();
109− virtual ~FakeTimerFactory() {}
110−
111− void updateTime(qint64 msecsSinceReference);
112− QSharedPointer<TimeSource> timeSource() { return m_timeSource; }
113−
114− AbstractTimer *createTimer(QObject *parent = nullptr) override;
115− QList<QPointer<FakeTimer>> timers;
116−private:
117− QSharedPointer<FakeTimeSource> m_timeSource;
118−};
119−
120−} // namespace UbuntuGestures
121−
122−#endif // UBUNTUGESTURES_TIMER_H
libs/UbuntuGestures/TouchOwnershipEvent.hdeleted−50
@@ -1,50 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H
18−#define UBUNTU_TOUCHOWNERSHIPEVENT_H
19−
20−#include <QEvent>
21−#include "UbuntuGesturesGlobal.h"
22−
23−/*
24− When an item get an ownership event for a touch it can grab/steal that touch
25− with a clean conscience.
26− */
27−class UBUNTUGESTURES_EXPORT TouchOwnershipEvent : public QEvent
28−{
29−public:
30− TouchOwnershipEvent(int touchId, bool gained);
31−
32− static Type touchOwnershipEventType();
33−
34− /*
35− Whether ownership was gained (true) or lost (false)
36− */
37− bool gained() const { return m_gained; }
38−
39− /*
40− Id of the touch whose ownership was granted.
41− */
42− int touchId() const { return m_touchId; }
43−
44−private:
45− static Type m_touchOwnershipType;
46− int m_touchId;
47− bool m_gained;
48−};
49−
50−#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H
libs/UbuntuGestures/TouchRegistry.cppdeleted−553
@@ -1,553 +0,0 @@
1−/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "TouchRegistry.h"
18−
19−#include <QCoreApplication>
20−#include <QDebug>
21−
22−#pragma GCC diagnostic push
23−#pragma GCC diagnostic ignored "-pedantic"
24−#include <private/qquickitem_p.h>
25−#pragma GCC diagnostic pop
26−
27−#include "CandidateInactivityTimer.h"
28−#include "Timer.h"
29−#include "TouchOwnershipEvent.h"
30−#include "UnownedTouchEvent.h"
31−
32−#define TOUCHREGISTRY_DEBUG 0
33−
34−#if TOUCHREGISTRY_DEBUG
35− #include "DebugHelpers.h"
36− #define UG_DEBUG qDebug() << "[TouchRegistry]"
37−#endif // TOUCHREGISTRY_DEBUG
38−
39−using namespace UbuntuGestures;
40−
41−TouchRegistry *TouchRegistry::m_instance = nullptr;
42−
43−TouchRegistry::TouchRegistry(QObject *parent)
44− : QObject(parent)
45− , m_inDispatchLoop(false)
46− , m_timerFactory(new TimerFactory)
47−{
48−}
49−
50−TouchRegistry::~TouchRegistry()
51−{
52− Q_ASSERT(m_instance != nullptr);
53− m_instance = nullptr;
54− delete m_timerFactory;
55−}
56−
57−TouchRegistry *TouchRegistry::instance()
58−{
59− if (m_instance == nullptr) {
60− m_instance = new TouchRegistry;
61− }
62− return m_instance;
63−}
64−
65−void TouchRegistry::setTimerFactory(AbstractTimerFactory *timerFactory)
66−{
67− delete m_timerFactory;
68− m_timerFactory = timerFactory;
69−}
70−
71−void TouchRegistry::update(const QTouchEvent *event)
72−{
73− #if TOUCHREGISTRY_DEBUG
74− UG_DEBUG << "got" << qPrintable(touchEventToString(event));
75− #endif
76−
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());
85−
86− touchInfo->physicallyEnded = true;
87− }
88− }
89−
90− deliverTouchUpdatesToUndecidedCandidatesAndWatchers(event);
91−
92− freeEndedTouchInfos();
93−}
94−
95−void TouchRegistry::deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event)
96−{
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.
101−
102− const QList<QTouchEvent::TouchPoint> &updatedTouchPoints = event->touchPoints();
103−
104− // Maps an item to the touches in this event he should be informed about.
105− // E.g.: a QTouchEvent might have three touches but a given item might be interested in only
106− // one of them. So he will get a UnownedTouchEvent from this QTouchEvent containing only that
107− // touch point.
108− QHash<QQuickItem*, QList<int>> touchIdsForItems;
109−
110− // Build touchIdsForItems
111− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
112− if (touchInfo->isOwned() && touchInfo->watchers.isEmpty())
113− return true;
114−
115− for (int j = 0; j < updatedTouchPoints.count(); ++j) {
116− if (updatedTouchPoints[j].id() == touchInfo->id) {
117− if (!touchInfo->isOwned()) {
118− for (int i = 0; i < touchInfo->candidates.count(); ++i) {
119− CandidateInfo &candidate = touchInfo->candidates[i];
120− Q_ASSERT(!candidate.item.isNull());
121− if (candidate.state != CandidateInfo::InterimOwner) {
122− touchIdsForItems[candidate.item.data()].append(touchInfo->id);
123− }
124− }
125− }
126−
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);
131− }
132− }
133−
134− return true;
135− }
136− }
137−
138− return true;
139− });
140−
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);
149− ++it;
150− };
151− m_inDispatchLoop = false;
152−}
153−
154−void TouchRegistry::freeEndedTouchInfos()
155−{
156− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
157− if (touchInfo->ended()) {
158− m_touchInfoPool.freeSlot(touchInfo);
159− }
160− return true;
161− });
162−}
163−
164−/*
165− Extracts the touches with the given touchIds from event and send them in a
166− UnownedTouchEvent to the given item
167− */
168−void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
169− QQuickItem *item)
170−{
171− Qt::TouchPointStates touchPointStates = 0;
172− QList<QTouchEvent::TouchPoint> touchPoints;
173−
174− const QList<QTouchEvent::TouchPoint> &allTouchPoints = event->touchPoints();
175−
176− QTransform windowToCandidateTransform = QQuickItemPrivate::get(item)->windowToItemTransform();
177− QMatrix4x4 windowToCandidateMatrix(windowToCandidateTransform);
178−
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;
183−
184− translateTouchPointFromScreenToWindowCoords(touchPoint);
185−
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());
191−
192− touchPoints.append(touchPoint);
193− touchPointStates |= touchPoint.state();
194− }
195− }
196−
197− QTouchEvent *eventForItem = new QTouchEvent(event->type(),
198− event->device(),
199− event->modifiers(),
200− touchPointStates,
201− touchPoints);
202− eventForItem->setWindow(event->window());
203− eventForItem->setTimestamp(event->timestamp());
204− eventForItem->setTarget(event->target());
205−
206− UnownedTouchEvent unownedTouchEvent(eventForItem);
207−
208− #if TOUCHREGISTRY_DEBUG
209− UG_DEBUG << "Sending unowned" << qPrintable(touchEventToString(eventForItem))
210− << "to" << item;
211− #endif
212−
213− QCoreApplication::sendEvent(item, &unownedTouchEvent);
214−}
215−
216−void TouchRegistry::translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint)
217−{
218− touchPoint.setScreenRect(touchPoint.sceneRect());
219− touchPoint.setStartScreenPos(touchPoint.startScenePos());
220− touchPoint.setLastScreenPos(touchPoint.lastScenePos());
221−
222− touchPoint.setSceneRect(touchPoint.rect());
223− touchPoint.setStartScenePos(touchPoint.startPos());
224− touchPoint.setLastScenePos(touchPoint.lastPos());
225−}
226−
227−bool TouchRegistry::eventFilter(QObject *watched, QEvent *event)
228−{
229− Q_UNUSED(watched);
230−
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));
237− break;
238− default:
239− // do nothing
240− break;
241− }
242−
243− // Do not filter out the event. i.e., let it be handled further as
244− // we're just monitoring events
245− return false;
246−}
247−
248−void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)
249−{
250− #if TOUCHREGISTRY_DEBUG
251− UG_DEBUG << "addCandidateOwnerForTouch id" << id << "candidate" << candidate;
252− #endif
253−
254− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
255− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
256−
257− if (touchInfo->isOwned()) {
258− qWarning("TouchRegistry: trying to add candidate owner for a touch that's already owned");
259− return;
260− }
261−
262− // TODO: Check if candidate already exists
263−
264− CandidateInfo candidateInfo;
265− candidateInfo.state = CandidateInfo::Undecided;
266− candidateInfo.item = candidate;
267− candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,
268− m_timerFactory->createTimer(),
269− this);
270− connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,
271− this, &TouchRegistry::rejectCandidateOwnerForTouch);
272−
273− touchInfo->candidates.append(candidateInfo);
274−
275− connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });
276−}
277−
278−void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)
279−{
280− #if TOUCHREGISTRY_DEBUG
281− UG_DEBUG << "addTouchWatcher id" << touchId << "watcher" << watcher;
282− #endif
283−
284− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
285− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
286−
287− // TODO: Check if watcher already exists
288−
289− touchInfo->watchers.append(watcher);
290−}
291−
292−void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)
293−{
294− #if TOUCHREGISTRY_DEBUG
295− UG_DEBUG << "removeCandidateOwnerForTouch id" << id << "candidate" << candidate;
296− #endif
297−
298− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
299− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
300−
301−
302− // TODO: check if the candidate is in fact the owner of the touch
303−
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);
308− removed = true;
309− }
310− }
311−}
312−
313−void TouchRegistry::pruneNullCandidatesForTouch(int touchId)
314−{
315− #if TOUCHREGISTRY_DEBUG
316− UG_DEBUG << "pruneNullCandidatesForTouch touchId" << touchId;
317− #endif
318−
319− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
320− if (!touchInfo) {
321− // doesn't matter as touch is already gone.
322− return;
323− }
324−
325− int i = 0;
326− while (i < touchInfo->candidates.count()) {
327− if (touchInfo->candidates[i].item.isNull()) {
328− removeCandidateOwnerForTouchByIndex(touchInfo, i);
329− } else {
330− ++i;
331− }
332− }
333−}
334−
335−void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::TouchInfo>::Iterator &touchInfo,
336− int candidateIndex)
337−{
338− // TODO: check if the candidate is in fact the owner of the touch
339−
340− Q_ASSERT(candidateIndex < touchInfo->candidates.count());
341−
342− if (candidateIndex == 0 && touchInfo->candidates[candidateIndex].state != CandidateInfo::Undecided) {
343− qCritical("TouchRegistry: touch owner is being removed.");
344− }
345− removeCandidateHelper(touchInfo, candidateIndex);
346−
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();
352− }
353− }
354−
355− if (!m_inDispatchLoop && touchInfo->ended()) {
356− m_touchInfoPool.freeSlot(touchInfo);
357− }
358−}
359−
360−void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
361−{
362− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
363− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
364−
365− Q_ASSERT(!touchInfo->isOwned());
366−
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;
374− candidateIndex = i;
375− break;
376− }
377− }
378− #if TOUCHREGISTRY_DEBUG
379− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate << "index: " << candidateIndex;
380− #endif
381−
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); });
392− }
393−
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();
398− }
399−}
400−
401−Pool<TouchRegistry::TouchInfo>::Iterator TouchRegistry::findTouchInfo(int id)
402−{
403− Pool<TouchInfo>::Iterator touchInfo;
404−
405− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &someTouchInfo) -> bool {
406− if (someTouchInfo->id == id) {
407− touchInfo = someTouchInfo;
408− return false;
409− } else {
410− return true;
411− }
412− });
413−
414− return touchInfo;
415−}
416−
417−
418−void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)
419−{
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.
423−
424− #if TOUCHREGISTRY_DEBUG
425− UG_DEBUG << "rejectCandidateOwnerForTouch id" << id << "candidate" << (void*)candidate;
426− #endif
427−
428− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
429− if (!touchInfo) {
430− #if TOUCHREGISTRY_DEBUG
431− UG_DEBUG << "Failed to find TouchInfo for id" << id;
432− #endif
433− return;
434− }
435−
436− int rejectedCandidateIndex = -1;
437−
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;
446− return;
447− } else {
448− // we found the guy and it's all fine.
449− rejectedCandidateIndex = i;
450− }
451− }
452− }
453−
454− // If we reached this point it's because the given candidate exists and is indeed undecided.
455−
456− Q_ASSERT(rejectedCandidateIndex >= 0 && rejectedCandidateIndex < touchInfo->candidates.size());
457−
458− {
459− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
460− QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);
461− }
462−
463− removeCandidateHelper(touchInfo, rejectedCandidateIndex);
464−
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();
470− }
471− }
472−}
473−
474−void TouchRegistry::removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex)
475−{
476− {
477− CandidateInfo &candidateInfo = touchInfo->candidates[candidateIndex];
478−
479− delete candidateInfo.inactivityTimer;
480− candidateInfo.inactivityTimer = nullptr;
481−
482− if (candidateInfo.item) {
483− disconnect(candidateInfo.item.data(), nullptr, this, nullptr);
484− }
485− }
486− touchInfo->candidates.removeAt(candidateIndex);
487−}
488−
489−////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////
490−
491−TouchRegistry::TouchInfo::TouchInfo(int id)
492−{
493− init(id);
494−}
495−
496−void TouchRegistry::TouchInfo::reset()
497−{
498− id = -1;
499−
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...
504− }
505−}
506−
507−void TouchRegistry::TouchInfo::init(int id)
508−{
509− this->id = id;
510− physicallyEnded = false;
511− candidates.clear();
512− watchers.clear();
513−}
514−
515−bool TouchRegistry::TouchInfo::isOwned() const
516−{
517− return !candidates.isEmpty() && candidates.first().state != CandidateInfo::Undecided;
518−}
519−
520−bool TouchRegistry::TouchInfo::ended() const
521−{
522− Q_ASSERT(isValid());
523− return physicallyEnded && (isOwned() || candidates.isEmpty());
524−}
525−
526−void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()
527−{
528− Q_ASSERT(isOwned());
529−
530− #if TOUCHREGISTRY_DEBUG
531− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id
532− << " gained) to candidate" << candidates[0].item;
533− #endif
534−
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) {
539− items << info.item;
540− }
541−
542− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
543− QCoreApplication::sendEvent(items[0], &gainedOwnershipEvent);
544−
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"
549− << items[i];
550− #endif
551− QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
552− }
553−}
libs/UbuntuGestures/TouchRegistry.hdeleted−201
@@ -1,201 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UNITY_TOUCHREGISTRY_H
18−#define UNITY_TOUCHREGISTRY_H
19−
20−#include <QQuickItem>
21−#include <QObject>
22−#include <QPointer>
23−#include <QTouchEvent>
24−#include <QVector>
25−
26−#include "UbuntuGesturesGlobal.h"
27−#include "CandidateInactivityTimer.h"
28−#include "Timer.h"
29−#include "Pool.h"
30−
31−namespace UbuntuGestures {
32− class AbstractTimerFactory;
33−}
34−
35−/*
36− Where the ownership of touches is registered.
37−
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.
40−
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.
44−
45− Usage:
46−
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
51− behave similarly.
52−
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.
59−
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).
63−
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
69− touch point.
70−
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.
74−
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
78− themselves.
79−
80− If an item wants ownership over touches as soon as he receives the TouchBegin for them, his step 1
81− would be instead:
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.
88−
89− Items oblivious to TouchRegistry will lose their touch points without warning, just like in plain Qt.
90−
91− [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
92− */
93−class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
94−{
95− Q_OBJECT
96−public:
97− virtual ~TouchRegistry();
98−
99− // Returns a pointer to the application's TouchRegistry instance.
100− static TouchRegistry *instance();
101−
102− void update(const QTouchEvent *event);
103−
104− // Calls update() if the given event is a QTouchEvent
105− bool eventFilter(QObject *watched, QEvent *event) override;
106−
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);
113−
114− // The same as rejecting ownership of a touch
115− void removeCandidateOwnerForTouch(int id, QQuickItem *candidate);
116−
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);
122−
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);
126−
127− // Useful for tests, where you should use fake timers
128− void setTimerFactory(UbuntuGestures::AbstractTimerFactory *timerFactory);
129−
130−private Q_SLOTS:
131− void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);
132−
133−private:
134− // Only instance() can cronstruct one
135− TouchRegistry(QObject *parent = nullptr);
136−
137− class CandidateInfo {
138− public:
139− enum {
140− // A candidate owner that doesn't yet know for sure whether he wants the touch point
141− // (gesture recognition is stilll going on)
142− Undecided = 0,
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
145− Requested = 1,
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.
150− InterimOwner = 2
151− } state;
152− QPointer<QQuickItem> item;
153− QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
154− };
155−
156− class TouchInfo {
157− public:
158− TouchInfo() : id(-1) {}
159− TouchInfo(int id);
160− bool isValid() const { return id >= 0; }
161− void reset();
162− void init(int id);
163− int id;
164− bool physicallyEnded;
165− bool isOwned() const;
166− bool ended() const;
167− void notifyCandidatesOfOwnershipResolution();
168−
169− // TODO optimize storage (s/QList/Pool)
170− QList<CandidateInfo> candidates;
171− QList<QPointer<QQuickItem>> watchers;
172− };
173−
174− void pruneNullCandidatesForTouch(int touchId);
175− void removeCandidateOwnerForTouchByIndex(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
176− void removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
177−
178− Pool<TouchInfo>::Iterator findTouchInfo(int id);
179−
180− void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);
181−
182− static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);
183−
184− static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
185− QQuickItem *item);
186− void freeEndedTouchInfos();
187−
188− Pool<TouchInfo> m_touchInfoPool;
189−
190− // the singleton instance
191− static TouchRegistry *m_instance;
192−
193− bool m_inDispatchLoop;
194−
195− UbuntuGestures::AbstractTimerFactory *m_timerFactory;
196−
197− friend class tst_TouchRegistry;
198− friend class tst_DirectionalDragArea;
199−};
200−
201−#endif // UNITY_TOUCHREGISTRY_H
libs/UbuntuGestures/UnownedTouchEvent.hdeleted−45
@@ -1,45 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H
18−#define UBUNTU_UNOWNEDTOUCHEVENT_H
19−
20−#include <QTouchEvent>
21−#include <QScopedPointer>
22−#include "UbuntuGesturesGlobal.h"
23−
24−/*
25− A touch event with touch points that do not belong the item receiving it.
26−
27− See TouchRegistry::addCandidateOwnerForTouch and TouchRegistry::addTouchWatcher
28− */
29−class UBUNTUGESTURES_EXPORT UnownedTouchEvent : public QEvent
30−{
31−public:
32− UnownedTouchEvent(QTouchEvent *touchEvent);
33− static Type unownedTouchEventType();
34−
35− // TODO: It might be cleaner to store the information directly in UnownedTouchEvent
36− // instead of carrying around a synthesized QTouchEvent. But the latter option
37− // is very convenient.
38− QTouchEvent *touchEvent();
39−
40−private:
41− static Type m_unownedTouchEventType;
42− QScopedPointer<QTouchEvent> m_touchEvent;
43−};
44−
45−#endif // UBUNTU_UNOWNEDTOUCHEVENT_H
plugins/AccountsService/AccountsService.cpp+42−33
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
2525#include <glib.h>
2626
2727#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")
28−#define IFACE_LOCATION_HERE QStringLiteral("com.ubuntu.location.providers.here.AccountsService")
2928#define IFACE_UBUNTU_INPUT QStringLiteral("com.ubuntu.AccountsService.Input")
3029#define IFACE_UBUNTU_SECURITY QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")
3130#define IFACE_UBUNTU_SECURITY_OLD QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")
@@ -33,11 +32,13 @@
3332#define IFACE_UNITY_PRIVATE QStringLiteral("com.canonical.unity.AccountsService.Private")
3433
3534#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
36−#define PROP_DEMO_EDGES QStringLiteral("demo-edges")
35+#define PROP_DEMO_EDGES QStringLiteral("DemoEdges2")
3736#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")
3837#define PROP_EMAIL QStringLiteral("Email")
38+#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")
3939#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
4040#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
41+#define PROP_FAILED_FINGERPRINT_LOGINS QStringLiteral("FailedFingerprintLogins")
4142#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
4243#define PROP_INPUT_SOURCES QStringLiteral("InputSources")
4344#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
@@ -66,9 +67,9 @@ Q_DECLARE_METATYPE(StringMapList)
6667QVariant primaryButtonConverter(const QVariant &value)
6768{
6869 QString stringValue = value.toString();
69− if (stringValue == "left") {
70+ if (stringValue == QLatin1String("left")) {
7071 return QVariant::fromValue(0);
71− } else if (stringValue == "right") {
72+ } else if (stringValue == QLatin1String("right")) {
7273 return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
7374 } else {
7475 return QVariant::fromValue(0); // default to left
@@ -91,14 +92,14 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
9192 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
9293 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
9394 registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
94− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
95− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
95+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));
9696 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
9797 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
9898 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
9999 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
100100 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
101101 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
102+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));
102103 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
103104
104105 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
@@ -176,6 +177,12 @@ void AccountsService::markDemoEdgeCompleted(const QString &edge)
176177 }
177178}
178179
180+bool AccountsService::enableFingerprintIdentification() const
181+{
182+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);
183+ return value.toBool();
184+}
185+
179186bool AccountsService::enableLauncherWhileLocked() const
180187{
181188 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
@@ -206,32 +213,6 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
206213 return (PasswordDisplayHint)value.toInt();
207214}
208215
209−bool AccountsService::hereEnabled() const
210−{
211− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED);
212− return value.toBool();
213−}
214−
215−void AccountsService::setHereEnabled(bool enabled)
216−{
217− setProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, enabled);
218−}
219−
220−QString AccountsService::hereLicensePath() const
221−{
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;
227−}
228−
229−bool AccountsService::hereLicensePathValid() const
230−{
231− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
232− return !value.toString().isNull();
233−}
234−
235216QString AccountsService::realName() const
236217{
237218 auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
@@ -274,6 +255,34 @@ QStringList AccountsService::keymaps() const
274255 return {QStringLiteral("us")};
275256}
276257
258+void AccountsService::setKeymaps(const QStringList &keymaps)
259+{
260+ if (keymaps.isEmpty()) {
261+ qWarning() << "Setting empty keymaps is not supported";
262+ return;
263+ }
264+
265+ StringMapList result;
266+ Q_FOREACH(const QString &keymap, keymaps) {
267+ StringMap map;
268+ map.insert(QStringLiteral("xkb"), keymap);
269+ result.append(map);
270+ }
271+
272+ setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));
273+ Q_EMIT keymapsChanged();
274+}
275+
276+uint AccountsService::failedFingerprintLogins() const
277+{
278+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();
279+}
280+
281+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)
282+{
283+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);
284+}
285+
277286uint AccountsService::failedLogins() const
278287{
279288 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
plugins/AccountsService/AccountsService.h+16−21
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ class QDBusInterface;
2929class AccountsService: public QObject
3030{
3131 Q_OBJECT
32− Q_ENUMS(PasswordDisplayHint)
3332 Q_PROPERTY (QString user
3433 READ user
3534 WRITE setUser
@@ -41,6 +40,9 @@ class AccountsService: public QObject
4140 Q_PROPERTY (QStringList demoEdgesCompleted
4241 READ demoEdgesCompleted
4342 NOTIFY demoEdgesCompletedChanged)
43+ Q_PROPERTY (bool enableFingerprintIdentification
44+ READ enableFingerprintIdentification
45+ NOTIFY enableFingerprintIdentificationChanged)
4446 Q_PROPERTY (bool enableLauncherWhileLocked
4547 READ enableLauncherWhileLocked
4648 NOTIFY enableLauncherWhileLockedChanged)
@@ -60,27 +62,20 @@ class AccountsService: public QObject
6062 READ failedLogins
6163 WRITE setFailedLogins
6264 NOTIFY failedLoginsChanged)
63− Q_PROPERTY(bool hereEnabled
64− READ hereEnabled
65− WRITE setHereEnabled
66− NOTIFY hereEnabledChanged)
67− Q_PROPERTY(QString hereLicensePath
68− READ 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)
65+ Q_PROPERTY (uint failedFingerprintLogins
66+ READ failedFingerprintLogins
67+ WRITE setFailedFingerprintLogins
68+ NOTIFY failedFingerprintLoginsChanged)
7369 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
7470 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
75− Q_PROPERTY(QStringList keymaps
76− READ keymaps
77− NOTIFY keymapsChanged)
71+ Q_PROPERTY(QStringList keymaps READ keymaps WRITE setKeymaps NOTIFY keymapsChanged)
7872
7973public:
8074 enum PasswordDisplayHint {
8175 Keyboard,
8276 Numeric,
8377 };
78+ Q_ENUM(PasswordDisplayHint)
8479
8580 explicit AccountsService(QObject *parent = 0, const QString & user = QString());
8681 ~AccountsService() = default;
@@ -91,6 +86,7 @@ public:
9186 void setDemoEdges(bool demoEdges);
9287 QStringList demoEdgesCompleted() const;
9388 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
89+ bool enableFingerprintIdentification() const;
9490 bool enableLauncherWhileLocked() const;
9591 bool enableIndicatorsWhileLocked() const;
9692 QString backgroundFile() const;
@@ -98,28 +94,27 @@ public:
9894 PasswordDisplayHint passwordDisplayHint() const;
9995 uint failedLogins() const;
10096 void setFailedLogins(uint failedLogins);
101− bool hereEnabled() const;
102− void setHereEnabled(bool enabled);
103− QString hereLicensePath() const;
104− bool hereLicensePathValid() const;
97+ uint failedFingerprintLogins() const;
98+ void setFailedFingerprintLogins(uint failedFingerprintLogins);
10599 QString realName() const;
106100 void setRealName(const QString &realName);
107101 QString email() const;
108102 void setEmail(const QString &email);
109103 QStringList keymaps() const;
104+ void setKeymaps(const QStringList &keymaps);
110105
111106Q_SIGNALS:
112107 void userChanged();
113108 void demoEdgesChanged();
114109 void demoEdgesCompletedChanged();
110+ void enableFingerprintIdentificationChanged();
115111 void enableLauncherWhileLockedChanged();
116112 void enableIndicatorsWhileLockedChanged();
117113 void backgroundFileChanged();
118114 void statsWelcomeScreenChanged();
119115 void passwordDisplayHintChanged();
120116 void failedLoginsChanged();
121− void hereEnabledChanged();
122− void hereLicensePathChanged();
117+ void failedFingerprintLoginsChanged();
123118 void realNameChanged();
124119 void emailChanged();
125120 void keymapsChanged();
plugins/AccountsService/AccountsService.qmltypesdeleted−41
@@ -1,41 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "AccountsService"
12− prototype: "QObject"
13− exports: ["AccountsService/AccountsService 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Enum {
18− name: "PasswordDisplayHint"
19− values: {
20− "Keyboard": 0,
21− "Numeric": 1
22− }
23− }
24− Property { name: "user"; type: "string" }
25− Property { name: "demoEdges"; type: "bool" }
26− Property { name: "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 }
36− Method {
37− name: "markDemoEdgeCompleted"
38− Parameter { name: "edge"; type: "string" }
39− }
40− }
41−}
plugins/AccountsService/CMakeLists.txt+1−2
@@ -7,9 +7,8 @@ add_library(AccountsService-qml MODULE
77 plugin.cpp
88 )
99
10−qt5_use_modules(AccountsService-qml DBus Qml)
11−
1210target_link_libraries(AccountsService-qml
11+ Qt5::DBus Qt5::Qml
1312 ${GLIB_LIBRARIES}
1413 )
1514
plugins/AccountsService/com.canonical.unity.AccountsService.xml+10
@@ -9,11 +9,17 @@
99 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
1010 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
1111
12+ <!-- Marks that V1 (pre-8.21) edge demos have been run. Legacy value. -->
1213 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
1314 <property name="demo-edges" type="b" access="readwrite">
1415 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1516 </property>
1617
18+ <!-- Marks that V2 (post-8.21) edge demos have been run -->
19+ <property name="DemoEdges2" type="b" access="readwrite">
20+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
21+ </property>
22+
1723 <!-- List of tutorial pages that have been completed by the user -->
1824 <property name="DemoEdgesCompleted" type="as" access="readwrite">
1925 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
@@ -47,5 +53,9 @@
4753 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
4854 </property>
4955
56+ <property name="FailedFingerprintLogins" type="u" access="readwrite">
57+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
58+ </property>
59+
5060 </interface>
5161</node>
plugins/CMakeLists.txt+3−4
@@ -1,4 +1,4 @@
1−include(QmlPlugins)
1+find_package(QmlPlugins)
22
33# Set up and install a plugin for unity8.
44#
@@ -15,12 +15,11 @@ add_subdirectory(AccountsService)
1515add_subdirectory(Cursor)
1616add_subdirectory(GlobalShortcut)
1717add_subdirectory(Greeter)
18−add_subdirectory(IntegratedLightDM)
18+add_subdirectory(LightDM)
1919add_subdirectory(Lights)
20−add_subdirectory(Dash)
2120add_subdirectory(Powerd)
21+add_subdirectory(ScreenshotDirectory)
2222add_subdirectory(SessionBroadcast)
23−add_subdirectory(ScreenGrabber)
2423add_subdirectory(Ubuntu)
2524add_subdirectory(UInput)
2625add_subdirectory(Unity)
plugins/Cursor/CMakeLists.txt+8−4
@@ -3,13 +3,18 @@ add_subdirectory(3rd_party)
33include_directories(
44 ${CMAKE_CURRENT_SOURCE_DIR}
55 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor
6+)
7+
8+include_directories(
9+ SYSTEM
610 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
711)
812
913set(QMLPLUGIN_SRC
1014 plugin.cpp
11− MousePointer.cpp
15+ CursorImageInfo.cpp
1216 CursorImageProvider.cpp
17+ MousePointer.cpp
1318 # We need to run moc on this header
1419 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
1520 )
@@ -21,8 +26,7 @@ add_library(Cursor-qml SHARED
2126target_link_libraries(Cursor-qml
2227 xcursorloader-static
2328 ${QT5PLATFORM_SUPPORT_LDFLAGS}
29+ Qt5::Qml Qt5::Quick Qt5::Svg
2430)
2531
26−qt5_use_modules(Cursor-qml Qml Quick DBus Network Gui Sql Concurrent Svg)
27−
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 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -15,14 +15,48 @@
1515 */
1616
1717import QtQuick 2.4
18−import Cursor 1.0 // For MousePointer
18+import Cursor 1.1
19+import Powerd 0.1
1920
2021MousePointer {
2122 id: mousePointer
2223
23− Image {
24− x: -mousePointer.hotspotX
25− y: -mousePointer.hotspotY
26− source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName
24+ CursorImageInfo {
25+ id: imageInfo
26+ themeName: mousePointer.themeName
27+ cursorName: mousePointer.cursorName
28+ cursorHeight: mousePointer.height
29+ }
30+
31+ Loader {
32+ active: mousePointer.visible && imageInfo.frameCount > 1
33+ sourceComponent: AnimatedSprite {
34+ x: -imageInfo.hotspot.x
35+ y: -imageInfo.hotspot.y
36+ source: imageInfo.imageSource
37+
38+ interpolate: false
39+
40+ width: imageInfo.frameWidth
41+ height: imageInfo.frameHeight
42+
43+ frameCount: imageInfo.frameCount
44+ frameDuration: imageInfo.frameDuration
45+ frameWidth: imageInfo.frameWidth
46+ frameHeight: imageInfo.frameHeight
47+
48+ running: Powerd.status === Powerd.On
49+ }
50+ }
51+
52+ Loader {
53+ active: mousePointer.visible && imageInfo.frameCount === 1
54+ sourceComponent: Image {
55+ x: -imageInfo.hotspot.x
56+ y: -imageInfo.hotspot.y
57+ source: imageInfo.imageSource
58+ width: sourceSize.width
59+ height: sourceSize.height
60+ }
2761 }
2862}
plugins/Cursor/Cursor.qmltypesdeleted−78
@@ -1,78 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Cursor 1.0 plugins'
8−
9−Module {
10− Component {
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 }
18− Signal {
19− name: "cursorNameChanged"
20− Parameter { name: "name"; type: "string" }
21− }
22− Signal {
23− name: "themeNameChanged"
24− Parameter { name: "name"; type: "string" }
25− }
26− Signal {
27− name: "hotspotXChanged"
28− Parameter { name: "value"; type: "double" }
29− }
30− Signal {
31− name: "hotspotYChanged"
32− Parameter { name: "value"; type: "double" }
33− }
34− Method {
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" }
40− }
41− Method {
42− name: "handleWheelEvent"
43− Parameter { name: "timestamp"; type: "ulong" }
44− Parameter { name: "angleDelta"; type: "QPoint" }
45− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
46− }
47− }
48− Component {
49− name: "MousePointer"
50− defaultProperty: "data"
51− prototype: "MirMousePointerInterface"
52− exports: ["Cursor/MousePointer 1.0"]
53− exportMetaObjectRevisions: [0]
54− Signal {
55− name: "pushedLeftBoundary"
56− Parameter { name: "amount"; type: "double" }
57− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
58− }
59− Signal {
60− name: "pushedRightBoundary"
61− Parameter { name: "amount"; type: "double" }
62− Parameter { name: "buttons"; type: "Qt::MouseButtons" }
63− }
64− Method {
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" }
70− }
71− Method {
72− name: "handleWheelEvent"
73− Parameter { name: "timestamp"; type: "ulong" }
74− Parameter { name: "angleDelta"; type: "QPoint" }
75− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
76− }
77− }
78−}
plugins/Cursor/CursorImageInfo.cppnew file+115
@@ -0,0 +1,115 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "CursorImageInfo.h"
18+
19+CursorImageInfo::CursorImageInfo(QObject *parent)
20+ : QObject(parent)
21+{
22+}
23+
24+void CursorImageInfo::setCursorName(const QString &cursorName)
25+{
26+ if (cursorName != m_cursorName) {
27+ m_cursorName = cursorName;
28+ update();
29+ Q_EMIT cursorNameChanged();
30+ }
31+
32+}
33+void CursorImageInfo::setCursorHeight(qreal cursorHeight)
34+{
35+ if (cursorHeight != m_cursorHeight) {
36+ m_cursorHeight = cursorHeight;
37+ update();
38+ Q_EMIT cursorHeightChanged();
39+ }
40+}
41+
42+void CursorImageInfo::setThemeName(const QString &themeName)
43+{
44+ if (m_themeName != themeName) {
45+ m_themeName = themeName;
46+ update();
47+ Q_EMIT themeNameChanged();
48+ }
49+}
50+
51+void CursorImageInfo::update()
52+{
53+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName, (int) m_cursorHeight);
54+
55+ Q_EMIT hotspotChanged();
56+ Q_EMIT frameWidthChanged();
57+ Q_EMIT frameHeightChanged();
58+ Q_EMIT frameCountChanged();
59+ Q_EMIT frameDurationChanged();
60+ Q_EMIT imageSourceChanged();
61+}
62+
63+QPoint CursorImageInfo::hotspot() const
64+{
65+ if (m_cursorImage) {
66+ return m_cursorImage->hotspot;
67+ } else {
68+ return QPoint();
69+ }
70+}
71+
72+qreal CursorImageInfo::frameWidth() const
73+{
74+ if (m_cursorImage) {
75+ return m_cursorImage->frameWidth;
76+ } else {
77+ return 0;
78+ }
79+}
80+
81+qreal CursorImageInfo::frameHeight() const
82+{
83+ if (m_cursorImage) {
84+ return m_cursorImage->frameHeight;
85+ } else {
86+ return 0;
87+ }
88+}
89+
90+int CursorImageInfo::frameCount() const
91+{
92+ if (m_cursorImage) {
93+ return m_cursorImage->frameCount;
94+ } else {
95+ return 0;
96+ }
97+}
98+
99+int CursorImageInfo::frameDuration() const
100+{
101+ if (m_cursorImage) {
102+ return m_cursorImage->frameDuration;
103+ } else {
104+ return 0;
105+ }
106+}
107+
108+QUrl CursorImageInfo::imageSource() const
109+{
110+ auto urlString = QString("image://cursor/%1/%2/%3")
111+ .arg(m_themeName, m_cursorName)
112+ .arg(m_cursorHeight);
113+
114+ return QUrl(urlString);
115+}
plugins/Cursor/CursorImageInfo.hnew file+82
@@ -0,0 +1,82 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef CURSOR_IMAGE_INFO_H
18+#define CURSOR_IMAGE_INFO_H
19+
20+#include "CursorImageProvider.h"
21+
22+#include <QObject>
23+#include <QString>
24+#include <QUrl>
25+
26+class CursorImageInfo : public QObject
27+{
28+ Q_OBJECT
29+
30+ Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)
31+ Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)
32+ Q_PROPERTY(qreal cursorHeight READ cursorHeight WRITE setCursorHeight NOTIFY cursorHeightChanged)
33+
34+ Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)
35+ Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)
36+ Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)
37+ Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)
38+ Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)
39+ Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)
40+
41+public:
42+ CursorImageInfo(QObject *parent = nullptr);
43+
44+ QString themeName() const { return m_themeName; }
45+ void setThemeName(const QString &);
46+
47+ QString cursorName() const { return m_cursorName; }
48+ void setCursorName(const QString &);
49+
50+ qreal cursorHeight() const { return m_cursorHeight; }
51+ void setCursorHeight(qreal);
52+
53+ QPoint hotspot() const;
54+ qreal frameWidth() const;
55+ qreal frameHeight() const;
56+ int frameCount() const;
57+ int frameDuration() const;
58+ QUrl imageSource() const;
59+
60+Q_SIGNALS:
61+ void themeNameChanged();
62+ void cursorNameChanged();
63+ void cursorHeightChanged();
64+ void hotspotChanged();
65+ void frameWidthChanged();
66+ void frameHeightChanged();
67+ void frameCountChanged();
68+ void frameDurationChanged();
69+ void imageSourceChanged();
70+
71+private Q_SLOTS:
72+ void update();
73+
74+private:
75+ QString m_themeName;
76+ QString m_cursorName;
77+ qreal m_cursorHeight{0};
78+
79+ CursorImage *m_cursorImage{nullptr};
80+};
81+
82+#endif // CURSOR_IMAGE_INFO_H
plugins/Cursor/CursorImageProvider.cpp+85−42
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it under
55 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -27,7 +27,7 @@ CursorImageProvider *CursorImageProvider::m_instance = nullptr;
2727/////
2828// BuiltInCursorImage
2929
30−BuiltInCursorImage::BuiltInCursorImage()
30+BuiltInCursorImage::BuiltInCursorImage(int cursorHeight)
3131{
3232 const char *svgString =
3333 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
@@ -42,10 +42,15 @@ BuiltInCursorImage::BuiltInCursorImage()
4242 " 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\" />"
4343 "</svg>";
4444
45− qimage = QImage(20, 32, QImage::Format_ARGB32);
45+ // NB: Original image dimension is 20x32. Ensure aspect ratio is kept
46+ qimage = QImage((20./32.)*cursorHeight, cursorHeight, QImage::Format_ARGB32);
4647 qimage.fill(Qt::transparent);
4748 QPainter imagePainter(&qimage);
4849
50+ frameWidth = qimage.width();
51+ frameHeight = qimage.height();
52+ requestedHeight = cursorHeight;
53+
4954 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));
5055 svgRenderer->render(&imagePainter);
5156 delete svgRenderer;
@@ -59,6 +64,8 @@ BlankCursorImage::BlankCursorImage()
5964{
6065 qimage = QImage(1, 1, QImage::Format_ARGB32);
6166 qimage.fill(Qt::transparent);
67+ frameWidth = qimage.width();
68+ frameHeight = qimage.height();
6269}
6370
6471/////
@@ -69,40 +76,72 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)
6976{
7077 qimage = cursor.pixmap().toImage();
7178 hotspot = cursor.hotSpot();
79+ frameWidth = qimage.width();
80+ frameHeight = qimage.height();
7281}
7382
7483/////
7584// XCursorImage
7685
77−XCursorImage::XCursorImage(const QString &theme, const QString &file)
78− : xcursorImages(nullptr)
86+XCursorImage::XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx)
7987{
80− // TODO: Consider grid unit value
81− // Hardcoding to a medium size for now
82− int preferredCursorHeightPx = 32;
88+ requestedHeight = preferredCursorHeightPx;
8389
84− xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
90+ XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
8591 preferredCursorHeightPx);
86− if (!xcursorImages) {
92+ if (!xcursorImages || xcursorImages->nimage == 0) {
8793 return;
8894 }
8995
90− // Just take the first one. It will have multiple images in case of an animated cursor.
91− // TODO: Support animated cursors
92− if ( xcursorImages->nimage > 0) {
93− XcursorImage *xcursorImage = xcursorImages->images[0];
96+ frameCount = xcursorImages->nimage;
9497
95− qimage = QImage((uchar*)xcursorImage->pixels,
96− xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
98+ for (int i = 0; i < xcursorImages->nimage; ++i) {
99+ XcursorImage *xcursorImage = xcursorImages->images[i];
100+ if (frameWidth < (int)xcursorImage->width) {
101+ frameWidth = xcursorImage->width;
102+ }
103+ if (frameHeight < (int)xcursorImage->height) {
104+ frameHeight = xcursorImage->height;
105+ }
106+ if (i == 0) {
107+ frameDuration = (int)xcursorImage->delay;
108+ } else {
109+ if (frameDuration != (int)xcursorImage->delay) {
110+ qWarning().nospace() << "CursorImageProvider: XCursorImage("<<theme<<","<<file<<") has"
111+ " varying delays in its animation. Animation won't look right.";
112+ }
113+ }
114+ }
97115
116+ {
117+ // Assume that the hotspot position does not animate
118+ XcursorImage *xcursorImage = xcursorImages->images[0];
98119 hotspot.setX(xcursorImage->xhot);
99120 hotspot.setY(xcursorImage->yhot);
100121 }
122+
123+ // Build the sprite as a single row of frames
124+ qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);
125+ qimage.fill(Qt::transparent);
126+
127+ {
128+ QPainter painter(&qimage);
129+
130+ for (int i = 0; i < xcursorImages->nimage; ++i) {
131+ XcursorImage *xcursorImage = xcursorImages->images[i];
132+
133+ auto frameImage = QImage((uchar*)xcursorImage->pixels,
134+ xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
135+
136+ painter.drawImage(QPoint(i*frameWidth, 0), frameImage);
137+ }
138+ }
139+
140+ XcursorImagesDestroy(xcursorImages);
101141}
102142
103143XCursorImage::~XCursorImage()
104144{
105− XcursorImagesDestroy(xcursorImages);
106145}
107146
108147/////
@@ -135,6 +174,8 @@ CursorImageProvider::CursorImageProvider()
135174 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));
136175 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));
137176
177+ m_fallbackNames[QStringLiteral("grabbing")].append(QStringLiteral("closedhand")); // Breeze
178+
138179 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));
139180 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));
140181
@@ -196,44 +237,43 @@ CursorImageProvider::~CursorImageProvider()
196237 m_instance = nullptr;
197238}
198239
199−QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSize *size, const QSize & /*requestedSize*/)
240+QImage CursorImageProvider::requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize & /*requestedSize*/)
200241{
201− CursorImage *cursorImage = fetchCursor(cursorThemeAndName);
242+ CursorImage *cursorImage = fetchCursor(cursorThemeAndNameAndHeight);
202243 size->setWidth(cursorImage->qimage.width());
203244 size->setHeight(cursorImage->qimage.height());
204245
205246 return cursorImage->qimage;
206247}
207248
208−QPoint CursorImageProvider::hotspot(const QString &themeName, const QString &cursorName)
209−{
210− CursorImage *cursorImage = fetchCursor(themeName, cursorName);
211− if (cursorImage) {
212− return cursorImage->hotspot;
213− } else {
214− return QPoint(0,0);
215− }
216−}
217−
218−CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)
249+CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndNameAndHeight)
219250{
220251 QString themeName;
221252 QString cursorName;
253+ int cursorHeight;
222254 {
223− QStringList themeAndNameList = cursorThemeAndName.split('/');
224− if (themeAndNameList.size() != 2) {
255+ QStringList themeAndNameList = cursorThemeAndNameAndHeight.split('/');
256+ if (themeAndNameList.size() != 3) {
225257 return nullptr;
226258 }
227259 themeName = themeAndNameList[0];
228260 cursorName = themeAndNameList[1];
261+
262+ bool ok;
263+ cursorHeight = themeAndNameList[2].toInt(&ok);
264+ if (!ok) {
265+ cursorHeight = 32;
266+ qWarning().nospace() << "CursorImageProvider: invalid cursor height ("<<themeAndNameList[2]<<")."
267+ " Falling back to "<<cursorHeight<<" pixels";
268+ }
229269 }
230270
231− return fetchCursor(themeName, cursorName);
271+ return fetchCursor(themeName, cursorName, cursorHeight);
232272}
233273
234−CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName)
274+CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight)
235275{
236− CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName);
276+ CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName, cursorHeight);
237277
238278 // Try some fallbacks
239279 if (cursorImage->qimage.isNull()) {
@@ -242,7 +282,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
242282 int i = 0;
243283 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {
244284 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);
246286 ++i;
247287 }
248288 }
@@ -252,14 +292,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
252292 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {
253293 qDebug() << "CursorImageProvider:" << cursorName
254294 << "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);
256296 }
257297
258298 if (cursorImage->qimage.isNull()) {
259299 // finally, go for the built-in cursor
260300 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";
261− if (!m_builtInCursorImage) {
262− m_builtInCursorImage.reset(new BuiltInCursorImage);
301+ if (!m_builtInCursorImage || m_builtInCursorImage->requestedHeight != cursorHeight) {
302+ m_builtInCursorImage.reset(new BuiltInCursorImage(cursorHeight));
263303 }
264304 cursorImage = m_builtInCursorImage.data();
265305 }
@@ -267,17 +307,20 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
267307 return cursorImage;
268308}
269309
270−CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)
310+CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight)
271311{
272312 if (cursorName == QLatin1String("blank")) {
273313 return &m_blankCursorImage;
274− } else if (cursorName == QLatin1String("custom")) {
314+ } else if (cursorName.startsWith(QLatin1String("custom"))) {
275315 return m_customCursorImage.data();
276316 } else {
277317 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
278318
279319 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);
281324 }
282325
283326 return themeCursors[cursorName];
plugins/Cursor/CursorImageProvider.h+20−9
@@ -31,20 +31,31 @@ public:
3131 virtual ~CursorImage() {}
3232
3333 QImage qimage;
34+
35+ // TODO: consider if there's a need to animate the hotspot
36+ // ie, if there's a need to make it an array of points, one for each frame.
37+ // Maybe no single xcursor (or at least the ones we know of or use)
38+ // vary its hotspot position through its animation.
3439 QPoint hotspot;
40+
41+ int frameWidth{0};
42+ int frameHeight{0};
43+ int frameCount{1};
44+ int frameDuration{40};
45+
46+ // Requested height when creating this cursor.
47+ int requestedHeight{0};
3548};
3649
3750class XCursorImage : public CursorImage {
3851public:
39− XCursorImage(const QString &theme, const QString &file);
52+ XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx);
4053 virtual ~XCursorImage();
41−
42− XcursorImages *xcursorImages;
4354};
4455
4556class BuiltInCursorImage : public CursorImage {
4657public:
47− BuiltInCursorImage();
58+ BuiltInCursorImage(int cursorHeight);
4859};
4960
5061class BlankCursorImage : public CursorImage {
@@ -66,18 +77,18 @@ public:
6677 static CursorImageProvider *instance() { return m_instance; }
6778
6879
69− QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;
80+ QImage requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize &requestedSize) override;
7081
71− QPoint hotspot(const QString &themeName, const QString &cursorName);
82+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight);
7283
7384 void setCustomCursor(const QCursor &customCursor);
7485
7586private:
76− CursorImage *fetchCursor(const QString &cursorThemeAndName);
77− CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);
78− CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName);
87+ CursorImage *fetchCursor(const QString &cursorThemeAndNameAndHeight);
88+ CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight);
7989
8090 // themeName -> (cursorName -> cursorImage)
91+ // TODO: discard old, unused, cursors
8192 QMap<QString, QMap<QString, CursorImage*> > m_cursors;
8293
8394 QScopedPointer<CursorImage> m_builtInCursorImage;
plugins/Cursor/MousePointer.cpp+126−39
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it under
55 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -22,6 +22,7 @@
2222
2323#include <QQuickWindow>
2424#include <QGuiApplication>
25+#include <QtMath>
2526
2627#include <qpa/qwindowsysteminterface.h>
2728
@@ -29,10 +30,7 @@ MousePointer::MousePointer(QQuickItem *parent)
2930 : MirMousePointerInterface(parent)
3031 , m_cursorName(QStringLiteral("left_ptr"))
3132 , m_themeName(QStringLiteral("default"))
32− , m_hotspotX(0)
33− , m_hotspotY(0)
3433{
35− updateHotspot();
3634}
3735
3836void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
@@ -46,29 +44,83 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse
4644 Q_EMIT mouseMoved();
4745 }
4846
49− qreal newX = x() + movement.x();
50− if (newX < 0) {
47+ m_accumulatedMovement += movement;
48+ // don't apply the fractional part
49+ QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));
50+ m_accumulatedMovement -= appliedMovement;
51+
52+ qreal newX = x() + appliedMovement.x();
53+ qreal newY = y() + appliedMovement.y();
54+ const qreal sceneWidth = parentItem()->width();
55+ const qreal sceneHeight = parentItem()->height();
56+
57+ if (newX <= 0 && newY < m_topBoundaryOffset) { // top left corner
58+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-m_topBoundaryOffset, 2));
59+ Q_EMIT pushedTopLeftCorner(qAbs(distance), buttons);
60+ m_pushing = true;
61+ } else if (newX >= sceneWidth-1 && newY < m_topBoundaryOffset) { // top right corner
62+ const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-m_topBoundaryOffset, 2));
63+ Q_EMIT pushedTopRightCorner(qAbs(distance), buttons);
64+ m_pushing = true;
65+ } else if (newX < 0 && newY >= sceneHeight-1) { // bottom left corner
66+ const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-sceneHeight, 2));
67+ Q_EMIT pushedBottomLeftCorner(qAbs(distance), buttons);
68+ m_pushing = true;
69+ } else if (newX >= sceneWidth-1 && newY >= sceneHeight-1) { // bottom right corner
70+ const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-sceneHeight, 2));
71+ Q_EMIT pushedBottomRightCorner(qAbs(distance), buttons);
72+ m_pushing = true;
73+ } else if (newX < 0) { // left edge
5174 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
52− newX = 0;
53− } else if (newX > parentItem()->width()) {
54− Q_EMIT pushedRightBoundary(newX - parentItem()->width(), buttons);
55− newX = parentItem()->width();
75+ m_pushing = true;
76+ } else if (newX >= sceneWidth) { // right edge
77+ Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);
78+ m_pushing = true;
79+ } else if (newY < m_topBoundaryOffset) { // top edge
80+ Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);
81+ m_pushing = true;
82+ } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing
83+ if (m_pushing) {
84+ Q_EMIT pushStopped();
85+ m_pushing = false;
86+ }
5687 }
57− setX(newX);
5888
59− qreal newY = y() + movement.y();
60− if (newY < 0) {
61− newY = 0;
62− } else if (newY > parentItem()->height()) {
63− newY = parentItem()->height();
64− }
65− setY(newY);
89+ applyItemConfinement(newX, newY);
90+
91+ setX(qBound(0.0, newX, sceneWidth - 1));
92+ setY(qBound(0.0, newY, sceneHeight - 1));
6693
6794 QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
6895 QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
6996 buttons, modifiers);
7097}
7198
99+void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)
100+{
101+ Q_ASSERT(parentItem() != nullptr);
102+
103+ if (m_confiningItem.isNull()) {
104+ return;
105+ }
106+
107+ QRectF confiningItemGeometry(0, 0, m_confiningItem->width(), m_confiningItem->height());
108+
109+ QRectF confiningRect = m_confiningItem->mapRectToItem(parentItem(), confiningItemGeometry);
110+
111+ if (newX < confiningRect.x()) {
112+ newX = confiningRect.x();
113+ } else if (newX > confiningRect.right()) {
114+ newX = confiningRect.right();
115+ }
116+
117+ if (newY < confiningRect.y()) {
118+ newY = confiningRect.y();
119+ } else if (newY > confiningRect.bottom()) {
120+ newY = confiningRect.bottom();
121+ }
122+}
123+
72124void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
73125{
74126 if (!parentItem()) {
@@ -80,6 +132,20 @@ void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::Keyb
80132 QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
81133}
82134
135+int MousePointer::topBoundaryOffset() const
136+{
137+ return m_topBoundaryOffset;
138+}
139+
140+void MousePointer::setTopBoundaryOffset(int topBoundaryOffset)
141+{
142+ if (m_topBoundaryOffset == topBoundaryOffset)
143+ return;
144+
145+ m_topBoundaryOffset = topBoundaryOffset;
146+ Q_EMIT topBoundaryOffsetChanged(topBoundaryOffset);
147+}
148+
83149void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
84150{
85151 if (change == ItemSceneChange) {
@@ -89,8 +155,32 @@ void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
89155
90156void MousePointer::registerWindow(QWindow *window)
91157{
92− if (m_registeredWindow && window != m_registeredWindow) {
93− auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredWindow->screen()->handle()->cursor());
158+ if (window == m_registeredWindow) {
159+ return;
160+ }
161+
162+ if (m_registeredWindow) {
163+ m_registeredWindow->disconnect(this);
164+ }
165+
166+ m_registeredWindow = window;
167+
168+ if (m_registeredWindow) {
169+ connect(window, &QWindow::screenChanged, this, &MousePointer::registerScreen);
170+ registerScreen(window->screen());
171+ } else {
172+ registerScreen(nullptr);
173+ }
174+}
175+
176+void MousePointer::registerScreen(QScreen *screen)
177+{
178+ if (m_registeredScreen == screen) {
179+ return;
180+ }
181+
182+ if (m_registeredScreen) {
183+ auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
94184 if (previousCursor) {
95185 previousCursor->setMousePointer(nullptr);
96186 } else {
@@ -98,10 +188,10 @@ void MousePointer::registerWindow(QWindow *window)
98188 }
99189 }
100190
101− m_registeredWindow = window;
191+ m_registeredScreen = screen;
102192
103− if (m_registeredWindow) {
104− auto cursor = dynamic_cast<MirPlatformCursor*>(window->screen()->handle()->cursor());
193+ if (m_registeredScreen) {
194+ auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
105195 if (cursor) {
106196 cursor->setMousePointer(this);
107197 } else {
@@ -115,22 +205,6 @@ void MousePointer::setCursorName(const QString &cursorName)
115205 if (cursorName != m_cursorName) {
116206 m_cursorName = cursorName;
117207 Q_EMIT cursorNameChanged(m_cursorName);
118− updateHotspot();
119− }
120−}
121−
122−void MousePointer::updateHotspot()
123−{
124− QPoint newHotspot = CursorImageProvider::instance()->hotspot(m_themeName, m_cursorName);
125−
126− if (m_hotspotX != newHotspot.x()) {
127− m_hotspotX = newHotspot.x();
128− Q_EMIT hotspotXChanged(m_hotspotX);
129− }
130−
131− if (m_hotspotY != newHotspot.y()) {
132− m_hotspotY = newHotspot.y();
133− Q_EMIT hotspotYChanged(m_hotspotY);
134208 }
135209}
136210
@@ -146,3 +220,16 @@ void MousePointer::setCustomCursor(const QCursor &customCursor)
146220{
147221 CursorImageProvider::instance()->setCustomCursor(customCursor);
148222}
223+
224+QQuickItem* MousePointer::confiningItem() const
225+{
226+ return m_confiningItem.data();
227+}
228+
229+void MousePointer::setConfiningItem(QQuickItem *item)
230+{
231+ if (item != m_confiningItem) {
232+ m_confiningItem = item;
233+ Q_EMIT confiningItemChanged();
234+ }
235+}
plugins/Cursor/MousePointer.h+32−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it under
55 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -20,12 +20,15 @@
2020// Qt
2121#include <QPointer>
2222#include <QWindow>
23+#include <QScreen>
2324
2425// Unity API
2526#include <unity/shell/application/MirMousePointerInterface.h>
2627
2728class MousePointer : public MirMousePointerInterface {
2829 Q_OBJECT
30+ Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)
31+ Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)
2932public:
3033 MousePointer(QQuickItem *parent = nullptr);
3134
@@ -35,11 +38,14 @@ public:
3538 void setThemeName(const QString &themeName) override;
3639 QString themeName() const override { return m_themeName; }
3740
38− qreal hotspotX() const override { return m_hotspotX; }
39− qreal hotspotY() const override { return m_hotspotY; }
40−
4141 void setCustomCursor(const QCursor &) override;
4242
43+ QQuickItem* confiningItem() const;
44+ void setConfiningItem(QQuickItem*);
45+
46+ int topBoundaryOffset() const;
47+ void setTopBoundaryOffset(int topBoundaryOffset);
48+
4349public Q_SLOTS:
4450 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
4551 Qt::KeyboardModifiers modifiers) override;
@@ -48,20 +54,39 @@ public Q_SLOTS:
4854Q_SIGNALS:
4955 void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
5056 void pushedRightBoundary(qreal amount, Qt::MouseButtons buttons);
57+ void pushedTopBoundary(qreal amount, Qt::MouseButtons buttons);
58+ void pushedTopLeftCorner(qreal amount, Qt::MouseButtons buttons);
59+ void pushedTopRightCorner(qreal amount, Qt::MouseButtons buttons);
60+ void pushedBottomLeftCorner(qreal amount, Qt::MouseButtons buttons);
61+ void pushedBottomRightCorner(qreal amount, Qt::MouseButtons buttons);
62+ void pushStopped();
5163 void mouseMoved();
64+ void confiningItemChanged();
65+
66+ void topBoundaryOffsetChanged(int topBoundaryOffset);
5267
5368protected:
5469 void itemChange(ItemChange change, const ItemChangeData &value) override;
5570
71+private Q_SLOTS:
72+ void registerScreen(QScreen *screen);
73+
5674private:
5775 void registerWindow(QWindow *window);
58− void updateHotspot();
76+ void applyItemConfinement(qreal &newX, qreal &newY);
5977
6078 QPointer<QWindow> m_registeredWindow;
79+ QPointer<QScreen> m_registeredScreen;
6180 QString m_cursorName;
6281 QString m_themeName;
63− int m_hotspotX;
64− int m_hotspotY;
82+
83+ // Accumulated, unapplied, mouse movement.
84+ QPointF m_accumulatedMovement;
85+
86+ QPointer<QQuickItem> m_confiningItem;
87+
88+ int m_topBoundaryOffset{0};
89+ bool m_pushing{false};
6590};
6691
6792#endif // MOUSEPOINTER_H
plugins/Cursor/plugin.cpp+4−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -22,13 +22,15 @@
2222#include "plugin.h"
2323
2424// local
25+#include "CursorImageInfo.h"
2526#include "CursorImageProvider.h"
2627#include "MousePointer.h"
2728
2829void CursorPlugin::registerTypes(const char *uri)
2930{
3031 Q_ASSERT(uri == QLatin1String("Cursor"));
31− qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");
32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");
33+ qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");
3234}
3335
3436void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Cursor/qmldir+1−1
@@ -1,3 +1,3 @@
11module Cursor
22plugin Cursor-qml
3−Cursor 1.0 Cursor.qml
3+Cursor 1.1 Cursor.qml
plugins/Dash/AudioProgressBar.qmldeleted−54
@@ -1,54 +0,0 @@
1−/*
2− * Copyright 2015 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import Dash 0.1
20−
21−Item {
22− id: root
23−
24− implicitHeight: progressBarImage.height
25−
26− property url source
27− readonly property double progress: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource) ? DashAudioPlayer.progress : 0
28−
29− Image {
30− id: progressBarImage
31− anchors { left: parent.left; right: parent.right }
32− height: units.dp(6)
33− source: "graphics/music_progress_bg.png"
34− asynchronous: true
35− sourceSize.width: width
36− sourceSize.height: height
37− }
38−
39− UbuntuShape {
40− id: progressBarFill
41− objectName: "progressBarFill"
42−
43− readonly property int maxWidth: progressBarImage.width
44−
45− anchors {
46− left: progressBarImage.left
47− right: progressBarImage.right
48− verticalCenter: progressBarImage.verticalCenter
49− rightMargin: maxWidth - (maxWidth * root.progress)
50− }
51− height: units.dp(2)
52− backgroundColor: UbuntuColors.orange
53− }
54−}
plugins/Dash/CMakeLists.txtdeleted−43
@@ -1,43 +0,0 @@
1−# There's no cmake var for v8 include path :-/
2−# so create one
3−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
4−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")
5− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
6−else()
7− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
8−endif()
9−
10−include_directories(
11− ${CMAKE_CURRENT_SOURCE_DIR}
12− ${CMAKE_CURRENT_BINARY_DIR}
13− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
14− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
15− ${Qt5V8_PRIVATE_INCLUDE_DIR}
16−)
17−
18−remove_definitions(-DQT_NO_KEYWORDS)
19−
20−set(QMLPLUGIN_SRC
21− plugin.cpp
22− listviewwithpageheader.cpp
23− abstractdashview.cpp
24− verticaljournal.cpp
25− horizontaljournal.cpp
26− organicgrid.cpp
27− )
28−
29−add_library(Dash-qml MODULE
30− ${QMLPLUGIN_SRC}
31− )
32−
33−target_link_libraries(Dash-qml
34− ${Qt5Gui_LIBRARIES}
35− ${Qt5Quick_LIBRARIES}
36− )
37−
38−qt5_use_modules(Dash-qml Qml Quick Concurrent)
39−
40−add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
41−
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 @@
1−/*
2− * Copyright 2014 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
20−
21−GridLayout {
22− id: grid
23− anchors {
24− left: parent.left;
25− right: parent.right;
26− }
27− columns: 2 + repeater.count % 2
28− rowSpacing: units.gu(.5)
29− property alias model: repeater.model
30− property color color: theme.palette.normal.baseText
31− property real fontScale: 1.0
32−
33− Repeater {
34− id: repeater
35− delegate: Row {
36− spacing: units.gu(0.5)
37− readonly property int column: index % grid.columns;
38− Layout.alignment: {
39− if (column == 0) return Qt.AlignLeft;
40− if (column == grid.columns - 1 || index == repeater.count - 1) return Qt.AlignRight;
41− if (column == 1) return Qt.AlignHCenter;
42− }
43− Layout.column: index % grid.columns
44− Layout.row: index / grid.columns
45− Layout.columnSpan: index == repeater.count - 1 && grid.columns == 3 && column == 1 ? 2 : 1
46− Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
47− Layout.fillWidth: true
48− height: units.gu(2)
49− Icon {
50− id: icon
51− height: units.gu(2)
52− // 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"] || ""
55− color: grid.color
56− }
57− Label {
58− id: label
59− width: parent.width - x
60− anchors.verticalCenter: parent.verticalCenter
61− text: "value" in modelData && modelData["value"] || "";
62− elide: Text.ElideRight
63− maximumLineCount: 1
64− font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
65− fontSize: "small"
66− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
67− color: grid.color
68− }
69− }
70− }
71−}
plugins/Dash/CardAudioProgress.qmldeleted−59
@@ -1,59 +0,0 @@
1−/*
2− * Copyright 2015 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import Dash 0.1
20−
21−Item {
22− id: root
23−
24− implicitHeight: positionLabel.y + positionLabel.height
25− visible: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)
26−
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
31−
32− AudioProgressBar {
33− id: progress
34− anchors { left: parent.left; right: parent.right }
35− }
36−
37− Label {
38− id: positionLabel
39− anchors {
40− left: parent.left
41− top: progress.bottom
42− }
43− verticalAlignment: Text.AlignBottom
44− fontSize: "x-small"
45− text: DashAudioPlayer.lengthToString(root.position)
46− color: root.color
47− }
48−
49− Label {
50− anchors {
51− right: parent.right
52− top: progress.bottom
53− }
54− verticalAlignment: Text.AlignBottom
55− fontSize: "x-small"
56− text: DashAudioPlayer.lengthToString(duration)
57− color: root.color
58− }
59−}
plugins/Dash/CardCreator.jsdeleted−906
@@ -1,906 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−.pragma library
18−
19−// %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\
32− aspect: { \n\
33− switch (root.backgroundShapeStyle) { \n\
34− case "inset": return UbuntuShape.Inset; \n\
35− case "shadow": return UbuntuShape.DropShadow; \n\
36− default: \n\
37− case "flat": return UbuntuShape.Flat; \n\
38− } \n\
39− } \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\
48− source: { \n\
49− if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
50− else return %4; \n\
51− } \n\
52− } \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\
58− } \n\
59− } \n\
60− }\n';
61−
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\
74− anchors { %1 } \n\
75− Loader { \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\
83− id: artShape; \n\
84− objectName: "artShape"; \n\
85− visible: image.status == Image.Ready; \n\
86− readonly property alias image: artImage; \n\
87− Loader { \n\
88− anchors.fill: parent; \n\
89− visible: %4; \n\
90− sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent; \n\
91− Component { \n\
92− id: artShapeShapeComponent; \n\
93− UbuntuShape { \n\
94− source: artImage; \n\
95− sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
96− radius: "medium"; \n\
97− aspect: { \n\
98− switch (root.artShapeStyle) { \n\
99− case "inset": return UbuntuShape.Inset; \n\
100− case "shadow": return UbuntuShape.DropShadow; \n\
101− default: \n\
102− case "flat": return UbuntuShape.Flat; \n\
103− } \n\
104− } \n\
105− } \n\
106− } \n\
107− Component { \n\
108− id: artShapeIconComponent; \n\
109− ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; } \n\
110− } \n\
111− } \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\
120− } else { \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\
123− } \n\
124− } \n\
125− CroppedImageMinimumSourceSize { \n\
126− id: artImage; \n\
127− objectName: "artImage"; \n\
128− source: artShapeLoader.cardArt; \n\
129− asynchronous: %6; \n\
130− visible: !%4; \n\
131− width: %2; \n\
132− height: %3; \n\
133− %7 \n\
134− } \n\
135− } \n\
136− } \n\
137− }\n';
138−
139−// %1 is anchors.fill
140−// %2 is width
141−// %3 is height
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\
146− width: %2; \n\
147− height: %3; \n\
148− readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
149− UbuntuShape { \n\
150− anchors.fill: parent; \n\
151− visible: parent.pressed; \n\
152− radius: "medium"; \n\
153− } \n\
154− Rectangle { \n\
155− color: Qt.rgba(0, 0, 0, 0.5); \n\
156− anchors.centerIn: parent; \n\
157− width: parent.width * 0.5; \n\
158− height: width; \n\
159− radius: width / 2; \n\
160− } \n\
161− Icon { \n\
162− anchors.centerIn: parent; \n\
163− width: parent.width * 0.3; \n\
164− height: width; \n\
165− opacity: 0.9; \n\
166− name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
167− color: "white"; \n\
168− asynchronous: %4; \n\
169− } \n\
170− onClicked: { \n\
171− if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
172− if (DashAudioPlayer.playing) { \n\
173− DashAudioPlayer.pause(); \n\
174− } else { \n\
175− DashAudioPlayer.play(); \n\
176− } \n\
177− } else { \n\
178− var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\
179− DashAudioPlayer.playSource(source, playlist); \n\
180− } \n\
181− } \n\
182− onPressAndHold: { \n\
183− root.pressAndHold(); \n\
184− } \n\
185− }';
186−
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\
197− id: overlay; \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\
203− } \n\
204− }\n';
205−
206−// multiple row version of HeaderRowCode
207−function kHeaderRowCodeGenerator() {
208− var kHeaderRowCodeTemplate = 'Row { \n\
209− id: row; \n\
210− objectName: "outerRow"; \n\
211− property real margins: units.gu(1); \n\
212− spacing: margins; \n\
213− %2\
214− anchors { %1 } \n\
215− anchors.right: parent.right; \n\
216− anchors.margins: margins; \n\
217− anchors.rightMargin: 0; \n\
218− data: [ \n\
219− %3 \n\
220− ] \n\
221− }\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'));
226− return code;
227−}
228−
229−// multiple item version of kHeaderContainerCode
230−function kHeaderContainerCodeGenerator() {
231− var headerContainerCodeTemplate = 'Item { \n\
232− id: headerTitleContainer; \n\
233− anchors { %1 } \n\
234− width: parent.width - x; \n\
235− implicitHeight: %2; \n\
236− data: [ \n\
237− %3 \n\
238− ]\n\
239− }\n';
240− var args = Array.prototype.slice.call(arguments);
241− var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));
242− return code;
243−}
244−
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\
256− anchors { %1 } \n\
257− }\n';
258−
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\
266− anchors { %1 } \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\
272− visible: %2; \n\
273− %3 \n\
274− }\n';
275−
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\
282− id: titleLabel; \n\
283− objectName: "titleLabel"; \n\
284− anchors { %1 } \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\
290− color: %2; \n\
291− visible: showHeader %3; \n\
292− width: %4; \n\
293− text: root.title; \n\
294− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
295− horizontalAlignment: %5; \n\
296− }\n';
297−
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\
303− id: emblemIcon; \n\
304− objectName: "emblemIcon"; \n\
305− anchors { \n\
306− bottom: titleLabel.baseline; \n\
307− right: parent.right; \n\
308− %1 \n\
309− } \n\
310− source: cardData && cardData["emblem"] || ""; \n\
311− color: %2; \n\
312− height: source != "" ? titleLabel.font.pixelSize : 0; \n\
313− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
314− }\n';
315−
316−// %1 is used as anchors of touchdown effect
317−var kTouchdownCode = 'UbuntuShape { \n\
318− id: touchdown; \n\
319− objectName: "touchdown"; \n\
320− anchors { %1 } \n\
321− visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed; \n\
322− radius: "medium"; \n\
323− borderSource: "radius_pressed.sci" \n\
324− }\n';
325−
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\
331− anchors { %1 } \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\
337− color: %2; \n\
338− visible: titleLabel.visible && titleLabel.text; \n\
339− text: cardData && cardData["subtitle"] || ""; \n\
340− font.weight: Font.Light; \n\
341− }\n';
342−
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\
348− anchors { %1 } \n\
349− color: %2; \n\
350− fontScale: root.fontScale; \n\
351− model: cardData && cardData["attributes"]; \n\
352− }\n';
353−
354−// %1 is used as top anchor of summary
355−// %2 is used as topMargin anchor of summary
356−// %3 is used as color of summary
357−var kSummaryLabelCode = 'Label { \n\
358− id: summary; \n\
359− objectName: "summaryLabel"; \n\
360− anchors { \n\
361− top: %1; \n\
362− left: parent.left; \n\
363− right: parent.right; \n\
364− margins: units.gu(1); \n\
365− topMargin: %2; \n\
366− } \n\
367− wrapMode: Text.Wrap; \n\
368− maximumLineCount: 5; \n\
369− elide: Text.ElideRight; \n\
370− text: cardData && cardData["summary"] || ""; \n\
371− height: text ? implicitHeight : 0; \n\
372− fontSize: "small"; \n\
373− color: %3; \n\
374− }\n';
375−
376−// %1 is used as bottom anchor of audio progress bar
377−// %2 is used as left anchor of audio progress bar
378−// %3 is used as text color
379−var kAudioProgressBarCode = 'CardAudioProgress { \n\
380− id: audioProgressBar; \n\
381− duration: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["duration"]) || 0; \n\
382− source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
383− anchors { \n\
384− bottom: %1; \n\
385− left: %2; \n\
386− right: parent.right; \n\
387− margins: units.gu(1); \n\
388− } \n\
389− color: %3; \n\
390− }';
391−
392−function sanitizeColor(colorString) {
393− if (colorString !== undefined) {
394− if (colorString.match(/^[#a-z0-9]*$/i) === null) {
395− // This is not the perfect regexp for color
396− // but what we're trying to do here is just protect
397− // against injection so it's ok
398− return "";
399− }
400− }
401− return colorString;
402−}
403−
404−function cardString(template, components, isCardTool) {
405− var code;
406−
407− var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
408−
409− code = 'AbstractButton { \n\
410− id: root; \n\
411− property var cardData; \n\
412− property string artShapeStyle: "inset"; \n\
413− property string backgroundShapeStyle: "inset"; \n\
414− property real fontScale: 1.0; \n\
415− property var scopeStyle: null; \n\
416− %2\
417− property size fixedArtShapeSize: Qt.size(-1, -1); \n\
418− readonly property string title: cardData && cardData["title"] || ""; \n\
419− property bool showHeader: true; \n\
420− implicitWidth: childrenRect.width; \n\
421− enabled: %1; \n\
422− \n'.arg(templateInteractive);
423−
424− code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
425−
426− var hasArt = components["art"] && components["art"]["field"] || false;
427− var hasSummary = components["summary"] || false;
428− var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
429− var artAndSummary = hasArt && hasSummary && !isConciergeMode;
430− var isHorizontal = template["card-layout"] === "horizontal";
431− var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
432− (hasSummary && (template["card-background"] || components["background"]));
433− var hasTitle = components["title"] || false;
434− var hasMascot = components["mascot"] || false;
435− var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
436− var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
437− var hasSubtitle = hasTitle && components["subtitle"] || false;
438− var hasHeaderRow = hasMascot && hasTitle;
439− var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
440− var isAudio = template["quick-preview-type"] === "audio";
441− var asynchronous = isCardTool ? "false" : "true";
442−
443− if (isAudio) {
444− // For now we only support audio cards with [optional] art, title, subtitle
445− // in horizontal mode
446− // Anything else makes it behave not like an audio card
447− if (hasSummary) isAudio = false;
448− if (!isHorizontal) isAudio = false;
449− if (hasMascot) isAudio = false;
450− if (hasEmblem) isAudio = false;
451− if (headerAsOverlay) isAudio = false;
452− if (hasAttributes) isAudio = false;
453− }
454−
455− if (hasBackground) {
456− var templateCardBackground;
457− if (template && typeof template["card-background"] === "string") {
458− templateCardBackground = 'decodeURI("' + encodeURI(template["card-background"]) + '")';
459− } else {
460− templateCardBackground = '""';
461− }
462−
463− var backgroundElements0;
464− var backgroundElements1;
465− if (template && typeof template["card-background"] === "object" && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
466− var element0 = sanitizeColor(template["card-background"]["elements"][0]);
467− var element1 = sanitizeColor(template["card-background"]["elements"][1]);
468− if (element0 !== undefined) {
469− backgroundElements0 = '"%1"'.arg(element0);
470− }
471− if (element1 !== undefined) {
472− backgroundElements1 = '"%1"'.arg(element1);
473− }
474− }
475− code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
476− }
477−
478− if (hasArt) {
479− code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
480−
481− var widthCode, heightCode;
482− var artAnchors;
483− if (isHorizontal) {
484− artAnchors = 'left: parent.left';
485− if (hasMascot || hasTitle) {
486− widthCode = 'height * artShape.aspect'
487− heightCode = 'headerHeight + 2 * units.gu(1)';
488− } else {
489− // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?
490− // So we define a "random" height of the image height + 2 gu for the margins
491− widthCode = 'height * artShape.aspect'
492− heightCode = 'units.gu(7.625)';
493− }
494− } else {
495− artAnchors = 'horizontalCenter: parent.horizontalCenter;';
496− widthCode = 'root.width'
497− heightCode = 'width / artShape.aspect';
498− }
499−
500− var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;
501− if (isNaN(aspectRatio)) {
502− aspectRatio = 1;
503− }
504− var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";
505− fallback = encodeURI(fallback);
506− var fallbackStatusCode = "";
507− var fallbackURICode = '""';
508− if (fallback !== "") {
509− // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
510− // which in kArtShapeHolderCode is %8
511− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
512− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
513− }
514− code += kArtShapeHolderCode.arg(artAnchors)
515− .arg(widthCode)
516− .arg(heightCode)
517− .arg(isConciergeMode ? "false" : "true")
518− .arg(aspectRatio)
519− .arg(asynchronous)
520− .arg(fallbackStatusCode)
521− .arg(fallbackURICode);
522− } else {
523− code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
524− }
525−
526− if (headerAsOverlay) {
527− var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
528− code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
529− }
530−
531− var headerVerticalAnchors;
532− if (headerAsOverlay) {
533− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\
534− bottomMargin: units.gu(1);\n';
535− } else {
536− if (hasArt) {
537− if (isHorizontal) {
538− headerVerticalAnchors = 'top: artShapeHolder.top; \n\
539− topMargin: units.gu(1);\n';
540− } else {
541− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\
542− topMargin: units.gu(1);\n';
543− }
544− } else {
545− headerVerticalAnchors = 'top: parent.top; \n\
546− topMargin: units.gu(1);\n';
547− }
548− }
549−
550− var headerLeftAnchor;
551− var headerLeftAnchorHasMargin = false;
552− if (isHorizontal && hasArt) {
553− headerLeftAnchor = 'left: artShapeHolder.right; \n\
554− leftMargin: units.gu(1);\n';
555− headerLeftAnchorHasMargin = true;
556− } else if (isHorizontal && isAudio) {
557− headerLeftAnchor = 'left: audioButton.right; \n\
558− leftMargin: units.gu(1);\n';
559− headerLeftAnchorHasMargin = true;
560− } else {
561− headerLeftAnchor = 'left: parent.left;\n';
562− }
563−
564− var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary && !isAudio;
565−
566− if (hasHeaderRow) {
567− code += 'readonly property int headerHeight: row.height;\n'
568− } else if (hasMascot) {
569− code += 'readonly property int headerHeight: mascotImage.height;\n'
570− } else if (hasAttributes) {
571− if (hasTitle && hasSubtitle) {
572− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
573− } else if (hasTitle) {
574− code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'
575− } else {
576− code += 'readonly property int headerHeight: attributesRow.height;\n'
577− }
578− } else if (isAudio) {
579− if (hasSubtitle) {
580− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
581− } else if (hasTitle) {
582− code += 'readonly property int headerHeight: titleLabel.height + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
583− } else {
584− code += 'readonly property int headerHeight: audioProgressBar.height;\n'
585− }
586− } else if (hasSubtitle) {
587− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'
588− } else if (hasTitle) {
589− code += 'readonly property int headerHeight: titleLabel.height;\n'
590− } else {
591− code += 'readonly property int headerHeight: 0;\n'
592− }
593−
594− var mascotShapeCode = '';
595− var mascotCode = '';
596− if (hasMascot) {
597− var useMascotShape = !hasBackground && !headerAsOverlay;
598− var mascotAnchors = '';
599− if (!hasHeaderRow) {
600− mascotAnchors += headerLeftAnchor;
601− mascotAnchors += headerVerticalAnchors;
602− if (!headerLeftAnchorHasMargin) {
603− mascotAnchors += 'leftMargin: units.gu(1);\n'
604− }
605− } else {
606− mascotAnchors = 'verticalCenter: parent.verticalCenter;'
607− }
608−
609− if (useMascotShape) {
610− mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
611− }
612−
613− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
614− var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
615− fallback = encodeURI(fallback);
616− var fallbackStatusCode = "";
617− var fallbackURICode = '""';
618− if (fallback !== "") {
619− // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode
620− // which in kMascotImageCode is %4
621− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %4;';
622− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
623− }
624− mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackStatusCode).arg(fallbackURICode);
625− }
626−
627− 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")';
628−
629− var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
630− var titleSubtitleCode = '';
631− if (hasTitle) {
632− var titleColor;
633− if (headerAsOverlay) {
634− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
635− } else if (hasSummary) {
636− titleColor = 'summary.color';
637− } else if (hasBackground) {
638− titleColor = summaryColorWithBackground;
639− } else {
640− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
641− }
642−
643− var titleAnchors;
644− var subtitleAnchors;
645− var attributesAnchors;
646− var titleContainerAnchors;
647− var titleRightAnchor;
648− var titleWidth = "undefined";
649−
650− var extraRightAnchor = '';
651− var extraLeftAnchor = '';
652− if (!touchdownOnArtShape) {
653− extraRightAnchor = 'rightMargin: units.gu(1); \n';
654− extraLeftAnchor = 'leftMargin: units.gu(1); \n';
655− } else if (headerAsOverlay && !hasEmblem) {
656− extraRightAnchor = 'rightMargin: units.gu(1); \n';
657− }
658−
659− if (hasMascot) {
660− titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
661− } else {
662− titleContainerAnchors = 'right: parent.right; ';
663− titleContainerAnchors += headerLeftAnchor;
664− titleContainerAnchors += headerVerticalAnchors;
665− if (!headerLeftAnchorHasMargin) {
666− titleContainerAnchors += extraLeftAnchor;
667− }
668− }
669− if (hasEmblem) {
670− titleRightAnchor = 'right: emblemIcon.left; \n\
671− rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';
672− } else {
673− titleRightAnchor = 'right: parent.right; \n'
674− titleRightAnchor += extraRightAnchor;
675− }
676−
677− if (hasTitleContainer) {
678− // Using headerTitleContainer
679− titleAnchors = titleRightAnchor;
680− titleAnchors += 'left: parent.left; \n\
681− top: parent.top;';
682− subtitleAnchors = 'right: parent.right; \n\
683− left: parent.left; \n';
684− subtitleAnchors += extraRightAnchor;
685− if (hasSubtitle) {
686− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
687− subtitleAnchors += 'top: titleLabel.bottom;\n';
688− } else {
689− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
690− }
691− } else if (hasMascot) {
692− // Using row without titleContainer
693− titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
694− titleWidth = "parent.width - x";
695− } else {
696− if (headerAsOverlay) {
697− // Using anchors to the overlay
698− titleAnchors = titleRightAnchor;
699− titleAnchors += 'left: parent.left; \n\
700− leftMargin: units.gu(1); \n\
701− top: overlayLoader.top; \n\
702− topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';
703− } else {
704− // Using anchors to the mascot/parent
705− titleAnchors = titleRightAnchor;
706− titleAnchors += headerLeftAnchor;
707− titleAnchors += headerVerticalAnchors;
708− if (!headerLeftAnchorHasMargin) {
709− titleAnchors += extraLeftAnchor;
710− }
711− }
712− subtitleAnchors = 'left: titleLabel.left; \n\
713− leftMargin: titleLabel.leftMargin; \n';
714− subtitleAnchors += extraRightAnchor;
715− if (hasEmblem) {
716− // using container
717− subtitleAnchors += 'right: parent.right; \n';
718− } else {
719− subtitleAnchors += 'right: titleLabel.right; \n';
720− }
721−
722− if (hasSubtitle) {
723− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
724− subtitleAnchors += 'top: titleLabel.bottom;\n';
725− } else {
726− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
727− }
728− }
729−
730− var titleAlignment = "Text.AlignHCenter";
731− if (template["card-layout"] === "horizontal"
732− || typeof components["title"] !== "object"
733− || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
734− var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
735− for (var key in keys) {
736− key = keys[key];
737− try {
738− if (typeof components[key] === "string"
739− || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
740− } catch (e) {
741− continue;
742− }
743− }
744−
745− // code for different elements
746− var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
747− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
748− var subtitleCode;
749− var attributesCode;
750−
751− // code for the title container
752− var containerCode = [];
753− var containerHeight = 'titleLabel.height';
754− containerCode.push(titleCode);
755− if (hasSubtitle) {
756− subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);
757− containerCode.push(subtitleCode);
758− containerHeight += ' + subtitleLabel.height';
759− }
760− if (hasEmblem) {
761− containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));
762− }
763− if (hasAttributes) {
764− attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
765− containerCode.push(attributesCode);
766− containerHeight += ' + attributesRow.height';
767− }
768−
769− if (hasTitleContainer) {
770− // use container
771− titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);
772− } else {
773− // no container
774− titleSubtitleCode = titleCode;
775− if (hasSubtitle) {
776− titleSubtitleCode += subtitleCode;
777− }
778− if (hasAttributes) {
779− titleSubtitleCode += attributesCode;
780− }
781− }
782− }
783−
784− if (hasHeaderRow) {
785− var rowCode = [mascotCode, titleSubtitleCode];
786− if (mascotShapeCode != '') {
787− rowCode.unshift(mascotShapeCode);
788− }
789− code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
790− } else {
791− code += mascotShapeCode + mascotCode + titleSubtitleCode;
792− }
793−
794− if (isAudio) {
795− var audioProgressBarLeftAnchor = 'audioButton.right';
796− var audioProgressBarBottomAnchor = 'audioButton.bottom';
797− var audioProgressBarTextColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
798−
799− code += kAudioProgressBarCode.arg(audioProgressBarBottomAnchor)
800− .arg(audioProgressBarLeftAnchor)
801− .arg(audioProgressBarTextColor);
802−
803− var audioButtonAnchorsFill;
804− var audioButtonWidth;
805− var audioButtonHeight;
806− if (hasArt) {
807− audioButtonAnchorsFill = 'artShapeHolder';
808− audioButtonWidth = 'undefined';
809− audioButtonHeight = 'undefined';
810− } else {
811− audioButtonAnchorsFill = 'undefined';
812− audioButtonWidth = 'height';
813− audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
814− : 'root.fixedHeaderHeight + 2 * units.gu(1)';
815− }
816− code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
817− }
818−
819− if (hasSummary) {
820− var summaryTopAnchor;
821− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
822− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
823− else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
824− else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
825− else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
826− else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
827− else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
828− else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
829− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
830− else summaryTopAnchor = 'parent.top';
831−
832− var summaryColor;
833− if (hasBackground) {
834− summaryColor = summaryColorWithBackground;
835− } else {
836− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
837− }
838−
839− var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
840−
841− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
842− }
843−
844− var touchdownAnchors;
845− if (hasBackground) {
846− touchdownAnchors = 'fill: backgroundLoader';
847− } else if (touchdownOnArtShape) {
848− touchdownAnchors = 'fill: artShapeHolder';
849− } else {
850− touchdownAnchors = 'fill: root'
851− }
852− code += kTouchdownCode.arg(touchdownAnchors);
853−
854− var implicitHeight = 'implicitHeight: ';
855− if (hasSummary) {
856− implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
857− } else if (isAudio) {
858− implicitHeight += 'audioButton.height;\n';
859− } else if (headerAsOverlay) {
860− implicitHeight += 'artShapeHolder.height;\n';
861− } else if (hasHeaderRow) {
862− implicitHeight += 'row.y + row.height + units.gu(1);\n';
863− } else if (hasMascot) {
864− implicitHeight += 'mascotImage.y + mascotImage.height;\n';
865− } else if (hasTitleContainer) {
866− implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';
867− } else if (hasAttributes) {
868− implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';
869− } else if (hasSubtitle) {
870− implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
871− } else if (hasTitle) {
872− implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
873− } else if (hasArt) {
874− implicitHeight += 'artShapeHolder.height;\n';
875− } else {
876− implicitHeight = '';
877− }
878−
879− // Close the AbstractButton
880− code += implicitHeight + '}\n';
881−
882− return code;
883−}
884−
885−function createCardComponent(parent, template, components, isCardTool, identifier) {
886− var imports = 'import QtQuick 2.4; \n\
887− import Ubuntu.Components 1.3; \n\
888− import Ubuntu.Settings.Components 0.1; \n\
889− import Dash 0.1;\n\
890− import Utils 0.1;\n';
891− var card = cardString(template, components, isCardTool);
892− var code = imports + 'Component {\n' + card + '}\n';
893−
894− try {
895− return Qt.createQmlObject(code, parent, identifier);
896− } catch (e) {
897− console.error("ERROR: Invalid component created.");
898− console.error("Template:");
899− console.error(JSON.stringify(template));
900− console.error("Components:");
901− console.error(JSON.stringify(components));
902− console.error("Code:");
903− console.error(code);
904− throw e;
905− }
906−}
plugins/Dash/CardCreatorCache.qmldeleted−40
@@ -1,40 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−pragma Singleton
18−import QtQuick 2.4
19−import "CardCreator.js" as CardCreator
20−
21−QtObject {
22− id: root
23−
24− property var cache: new Object();
25−
26− function getCardComponent(template, components, isCardTool) {
27− if (template === undefined || components === undefined)
28− return undefined;
29−
30− var tString = JSON.stringify(template);
31− var cString = JSON.stringify(components);
32− var allString = tString + cString + isCardTool;
33− var component = cache[allString];
34− if (component === undefined) {
35− component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);
36− cache[allString] = component;
37− }
38− return component;
39− }
40−}
plugins/Dash/CroppedImageMinimumSourceSize.qmldeleted−38
@@ -1,38 +0,0 @@
1−/*
2− * Copyright (C) 2014, 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−
19−Image {
20− id: root
21−
22− fillMode: Image.PreserveAspectCrop
23−
24− property bool useHeight: false
25− function updateUseHeight()
26− {
27− // Do not turn into a binding since otherwise the qml
28− // engine complains about binding loops
29− useHeight = (implicitWidth / implicitHeight) > (width / height);
30− }
31−
32− onHeightChanged: updateUseHeight();
33− onWidthChanged: updateUseHeight();
34− onImplicitHeightChanged: updateUseHeight();
35− onImplicitWidthChanged: updateUseHeight();
36−
37− sourceSize: useHeight ? Qt.size(0, height) : Qt.size(width, 0)
38−}
plugins/Dash/Dash.qmltypesdeleted−100
@@ -1,100 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Dash 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "AbstractDashView"
12− defaultProperty: "data"
13− prototype: "QQuickItem"
14− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
15− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
16− Property { name: "columnSpacing"; type: "double" }
17− Property { name: "rowSpacing"; type: "double" }
18− Property { name: "cacheBuffer"; type: "int" }
19− Property { name: "displayMarginBeginning"; type: "double" }
20− Property { name: "displayMarginEnd"; type: "double" }
21− }
22− Component {
23− name: "HorizontalJournal"
24− defaultProperty: "data"
25− prototype: "AbstractDashView"
26− exports: ["Dash/HorizontalJournal 0.1"]
27− exportMetaObjectRevisions: [0]
28− Property { name: "rowHeight"; type: "double" }
29− }
30− Component {
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" }
50− Method {
51− name: "item"
52− type: "QQuickItem*"
53− Parameter { name: "modelIndex"; type: "int" }
54− }
55− Method {
56− name: "maximizeVisibleArea"
57− type: "bool"
58− Parameter { name: "modelIndex"; type: "int" }
59− }
60− Method {
61− name: "maximizeVisibleArea"
62− type: "bool"
63− Parameter { name: "modelIndex"; type: "int" }
64− Parameter { name: "itemHeight"; type: "int" }
65− }
66− }
67− Component {
68− name: "OrganicGrid"
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" }
75− }
76− Component {
77− name: "VerticalJournal"
78− defaultProperty: "data"
79− prototype: "AbstractDashView"
80− exports: ["Dash/VerticalJournal 0.1"]
81− exportMetaObjectRevisions: [0]
82− Property { name: "columnWidth"; type: "double" }
83− }
84− Component {
85− prototype: "QObject"
86− name: "CardCreatorCache"
87− exports: ["CardCreatorCache -1.-1"]
88− exportMetaObjectRevisions: [-1]
89− isComposite: true
90− isCreatable: false
91− isSingleton: true
92− Property { name: "cache"; type: "QVariant" }
93− Method {
94− name: "getCardComponent"
95− type: "QVariant"
96− Parameter { name: "template"; type: "QVariant" }
97− Parameter { name: "components"; type: "QVariant" }
98− }
99− }
100−}
plugins/Dash/DashAudioPlayer.qmldeleted−96
@@ -1,96 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−pragma Singleton
18−import QtQuick 2.4
19−import QtMultimedia 5.6
20−import Dash 0.1
21−
22−QtObject {
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
29−
30− function playSource(newSource, newPlaylist) {
31− stop();
32− audio.playlist.clear();
33− if (newPlaylist) {
34− // Look for newSource in newPlaylist
35− var sourceIndex = -1;
36− for (var i in newPlaylist) {
37− if (AudioUrlComparer.compare(newSource, newPlaylist[i])) {
38− sourceIndex = i;
39− break;
40− }
41− }
42− var urls = [];
43− if (sourceIndex === -1 && newSource != "") {
44− // If the playing song is not in the playlist, add it
45− urls.push(newSource);
46− sourceIndex = 0;
47− }
48− for (var i in newPlaylist) {
49− urls.push(newPlaylist[i]);
50− }
51− audio.playlist.addItems(urls);
52− audio.playlist.currentIndex = sourceIndex;
53− } else {
54− audio.playlist.addItem(newSource);
55− audio.playlist.currentIndex = 0;
56− }
57− play();
58− }
59−
60− function stop() {
61− audio.stop();
62− }
63−
64− function play() {
65− audio.play();
66− }
67−
68− function pause() {
69− audio.pause();
70− }
71−
72− property QtObject audio: Audio {
73− id: audio
74− objectName: "audio"
75− playlist: Playlist {
76− objectName: "playlist"
77− }
78−
79− onErrorStringChanged: console.warn("Dash Audio player error:", errorString)
80− }
81−
82− function lengthToString(s) {
83− if (typeof(s) !== "number" || s < 0) return "";
84−
85− var sec = "" + s % 60;
86− if (sec.length == 1) sec = "0" + sec;
87− var hour = Math.floor(s / 3600);
88− if (hour < 1) {
89− return Math.floor(s / 60) + ":" + sec;
90− } else {
91− var min = "" + Math.floor(s / 60) % 60;
92− if (min.length == 1) min = "0" + min;
93− return hour + ":" + min + ":" + sec;
94− }
95− }
96−}
plugins/Dash/ScopeStyle.qmldeleted−95
@@ -1,95 +0,0 @@
1−/*
2− * Copyright 2014 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Utils 0.1
19−import Ubuntu.Components 1.3
20−
21−/*! \brief Helper for processing scope customization options.
22−
23− It will take the customizations object passed by the scope and
24− process it to provide the scope UI with data such as colors or
25− image paths.
26− */
27−
28−QtObject {
29− /// Style object passed from the scope
30− property var style: Object()
31−
32− /// Color used for text and symbolic icons
33− readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
34−
35− /// Luminance of the foreground color
36− readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
37−
38− /// Color used for the overall background
39− readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"
40−
41− /// Luminance of the background color
42− readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
43−
44− /*! \brief Get the most contrasting available color based on luminance
45− *
46− * If background color is transparent, theme provided colors are taken into account
47− */
48− function getTextColor(luminance) {
49− if (Math.abs(foregroundLuminance - luminance) >
50− Math.abs(d.opaqueBackgroundLuminance - luminance)) {
51− return foreground;
52− } else {
53− return d.opaqueBackground;
54− }
55− }
56−
57− /// Source of the logo image for the header
58− readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
59−
60− /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
62−
63− /// Foreground color for the header
64− readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
65−
66− /// Color of the header divider
67− readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"
68−
69− /// Background style for the navigation
70− readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
71−
72− /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
74−
75− //! @cond
76− property var d: QtObject {
77− // FIXME: should be taken from the theme
78− readonly property color defaultLight: "white"
79− readonly property color defaultDark: UbuntuColors.darkGrey
80− readonly property real defaultLightLuminance: Style.luminance(defaultLight)
81− readonly property real defaultDarkLuminance: Style.luminance(defaultDark)
82−
83− readonly property color opaqueBackground: {
84− background.a > 0 ?
85− background :
86− (Math.abs(foregroundLuminance - defaultLightLuminance) >
87− Math.abs(foregroundLuminance - defaultDarkLuminance)) ?
88− defaultLight : defaultDark
89− }
90− readonly property real opaqueBackgroundLuminance: Style.luminance(opaqueBackground)
91−
92− readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }
93− }
94− //! @endcond
95−}
plugins/Dash/abstractdashview.cppdeleted−346
@@ -1,346 +0,0 @@
1−/*
2− * Copyright (C) 2013, 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "abstractdashview.h"
18−
19−AbstractDashView::AbstractDashView()
20− : m_delegateModel(nullptr)
21− , m_asyncRequestedIndex(-1)
22− , m_columnSpacing(0)
23− , m_rowSpacing(0)
24− , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
25− , m_displayMarginBeginning(0)
26− , m_displayMarginEnd(0)
27− , m_needsRelayout(false)
28− , m_delegateValidated(false)
29− , m_implicitHeightDirty(false)
30−{
31− connect(this, &AbstractDashView::widthChanged, this, &AbstractDashView::relayout);
32− connect(this, &AbstractDashView::heightChanged, this, &AbstractDashView::onHeightChanged);
33−}
34−
35−QAbstractItemModel *AbstractDashView::model() const
36−{
37− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
38−}
39−
40−void AbstractDashView::setModel(QAbstractItemModel *model)
41−{
42− if (model != this->model()) {
43− if (!m_delegateModel) {
44− createDelegateModel();
45− } else {
46− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);
47− }
48− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
49− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);
50−
51− cleanupExistingItems();
52−
53− Q_EMIT modelChanged();
54− polish();
55− }
56−}
57−
58−QQmlComponent *AbstractDashView::delegate() const
59−{
60− return m_delegateModel ? m_delegateModel->delegate() : nullptr;
61−}
62−
63−void AbstractDashView::setDelegate(QQmlComponent *delegate)
64−{
65− if (delegate != this->delegate()) {
66− if (!m_delegateModel) {
67− createDelegateModel();
68− }
69−
70− cleanupExistingItems();
71−
72− m_delegateModel->setDelegate(delegate);
73−
74− Q_EMIT delegateChanged();
75− m_delegateValidated = false;
76− polish();
77− }
78−}
79−
80−qreal AbstractDashView::columnSpacing() const
81−{
82− return m_columnSpacing;
83−}
84−
85−void AbstractDashView::setColumnSpacing(qreal columnSpacing)
86−{
87− if (columnSpacing != m_columnSpacing) {
88− m_columnSpacing = columnSpacing;
89− Q_EMIT columnSpacingChanged();
90−
91− if (isComponentComplete()) {
92− relayout();
93− }
94− }
95−}
96−
97−qreal AbstractDashView::rowSpacing() const
98−{
99− return m_rowSpacing;
100−}
101−
102−void AbstractDashView::setRowSpacing(qreal rowSpacing)
103−{
104− if (rowSpacing != m_rowSpacing) {
105− m_rowSpacing = rowSpacing;
106− Q_EMIT rowSpacingChanged();
107−
108− if (isComponentComplete()) {
109− relayout();
110− }
111− }
112−}
113−
114−int AbstractDashView::cacheBuffer() const
115−{
116− return m_buffer;
117−}
118−
119−void AbstractDashView::setCacheBuffer(int buffer)
120−{
121− if (buffer < 0) {
122− qmlInfo(this) << "Cannot set a negative cache buffer";
123− return;
124− }
125−
126− if (m_buffer != buffer) {
127− m_buffer = buffer;
128− if (isComponentComplete()) {
129− polish();
130− }
131− emit cacheBufferChanged();
132− }
133−}
134−
135−qreal AbstractDashView::displayMarginBeginning() const
136−{
137− return m_displayMarginBeginning;
138−}
139−
140−void AbstractDashView::setDisplayMarginBeginning(qreal begin)
141−{
142− if (m_displayMarginBeginning == begin)
143− return;
144− m_displayMarginBeginning = begin;
145− if (isComponentComplete()) {
146− polish();
147− }
148− emit displayMarginBeginningChanged();
149−}
150−
151−qreal AbstractDashView::displayMarginEnd() const
152−{
153− return m_displayMarginEnd;
154−}
155−
156−void AbstractDashView::setDisplayMarginEnd(qreal end)
157−{
158− if (m_displayMarginEnd == end)
159− return;
160− m_displayMarginEnd = end;
161− if (isComponentComplete()) {
162− polish();
163− }
164− emit displayMarginEndChanged();
165−}
166−
167−void AbstractDashView::createDelegateModel()
168−{
169− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);
170− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &AbstractDashView::itemCreated);
171− if (isComponentComplete())
172− m_delegateModel->componentComplete();
173−}
174−
175−void AbstractDashView::refill()
176−{
177− if (!isComponentComplete() || height() < 0) {
178− return;
179− }
180−
181− const qreal from = -m_displayMarginBeginning;
182− const qreal to = height() + m_displayMarginEnd;
183− const qreal bufferFrom = from - m_buffer;
184− const qreal bufferTo = to + m_buffer;
185−
186− bool added = addVisibleItems(from, to, false);
187− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
188− added |= addVisibleItems(bufferFrom, bufferTo, true);
189−
190− if (added || removed) {
191− m_implicitHeightDirty = true;
192− polish();
193− }
194−}
195−
196−bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)
197−{
198− if (fillToY <= fillFromY)
199− return false;
200−
201− if (!delegate())
202− return false;
203−
204− if (m_delegateModel->count() == 0)
205− return false;
206−
207− int modelIndex;
208− qreal yPos;
209− findBottomModelIndexToAdd(&modelIndex, &yPos);
210− bool changed = false;
211− while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {
212− if (!createItem(modelIndex, asynchronous))
213− break;
214−
215− changed = true;
216− findBottomModelIndexToAdd(&modelIndex, &yPos);
217− }
218−
219− findTopModelIndexToAdd(&modelIndex, &yPos);
220− while (modelIndex >= 0 && yPos > fillFromY) {
221− if (!createItem(modelIndex, asynchronous))
222− break;
223−
224− changed = true;
225− findTopModelIndexToAdd(&modelIndex, &yPos);
226− }
227−
228− return changed;
229−}
230−
231−QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)
232−{
233− if (asynchronous && m_asyncRequestedIndex != -1)
234− return nullptr;
235−
236− m_asyncRequestedIndex = -1;
237− QObject* object = m_delegateModel->object(modelIndex, asynchronous);
238− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
239− if (!item) {
240− if (object) {
241− m_delegateModel->release(object);
242− if (!m_delegateValidated) {
243− m_delegateValidated = true;
244− QObject* delegateObj = delegate();
245− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";
246− }
247− } else {
248− m_asyncRequestedIndex = modelIndex;
249− }
250− return nullptr;
251− } else {
252− addItemToView(modelIndex, item);
253− return item;
254− }
255−}
256−
257−void AbstractDashView::releaseItem(QQuickItem *item)
258−{
259− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);
260− if (flags & QQmlDelegateModel::Destroyed) {
261− item->setParentItem(nullptr);
262− }
263−}
264−
265−void AbstractDashView::setImplicitHeightDirty()
266−{
267− m_implicitHeightDirty = true;
268−}
269−
270−void AbstractDashView::itemCreated(int modelIndex, QObject *object)
271−{
272− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
273− if (!item) {
274− qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;
275− return;
276− }
277− item->setParentItem(this);
278−
279− // We only need to call createItem if we are here because of an asynchronous generation
280− // otherwise we are in this slot because createItem is creating the item sync
281− // and thus we don't need to call createItem again, nor need to set m_implicitHeightDirty
282− // and call polish because the sync createItem was called from addVisibleItems that
283− // is called from refill that will already do those if an item was added
284− if (modelIndex == m_asyncRequestedIndex) {
285− createItem(modelIndex, false);
286− m_implicitHeightDirty = true;
287− polish();
288− }
289−}
290−
291−void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)
292−{
293− if (reset) {
294− cleanupExistingItems();
295− } else {
296− processModelRemoves(changeSet.removes());
297− }
298− polish();
299−}
300−
301−
302−void AbstractDashView::relayout()
303−{
304− m_needsRelayout = true;
305− polish();
306−}
307−
308−void AbstractDashView::onHeightChanged()
309−{
310− polish();
311−}
312−
313−void AbstractDashView::updatePolish()
314−{
315− if (!model())
316− return;
317−
318− if (m_needsRelayout) {
319− doRelayout();
320− m_needsRelayout = false;
321− m_implicitHeightDirty = true;
322− }
323−
324− refill();
325−
326− const qreal from = -m_displayMarginBeginning;
327− const qreal to = height() + m_displayMarginEnd;
328− updateItemCulling(from, to);
329−
330− if (m_implicitHeightDirty) {
331− calculateImplicitHeight();
332− m_implicitHeightDirty = false;
333− }
334−}
335−
336−void AbstractDashView::componentComplete()
337−{
338− if (m_delegateModel)
339− m_delegateModel->componentComplete();
340−
341− QQuickItem::componentComplete();
342−
343− m_needsRelayout = true;
344−
345− polish();
346−}
plugins/Dash/abstractdashview.hdeleted−129
@@ -1,129 +0,0 @@
1−/*
2− * Copyright (C) 2013, 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef ABSTRACTDASHVIEW_H
18−#define ABSTRACTDASHVIEW_H
19−
20−#include <QQuickItem>
21−
22−class QAbstractItemModel;
23−class QQmlComponent;
24−#pragma GCC diagnostic push
25−#pragma GCC diagnostic ignored "-pedantic"
26−#include <private/qqmldelegatemodel_p.h>
27−#include <qqmlinfo.h>
28−#pragma GCC diagnostic pop
29−
30−class AbstractDashView : public QQuickItem
31−{
32− Q_OBJECT
33−
34− Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)
35− Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
36− Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
37− Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
38− Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
39− Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
40− WRITE setDisplayMarginBeginning
41− NOTIFY displayMarginBeginningChanged)
42− Q_PROPERTY(qreal displayMarginEnd READ displayMarginEnd
43− WRITE setDisplayMarginEnd
44− NOTIFY displayMarginEndChanged)
45−
46−friend class VerticalJournalTest;
47−friend class HorizontalJournalTest;
48−friend class OrganicGridTest;
49−
50−public:
51− AbstractDashView();
52−
53− QAbstractItemModel *model() const;
54− void setModel(QAbstractItemModel *model);
55−
56− QQmlComponent *delegate() const;
57− void setDelegate(QQmlComponent *delegate);
58−
59− qreal columnSpacing() const;
60− void setColumnSpacing(qreal columnSpacing);
61−
62− qreal rowSpacing() const;
63− void setRowSpacing(qreal rowSpacing);
64−
65− int cacheBuffer() const;
66− void setCacheBuffer(int);
67−
68− qreal displayMarginBeginning() const;
69− void setDisplayMarginBeginning(qreal);
70−
71− qreal displayMarginEnd() const;
72− void setDisplayMarginEnd(qreal);
73−
74−Q_SIGNALS:
75− void modelChanged();
76− void delegateChanged();
77− void columnSpacingChanged();
78− void rowSpacingChanged();
79− void cacheBufferChanged();
80− void displayMarginBeginningChanged();
81− void displayMarginEndChanged();
82−
83−protected Q_SLOTS:
84− void relayout();
85−
86−protected:
87− void updatePolish() override;
88− void componentComplete() override;
89−
90− void releaseItem(QQuickItem *item);
91− void setImplicitHeightDirty();
92−
93−private Q_SLOTS:
94− void itemCreated(int modelIndex, QObject *object);
95− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);
96− void onHeightChanged();
97−
98−private:
99− void createDelegateModel();
100− void refill();
101− bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);
102− QQuickItem *createItem(int modelIndex, bool asynchronous);
103−
104− virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;
105− virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;
106− virtual void addItemToView(int modelIndex, QQuickItem *item) = 0;
107− virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;
108− virtual void cleanupExistingItems() = 0;
109− virtual void doRelayout() = 0;
110− virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
111− virtual void calculateImplicitHeight() = 0;
112− virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
113−
114− QQmlDelegateModel *m_delegateModel;
115−
116− // Index we are waiting because we requested it asynchronously
117− int m_asyncRequestedIndex;
118−
119− int m_columnSpacing;
120− int m_rowSpacing;
121− int m_buffer;
122− qreal m_displayMarginBeginning;
123− qreal m_displayMarginEnd;
124− bool m_needsRelayout;
125− bool m_delegateValidated;
126− bool m_implicitHeightDirty;
127−};
128−
129−#endif
plugins/Dash/graphics/music_progress_bg.pngdeleted
Binary file not shown.
plugins/Dash/horizontaljournal.cppdeleted−242
@@ -1,242 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−/*
18− * The implementation is centered around m_visibleItems
19− * that a list for each of the items in the view.
20− * m_firstVisibleIndex is the index of the first item in m_visibleItems
21− * m_lastInRowIndexPosition is a map that contains the x position
22− * of items that are the last ones of a row so we can reconstruct the rows
23− * when building back
24− */
25−
26−#include "horizontaljournal.h"
27−
28−#include <qqmlengine.h>
29−#pragma GCC diagnostic push
30−#pragma GCC diagnostic ignored "-pedantic"
31−#include <private/qqmldelegatemodel_p.h>
32−#include <qqmlinfo.h>
33−#include <private/qquickitem_p.h>
34−#pragma GCC diagnostic pop
35−
36−HorizontalJournal::HorizontalJournal()
37− : m_firstVisibleIndex(-1)
38− , m_rowHeight(0)
39−{
40−}
41−
42−qreal HorizontalJournal::rowHeight() const
43−{
44− return m_rowHeight;
45−}
46−
47−void HorizontalJournal::setRowHeight(qreal rowHeight)
48−{
49− if (rowHeight != m_rowHeight) {
50− m_rowHeight = rowHeight;
51− Q_EMIT rowHeightChanged();
52−
53− if (isComponentComplete()) {
54− Q_FOREACH(QQuickItem *item, m_visibleItems) {
55− item->setHeight(rowHeight);
56− }
57− relayout();
58− }
59− }
60−}
61−
62−void HorizontalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
63−{
64− if (m_visibleItems.isEmpty()) {
65− *modelIndex = 0;
66− *yPos = 0;
67− } else {
68− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();
69− if (m_lastInRowIndexPosition.contains(*modelIndex - 1)) {
70− *yPos = m_visibleItems.last()->y() + m_rowHeight + rowSpacing();
71− } else {
72− *yPos = m_visibleItems.last()->y();
73− }
74− }
75−}
76−
77−void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
78−{
79− if (m_visibleItems.isEmpty()) {
80− *modelIndex = -1;
81− *yPos = INT_MIN;
82− } else {
83− *modelIndex = m_firstVisibleIndex - 1;
84− if (m_lastInRowIndexPosition.contains(*modelIndex)) {
85− *yPos = m_visibleItems.first()->y() - rowSpacing() - m_rowHeight;
86− } else {
87− *yPos = m_visibleItems.first()->y();
88− }
89− }
90−}
91−
92−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
93−{
94− bool changed = false;
95−
96− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {
97− releaseItem(m_visibleItems.takeFirst());
98− changed = true;
99− m_firstVisibleIndex++;
100− }
101−
102− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {
103− releaseItem(m_visibleItems.takeLast());
104− changed = true;
105− m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());
106− }
107−
108− if (m_visibleItems.isEmpty()) {
109− m_firstVisibleIndex = -1;
110− }
111−
112− return changed;
113−}
114−
115−void HorizontalJournal::addItemToView(int modelIndex, QQuickItem *item)
116−{
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);
120− }
121−
122− if (m_visibleItems.isEmpty()) {
123− Q_ASSERT(modelIndex == 0);
124− item->setY(0);
125− item->setX(0);
126− m_visibleItems << item;
127− m_firstVisibleIndex = 0;
128− } else {
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()) {
133− // Fits in the row
134− item->setY(lastItem->y());
135− item->setX(lastItem->x() + lastItem->width() + columnSpacing());
136− } else {
137− // Starts a new row
138− item->setY(lastItem->y() + m_rowHeight + rowSpacing());
139− item->setX(0);
140− m_lastInRowIndexPosition[modelIndex - 1] = lastItem->x();
141− }
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]);
149− } else {
150− item->setY(firstItem->y());
151− item->setX(firstItem->x() - columnSpacing() - item->width());
152− }
153− m_firstVisibleIndex = modelIndex;
154− m_visibleItems.prepend(item);
155− } else {
156− qWarning() << "HorizontalJournal::addItemToView - Got unexpected modelIndex"
157− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();
158− }
159− }
160−}
161−
162−void HorizontalJournal::cleanupExistingItems()
163−{
164− // Cleanup the existing items
165− Q_FOREACH(QQuickItem *item, m_visibleItems)
166− releaseItem(item);
167− m_visibleItems.clear();
168− m_lastInRowIndexPosition.clear();
169− m_firstVisibleIndex = -1;
170− setImplicitHeightDirty();
171−}
172−
173−void HorizontalJournal::calculateImplicitHeight()
174−{
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));
180− } else {
181− setImplicitHeight(0);
182− }
183−}
184−
185−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
186−{
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);
196− } else {
197− if (indexToRemove < lastIndex) {
198− qDebug() << "HorizontalJournal only supports removal from the end of the model, resetting instead";
199− cleanupExistingItems();
200− break;
201− } else {
202− setImplicitHeightDirty();
203− }
204− }
205− }
206− }
207− if (m_visibleItems.isEmpty()) {
208− m_firstVisibleIndex = -1;
209− }
210−}
211−
212−
213−void HorizontalJournal::doRelayout()
214−{
215− // If m_firstVisibleIndex is not 0 we need to drop all the delegates
216− // since we can't consistently relayout without the first item being there
217−
218− if (m_firstVisibleIndex == 0) {
219− int i = 0;
220− const QList<QQuickItem*> allItems = m_visibleItems;
221− m_visibleItems.clear();
222− m_lastInRowIndexPosition.clear();
223− Q_FOREACH(QQuickItem *item, allItems) {
224− addItemToView(i, item);
225− ++i;
226− }
227− } else {
228− Q_FOREACH(QQuickItem *item, m_visibleItems) {
229− releaseItem(item);
230− }
231− m_visibleItems.clear();
232− m_lastInRowIndexPosition.clear();
233− m_firstVisibleIndex = -1;
234− }
235−}
236−
237−void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
238−{
239− Q_FOREACH(QQuickItem *item, m_visibleItems) {
240− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);
241− }
242−}
plugins/Dash/horizontaljournal.hdeleted−63
@@ -1,63 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef HORIZONTALJOURNAL_H
18−#define HORIZONTALJOURNAL_H
19−
20−#include "abstractdashview.h"
21−
22− /** A horizontal journal is a view that creates delegates
23− * based on a model and layouts them one after the other
24− * in the same row until there is no more free space for the next item
25− * and so that item is layouted in the next row
26− *
27− * All delegates are forced to rowHeight if they don't have it.
28− */
29− class HorizontalJournal : public AbstractDashView
30−{
31− Q_OBJECT
32−
33− Q_PROPERTY(qreal rowHeight READ rowHeight WRITE setRowHeight NOTIFY rowHeightChanged)
34−
35−friend class HorizontalJournalTest;
36−
37−public:
38− HorizontalJournal();
39−
40− qreal rowHeight() const;
41− void setRowHeight(qreal rowHeight);
42−
43−Q_SIGNALS:
44− void rowHeightChanged();
45−
46−private:
47− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
48− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
49− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
50− void addItemToView(int modelIndex, QQuickItem *item) override;
51− void cleanupExistingItems() override;
52− void calculateImplicitHeight() override;
53− void doRelayout() override;
54− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
55− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
56−
57− int m_firstVisibleIndex;
58− QList<QQuickItem*> m_visibleItems;
59− QMap<int, double> m_lastInRowIndexPosition;
60− int m_rowHeight;
61−};
62−
63−#endif
plugins/Dash/listviewwithpageheader.cppdeleted−1398
@@ -1,1398 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−/*
18− * Some documentation on how this thing works:
19− *
20− * A flickable has two very important concepts that define the top and
21− * height of the flickable area.
22− * The top is returned in minYExtent()
23− * The height is set using setContentHeight()
24− * By changing those two values we can make the list grow up or down
25− * as needed. e.g. if we are in the middle of the list
26− * and something that is above the viewport grows, since we do not
27− * want to change the viewport because of that we just adjust the
28− * minYExtent so that the list grows up.
29− *
30− * The implementation on the list relies on the delegateModel doing
31− * most of the instantiation work. You call createItem() when you
32− * need to create an item asking for it async or not. If returns null
33− * it means the item will be created async and the model will call the
34− * itemCreated slot with the item.
35− *
36− * updatePolish is the central point of dispatch for the work of the
37− * class. It is called by the scene graph just before drawing the class.
38− * In it we:
39− * * Make sure all items are positioned correctly
40− * * Add/Remove items if needed
41− * * Update the content height if it was dirty
42− *
43− * m_visibleItems contains all the items we have created at the moment.
44− * Actually not all of them are visible since it includes the ones
45− * in the cache area we create asynchronously to help performance.
46− * The first item in m_visibleItems has the m_firstVisibleIndex in
47− * the model. If you actually want to know what is the first
48− * item in the viewport you have to find the first non culled element
49− * in m_visibleItems
50− *
51− * All the items (except the header) are childs of m_clipItem which
52− * is a child of the contentItem() of the flickable (The contentItem()
53− * is what actually 'moves' in a a flickable). This way
54− * we can implement the clipping needed so we can have the header
55− * shown in the middle of the list over the items without the items
56− * leaking under the header in case it is transparent.
57− *
58− * The first item of m_visibleItems is the one that defines the
59− * positions of all the rest of items (see updatePolish()) and
60− * this is why sometimes we move it even if it's not the item
61− * that has triggered the function (i.e. in itemGeometryChanged())
62− *
63− * m_visibleItems is a list of ListItem. Each ListItem
64− * will contain a item and potentially a sectionItem. The sectionItem
65− * is only there when the list is using sectionDelegate+sectionProperty
66− * and this is the first item of the section. Each ListItem is vertically
67− * layouted with the sectionItem first and then the item.
68− *
69− * For sectioning we also have a section item alone (m_topSectionItem)
70− * that is used for the cases we need to show the sticky section item at
71− * the top of the view.
72− *
73− * Each delegate item has a context property called heightToClip that is
74− * used to communicate to the delegate implementation in case it has to
75− * clip itself because of overlapping with the top sticky section item.
76− * This is an implementation decision since it has been agreed it
77− * is easier to implement the clipping in QML with this info than to
78− * do it at the C++ level.
79− *
80− * Note that minYExtent and height are not always totally accurate, since
81− * we don't have the items created we can't guess their heights
82− * so we can only guarantee the values are correct when the first/last
83− * items of the list are visible, otherwise we just live with good enough
84− * values that make the list scrollable
85− *
86− * There are a few things that are not really implemented or tested properly
87− * which we don't use at the moment like changing the model, changing
88− * the section delegate, having a section delegate that changes its size, etc.
89− * The known missing features are marked with TODOs along the code.
90− */
91−
92−#include "listviewwithpageheader.h"
93−
94−#include <QCoreApplication>
95−#include <QDebug>
96−#include <qqmlinfo.h>
97−#include <qqmlengine.h>
98−#pragma GCC diagnostic push
99−#pragma GCC diagnostic ignored "-pedantic"
100−#include <private/qqmldelegatemodel_p.h>
101−#include <private/qqmlglobal_p.h>
102−#include <private/qquickitem_p.h>
103−#include <private/qquickanimation_p.h>
104−#pragma GCC diagnostic pop
105−// #include <private/qquickrectangle_p.h>
106−
107−qreal ListViewWithPageHeader::ListItem::height() const
108−{
109− return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
110−}
111−
112−qreal ListViewWithPageHeader::ListItem::y() const
113−{
114− return m_item->y() - (m_sectionItem ? m_sectionItem->height() : 0);
115−}
116−
117−void ListViewWithPageHeader::ListItem::setY(qreal newY)
118−{
119− if (m_sectionItem) {
120− m_sectionItem->setY(newY);
121− m_item->setY(newY + m_sectionItem->height());
122− } else {
123− m_item->setY(newY);
124− }
125−}
126−
127−bool ListViewWithPageHeader::ListItem::culled() const
128−{
129− return QQuickItemPrivate::get(m_item)->culled;
130−}
131−
132−void ListViewWithPageHeader::ListItem::setCulled(bool culled)
133−{
134− QQuickItemPrivate::get(m_item)->setCulled(culled);
135− if (m_sectionItem)
136− QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
137−}
138−
139−void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
140−{
141− m_sectionItem = sectionItem;
142−}
143−
144−ListViewWithPageHeader::ListViewWithPageHeader()
145− : m_delegateModel(nullptr)
146− , m_asyncRequestedIndex(-1)
147− , m_delegateValidated(false)
148− , m_firstVisibleIndex(-1)
149− , m_minYExtent(0)
150− , m_contentHeightDirty(false)
151− , m_headerItem(nullptr)
152− , m_previousContentY(0)
153− , m_headerItemShownHeight(0)
154− , m_sectionDelegate(nullptr)
155− , m_topSectionItem(nullptr)
156− , m_forceNoClip(false)
157− , m_inLayout(false)
158− , m_inContentHeightKeepHeaderShown(false)
159− , m_cacheBuffer(0)
160−{
161− m_clipItem = new QQuickItem(contentItem());
162−// m_clipItem = new QQuickRectangle(contentItem());
163−// ((QQuickRectangle*)m_clipItem)->setColor(Qt::gray);
164−
165− m_contentYAnimation = new QQuickNumberAnimation(this);
166− m_contentYAnimation->setEasing(QEasingCurve::OutQuad);
167− m_contentYAnimation->setProperty(QStringLiteral("contentY"));
168− m_contentYAnimation->setDuration(200);
169− m_contentYAnimation->setTargetObject(this);
170−
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);
175−
176− setFlickableDirection(VerticalFlick);
177−}
178−
179−ListViewWithPageHeader::~ListViewWithPageHeader()
180−{
181−}
182−
183−QAbstractItemModel *ListViewWithPageHeader::model() const
184−{
185− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
186−}
187−
188−void ListViewWithPageHeader::setModel(QAbstractItemModel *model)
189−{
190− if (model != this->model()) {
191− if (!m_delegateModel) {
192− createDelegateModel();
193− } else {
194− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
195− }
196− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
197− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
198− Q_EMIT modelChanged();
199− polish();
200− // TODO?
201−// Q_EMIT contentHeightChanged();
202−// Q_EMIT contentYChanged();
203− }
204−}
205−
206−QQmlComponent *ListViewWithPageHeader::delegate() const
207−{
208− return m_delegateModel ? m_delegateModel->delegate() : nullptr;
209−}
210−
211−void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
212−{
213− if (delegate != this->delegate()) {
214− if (!m_delegateModel) {
215− createDelegateModel();
216− }
217−
218− // Cleanup the existing items
219− Q_FOREACH(ListItem *item, m_visibleItems)
220− releaseItem(item);
221− m_visibleItems.clear();
222− initializeValuesForEmptyList();
223−
224− m_delegateModel->setDelegate(delegate);
225−
226− Q_EMIT delegateChanged();
227− m_delegateValidated = false;
228− m_contentHeightDirty = true;
229− polish();
230− }
231−}
232−
233−void ListViewWithPageHeader::initializeValuesForEmptyList()
234−{
235− m_firstVisibleIndex = -1;
236− adjustMinYExtent();
237− setContentY(0);
238− m_clipItem->setY(0);
239− if (m_topSectionItem) {
240− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
241− }
242−}
243−
244−QQuickItem *ListViewWithPageHeader::header() const
245−{
246− return m_headerItem;
247−}
248−
249−void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)
250−{
251− if (m_headerItem != headerItem) {
252− qreal oldHeaderHeight = 0;
253− qreal oldHeaderY = 0;
254− if (m_headerItem) {
255− oldHeaderHeight = m_headerItem->height();
256− oldHeaderY = m_headerItem->y();
257− m_headerItem->setParentItem(nullptr);
258− }
259− m_headerItem = headerItem;
260− if (m_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);
265− }
266− qreal newHeaderHeight = m_headerItem ? m_headerItem->height() : 0;
267− if (!m_visibleItems.isEmpty() && newHeaderHeight != oldHeaderHeight) {
268− headerHeightChanged(newHeaderHeight, oldHeaderHeight, oldHeaderY);
269− polish();
270− m_contentHeightDirty = true;
271− }
272− Q_EMIT headerChanged();
273− }
274−}
275−
276−QQmlComponent *ListViewWithPageHeader::sectionDelegate() const
277−{
278− return m_sectionDelegate;
279−}
280−
281−void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)
282−{
283− if (delegate != m_sectionDelegate) {
284− // TODO clean existing sections
285−
286− m_sectionDelegate = delegate;
287−
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);
292−
293− // TODO create sections for existing items
294−
295− Q_EMIT sectionDelegateChanged();
296− Q_EMIT stickyHeaderHeightChanged();
297− }
298−}
299−
300−QString ListViewWithPageHeader::sectionProperty() const
301−{
302− return m_sectionProperty;
303−}
304−
305−void ListViewWithPageHeader::setSectionProperty(const QString &property)
306−{
307− if (property != m_sectionProperty) {
308− m_sectionProperty = property;
309−
310− updateWatchedRoles();
311−
312− // TODO recreate sections
313−
314− Q_EMIT sectionPropertyChanged();
315− }
316−}
317−
318−bool ListViewWithPageHeader::forceNoClip() const
319−{
320− return m_forceNoClip;
321−}
322−
323−void ListViewWithPageHeader::setForceNoClip(bool noClip)
324−{
325− if (noClip != m_forceNoClip) {
326− m_forceNoClip = noClip;
327− updateClipItem();
328− Q_EMIT forceNoClipChanged();
329− }
330−}
331−
332−int ListViewWithPageHeader::stickyHeaderHeight() const
333−{
334− return m_topSectionItem ? m_topSectionItem->height() : 0;
335−}
336−
337−qreal ListViewWithPageHeader::headerItemShownHeight() const
338−{
339− return m_headerItemShownHeight;
340−}
341−
342−int ListViewWithPageHeader::cacheBuffer() const
343−{
344− return m_cacheBuffer;
345−}
346−
347−void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
348−{
349− if (cacheBuffer < 0) {
350− qmlInfo(this) << "Cannot set a negative cache buffer";
351− return;
352− }
353−
354− if (cacheBuffer != m_cacheBuffer) {
355− m_cacheBuffer = cacheBuffer;
356− Q_EMIT cacheBufferChanged();
357− polish();
358− }
359−}
360−
361−void ListViewWithPageHeader::positionAtBeginning()
362−{
363− if (m_delegateModel->count() <= 0)
364− return;
365−
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)
372− releaseItem(item);
373− m_visibleItems.clear();
374− m_firstVisibleIndex = -1;
375−
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
380− int modelIndex = 1;
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)))
385− break;
386− pos += item->height();
387− ++modelIndex;
388− }
389−
390− m_previousContentY = m_visibleItems.first()->y() - headerHeight;
391− }
392− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);
393− if (m_headerItem) {
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);
399− }
400−}
401−
402−static inline bool uFuzzyCompare(qreal r1, qreal r2)
403−{
404− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
405−}
406−
407−void ListViewWithPageHeader::showHeader()
408−{
409− if (!m_headerItem)
410− return;
411−
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()) {
421− updateClipItem();
422− ListItem *firstItem = m_visibleItems.first();
423− firstItem->setY(firstItem->y() - m_headerItemShownHeight);
424− layout();
425− }
426− Q_EMIT headerItemShownHeightChanged();
427− }
428− m_contentYAnimation->setTo(to);
429− contentYAnimationType = ContentYAnimationShowHeader;
430− m_contentYAnimation->start();
431− }
432−}
433−
434−int ListViewWithPageHeader::firstCreatedIndex() const
435−{
436− return m_firstVisibleIndex;
437−}
438−
439−int ListViewWithPageHeader::createdItemCount() const
440−{
441− return m_visibleItems.count();
442−}
443−
444−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
445−{
446− ListItem *item = itemAtIndex(modelIndex);
447− if (item)
448− return item->m_item;
449− else
450− return nullptr;
451−}
452−
453−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)
454−{
455− ListItem *listItem = itemAtIndex(modelIndex);
456− if (listItem) {
457− return maximizeVisibleArea(listItem, listItem->height());
458− }
459−
460− return false;
461−}
462−
463−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)
464−{
465− if (itemHeight < 0)
466− return false;
467−
468− ListItem *listItem = itemAtIndex(modelIndex);
469− if (listItem) {
470− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));
471− }
472−
473− return false;
474−}
475−
476−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)
477−{
478− if (listItem) {
479− layout();
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()))
489− {
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();
499− }
500− }
501− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());
502− m_contentYAnimation->setTo(to);
503− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
504− m_contentYAnimation->start();
505− }
506− return true;
507− }
508− return false;
509−}
510−
511−qreal ListViewWithPageHeader::minYExtent() const
512−{
513−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;
514− return m_minYExtent;
515−}
516−
517−qreal ListViewWithPageHeader::maxYExtent() const
518−{
519− return height() - contentHeight();
520−}
521−
522−void ListViewWithPageHeader::componentComplete()
523−{
524− if (m_delegateModel)
525− m_delegateModel->componentComplete();
526−
527− QQuickFlickable::componentComplete();
528−
529− polish();
530−}
531−
532−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
533−{
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())
538− return;
539−
540− QQuickFlickable::viewportMoved(orient);
541−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();
542− const qreal diff = m_previousContentY - contentY();
543− adjustHeader(diff);
544− m_previousContentY = contentY();
545− layout();
546− polish();
547−}
548−
549−void ListViewWithPageHeader::adjustHeader(qreal diff)
550−{
551− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;
552− if (m_headerItem) {
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;
563−
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;
571− } else {
572− m_headerItemShownHeight += diff;
573− }
574− if (uFuzzyCompare(contentY(), -m_minYExtent)) {
575− m_headerItemShownHeight = 0;
576− } else {
577− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());
578− }
579− if (m_headerItemShownHeight > 0) {
580− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {
581− m_headerItem->setY(contentY());
582− m_headerItemShownHeight = m_headerItem->height();
583− } else {
584− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);
585− }
586− } else {
587− m_headerItem->setY(-m_minYExtent);
588− }
589− }
590− Q_EMIT headerItemShownHeightChanged();
591− } else {
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()));
595− }
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;
601− } else {
602− diff = -diff;
603− }
604− }
605− if (!m_visibleItems.isEmpty()) {
606− updateClipItem();
607− ListItem *firstItem = m_visibleItems.first();
608− firstItem->setY(firstItem->y() + diff);
609− if (showHeaderAnimationRunning) {
610− adjustMinYExtent();
611− }
612− }
613−}
614−
615−void ListViewWithPageHeader::createDelegateModel()
616−{
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();
622−}
623−
624−void ListViewWithPageHeader::refill()
625−{
626− if (m_inLayout) {
627− return;
628− }
629− if (!isComponentComplete()) {
630− return;
631− }
632−
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;
637−
638− bool added = addVisibleItems(from, to, false);
639− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
640− added |= addVisibleItems(bufferFrom, bufferTo, true);
641−
642− if (added || removed) {
643− m_contentHeightDirty = true;
644− }
645−}
646−
647−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)
648−{
649− if (!delegate())
650− return false;
651−
652− if (m_delegateModel->count() == 0)
653− return false;
654−
655− ListItem *item;
656−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;
657−
658− int modelIndex = 0;
659− qreal pos = 0;
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();
664− }
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)))
670− break;
671− pos += item->height();
672− ++modelIndex;
673− changed = true;
674− }
675−
676− modelIndex = 0;
677− pos = 0;
678− if (!m_visibleItems.isEmpty()) {
679− modelIndex = m_firstVisibleIndex - 1;
680− item = m_visibleItems.first();
681− pos = item->y() + m_clipItem->y();
682− }
683− while (modelIndex >= 0 && pos > fillFrom) {
684−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;
685− if (!(item = createItem(modelIndex, asynchronous)))
686− break;
687− pos -= item->height();
688− --modelIndex;
689− changed = true;
690− }
691−
692− return changed;
693−}
694−
695−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)
696−{
697− QQuickItem *item = listItem->m_item;
698− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);
699− if (flags & QQmlDelegateModel::Destroyed) {
700− item->setParentItem(nullptr);
701− }
702− listItem->sectionItem()->deleteLater();
703− delete listItem;
704−}
705−
706−void ListViewWithPageHeader::releaseItem(ListItem *listItem)
707−{
708− QQuickItemPrivate::get(listItem->m_item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
709− if (listItem->sectionItem()) {
710− QQuickItemPrivate::get(listItem->sectionItem())->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
711− }
712− m_itemsToRelease << listItem;
713−}
714−
715−void ListViewWithPageHeader::updateWatchedRoles()
716−{
717− if (m_delegateModel) {
718− QList<QByteArray> roles;
719− if (!m_sectionProperty.isEmpty())
720− roles << m_sectionProperty.toUtf8();
721− m_delegateModel->setWatchedRoles(roles);
722− }
723−}
724−
725−QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)
726−{
727− if (!m_sectionDelegate)
728− return nullptr;
729−
730− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
731−
732− if (modelIndex > 0) {
733− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
734− if (section == prevSection)
735− return nullptr;
736− }
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
743− if (nextItem) {
744− QQuickItem *sectionItem = nextItem->sectionItem();
745− nextItem->setSectionItem(nullptr);
746− return sectionItem;
747− }
748− }
749− }
750−
751− return getSectionItem(section);
752−}
753−
754−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString §ionText, bool watchGeometry)
755−{
756− QQuickItem *sectionItem = nullptr;
757−
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);
763− if (nobj) {
764− QQml_setParent_noEvent(context, nobj);
765− sectionItem = qobject_cast<QQuickItem *>(nobj);
766− if (!sectionItem) {
767− delete nobj;
768− } else {
769− sectionItem->setZ(2);
770− QQml_setParent_noEvent(sectionItem, m_clipItem);
771− sectionItem->setParentItem(m_clipItem);
772− }
773− } else {
774− delete context;
775− }
776− m_sectionDelegate->completeCreate();
777−
778− if (watchGeometry) {
779− QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
780− }
781−
782− return sectionItem;
783−}
784−
785−void ListViewWithPageHeader::updateSectionItem(int modelIndex)
786−{
787− ListItem *item = itemAtIndex(modelIndex);
788− if (item) {
789− const QString sectionText = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
790−
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;
797− }
798− }
799−
800− if (needSectionHeader) {
801− if (!item->sectionItem()) {
802− item->setSectionItem(getSectionItem(sectionText));
803− } else {
804− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();
805− context->setContextProperty(QStringLiteral("section"), sectionText);
806− }
807− } else {
808− if (item->sectionItem()) {
809− item->sectionItem()->deleteLater();
810− item->setSectionItem(nullptr);
811− }
812− }
813− }
814−}
815−
816−bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
817−{
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) {
822− return false;
823− } else if (contentY() + height() > contentHeight()) {
824− return false;
825− }
826− bool changed = false;
827−
828− bool foundVisible = false;
829− int i = 0;
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;
838− releaseItem(item);
839− m_visibleItems.removeAt(i);
840− changed = true;
841− ++removedItems;
842− } else {
843− if (!foundVisible) {
844− foundVisible = true;
845− const int itemIndex = m_firstVisibleIndex + removedItems + i;
846− m_firstVisibleIndex = itemIndex;
847− }
848− ++i;
849− }
850− }
851− if (!foundVisible) {
852− initializeValuesForEmptyList();
853− }
854− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
855− adjustMinYExtent();
856− }
857−
858− return changed;
859−}
860−
861−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)
862−{
863−// qDebug() << "CREATE ITEM" << modelIndex;
864− if (asynchronous && m_asyncRequestedIndex != -1)
865− return nullptr;
866−
867− m_asyncRequestedIndex = -1;
868− QObject* object = m_delegateModel->object(modelIndex, asynchronous);
869− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
870− if (!item) {
871− if (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";
877− }
878− } else {
879− m_asyncRequestedIndex = modelIndex;
880− }
881− return 0;
882− } else {
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
892− if (prevItem) {
893− listItem->setY(prevItem->y() + prevItem->height());
894− } else {
895− ListItem *currItem = itemAtIndex(modelIndex);
896− if (currItem) {
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());
899− } else {
900− ListItem *nextItem = itemAtIndex(modelIndex + 1);
901− if (nextItem) {
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()) {
906− lostItem = true;
907− }
908− }
909− }
910− if (lostItem) {
911− listItem->setCulled(true);
912− releaseItem(listItem);
913− listItem = nullptr;
914− } else {
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;
918− } else {
919− m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);
920− }
921− if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {
922− m_firstVisibleIndex = modelIndex;
923− polish();
924− }
925− if (listItem->sectionItem()) {
926− QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();
927− context->setContextProperty(QStringLiteral("delegateIndex"), modelIndex);
928− }
929− adjustMinYExtent();
930− m_contentHeightDirty = true;
931− }
932− return listItem;
933− }
934−}
935−
936−void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)
937−{
938− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
939− if (!item) {
940− qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;
941− return;
942− }
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())
948− return;
949−
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);
956− refill();
957− }
958−}
959−
960−void ListViewWithPageHeader::updateClipItem()
961−{
962− m_clipItem->setHeight(height() - m_headerItemShownHeight);
963− m_clipItem->setY(contentY() + m_headerItemShownHeight);
964− m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);
965−}
966−
967−void ListViewWithPageHeader::onContentHeightChanged()
968−{
969− updateClipItem();
970−}
971−
972−void ListViewWithPageHeader::onContentWidthChanged()
973−{
974− m_clipItem->setWidth(contentItem()->width());
975−}
976−
977−void ListViewWithPageHeader::onHeightChanged()
978−{
979− polish();
980−}
981−
982−
983−void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)
984−{
985− // TODO Do something with reset
986−// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
987− const auto oldFirstVisibleIndex = m_firstVisibleIndex;
988−
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()) {
1000− growDown = false;
1001− }
1002− }
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);
1013− }
1014− }
1015− releaseItem(item);
1016− m_visibleItems.removeAt(visibleIndex);
1017− }
1018− }
1019− if (growDown) {
1020− adjustMinYExtent();
1021− } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {
1022− m_visibleItems.first()->setY(oldFirstValidIndexPos);
1023− }
1024− if (m_visibleItems.isEmpty()) {
1025− m_firstVisibleIndex = -1;
1026− } else {
1027− m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);
1028− }
1029− } else if (remove.index + remove.count <= m_firstVisibleIndex) {
1030− m_firstVisibleIndex -= remove.count;
1031− }
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--;
1038− }
1039− }
1040− }
1041−
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)
1047− {
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) {
1055− growUp = true;
1056− }
1057− break;
1058− }
1059− }
1060− }
1061−
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);
1066− if (growUp) {
1067− ListItem *firstItem = m_visibleItems.first();
1068− firstItem->setY(firstItem->y() - item->height());
1069− }
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());
1079− }
1080− }
1081− }
1082− }
1083− if (firstItemWithViewOnTop) {
1084− ListItem *firstItem = m_visibleItems.first();
1085− firstItem->setY(oldFirstValidIndexPos);
1086− }
1087− adjustMinYExtent();
1088− } else if (insert.index <= m_firstVisibleIndex) {
1089− m_firstVisibleIndex += insert.count;
1090− }
1091−
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++;
1096− }
1097− }
1098− }
1099−
1100− Q_FOREACH(const QQmlChangeSet::Change change, changeSet.changes()) {
1101− for (int i = change.start(); i < change.end(); ++i) {
1102− updateSectionItem(i);
1103− }
1104− // Also update the section header for the next item after the change since it may be influenced
1105− updateSectionItem(change.end());
1106− }
1107−
1108− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
1109− if (m_visibleItems.isEmpty()) {
1110− initializeValuesForEmptyList();
1111− } else {
1112− adjustMinYExtent();
1113− }
1114− }
1115−
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);
1121− }
1122− }
1123−
1124− layout();
1125− polish();
1126− m_contentHeightDirty = true;
1127−}
1128−
1129−void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)
1130−{
1131− setInteractive(!running);
1132− if (!running) {
1133− m_contentHeightDirty = true;
1134− polish();
1135− }
1136−}
1137−
1138−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
1139−{
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);
1149− }
1150−
1151− if (firstItem->y() != prevFirstItemY) {
1152− adjustMinYExtent();
1153− layout();
1154− }
1155− }
1156− refill();
1157− adjustMinYExtent();
1158− polish();
1159− m_contentHeightDirty = true;
1160− }
1161−}
1162−
1163−void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)
1164−{
1165− if (item == m_headerItem) {
1166− const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;
1167− if (diff != 0) {
1168− adjustHeader(diff);
1169− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();
1170− layout();
1171− polish();
1172− m_contentHeightDirty = true;
1173− }
1174− }
1175−}
1176−
1177−void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)
1178−{
1179− const qreal heightDiff = newHeaderHeight - oldHeaderHeight;
1180− if (m_headerItemShownHeight > 0) {
1181− // If the header is shown because of the clip
1182− // Change its size
1183− m_headerItemShownHeight += heightDiff;
1184− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);
1185− updateClipItem();
1186− adjustMinYExtent();
1187− Q_EMIT headerItemShownHeightChanged();
1188− } else {
1189− if (oldHeaderY + oldHeaderHeight > contentY()) {
1190− // If the header is shown because its position
1191− // Change its size
1192− ListItem *firstItem = m_visibleItems.first();
1193− firstItem->setY(firstItem->y() + heightDiff);
1194− layout();
1195− } else {
1196− // If the header is not on screen, just change the start of the list
1197− // so the viewport is not changed
1198− adjustMinYExtent();
1199− }
1200− }
1201−}
1202−
1203−
1204−void ListViewWithPageHeader::adjustMinYExtent()
1205−{
1206− if (m_visibleItems.isEmpty() || (contentHeight() + m_minYExtent < height())) {
1207− m_minYExtent = 0;
1208− } else {
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();
1216− }
1217− nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
1218−// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;
1219− }
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)) {
1223− m_minYExtent = 0;
1224− m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);
1225− }
1226− }
1227−}
1228−
1229−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const
1230−{
1231− const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;
1232− if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())
1233− return m_visibleItems[visibleIndexedModelIndex];
1234−
1235− return nullptr;
1236−}
1237−
1238−void ListViewWithPageHeader::layout()
1239−{
1240− if (m_inLayout)
1241− return;
1242−
1243− m_inLayout = true;
1244− if (!m_visibleItems.isEmpty()) {
1245− const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;
1246− const qreal visibleTo = contentY() + height() - m_clipItem->y();
1247−
1248− qreal pos = m_visibleItems.first()->y();
1249−
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);
1256− item->setY(pos);
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();
1275− } else {
1276− showStickySectionItem = false;
1277− }
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);
1286− }
1287− } else {
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);
1292−
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)
1300− break;
1301− delegateIndex--;
1302− }
1303− context->setContextProperty(QStringLiteral("delegateIndex"), delegateIndex);
1304− if (item->sectionItem()) {
1305− QQuickItemPrivate::get(item->sectionItem())->setCulled(true);
1306− }
1307− }
1308− }
1309− }
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);
1314− } else {
1315− context->setContextProperty(QStringLiteral("heightToClip"), QVariant::fromValue<int>(0));
1316− }
1317−// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;
1318− pos += item->height();
1319− ++modelIndex;
1320− }
1321−
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());
1331− }
1332− break;
1333− }
1334− }
1335− }
1336− }
1337− }
1338− m_inLayout = false;
1339−}
1340−
1341−void ListViewWithPageHeader::updatePolish()
1342−{
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())
1347− return;
1348−
1349− Q_FOREACH(ListItem *item, m_itemsToRelease)
1350− reallyReleaseItem(item);
1351− m_itemsToRelease.clear();
1352−
1353− if (!model())
1354− return;
1355−
1356− layout();
1357−
1358− refill();
1359−
1360− if (m_contentHeightDirty) {
1361− qreal contentHeight;
1362− if (m_visibleItems.isEmpty()) {
1363− contentHeight = m_headerItem ? m_headerItem->height() : 0;
1364− } else {
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();
1374− }
1375− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);
1376− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;
1377− }
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()));
1383− }
1384− }
1385−
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
1390− m_minYExtent = 0;
1391− }
1392− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
1393− setContentHeight(contentHeight);
1394− m_inContentHeightKeepHeaderShown = false;
1395− }
1396−}
1397−
1398−#include "moc_listviewwithpageheader.cpp"
plugins/Dash/listviewwithpageheader.hdeleted−218
@@ -1,218 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef LISTVIEWWITHPAGEHEADER_H
18−#define LISTVIEWWITHPAGEHEADER_H
19−
20−#include <private/qquickitemchangelistener_p.h>
21−#include <private/qquickflickable_p.h>
22−
23−class QAbstractItemModel;
24−class QQuickNumberAnimation;
25−class QQmlChangeSet;
26−class QQmlDelegateModel;
27−
28−
29−/**
30− Note for users of this class
31−
32− ListViewWithPageHeader already loads delegates async when appropiate so if
33− your delegate uses a Loader you should not enable the asynchronous feature since
34− that will need to introduce sizing problems
35−
36− With the double async it may happen what while we are scrolling down
37− we reach to a point where given the size of the just created delegate with loader not yet loaded (which will be very close to 0)
38− we are already "at the end" of the list, but then a few milliseconds later the loader finishes loading and we could
39− have kept scrolling. This is specially visible at the end of the list where you realize
40− that scrolling ended a bit before the end of the list but the speed of the flicking was good
41− to reach the end
42−
43− By not having the second async we get a better sizing when the delegate is created and things work better
44−*/
45−
46−class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeListener
47−{
48− Q_OBJECT
49− Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)
50− Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
51− Q_PROPERTY(QQuickItem *pageHeader READ header WRITE setHeader NOTIFY headerChanged)
52− Q_PROPERTY(QQmlComponent *sectionDelegate READ sectionDelegate WRITE setSectionDelegate NOTIFY sectionDelegateChanged)
53− Q_PROPERTY(QString sectionProperty READ sectionProperty WRITE setSectionProperty NOTIFY sectionPropertyChanged)
54− Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
55− Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
56− Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57− Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
58−
59− friend class ListViewWithPageHeaderTest;
60− friend class ListViewWithPageHeaderTestSection;
61− friend class ListViewWithPageHeaderTestExternalModel;
62−
63−public:
64− ListViewWithPageHeader();
65− ~ListViewWithPageHeader();
66−
67− QAbstractItemModel *model() const;
68− void setModel(QAbstractItemModel *model);
69−
70− QQmlComponent *delegate() const;
71− void setDelegate(QQmlComponent *delegate);
72−
73− QQuickItem *header() const;
74− void setHeader(QQuickItem *header);
75−
76− QQmlComponent *sectionDelegate() const;
77− void setSectionDelegate(QQmlComponent *delegate);
78−
79− QString sectionProperty() const;
80− void setSectionProperty(const QString &property);
81−
82− bool forceNoClip() const;
83− void setForceNoClip(bool noClip);
84−
85− int stickyHeaderHeight() const;
86− qreal headerItemShownHeight() const;
87−
88− int cacheBuffer() const;
89− void setCacheBuffer(int cacheBuffer);
90−
91− Q_INVOKABLE void positionAtBeginning();
92− Q_INVOKABLE void showHeader();
93− Q_INVOKABLE int firstCreatedIndex() const;
94− Q_INVOKABLE int createdItemCount() const;
95− Q_INVOKABLE QQuickItem *item(int modelIndex) const;
96−
97− // The index has to be created for this to try to do something
98− // Created items are those visible and the precached ones
99− // Returns if the item existed or not
100− Q_INVOKABLE bool maximizeVisibleArea(int modelIndex);
101− Q_INVOKABLE bool maximizeVisibleArea(int modelIndex, int itemHeight);
102−
103−Q_SIGNALS:
104− void modelChanged();
105− void delegateChanged();
106− void headerChanged();
107− void sectionDelegateChanged();
108− void sectionPropertyChanged();
109− void forceNoClipChanged();
110− void stickyHeaderHeightChanged();
111− void headerItemShownHeightChanged();
112− void cacheBufferChanged();
113−
114−protected:
115− void componentComplete() override;
116− void viewportMoved(Qt::Orientations orient) override;
117− qreal minYExtent() const override;
118− 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;
122−
123−private Q_SLOTS:
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);
130−
131−private:
132− class ListItem
133− {
134− public:
135− qreal height() const;
136−
137− qreal y() const;
138− void setY(qreal newY);
139−
140− bool culled() const;
141− void setCulled(bool culled);
142−
143− QQuickItem *sectionItem() const { return m_sectionItem; }
144− void setSectionItem(QQuickItem *sectionItem);
145−
146− QQuickItem *m_item;
147− private:
148− QQuickItem *m_sectionItem;
149− };
150−
151− bool maximizeVisibleArea(ListItem *listItem, int listItemHeight);
152−
153− void createDelegateModel();
154−
155− void layout();
156− void refill();
157− bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);
158− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
159− ListItem *createItem(int modelIndex, bool asynchronous);
160−
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();
173−
174− QQmlDelegateModel *m_delegateModel;
175−
176− // Index we are waiting because we requested it asynchronously
177− int m_asyncRequestedIndex;
178−
179− // Used to only give a warning once if the delegate does not return objects
180− bool m_delegateValidated;
181−
182− // Visible indexes, [0] is m_firstValidIndex, [0+1] is m_firstValidIndex +1, ...
183− QList<ListItem *> m_visibleItems;
184− int m_firstVisibleIndex;
185−
186− qreal m_minYExtent;
187−
188− QQuickItem *m_clipItem;
189−
190− // If any of the heights has changed
191− // or new items have been added/removed
192− bool m_contentHeightDirty;
193−
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;
202−
203− QQmlComponent *m_sectionDelegate;
204− QString m_sectionProperty;
205− QQuickItem *m_topSectionItem;
206−
207− bool m_forceNoClip;
208− bool m_inLayout;
209− bool m_inContentHeightKeepHeaderShown;
210− int m_cacheBuffer;
211−
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;
215−};
216−
217−
218−#endif
plugins/Dash/organicgrid.cppdeleted−260
@@ -1,260 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "organicgrid.h"
18−
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
21−#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
23−
24−OrganicGrid::OrganicGrid()
25− : m_firstVisibleIndex(-1)
26− , m_numberOfModulesPerRow(-1)
27−{
28−}
29−
30−QSizeF OrganicGrid::smallDelegateSize() const
31−{
32− return m_smallDelegateSize;
33−}
34−
35−void OrganicGrid::setSmallDelegateSize(const QSizeF size)
36−{
37− if (m_smallDelegateSize != size) {
38− m_smallDelegateSize = size;
39− Q_EMIT smallDelegateSizeChanged();
40−
41− if (isComponentComplete()) {
42− relayout();
43− }
44− }
45−}
46−
47−QSizeF OrganicGrid::bigDelegateSize() const
48−{
49− return m_bigDelegateSize;
50−}
51−
52−void OrganicGrid::setBigDelegateSize(const QSizeF size)
53−{
54− if (m_bigDelegateSize != size) {
55− m_bigDelegateSize = size;
56− Q_EMIT bigDelegateSizeChanged();
57−
58− if (isComponentComplete()) {
59− relayout();
60− }
61− }
62−}
63−
64−QPointF OrganicGrid::positionForIndex(int modelIndex) const
65−{
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);
71−
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();
78− }
79−
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;
89− }
90−
91− return QPointF(xPos, yPos);
92−}
93−
94−QSizeF OrganicGrid::sizeForIndex(int modelIndex) const
95−{
96− const int moduleIndex = modelIndex % 6;
97− if (moduleIndex == 0 || moduleIndex == 1 || moduleIndex == 3 || moduleIndex == 5) {
98− return m_smallDelegateSize;
99− } else {
100− return m_bigDelegateSize;
101− }
102−}
103−
104−void OrganicGrid::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
105−{
106− if (m_visibleItems.isEmpty()) {
107− *modelIndex = 0;
108− *yPos = 0;
109− } else {
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();
115− }
116−}
117−
118−void OrganicGrid::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
119−{
120− if (m_visibleItems.isEmpty()) {
121− *modelIndex = 0;
122− *yPos = 0;
123− } else {
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();
130− }
131−}
132−
133−void OrganicGrid::addItemToView(int modelIndex, QQuickItem *item)
134−{
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;
144− } else {
145− qWarning() << "OrganicGrid::addItemToView - Got unexpected modelIndex"
146− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();
147− return;
148− }
149−
150− const QPointF pos = positionForIndex(modelIndex);
151− item->setPosition(pos);
152−
153− item->setSize(sizeForIndex(modelIndex));
154−}
155−
156−bool OrganicGrid::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
157−{
158− bool changed = false;
159−
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());
165− changed = true;
166− m_firstVisibleIndex++;
167−
168− lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;
169− removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;
170− }
171−
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());
176− changed = true;
177−
178− firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;
179− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;
180− }
181−
182− if (m_visibleItems.isEmpty()) {
183− m_firstVisibleIndex = -1;
184− }
185−
186− return changed;
187−}
188−
189−void OrganicGrid::cleanupExistingItems()
190−{
191− Q_FOREACH(QQuickItem *item, m_visibleItems)
192− releaseItem(item);
193− m_visibleItems.clear();
194− m_firstVisibleIndex = -1;
195− setImplicitHeightDirty();
196−}
197−
198−void OrganicGrid::doRelayout()
199−{
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);
203−
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);
209− ++i;
210− }
211−}
212−
213−void OrganicGrid::updateItemCulling(qreal visibleFromY, qreal visibleToY)
214−{
215− Q_FOREACH(QQuickItem *item, m_visibleItems) {
216− QQuickItemPrivate::get(item)->setCulled(item->y() + item->height() <= visibleFromY || item->y() >= visibleToY);
217− }
218−}
219−
220−void OrganicGrid::calculateImplicitHeight()
221−{
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);
227−
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());
233− } else {
234− setImplicitHeight(fullRowsHeight + rowSpacing() + moduleHeight);
235− }
236−}
237−
238−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
239−{
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());
247− } else {
248− if (indexToRemove < lastIndex) {
249− qDebug() << "OrganicGrid only supports removal from the end of the model, resetting instead";
250− cleanupExistingItems();
251− break;
252− }
253− }
254− }
255− }
256− if (m_visibleItems.isEmpty()) {
257− m_firstVisibleIndex = -1;
258− }
259− setImplicitHeightDirty();
260−}
plugins/Dash/organicgrid.hdeleted−91
@@ -1,91 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef ORGANICGRID_H
18−#define ORGANICGRID_H
19−
20−#include "abstractdashview.h"
21−
22− /** An Organic Grid is is a view that creates delegates
23− * based on a model and layouts them in groups of six items (called module).
24− *
25− * In each module there are 4 items that are forced to the small delegate size
26− * and two that are forced to the big delegate size.
27− *
28− * Example:
29− *
30− * +---+ +---+ +-----+
31− * | 1 | | 2 | | |
32− * +---+ +---+ | 5 |
33− * +-----+ | |
34− * | | +-----+
35− * | 3 | +---+ +---+
36− * | | | 4 | | 6 |
37− * +-----+ +---+ +---+
38− *
39− * Modules are positioned one after the other in a grid like fashion, i.e.
40− *
41− * +---+ +---+
42− * | 1 | | 2 |
43− * +---+ +---+
44− * +---+ +---+
45− * | 3 | | 4 |
46− * +---+ +---+
47− */
48−
49−class OrganicGrid : public AbstractDashView
50−{
51− Q_OBJECT
52−
53− Q_PROPERTY(QSizeF smallDelegateSize READ smallDelegateSize WRITE setSmallDelegateSize NOTIFY smallDelegateSizeChanged)
54− Q_PROPERTY(QSizeF bigDelegateSize READ bigDelegateSize WRITE setBigDelegateSize NOTIFY bigDelegateSizeChanged)
55−
56−friend class OrganicGridTest;
57−
58−public:
59− OrganicGrid();
60−
61− QSizeF smallDelegateSize() const;
62− void setSmallDelegateSize(const QSizeF size);
63−
64− QSizeF bigDelegateSize() const;
65− void setBigDelegateSize(const QSizeF size);
66−
67−Q_SIGNALS:
68− void smallDelegateSizeChanged();
69− void bigDelegateSizeChanged();
70−private:
71− QPointF positionForIndex(int modelIndex) const;
72− QSizeF sizeForIndex(int modelIndex) const;
73−
74− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
75− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
76− void addItemToView(int modelIndex, QQuickItem *item) override;
77− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
78− void cleanupExistingItems() override;
79− void doRelayout() override;
80− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
81− void calculateImplicitHeight() override;
82− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
83−
84− QSizeF m_smallDelegateSize;
85− QSizeF m_bigDelegateSize;
86− int m_firstVisibleIndex;
87− int m_numberOfModulesPerRow;
88− QList<QQuickItem*> m_visibleItems;
89−};
90−
91−#endif
plugins/Dash/plugin.cppdeleted−70
@@ -1,70 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− */
17−
18−#include "plugin.h"
19−
20−#include "horizontaljournal.h"
21−#include "listviewwithpageheader.h"
22−#include "organicgrid.h"
23−#include "verticaljournal.h"
24−
25−#include <QAbstractItemModel>
26−#include <QUrlQuery>
27−
28−static QUrl oauthCleanedUrl(QUrl u)
29−{
30− QUrlQuery q(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"));
37− u.setQuery(q);
38− return u;
39−}
40−
41−class AudioComparer : public QObject
42−{
43− Q_OBJECT
44−public:
45− Q_INVOKABLE bool compare(const QUrl &url1, const QUrl &url2)
46− {
47− return oauthCleanedUrl(url1) == oauthCleanedUrl(url2);
48− }
49−};
50−
51−static QObject *audio_comparer_singleton_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
52−{
53− Q_UNUSED(engine)
54− Q_UNUSED(scriptEngine)
55−
56− return new AudioComparer();
57−}
58−
59−void DashPlugin::registerTypes(const char *uri)
60−{
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);
68−}
69−
70−#include "plugin.moc"
plugins/Dash/qmldirdeleted−10
@@ -1,10 +0,0 @@
1−module Dash
2−plugin Dash-qml
3−typeinfo Dash.qmltypes
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−CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml
9−AudioProgressBar 0.1 AudioProgressBar.qml
10−CardAudioProgress 0.1 CardAudioProgress.qml
plugins/Dash/verticaljournal.cppdeleted−273
@@ -1,273 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−/*
18− * The implementation is centered around m_columnVisibleItems
19− * that holds a vector of lists. There's a list for each of the
20− * columns the view has. In the list the items of the column are
21− * ordered as they appear topdown in the view. m_indexColumnMap is
22− * used when re-building the list up since given a position
23− * in the middle of the list and the need to create the previous does
24− * not give us enough information to know in which column we have
25− * to position the item so that when we reach the item the view is
26− * correctly layouted at 0 for all the columns
27− */
28−#include "verticaljournal.h"
29−
30−#pragma GCC diagnostic push
31−#pragma GCC diagnostic ignored "-pedantic"
32−#include <private/qquickitem_p.h>
33−#pragma GCC diagnostic pop
34−
35−VerticalJournal::VerticalJournal()
36− : m_columnWidth(0)
37−{
38−}
39−
40−qreal VerticalJournal::columnWidth() const
41−{
42− return m_columnWidth;
43−}
44−
45−void VerticalJournal::setColumnWidth(qreal columnWidth)
46−{
47− if (columnWidth != m_columnWidth) {
48− m_columnWidth = columnWidth;
49− Q_EMIT columnWidthChanged();
50−
51− if (isComponentComplete()) {
52− Q_FOREACH(const auto &column, m_columnVisibleItems) {
53− Q_FOREACH(const ViewItem item, column) {
54− item.m_item->setWidth(columnWidth);
55− }
56− }
57− relayout();
58− }
59− }
60−}
61−
62−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
63−{
64− *modelIndex = 0;
65− *yPos = std::numeric_limits<qreal>::max();
66−
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);
72− } else {
73− *yPos = 0;
74− }
75− }
76−}
77−
78−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
79−{
80− *modelIndex = 0;
81− *yPos = std::numeric_limits<qreal>::lowest();
82− int columnToAddTo = -1;
83−
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) {
91− *yPos = itemTopPos;
92− *modelIndex = item.m_modelIndex - 1;
93− columnToAddTo = i;
94− }
95− }
96− }
97−
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));
107− }
108− }
109−}
110−
111−bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)
112−{
113− bool changed = false;
114−
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);
119− changed = true;
120− }
121−
122− while (!column.isEmpty() && column.last().y() > bufferToY) {
123− releaseItem(column.takeLast().m_item);
124− changed = true;
125− }
126− }
127−
128− return changed;
129−}
130−
131−void VerticalJournal::addItemToView(int modelIndex, QQuickItem *item)
132−{
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);
136− }
137−
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) {
146− columnToAddTo = i;
147− columnToAddY = iY;
148− }
149− }
150−
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());
155−
156− m_columnVisibleItems[columnToAddTo] << ViewItem(item, modelIndex);
157− m_indexColumnMap[modelIndex] = columnToAddTo;
158− } else {
159− Q_ASSERT(m_indexColumnMap.contains(modelIndex));
160− columnToAddTo = m_indexColumnMap[modelIndex];
161− columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();
162−
163− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));
164− item->setY(columnToAddY - rowSpacing() - item->height());
165−
166− m_columnVisibleItems[columnToAddTo].prepend(ViewItem(item, modelIndex));
167− }
168−}
169−
170−void VerticalJournal::cleanupExistingItems()
171−{
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);
177− column.clear();
178− }
179− m_indexColumnMap.clear();
180− setImplicitHeightDirty();
181−}
182−
183−void VerticalJournal::calculateImplicitHeight()
184−{
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());
192− }
193− }
194− if (lastModelIndex >= 0) {
195− const double averageHeight = bottomMostY / (lastModelIndex + 1);
196− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));
197− } else {
198− setImplicitHeight(0);
199− }
200−}
201−
202−void VerticalJournal::doRelayout()
203−{
204− QList<ViewItem> allItems;
205− Q_FOREACH(const auto &column, m_columnVisibleItems)
206− allItems << column;
207−
208− qSort(allItems);
209−
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();
215−
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
218−
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);
223− } else {
224− Q_FOREACH(const ViewItem item, allItems)
225− releaseItem(item.m_item);
226− }
227− }
228−}
229−
230−void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
231−{
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);
236− }
237− }
238−}
239−
240−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
241−{
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)
249− bool found = false;
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);
257− found = true;
258− }
259− lastCreatedIndex = qMax(lastCreatedIndex, lastColumnIndex);
260− }
261− }
262− if (!found) {
263− if (indexToRemove < lastCreatedIndex) {
264− qDebug() << "VerticalJournal only supports removal from the end of the model, resetting instead";
265− cleanupExistingItems();
266− break;
267− } else {
268− setImplicitHeightDirty();
269− }
270− }
271− }
272− }
273−}
plugins/Dash/verticaljournal.hdeleted−100
@@ -1,100 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef VERTICALJOURNAL_H
18−#define VERTICALJOURNAL_H
19−
20−#include "abstractdashview.h"
21−
22− /** A vertical journal is a view that creates delegates
23− * based on a model and layouts them in columns following
24− * a top-left most position rule.
25− *
26− * The number of columns is calculated using the width of
27− * the view itself, the columnWidth (i.e. the width of each individual delegate)
28− * and the columnSpacing between columns.
29− *
30− * All delegates are forced to columnWidth if they don't have it.
31− *
32− * The first nColumns items are layouted at row 0 from column 0
33− * to column nColumns-1 in order. After that every new item
34− * is positioned in the column which provides the free topmost
35− * position as possible. If more than one column tie in providing
36− * the topmost free position the leftmost column will be used.
37− *
38− * Example:
39− *
40− * +-----+ +-----+ +-----+
41− * | | | 2 | | |
42− * | | | | | |
43− * | 1 | +-----+ | 3 |
44− * | | +-----+ | |
45− * | | | | +-----+
46− * +-----+ | 4 | +-----+
47− * +-----+ | | | 5 |
48− * | 6 | +-----+ | |
49− * | | +-----+
50− * +-----+
51− *
52− */
53−
54−class VerticalJournal : public AbstractDashView
55−{
56− Q_OBJECT
57−
58− Q_PROPERTY(qreal columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged)
59−
60−friend class VerticalJournalTest;
61−
62−public:
63− VerticalJournal();
64−
65− qreal columnWidth() const;
66− void setColumnWidth(qreal columnWidth);
67−
68−Q_SIGNALS:
69− void columnWidthChanged();
70−
71−private:
72− class ViewItem
73− {
74− public:
75− ViewItem(QQuickItem *item, int modelIndex) : m_item(item), m_modelIndex(modelIndex) {}
76− qreal x() const { return m_item->x(); }
77− qreal y() const { return m_item->y(); }
78− qreal height() const { return m_item->height(); }
79− bool operator<(const ViewItem v) const { return m_modelIndex < v.m_modelIndex; }
80−
81− QQuickItem *m_item;
82− int m_modelIndex;
83− };
84−
85− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;
86− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;
87− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;
88− void addItemToView(int modelIndex, QQuickItem *item) override;
89− void cleanupExistingItems() override;
90− void calculateImplicitHeight() override;
91− void doRelayout() override;
92− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
94−
95− QVector<QList<ViewItem>> m_columnVisibleItems;
96− QHash<int, int> m_indexColumnMap;
97− int m_columnWidth;
98−};
99−
100−#endif
plugins/GlobalShortcut/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(globalshortcutplugin_SRCS
55
66add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
77
8−qt5_use_modules(GlobalShortcut-qml Quick Gui)
8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)
99
1010add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
plugins/GlobalShortcut/GlobalShortcut.qmltypesdeleted−31
@@ -1,31 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable GlobalShortcut 1.0 plugins'
8−
9−Module {
10− Component {
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" }
18− Signal {
19− name: "shortcutChanged"
20− Parameter { name: "shortcut"; type: "QVariant" }
21− }
22− Signal {
23− name: "triggered"
24− Parameter { name: "shortcut"; type: "string" }
25− }
26− Signal {
27− name: "activeChanged"
28− Parameter { name: "active"; type: "bool" }
29− }
30− }
31−}
plugins/GlobalShortcut/globalshortcut.cpp+15−4
@@ -58,15 +58,26 @@ void GlobalShortcut::setActive(bool active)
5858
5959void GlobalShortcut::componentComplete()
6060{
61+ if (this->window()) {
62+ QMetaObject::invokeMethod(this, "setupFilterOnWindow", Q_ARG(QQuickWindow*, this->window()));
63+ }
6164 connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);
6265}
6366
6467void GlobalShortcut::keyPressEvent(QKeyEvent * event)
6568{
66− Q_UNUSED(event)
67− if (m_active) {
68− Q_EMIT triggered(m_shortcut.toString());
69− }
69+ if (!m_active) return;
70+
71+ event->accept();
72+ Q_EMIT triggered(m_shortcut.toString());
73+}
74+
75+void GlobalShortcut::keyReleaseEvent(QKeyEvent * event)
76+{
77+ if (!m_active) return;
78+
79+ event->accept();
80+ Q_EMIT released(m_shortcut.toString());
7081}
7182
7283void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)
plugins/GlobalShortcut/globalshortcut.h+5
@@ -55,6 +55,7 @@ public:
5555protected:
5656 void componentComplete() override;
5757 void keyPressEvent(QKeyEvent * event) override;
58+ void keyReleaseEvent(QKeyEvent * event) override;
5859
5960Q_SIGNALS:
6061 void shortcutChanged(const QVariant &shortcut);
@@ -62,6 +63,10 @@ Q_SIGNALS:
6263 * Emitted when a global keypress of @p shortcut is detected
6364 */
6465 void triggered(const QString &shortcut);
66+ /**
67+ * Emitted when a global keypress of @p shortcut is released
68+ */
69+ void released(const QString &shortcut);
6570 void activeChanged(bool active);
6671
6772private Q_SLOTS:
plugins/GlobalShortcut/globalshortcutregistry.cpp+14−4
@@ -73,20 +73,30 @@ bool GlobalShortcutRegistry::eventFilter(QObject *obj, QEvent *event)
7373 Q_ASSERT(m_filteredWindow);
7474 Q_ASSERT(obj == static_cast<QObject*>(m_filteredWindow.data()));
7575
76− if (event->type() == QEvent::KeyPress) {
76+ if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
77+
7778 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
79+
80+ // Make a copy of the event so we don't alter it for passing on.
81+ QKeyEvent eCopy(keyEvent->type(),
82+ keyEvent->key(),
83+ keyEvent->modifiers(),
84+ keyEvent->text(),
85+ keyEvent->isAutoRepeat(),
86+ keyEvent->count());
87+ eCopy.ignore();
88+
7889 int seq = keyEvent->key() + keyEvent->modifiers();
7990 if (m_shortcuts.contains(seq)) {
8091 const auto shortcuts = m_shortcuts.value(seq);
8192 Q_FOREACH(const auto &shortcut, shortcuts) {
8293 if (shortcut) {
83− qApp->sendEvent(shortcut, keyEvent);
84− event->accept();
94+ qApp->sendEvent(shortcut, &eCopy);
8595 }
8696 }
8797 }
8898
89− return event->isAccepted();
99+ return eCopy.isAccepted();
90100 }
91101
92102 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=7)
21pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
32
43add_definitions(-DSM_BUSNAME=systemBus)
@@ -30,8 +29,7 @@ add_library(UnityLauncherAS-qml MODULE
3029target_link_libraries(UnityLauncherAS-qml
3130 unity8-private
3231 ${GSETTINGS_QT_LDFLAGS}
32+ Qt5::DBus Qt5::Qml Qt5::Gui
3333 )
3434
35−qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)
36−
3735add_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
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'
8−
9−Module {
10− Component {
11− name: "LauncherItem"
12− prototype: "unity::shell::launcher::LauncherItemInterface"
13− exports: ["Unity.Launcher/LauncherItem 0.1"]
14− isCreatable: false
15− exportMetaObjectRevisions: [0]
16− }
17− Component {
18− name: "LauncherModel"
19− prototype: "unity::shell::launcher::LauncherModelInterface"
20− exports: ["Unity.Launcher/LauncherModel 0.1"]
21− isCreatable: false
22− isSingleton: true
23− exportMetaObjectRevisions: [0]
24− Method {
25− name: "requestRemove"
26− Parameter { name: "appId"; type: "string" }
27− }
28− Method { name: "refresh" }
29− Method {
30− name: "get"
31− type: "unity::shell::launcher::LauncherItemInterface*"
32− Parameter { name: "index"; type: "int" }
33− }
34− Method {
35− name: "move"
36− Parameter { name: "oldIndex"; type: "int" }
37− Parameter { name: "newIndex"; type: "int" }
38− }
39− Method {
40− name: "pin"
41− Parameter { name: "appId"; type: "string" }
42− Parameter { name: "index"; type: "int" }
43− }
44− Method {
45− name: "pin"
46− Parameter { name: "appId"; type: "string" }
47− }
48− Method {
49− name: "quickListActionInvoked"
50− Parameter { name: "appId"; type: "string" }
51− Parameter { name: "actionIndex"; type: "int" }
52− }
53− Method {
54− name: "setUser"
55− Parameter { name: "username"; type: "string" }
56− }
57− Method {
58− name: "getUrlForAppId"
59− type: "string"
60− Parameter { name: "appId"; type: "string" }
61− }
62− }
63− Component {
64− name: "QuickListModel"
65− prototype: "unity::shell::launcher::QuickListModelInterface"
66− exports: ["Unity.Launcher/QuickListModel 0.1"]
67− isCreatable: false
68− exportMetaObjectRevisions: [0]
69− }
70− Component {
71− name: "unity::shell::launcher::LauncherItemInterface"
72− prototype: "QObject"
73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
74− isCreatable: false
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 }
86− Property {
87− name: "quickList"
88− type: "unity::shell::launcher::QuickListModelInterface"
89− isReadonly: true
90− isPointer: true
91− }
92− Signal {
93− name: "nameChanged"
94− Parameter { name: "name"; type: "string" }
95− }
96− Signal {
97− name: "iconChanged"
98− Parameter { name: "icon"; type: "string" }
99− }
100− Signal {
101− name: "pinnedChanged"
102− Parameter { name: "pinned"; type: "bool" }
103− }
104− Signal {
105− name: "runningChanged"
106− Parameter { name: "running"; type: "bool" }
107− }
108− Signal {
109− name: "recentChanged"
110− Parameter { name: "running"; type: "bool" }
111− }
112− Signal {
113− name: "progressChanged"
114− Parameter { name: "progress"; type: "int" }
115− }
116− Signal {
117− name: "countChanged"
118− Parameter { name: "count"; type: "int" }
119− }
120− Signal {
121− name: "countVisibleChanged"
122− Parameter { name: "countVisible"; type: "bool" }
123− }
124− Signal {
125− name: "focusedChanged"
126− Parameter { name: "focused"; type: "bool" }
127− }
128− }
129− Component {
130− name: "unity::shell::launcher::LauncherModelInterface"
131− prototype: "QAbstractListModel"
132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
133− isCreatable: false
134− exportMetaObjectRevisions: [0]
135− Property {
136− name: "applicationManager"
137− type: "unity::shell::application::ApplicationManagerInterface"
138− isPointer: true
139− }
140− Property { name: "onlyPinned"; type: "bool" }
141− Signal { name: "hint" }
142− Method {
143− name: "move"
144− Parameter { name: "oldIndex"; type: "int" }
145− Parameter { name: "newIndex"; type: "int" }
146− }
147− Method {
148− name: "get"
149− type: "unity::shell::launcher::LauncherItemInterface*"
150− Parameter { name: "index"; type: "int" }
151− }
152− Method {
153− name: "pin"
154− Parameter { name: "appId"; type: "string" }
155− Parameter { name: "index"; type: "int" }
156− }
157− Method {
158− name: "pin"
159− Parameter { name: "appId"; type: "string" }
160− }
161− Method {
162− name: "requestRemove"
163− Parameter { name: "appId"; type: "string" }
164− }
165− Method {
166− name: "quickListActionInvoked"
167− Parameter { name: "appId"; type: "string" }
168− Parameter { name: "actionIndex"; type: "int" }
169− }
170− Method {
171− name: "setUser"
172− Parameter { name: "username"; type: "string" }
173− }
174− }
175− Component {
176− name: "unity::shell::launcher::QuickListModelInterface"
177− prototype: "QAbstractListModel"
178− exports: ["Unity.Launcher/QuickListInterface 0.1"]
179− isCreatable: false
180− exportMetaObjectRevisions: [0]
181− }
182−}
plugins/Greeter/Unity/Launcher/launcheritem.cpp+33
@@ -32,6 +32,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
3232 m_countVisible(false),
3333 m_focused(false),
3434 m_alerting(false),
35+ m_surfaceCount(0),
3536 m_quickList(new QuickListModel(this))
3637{
3738 QuickListEntry nameAction;
@@ -75,6 +76,25 @@ void LauncherItem::setIcon(const QString &icon)
7576 }
7677}
7778
79+QStringList LauncherItem::keywords() const
80+{
81+ return m_keywords;
82+}
83+
84+void LauncherItem::setKeywords(const QStringList &keywords)
85+{
86+ if (m_keywords != keywords) {
87+ m_keywords = keywords;
88+ Q_EMIT keywordsChanged(keywords);
89+ }
90+}
91+
92+uint LauncherItem::popularity() const
93+{
94+ // Not exposing usage order in greeter session at this point.
95+ return 0;
96+}
97+
7898bool LauncherItem::pinned() const
7999{
80100 return m_pinned;
@@ -179,6 +199,19 @@ void LauncherItem::setAlerting(bool alerting)
179199 }
180200}
181201
202+int LauncherItem::surfaceCount() const
203+{
204+ return m_surfaceCount;
205+}
206+
207+void LauncherItem::setSurfaceCount(int surfaceCount)
208+{
209+ if (m_surfaceCount != surfaceCount) {
210+ m_surfaceCount = surfaceCount;
211+ Q_EMIT surfaceCountChanged(surfaceCount);
212+ }
213+}
214+
182215unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
183216{
184217 return m_quickList;
plugins/Greeter/Unity/Launcher/launcheritem.h+7−1
@@ -34,6 +34,8 @@ public:
3434 QString appId() const override;
3535 QString name() const override;
3636 QString icon() const override;
37+ QStringList keywords() const override;
38+ uint popularity() const override;
3739 bool pinned() const override;
3840 bool running() const override;
3941 bool recent() const override;
@@ -42,12 +44,14 @@ public:
4244 bool countVisible() const override;
4345 bool focused() const override;
4446 bool alerting() const override;
47+ int surfaceCount() const override;
4548
4649 unity::shell::launcher::QuickListModelInterface *quickList() const override;
4750
4851private:
4952 void setName(const QString &name);
5053 void setIcon(const QString &icon);
54+ void setKeywords(const QStringList &keywords);
5155 void setPinned(bool pinned);
5256 void setRunning(bool running);
5357 void setRecent(bool recent);
@@ -56,12 +60,13 @@ private:
5660 void setCountVisible(bool countVisible);
5761 void setFocused(bool focused);
5862 void setAlerting(bool alerting);
59−
63+ void setSurfaceCount(int surfaceCount);
6064
6165private:
6266 QString m_appId;
6367 QString m_name;
6468 QString m_icon;
69+ QStringList m_keywords;
6570 bool m_pinned;
6671 bool m_running;
6772 bool m_recent;
@@ -70,6 +75,7 @@ private:
7075 bool m_countVisible;
7176 bool m_focused;
7277 bool m_alerting;
78+ int m_surfaceCount;
7379 QuickListModel *m_quickList;
7480
7581 friend class LauncherModel;
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−7
@@ -69,18 +69,13 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
6969 return item->focused();
7070 case RoleRunning:
7171 return item->running();
72+ case RoleSurfaceCount:
73+ return item->surfaceCount();
7274 }
7375
7476 return QVariant();
7577}
7678
77−void LauncherModel::setAlerting(const QString &appId, bool alerting)
78−{
79− Q_UNUSED(appId)
80− Q_UNUSED(alerting)
81− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
82−}
83−
8479unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
8580{
8681 if (index < 0 || index >= m_list.count()) {
plugins/Greeter/Unity/Launcher/launchermodelas.h−1
@@ -41,7 +41,6 @@ public:
4141
4242 QVariant data(const QModelIndex &index, int role) const override;
4343
44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
4544 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
4645 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
4746 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
6565 return m_list.at(index.row()).icon();
6666 case RoleClickable:
6767 return m_list.at(index.row()).clickable();
68+ case RoleIsPrivate:
69+ return false; // The greeter plugin would just not add any private entries
6870 }
6971 return QVariant();
7072}
plugins/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)
4−
5−add_subdirectory(liblightdm)
6−
7−include_directories(
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}
15−)
16−
17−set(QMLPLUGIN_SRC
18− ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
19− DBusGreeter.cpp
20− DBusGreeterList.cpp
21− Greeter.cpp
22− plugin.cpp
23− UsersModel.cpp
24− )
25−
26−add_library(IntegratedLightDM-qml MODULE
27− ${QMLPLUGIN_SRC}
28− )
29−
30−target_link_libraries(IntegratedLightDM-qml
31− integratedLightDM
32− unity8-private
33−# TODO: Once we split out a separate greeter process, uncomment these lines
34−# ${LIBLIGHTDM_LDFLAGS}
35− ${LIBUSERMETRICSOUTPUT_LDFLAGS}
36− )
37−
38−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
39−
40−add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)
plugins/IntegratedLightDM/Greeter.cppdeleted−138
@@ -1,138 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
17− */
18−
19−#include "Greeter.h"
20−#include "GreeterPrivate.h"
21−#include <libintl.h>
22−
23−GreeterPrivate::GreeterPrivate(Greeter* parent)
24− : m_greeter(new QLightDM::Greeter(parent)),
25− m_active(false),
26− wasPrompted(false),
27− promptless(false),
28− q_ptr(parent)
29−{
30−}
31−
32−Greeter::Greeter(QObject* parent)
33− : QObject(parent),
34− d_ptr(new GreeterPrivate(this))
35−{
36− Q_D(Greeter);
37−
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);
44−
45− d->m_greeter->connectSync();
46−}
47−
48−bool Greeter::isActive() const
49−{
50− Q_D(const Greeter);
51− return d->m_active;
52−}
53−
54−void Greeter::setIsActive(bool active)
55−{
56− Q_D(Greeter);
57− if (d->m_active != active) {
58− d->m_active = active;
59− Q_EMIT isActiveChanged();
60− }
61−}
62−
63−bool Greeter::isAuthenticated() const
64−{
65− Q_D(const Greeter);
66− return d->m_greeter->isAuthenticated();
67−}
68−
69−QString Greeter::authenticationUser() const
70−{
71− Q_D(const Greeter);
72− return d->m_greeter->authenticationUser();
73−}
74−
75−bool Greeter::promptless() const
76−{
77− Q_D(const Greeter);
78− return d->promptless;
79−}
80−
81−void Greeter::authenticate(const QString &username)
82−{
83− Q_D(Greeter);
84− d->wasPrompted = false;
85− if (d->promptless) {
86− d->promptless = false;
87− Q_EMIT promptlessChanged();
88− }
89−
90− d->m_greeter->authenticate(username);
91− Q_EMIT isAuthenticatedChanged();
92− Q_EMIT authenticationUserChanged(username);
93−}
94−
95−void Greeter::respond(const QString &response)
96−{
97− Q_D(Greeter);
98− d->m_greeter->respond(response);
99−}
100−
101−bool Greeter::startSessionSync(const QString &session)
102−{
103− Q_D(Greeter);
104− return d->m_greeter->startSessionSync(session);
105−}
106−
107−void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
108−{
109− Q_D(Greeter);
110− d->wasPrompted = true;
111−
112− bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
113−
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);
118− }
119−
120− Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
121−}
122−
123−void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
124−{
125− Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);
126−}
127−
128−void Greeter::authenticationCompleteFilter()
129−{
130− Q_D(Greeter);
131− if (!d->wasPrompted) {
132− d->promptless = true;
133− Q_EMIT promptlessChanged();
134− }
135−
136− Q_EMIT isAuthenticatedChanged();
137− Q_EMIT authenticationComplete();
138−}
plugins/IntegratedLightDM/IntegratedLightDM.qmltypesdeleted−251
@@ -1,251 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "Greeter"
12− prototype: "QObject"
13− exports: ["LightDM/Greeter 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Property { name: "active"; type: "bool" }
18− Property { name: "authenticated"; type: "bool"; isReadonly: true }
19− Property { name: "authenticationUser"; type: "string"; isReadonly: true }
20− Property { name: "promptless"; type: "bool"; isReadonly: true }
21− Signal {
22− name: "showMessage"
23− Parameter { name: "text"; type: "string" }
24− Parameter { name: "isError"; type: "bool" }
25− }
26− Signal {
27− name: "showPrompt"
28− Parameter { name: "text"; type: "string" }
29− Parameter { name: "isSecret"; type: "bool" }
30− Parameter { name: "isDefaultPrompt"; type: "bool" }
31− }
32− Signal { name: "authenticationComplete" }
33− Signal {
34− name: "authenticationUserChanged"
35− Parameter { name: "user"; type: "string" }
36− }
37− Signal { name: "isActiveChanged" }
38− Signal { name: "isAuthenticatedChanged" }
39− Signal { name: "showGreeter" }
40− Signal { name: "hideGreeter" }
41− Signal {
42− name: "requestAuthenticationUser"
43− Parameter { name: "user"; type: "string" }
44− }
45− Method {
46− name: "authenticate"
47− Parameter { name: "username"; type: "string" }
48− }
49− Method { name: "authenticate" }
50− Method {
51− name: "respond"
52− Parameter { name: "response"; type: "string" }
53− }
54− Method {
55− name: "startSessionSync"
56− type: "bool"
57− Parameter { name: "session"; type: "string" }
58− }
59− Method { name: "startSessionSync"; type: "bool" }
60− Method {
61− name: "setIsActive"
62− Parameter { name: "isActive"; type: "bool" }
63− }
64− }
65− Component {
66− name: "QAbstractProxyModel"
67− prototype: "QAbstractItemModel"
68− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
69− }
70− Component {
71− name: "QLightDM::UsersModel"
72− prototype: "QAbstractListModel"
73− exports: ["LightDM/UserRoles 0.1"]
74− isCreatable: false
75− exportMetaObjectRevisions: [0]
76− Enum {
77− name: "UserModelRoles"
78− values: {
79− "NameRole": 256,
80− "RealNameRole": 257,
81− "LoggedInRole": 258,
82− "BackgroundRole": 259,
83− "SessionRole": 260,
84− "HasMessagesRole": 261,
85− "ImagePathRole": 262,
86− "BackgroundPathRole": 263
87− }
88− }
89− }
90− Component {
91− name: "QSortFilterProxyModel"
92− prototype: "QAbstractProxyModel"
93− Property { name: "filterRegExp"; type: "QRegExp" }
94− Property { name: "filterKeyColumn"; type: "int" }
95− Property { name: "dynamicSortFilter"; type: "bool" }
96− Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
97− Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
98− Property { name: "isSortLocaleAware"; type: "bool" }
99− Property { name: "sortRole"; type: "int" }
100− Property { name: "filterRole"; type: "int" }
101− Method {
102− name: "setFilterRegExp"
103− Parameter { name: "pattern"; type: "string" }
104− }
105− Method {
106− name: "setFilterWildcard"
107− Parameter { name: "pattern"; type: "string" }
108− }
109− Method {
110− name: "setFilterFixedString"
111− Parameter { name: "pattern"; type: "string" }
112− }
113− Method { name: "clear" }
114− Method { name: "invalidate" }
115− }
116− Component {
117− name: "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" }
123− Signal {
124− name: "invertMatchChanged"
125− Parameter { type: "bool" }
126− }
127− Method {
128− name: "get"
129− type: "QVariantMap"
130− Parameter { name: "row"; type: "int" }
131− }
132− Method {
133− name: "data"
134− type: "QVariant"
135− Parameter { name: "row"; type: "int" }
136− Parameter { name: "role"; type: "int" }
137− }
138− Method { name: "count"; type: "int" }
139− Method {
140− name: "findFirst"
141− type: "int"
142− Parameter { name: "role"; type: "int" }
143− Parameter { name: "value"; type: "QVariant" }
144− }
145− Method {
146− name: "mapRowToSource"
147− type: "int"
148− Parameter { name: "row"; type: "int" }
149− }
150− Method {
151− name: "mapFromSource"
152− type: "int"
153− Parameter { name: "row"; type: "int" }
154− }
155− Method {
156− name: "mapToSource"
157− type: "int"
158− Parameter { name: "row"; type: "int" }
159− }
160− }
161− Component {
162− name: "UserMetricsOutput::ColorTheme"
163− prototype: "QObject"
164− Property { name: "start"; type: "QColor"; isReadonly: true }
165− Property { name: "main"; type: "QColor"; isReadonly: true }
166− Property { name: "end"; type: "QColor"; isReadonly: true }
167− Signal {
168− name: "startChanged"
169− Parameter { name: "color"; type: "QColor" }
170− }
171− Signal {
172− name: "mainChanged"
173− Parameter { name: "color"; type: "QColor" }
174− }
175− Signal {
176− name: "endChanged"
177− Parameter { name: "color"; type: "QColor" }
178− }
179− }
180− Component {
181− name: "UserMetricsOutput::UserMetrics"
182− prototype: "QObject"
183− exports: ["LightDM/Infographic 0.1"]
184− isCreatable: false
185− isSingleton: true
186− exportMetaObjectRevisions: [0]
187− Property { name: "label"; type: "string"; isReadonly: true }
188− Property { name: "username"; type: "string" }
189− Property {
190− name: "firstColor"
191− type: "UserMetricsOutput::ColorTheme"
192− isReadonly: true
193− isPointer: true
194− }
195− Property {
196− name: "secondColor"
197− type: "UserMetricsOutput::ColorTheme"
198− isReadonly: true
199− isPointer: true
200− }
201− Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
202− Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
203− Property { name: "currentDay"; type: "int"; isReadonly: true }
204− Signal {
205− name: "labelChanged"
206− Parameter { name: "label"; type: "string" }
207− }
208− Signal {
209− name: "usernameChanged"
210− Parameter { name: "username"; type: "string" }
211− }
212− Signal {
213− name: "firstColorChanged"
214− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
215− }
216− Signal {
217− name: "firstMonthChanged"
218− Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }
219− }
220− Signal {
221− name: "currentDayChanged"
222− Parameter { name: "currentDay"; type: "int" }
223− }
224− Signal {
225− name: "secondColorChanged"
226− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
227− }
228− Signal {
229− name: "secondMonthChanged"
230− Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }
231− }
232− Signal { name: "nextDataSource" }
233− Signal { name: "readyForDataChange" }
234− Signal { name: "dataAboutToAppear" }
235− Signal { name: "dataAppeared" }
236− Signal { name: "dataAboutToChange" }
237− Signal { name: "dataChanged" }
238− Signal { name: "dataAboutToDisappear" }
239− Signal { name: "dataDisappeared" }
240− Method { name: "nextDataSourceSlot" }
241− Method { name: "readyForDataChangeSlot" }
242− }
243− Component {
244− name: "UsersModel"
245− prototype: "UnitySortFilterProxyModelQML"
246− exports: ["LightDM/Users 0.1"]
247− isCreatable: false
248− isSingleton: true
249− exportMetaObjectRevisions: [0]
250− }
251−}
plugins/IntegratedLightDM/UsersModel.cppdeleted−71
@@ -1,71 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
17− */
18−
19−#include "UsersModel.h"
20−#include <QLightDM/UsersModel>
21−#include <QtCore/QSortFilterProxyModel>
22−
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
29−{
30− Q_OBJECT
31−
32−public:
33− explicit MangleModel(QObject* parent=0);
34−
35− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
36−};
37−
38−MangleModel::MangleModel(QObject* parent)
39− : QSortFilterProxyModel(parent)
40−{
41− setSourceModel(new QLightDM::UsersModel(this));
42−}
43−
44−QVariant MangleModel::data(const QModelIndex &index, int role) const
45−{
46− QVariant variantData = QSortFilterProxyModel::data(index, role);
47−
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;
54− }
55−
56− return variantData;
57−}
58−
59−// **** Now we continue with actual UsersModel class ****
60−
61−UsersModel::UsersModel(QObject* parent)
62− : UnitySortFilterProxyModelQML(parent)
63−{
64− setModel(new MangleModel(this));
65− setSortCaseSensitivity(Qt::CaseInsensitive);
66− setSortLocaleAware(true);
67− setSortRole(QLightDM::UsersModel::RealNameRole);
68− sort(0);
69−}
70−
71−#include "UsersModel.moc"
plugins/LightDM/CMakeLists.txtnew file+26
@@ -0,0 +1,26 @@
1+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
2+
3+find_package(Qt5Core REQUIRED)
4+find_package(Qt5Quick REQUIRED)
5+
6+include_directories(
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}
12+)
13+
14+set(QMLPLUGIN_SRC
15+ ../Utils/unitysortfilterproxymodelqml.cpp
16+ DBusGreeter.cpp
17+ DBusGreeterList.cpp
18+ Greeter.cpp
19+ plugin.cpp
20+ PromptsModel.cpp
21+ SessionsModel.cpp
22+ UsersModel.cpp
23+ )
24+
25+add_subdirectory(FullLightDM)
26+add_subdirectory(IntegratedLightDM)
plugins/IntegratedLightDM/DBusGreeter.cpp → plugins/LightDM/DBusGreeter.cpprenamed+5−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@ DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)
2424 : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),
2525 m_greeter(greeter)
2626{
27− connect(m_greeter, &Greeter::isActiveChanged, this, &DBusGreeter::isActiveChangedHandler);
27+ connect(m_greeter, &Greeter::isActiveChanged,
28+ this, &DBusGreeter::isActiveChangedHandler);
2829}
2930
3031bool DBusGreeter::isActive() const
@@ -34,12 +35,12 @@ bool DBusGreeter::isActive() const
3435
3536void DBusGreeter::ShowGreeter()
3637{
37− return Q_EMIT m_greeter->showGreeter();
38+ Q_EMIT m_greeter->showGreeter();
3839}
3940
4041void DBusGreeter::HideGreeter()
4142{
42− return Q_EMIT m_greeter->hideGreeter();
43+ Q_EMIT m_greeter->hideGreeter();
4344}
4445
4546void DBusGreeter::isActiveChangedHandler()
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
4343 return !m_greeter->promptless();
4444}
4545
46−void DBusGreeterList::authenticationUserChangedHandler(const QString &user)
46+void DBusGreeterList::authenticationUserChangedHandler()
4747{
48− notifyPropertyChanged(QStringLiteral("ActiveEntry"), user);
49− Q_EMIT EntrySelected(user);
48+ notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());
49+ Q_EMIT EntrySelected(m_greeter->authenticationUser());
5050}
5151
5252void DBusGreeterList::promptlessChangedHandler()
plugins/IntegratedLightDM/DBusGreeterList.h → plugins/LightDM/DBusGreeterList.hrenamed+1−1
@@ -47,7 +47,7 @@ Q_SIGNALS:
4747 void entryIsLockedChanged();
4848
4949private Q_SLOTS:
50− void authenticationUserChangedHandler(const QString &user);
50+ void authenticationUserChangedHandler();
5151 void promptlessChangedHandler();
5252
5353private:
plugins/LightDM/FullLightDM/CMakeLists.txtnew file+32
@@ -0,0 +1,32 @@
1+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
2+
3+set(PLUGIN_CLASSNAME "FullLightDM")
4+
5+add_definitions(-DFULL_LIGHTDM)
6+
7+include_directories(
8+ ../
9+ ${CMAKE_CURRENT_BINARY_DIR}
10+ )
11+
12+include_directories(
13+ SYSTEM
14+ ${LIBLIGHTDM_INCLUDE_DIRS}
15+ )
16+
17+foreach(source_file ${QMLPLUGIN_SRC})
18+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
19+endforeach()
20+
21+add_library(FullLightDM-qml MODULE
22+ ${RELATIVE_QMLPLUGIN_SRC}
23+ )
24+
25+target_link_libraries(FullLightDM-qml
26+ unity8-private
27+ ${LIBLIGHTDM_LDFLAGS}
28+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29+ Qt5::DBus Qt5::Gui Qt5::Qml
30+ )
31+
32+add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)
plugins/LightDM/FullLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module LightDM.FullLightDM
2+plugin FullLightDM-qml
3+typeinfo FullLightDM.qmltypes
plugins/LightDM/Greeter.cppnew file+279
@@ -0,0 +1,279 @@
1+/*
2+ * Copyright (C) 2013-2017 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#include "Greeter.h"
19+#include "GreeterPrivate.h"
20+#include <QCoreApplication>
21+#include <libintl.h>
22+
23+static Greeter *singleton = nullptr;
24+
25+GreeterPrivate::GreeterPrivate(Greeter* parent)
26+ : m_greeter(new QLightDM::Greeter(parent)),
27+ m_active(false),
28+ responded(false),
29+ everResponded(false),
30+ promptless(false),
31+ q_ptr(parent)
32+{
33+}
34+
35+Greeter::Greeter(QObject* parent)
36+ : QObject(parent),
37+ d_ptr(new GreeterPrivate(this))
38+{
39+ Q_D(Greeter);
40+
41+ connect(d->m_greeter, &QLightDM::Greeter::showMessage,
42+ this, &Greeter::showMessageFilter);
43+ connect(d->m_greeter, &QLightDM::Greeter::showPrompt,
44+ this, &Greeter::showPromptFilter);
45+ connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,
46+ this, &Greeter::authenticationCompleteFilter);
47+
48+ // Don't get stuck waiting for PAM as we shut down.
49+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
50+ d->m_greeter, &QLightDM::Greeter::cancelAuthentication);
51+
52+ d->m_greeter->connectSync();
53+}
54+
55+Greeter::~Greeter()
56+{
57+ singleton = nullptr;
58+}
59+
60+Greeter *Greeter::instance()
61+{
62+ if (!singleton) {
63+ singleton = new Greeter;
64+ }
65+ return singleton;
66+}
67+
68+PromptsModel *Greeter::promptsModel()
69+{
70+ Q_D(Greeter);
71+ return &d->prompts;
72+}
73+
74+bool Greeter::isActive() const
75+{
76+ Q_D(const Greeter);
77+ return d->m_active;
78+}
79+
80+void Greeter::setIsActive(bool active)
81+{
82+ Q_D(Greeter);
83+ if (d->m_active != active) {
84+ d->m_active = active;
85+ Q_EMIT isActiveChanged();
86+ }
87+}
88+
89+bool Greeter::isAuthenticated() const
90+{
91+ Q_D(const Greeter);
92+ return d->m_greeter->isAuthenticated();
93+}
94+
95+QString Greeter::authenticationUser() const
96+{
97+ Q_D(const Greeter);
98+ return d->cachedAuthUser;
99+}
100+
101+void Greeter::checkAuthenticationUser()
102+{
103+ Q_D(Greeter);
104+ if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {
105+ d->cachedAuthUser = d->m_greeter->authenticationUser();
106+ Q_EMIT authenticationUserChanged();
107+ }
108+}
109+
110+QString Greeter::defaultSessionHint() const
111+{
112+ Q_D(const Greeter);
113+ return d->m_greeter->defaultSessionHint();
114+}
115+
116+bool Greeter::promptless() const
117+{
118+ Q_D(const Greeter);
119+ return d->promptless;
120+}
121+
122+QString Greeter::selectUser() const
123+{
124+ Q_D(const Greeter);
125+ if (hasGuestAccount() && d->m_greeter->selectGuestHint()) {
126+ return QStringLiteral("*guest");
127+ } else {
128+ return d->m_greeter->selectUserHint();
129+ }
130+}
131+
132+bool Greeter::hasGuestAccount() const
133+{
134+ Q_D(const Greeter);
135+ return d->m_greeter->hasGuestAccountHint();
136+}
137+
138+bool Greeter::showManualLoginHint() const
139+{
140+ Q_D(const Greeter);
141+ return d->m_greeter->showManualLoginHint();
142+}
143+
144+bool Greeter::hideUsersHint() const
145+{
146+ Q_D(const Greeter);
147+ return d->m_greeter->hideUsersHint();
148+}
149+
150+void Greeter::authenticate(const QString &username)
151+{
152+ Q_D(Greeter);
153+ d->prompts.clear();
154+ d->responded = false;
155+ d->everResponded = false;
156+ if (d->promptless) {
157+ d->promptless = false;
158+ Q_EMIT promptlessChanged();
159+ }
160+
161+ if (authenticationUser() == username) {
162+ d->prompts = d->leftovers;
163+ }
164+ d->leftovers.clear();
165+
166+ if (username == QStringLiteral("*guest")) {
167+ d->m_greeter->authenticateAsGuest();
168+ } else if (username == QStringLiteral("*other")) {
169+ d->m_greeter->authenticate(nullptr);
170+ } else {
171+ d->m_greeter->authenticate(username);
172+ }
173+
174+ Q_EMIT authenticationStarted();
175+ Q_EMIT isAuthenticatedChanged();
176+ checkAuthenticationUser();
177+}
178+
179+void Greeter::respond(const QString &response)
180+{
181+ Q_D(Greeter);
182+ d->responded = true;
183+ d->everResponded = true;
184+ d->m_greeter->respond(response);
185+}
186+
187+bool Greeter::startSessionSync(const QString &session)
188+{
189+ Q_D(Greeter);
190+ return d->m_greeter->startSessionSync(session);
191+}
192+
193+void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
194+{
195+ Q_D(Greeter);
196+
197+ checkAuthenticationUser(); // may have changed in liblightdm
198+
199+ bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
200+ bool isSecret = type == QLightDM::Greeter::PromptTypeSecret;
201+
202+ QString trimmedText;
203+ if (!isDefaultPrompt)
204+ trimmedText = text.trimmed();
205+
206+ // Strip prompt of any colons at the end
207+ if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {
208+ trimmedText.chop(1);
209+ }
210+
211+ if (trimmedText == "login") {
212+ // 'login' is provided untranslated by LightDM when asking for a manual
213+ // login username.
214+ trimmedText = gettext("Username");
215+ }
216+
217+ if (d->responded) {
218+ d->prompts.clear();
219+ d->responded = false;
220+ }
221+
222+ d->prompts.append(trimmedText, isSecret ? PromptsModel::Secret : PromptsModel::Question);
223+}
224+
225+void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
226+{
227+ Q_D(Greeter);
228+
229+ checkAuthenticationUser(); // may have changed in liblightdm
230+
231+ bool isError = type == QLightDM::Greeter::MessageTypeError;
232+
233+ if (d->responded) {
234+ d->prompts.clear();
235+ d->responded = false;
236+ }
237+ d->prompts.append(text, isError? PromptsModel::Error : PromptsModel::Message);
238+}
239+
240+void Greeter::authenticationCompleteFilter()
241+{
242+ Q_D(Greeter);
243+
244+ Q_EMIT isAuthenticatedChanged();
245+
246+ bool automatic = !d->everResponded;
247+ bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;
248+
249+ if (isAuthenticated() && automatic) {
250+ d->promptless = true;
251+ Q_EMIT promptlessChanged();
252+ }
253+
254+ if (!isAuthenticated()) {
255+ if (pamHasLeftoverMessages) {
256+ d->leftovers = d->prompts; // Prefer PAM's messages
257+ } else if (automatic) {
258+ d->leftovers.append(gettext("Failed to authenticate"), PromptsModel::Error);
259+ } else {
260+ d->leftovers.append(gettext("Invalid password, please try again"), PromptsModel::Error);
261+ }
262+ } else if (pamHasLeftoverMessages) {
263+ automatic = true; // treat this successful login as automatic, so user sees message
264+ d->leftovers = d->prompts;
265+ }
266+
267+ if (automatic) {
268+ d->prompts = d->leftovers; // OK, we'll just use these now
269+ d->leftovers.clear();
270+ d->prompts.append(isAuthenticated() ? gettext("Log In") : gettext("Retry"),
271+ PromptsModel::Button);
272+ }
273+
274+ if (isAuthenticated()) {
275+ Q_EMIT loginSuccess(automatic);
276+ } else {
277+ Q_EMIT loginError(automatic);
278+ }
279+}
plugins/IntegratedLightDM/Greeter.h → plugins/LightDM/Greeter.hrenamed+21−11
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,6 @@
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 *
16− * Authors: Michael Terry <michael.terry@canonical.com>
1716 */
1817
1918/* This class is a really tiny filter around QLightDM::Greeter. There are some
@@ -22,13 +21,13 @@
2221 such edits in the future, and by inserting ourselves here, we have more
2322 control. */
2423
25−#ifndef UNITY_GREETER_H
26−#define UNITY_GREETER_H
24+#pragma once
2725
2826#include <QLightDM/Greeter>
2927#include <QtCore/QObject>
3028
3129class GreeterPrivate;
30+class PromptsModel;
3231
3332class Greeter : public QObject
3433{
@@ -37,15 +36,25 @@ class Greeter : public QObject
3736 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
3837 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
3938 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
4040 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
4142
4243public:
43− explicit Greeter(QObject* parent=0);
44+ static Greeter *instance();
45+ virtual ~Greeter();
4446
4547 bool isActive() const;
4648 bool isAuthenticated() const;
4749 QString authenticationUser() const;
50+ QString defaultSessionHint() const;
4851 bool promptless() const;
52+ QString selectUser() const;
53+ bool hasGuestAccount() const;
54+ bool showManualLoginHint() const;
55+ bool hideUsersHint() const;
56+
57+ PromptsModel *promptsModel();
4958
5059public Q_SLOTS:
5160 void authenticate(const QString &username=QString());
@@ -54,21 +63,23 @@ public Q_SLOTS:
5463 void setIsActive(bool isActive);
5564
5665Q_SIGNALS:
57− void showMessage(const QString &text, bool isError);
58− void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
59− void authenticationComplete();
60− void authenticationUserChanged(const QString &user);
66+ void authenticationUserChanged();
6167 void isActiveChanged();
6268 void isAuthenticatedChanged();
6369 void promptlessChanged();
6470 void showGreeter();
6571 void hideGreeter();
72+ void loginError(bool automatic);
73+ void loginSuccess(bool automatic);
74+ void authenticationStarted(); // useful for testing
6675
6776 // This signal is emitted by external agents like indicators, and the UI
6877 // should switch to this user if possible.
6978 void requestAuthenticationUser(const QString &user);
7079
7180protected:
81+ explicit Greeter(QObject* parent=0);
82+
7283 GreeterPrivate * const d_ptr;
7384
7485 Q_DECLARE_PRIVATE(Greeter)
@@ -77,6 +88,5 @@ private Q_SLOTS:
7788 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);
7889 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);
7990 void authenticationCompleteFilter();
91+ void checkAuthenticationUser();
8092};
81−
82−#endif
plugins/IntegratedLightDM/GreeterPrivate.h → plugins/LightDM/GreeterPrivate.hrenamed+13−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2015-2017 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,10 +14,14 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef UNITY_GREETER_PRIVATE_H
18−#define UNITY_GREETER_PRIVATE_H
17+#pragma once
1918
20−#include <QLightDM/Greeter>
19+#include "PromptsModel.h"
20+#include <QObject>
21+
22+namespace QLightDM {
23+ class Greeter;
24+}
2125
2226class GreeterPrivate
2327{
@@ -26,8 +30,12 @@ public:
2630
2731 QLightDM::Greeter *m_greeter;
2832 bool m_active;
29− bool wasPrompted;
33+ PromptsModel prompts;
34+ PromptsModel leftovers; // prompts to show during next auth for same user
35+ bool responded;
36+ bool everResponded;
3037 bool promptless;
38+ QString cachedAuthUser;
3139
3240protected:
3341 Greeter * const q_ptr;
@@ -35,5 +43,3 @@ protected:
3543private:
3644 Q_DECLARE_PUBLIC(Greeter)
3745};
38−
39−#endif // UNITY_GREETER_PRIVATE_H
plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+33
@@ -0,0 +1,33 @@
1+set(PLUGIN_CLASSNAME "IntegratedLightDM")
2+
3+add_definitions(-DINTEGRATED_LIGHTDM)
4+
5+foreach(include_directory ${QMLPLUGIN_INCLUDES})
6+ list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
7+endforeach()
8+
9+include_directories(
10+ . #QLightDM
11+ ${QMLPLUGIN_INCLUDES}
12+ ${libunity8-private_SOURCE_DIR}
13+ ${CMAKE_CURRENT_BINARY_DIR}
14+)
15+
16+foreach(source_file ${QMLPLUGIN_SRC})
17+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
18+endforeach()
19+
20+add_library(IntegratedLightDM-qml MODULE
21+ ${RELATIVE_QMLPLUGIN_SRC}
22+ )
23+
24+target_link_libraries(IntegratedLightDM-qml
25+ integratedLightDM
26+ unity8-private
27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28+ Qt5::DBus Qt5::Gui Qt5::Qml
29+ )
30+
31+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
32+
33+add_subdirectory(liblightdm)
tests/mocks/IntegratedLightDM/QLightDM/Greeter → plugins/LightDM/IntegratedLightDM/QLightDM/Greeterrenamed+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
qml/Dash/ScopeSettings/ScopeSettingNumber.qml → plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelrenamed+2−6
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,4 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.4
18−
19−ScopeSettingString {
20− mode: "number"
21−}
17+#include "../liblightdm/SessionsModel.h"
tests/mocks/IntegratedLightDM/QLightDM/UsersModel → plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelrenamed+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt → plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed+7−6
@@ -2,8 +2,10 @@ pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
22
33set(LibLightDM_SOURCES
44 Greeter.cpp
5+ SessionsModel.cpp
56 UsersModel.cpp
67 GreeterPrivate.cpp
8+ SessionsModelPrivate.cpp
79 UsersModelPrivate.cpp
810 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
911 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
@@ -24,30 +26,29 @@ target_link_libraries(integratedLightDM
2426 ${GLIB_LIBRARIES}
2527 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
2628 -lpam
29+ Qt5::Concurrent Qt5::DBus Qt5::Gui
2730)
2831target_link_libraries(integratedLightDMSession
2932 ${GLIB_LIBRARIES}
3033 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
3134 -lpam
35+ Qt5::Concurrent Qt5::DBus Qt5::Gui
3236)
3337target_link_libraries(MockLightDM-demo-shared
3438 ${GLIB_LIBRARIES}
3539 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
3640 -lpam
41+ Qt5::Concurrent Qt5::DBus Qt5::Gui
3742)
3843
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)
42−
4344set_target_properties(integratedLightDM PROPERTIES
4445 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
4546set_target_properties(integratedLightDMSession PROPERTIES
4647 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
4748set_target_properties(MockLightDM-demo-shared PROPERTIES
4849 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
49− OUTPUT_NAME lightdm-qt5-2)
50+ OUTPUT_NAME lightdm-qt5-3)
5051
5152install(TARGETS MockLightDM-demo-shared
52− DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo
53+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
5354 )
plugins/IntegratedLightDM/liblightdm/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed+6−8
@@ -49,7 +49,7 @@ QString Greeter::authenticationUser() const
4949
5050bool Greeter::hasGuestAccountHint() const
5151{
52− return true;
52+ return false;
5353}
5454
5555QString Greeter::getHint(const QString &name) const
@@ -70,15 +70,10 @@ bool Greeter::hideUsersHint() const
7070
7171bool Greeter::showManualLoginHint() const
7272{
73− return true;
73+ return false;
7474}
7575
7676bool Greeter::showRemoteLoginHint() const
77−{
78− return true;
79−}
80−
81−bool Greeter::lockHint () const
8277{
8378 return false;
8479}
@@ -151,7 +146,10 @@ void Greeter::authenticateRemote(const QString &session, const QString &username
151146}
152147
153148void Greeter::cancelAuthentication()
154−{}
149+{
150+ Q_D(Greeter);
151+ d->cancelAuthentication();
152+}
155153
156154void Greeter::setLanguage (const QString &language)
157155{
plugins/IntegratedLightDM/liblightdm/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed+2−4
@@ -45,20 +45,19 @@ class Q_DECL_EXPORT Greeter : public QObject
4545
4646 Q_PROPERTY(QString hostname READ hostname CONSTANT)
4747 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
48− Q_PROPERTY(bool locked READ lockHint CONSTANT)
49−
50− Q_ENUMS(PromptType MessageType)
5148
5249public:
5350 enum PromptType {
5451 PromptTypeQuestion,
5552 PromptTypeSecret
5653 };
54+ Q_ENUM(PromptType)
5755
5856 enum MessageType {
5957 MessageTypeInfo,
6058 MessageTypeError
6159 };
60+ Q_ENUM(MessageType)
6261
6362 explicit Greeter(QObject* parent=0);
6463 virtual ~Greeter();
@@ -68,7 +67,6 @@ public:
6867 bool hideUsersHint() const;
6968 bool showManualLoginHint() const;
7069 bool showRemoteLoginHint() const;
71− bool lockHint () const;
7270 bool hasGuestAccountHint() const;
7371 QString selectUserHint() const;
7472 bool selectGuestHint() const;
plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+28−24
@@ -50,8 +50,7 @@ public:
5050 {
5151 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
5252
53− connect(&futureWatcher, &QFutureWatcher<int>::finished,
54− this, &GreeterImpl::finishPam);
53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);
5554 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
5655 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
5756 // This next connect is how we pass ResponseFutures between threads
@@ -207,6 +206,28 @@ public Q_SLOTS:
207206 }
208207 }
209208
209+ void cancelPam()
210+ {
211+ if (pamHandle != nullptr) {
212+ QFuture<int> pamFuture = futureWatcher.future();
213+ pam_handle *handle = pamHandle;
214+ pamHandle = nullptr; // to disable normal finishPam() handling
215+ pamFuture.cancel();
216+
217+ // Note the empty loop, we just want to clear the futures queue.
218+ // Any further prompts from the pam thread will be immediately
219+ // responded to/dismissed in handlePrompt().
220+ while (respond(QString()));
221+
222+ // Now let signal/slot handling happen so the thread can finish
223+ while (!pamFuture.isFinished()) {
224+ QCoreApplication::processEvents();
225+ }
226+
227+ pam_end(handle, PAM_CONV_ERR);
228+ }
229+ }
230+
210231Q_SIGNALS:
211232 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
212233 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
@@ -248,28 +269,6 @@ private Q_SLOTS:
248269 }
249270
250271private:
251− void cancelPam()
252− {
253− if (pamHandle != nullptr) {
254− QFuture<int> pamFuture = futureWatcher.future();
255− pam_handle *handle = pamHandle;
256− pamHandle = nullptr; // to disable normal finishPam() handling
257− pamFuture.cancel();
258−
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()));
263−
264− // Now let signal/slot handling happen so the thread can finish
265− while (!pamFuture.isFinished()) {
266− QCoreApplication::processEvents();
267− }
268−
269− pam_end(handle, PAM_CONV_ERR);
270− }
271− }
272−
273272 Greeter *greeter;
274273 GreeterPrivate *greeterPrivate;
275274 pam_handle* pamHandle;
@@ -300,6 +299,11 @@ void GreeterPrivate::handleRespond(const QString &response)
300299 m_impl->respond(response);
301300}
302301
302+void GreeterPrivate::cancelAuthentication()
303+{
304+ m_impl->cancelPam();
305+}
306+
303307}
304308
305309#include "GreeterPrivate.moc"
plugins/IntegratedLightDM/liblightdm/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed+1
@@ -38,6 +38,7 @@ public:
3838
3939 void handleAuthenticate();
4040 void handleRespond(const QString &response);
41+ void cancelAuthentication();
4142
4243protected:
4344 GreeterImpl *m_impl; // if the backend needs more private data
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppnew file+87
@@ -0,0 +1,87 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+
19+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
20+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
21+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
22+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
23+
24+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
25+// To use the same method of setting role name that it does, we
26+// set our compatibility to Qt4 here too.
27+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
28+
29+#include "SessionsModel.h"
30+#include "SessionsModelPrivate.h"
31+#include <QtCore/QDir>
32+#include <QtCore/QString>
33+
34+namespace QLightDM
35+{
36+
37+SessionsModel::SessionsModel(QObject* parent) :
38+ QAbstractListModel(parent),
39+ d_ptr(new SessionsModelPrivate(this))
40+{
41+ m_roleNames = QAbstractListModel::roleNames();
42+ m_roleNames[KeyRole] = "key";
43+ m_roleNames[TypeRole] = "type";
44+}
45+
46+SessionsModel::~SessionsModel()
47+{
48+ delete d_ptr;
49+}
50+
51+QVariant SessionsModel::data(const QModelIndex& index, int role) const
52+{
53+ Q_D(const SessionsModel);
54+
55+ if(!index.isValid()) {
56+ return QVariant();
57+ }
58+
59+ int row = index.row();
60+
61+ switch (role) {
62+ case QLightDM::SessionsModel::KeyRole:
63+ return d->sessionItems[row].key;
64+ case Qt::DisplayRole:
65+ return d->sessionItems[row].name;
66+ default:
67+ return QVariant();
68+ }
69+}
70+
71+QHash<int, QByteArray> SessionsModel::roleNames() const
72+{
73+ return m_roleNames;
74+}
75+
76+int SessionsModel::rowCount(const QModelIndex& parent) const
77+{
78+ Q_D(const SessionsModel);
79+
80+ if (parent.isValid()) {
81+ return 0;
82+ } else { // parent is root
83+ return d->sessionItems.size();
84+ }
85+}
86+
87+} // namespace QLightDM
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hnew file+72
@@ -0,0 +1,72 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H
19+#define UNITY_INTEGRATED_SESSIONSMODEL_H
20+
21+#include <QtCore/QAbstractListModel>
22+#include <QtCore/QString>
23+
24+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
25+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
26+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
27+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
28+
29+// This is taken from liblightdm and modified to confirm to our syle conventions
30+namespace QLightDM
31+{
32+class SessionsModelPrivate;
33+
34+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
35+ {
36+ Q_OBJECT
37+
38+ public:
39+
40+ enum SessionModelRoles {
41+ //name is exposed as Qt::DisplayRole
42+ //comment is exposed as Qt::TooltipRole
43+ KeyRole = Qt::UserRole,
44+ IdRole = KeyRole, /** Deprecated */
45+ TypeRole
46+ };
47+ Q_ENUM(SessionModelRoles)
48+
49+ enum SessionType {
50+ LocalSessions,
51+ RemoteSessions
52+ };
53+ Q_ENUM(SessionType)
54+
55+ explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
56+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
57+ virtual ~SessionsModel();
58+
59+ QHash<int, QByteArray> roleNames() const override;
60+ int rowCount(const QModelIndex& parent) const override;
61+ QVariant data(const QModelIndex& index, int role) const override;
62+
63+ protected:
64+ SessionsModelPrivate* const d_ptr;
65+
66+ private:
67+ QHash<int, QByteArray> m_roleNames;
68+ Q_DECLARE_PRIVATE(SessionsModel)
69+ };
70+}
71+
72+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppnew file+36
@@ -0,0 +1,36 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#include "SessionsModelPrivate.h"
19+
20+#include <QDir>
21+#include <QSettings>
22+#include <QStringList>
23+
24+namespace QLightDM
25+{
26+
27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
28+ : q_ptr(parent)
29+{
30+ // Since this model is never visible, as there is only 1 session,
31+ // just use the session name as the key
32+ QString sessionName = qgetenv("XDG_SESSION_DESKTOP");
33+ sessionItems.append({sessionName, "", sessionName, ""});
34+}
35+
36+} // namespace QLightDM
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hnew file+54
@@ -0,0 +1,54 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
19+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
20+
21+#include <QtCore/QList>
22+#include <QtCore/QString>
23+
24+namespace QLightDM
25+{
26+class SessionsModel;
27+
28+class SessionItem
29+{
30+public:
31+ QString key;
32+ QString type; // unused
33+ QString name;
34+ QString comment; // unused
35+};
36+
37+class SessionsModelPrivate
38+{
39+public:
40+ explicit SessionsModelPrivate(SessionsModel* parent=0);
41+ virtual ~SessionsModelPrivate() = default;
42+
43+ QList<SessionItem> sessionItems;
44+
45+protected:
46+ SessionsModel* const q_ptr;
47+
48+private:
49+ Q_DECLARE_PUBLIC(SessionsModel)
50+};
51+
52+} // namespace QLightDM
53+
54+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
plugins/IntegratedLightDM/liblightdm/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+4−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :
4040 QAbstractListModel(parent),
4141 d_ptr(new UsersModelPrivate(this))
4242{
43− Q_D(UsersModel);
44−
4543 // Extend roleNames (we want to keep the "display" role)
4644 QHash<int, QByteArray> roles = roleNames();
4745 roles[NameRole] = "name";
@@ -52,6 +50,7 @@ UsersModel::UsersModel(QObject *parent) :
5250 roles[SessionRole] = "session";
5351 roles[HasMessagesRole] = "hasMessages";
5452 roles[ImagePathRole] = "imagePath";
53+ roles[UidRole] = "uid";
5554 setRoleNames(roles);
5655
5756 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
@@ -101,6 +100,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const
101100 return d->entries[row].has_messages;
102101 case UsersModel::ImagePathRole:
103102 return "";
103+ case UsersModel::UidRole:
104+ return d->entries[row].uid;
104105 default:
105106 return QVariant();
106107 }
plugins/IntegratedLightDM/liblightdm/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+3−3
@@ -37,8 +37,6 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel
3737{
3838 Q_OBJECT
3939
40− Q_ENUMS(UserModelRoles)
41−
4240public:
4341 explicit UsersModel(QObject *parent = 0);
4442 virtual ~UsersModel() = default;
@@ -50,8 +48,10 @@ public:
5048 SessionRole,
5149 HasMessagesRole,
5250 ImagePathRole,
53− BackgroundPathRole
51+ BackgroundPathRole,
52+ UidRole
5453 };
54+ Q_ENUM(UserModelRoles)
5555
5656 int rowCount(const QModelIndex &parent) const override;
5757 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 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
2626#include <QDir>
2727#include <QSettings>
2828#include <QStringList>
29+#include <unistd.h>
2930
3031namespace QLightDM
3132{
@@ -37,6 +38,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
3738{
3839 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
3940 QString currentUser = g_get_user_name();
41+ uid_t currentUid = getuid();
4042
4143 if (demoFile.exists()) {
4244 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
@@ -46,10 +48,10 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
4648 Q_FOREACH(const QString &user, users)
4749 {
4850 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++});
5052 }
5153 } else {
52− entries.append({currentUser, 0, 0, 0, false, false, 0, 0});
54+ entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});
5355
5456 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
5557 this, [this](const QString &user) {
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed+2−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ public:
4040 bool has_messages;
4141 QString session;
4242 QString infographic;
43+ uid_t uid;
4344};
4445
4546class 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 @@
1+/*
2+ * Copyright (C) 2017 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#include "PromptsModel.h"
19+
20+PromptsModel::PromptsModel(QObject* parent)
21+ : QAbstractListModel(parent)
22+{
23+ m_roleNames[TypeRole] = "type";
24+ m_roleNames[TextRole] = "text";
25+}
26+
27+PromptsModel& PromptsModel::operator=(const PromptsModel &other)
28+{
29+ beginResetModel();
30+ m_prompts = other.m_prompts;
31+ endResetModel();
32+ Q_EMIT countChanged();
33+ return *this;
34+}
35+
36+int PromptsModel::rowCount(const QModelIndex &parent) const
37+{
38+ if (parent.isValid())
39+ return 0;
40+
41+ return m_prompts.size();
42+}
43+
44+QVariant PromptsModel::data(const QModelIndex &index, int role) const
45+{
46+ if (!index.isValid() || index.column() > 0 || index.row() >= m_prompts.size())
47+ return QVariant();
48+
49+ switch (role) {
50+ case Qt::DisplayRole: // fallthrough
51+ case TextRole: return m_prompts[index.row()].prompt;
52+ case TypeRole: return m_prompts[index.row()].type;
53+ default: return QVariant();
54+ }
55+}
56+
57+QHash<int, QByteArray> PromptsModel::roleNames() const
58+{
59+ return m_roleNames;
60+}
61+
62+void PromptsModel::prepend(const QString &text, PromptType type)
63+{
64+ beginInsertRows(QModelIndex(), 0, 0);
65+ m_prompts.prepend(PromptInfo{text, type});
66+ endInsertRows();
67+
68+ Q_EMIT countChanged();
69+}
70+
71+void PromptsModel::append(const QString &text, PromptType type)
72+{
73+ beginInsertRows(QModelIndex(), m_prompts.size(), m_prompts.size());
74+ m_prompts.append(PromptInfo{text, type});
75+ endInsertRows();
76+
77+ Q_EMIT countChanged();
78+}
79+
80+void PromptsModel::clear()
81+{
82+ beginResetModel();
83+ m_prompts.clear();
84+ endResetModel();
85+
86+ Q_EMIT countChanged();
87+}
88+
89+bool PromptsModel::hasPrompt() const
90+{
91+ Q_FOREACH(const PromptInfo &info, m_prompts) {
92+ if (info.type == PromptType::Secret || info.type == PromptType::Question) {
93+ return true;
94+ }
95+ }
96+ return false;
97+}
plugins/LightDM/PromptsModel.hnew file+70
@@ -0,0 +1,70 @@
1+/*
2+ * Copyright (C) 2017 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#pragma once
19+
20+#include <QAbstractListModel>
21+
22+class PromptsModel : public QAbstractListModel
23+{
24+ Q_OBJECT
25+
26+ Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
27+
28+public:
29+ enum PromptsModelRoles {
30+ TypeRole = Qt::UserRole,
31+ TextRole,
32+ };
33+ Q_ENUM(PromptsModelRoles)
34+
35+ enum PromptType {
36+ Message,
37+ Error,
38+ Secret,
39+ Question,
40+ Button,
41+ };
42+ Q_ENUM(PromptType)
43+
44+ explicit PromptsModel(QObject* parent=0);
45+
46+ PromptsModel& operator=(const PromptsModel &other);
47+
48+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
49+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
50+ QHash<int, QByteArray> roleNames() const override;
51+
52+ Q_INVOKABLE void prepend(const QString &text, PromptType type);
53+ Q_INVOKABLE void append(const QString &text, PromptType type);
54+
55+ void clear();
56+
57+ bool hasPrompt() const;
58+
59+Q_SIGNALS:
60+ void countChanged();
61+
62+private:
63+ struct PromptInfo {
64+ QString prompt;
65+ PromptType type;
66+ };
67+
68+ QList<PromptInfo> m_prompts;
69+ QHash<int, QByteArray> m_roleNames;
70+};
plugins/LightDM/SessionsModel.cppnew file+135
@@ -0,0 +1,135 @@
1+/*
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#include "SessionsModel.h"
19+#include <QtCore/QFile>
20+#include <QtCore/QSortFilterProxyModel>
21+
22+QHash<int, QByteArray> SessionsModel::roleNames() const
23+{
24+ return m_roleNames;
25+}
26+
27+int SessionsModel::rowCount(const QModelIndex& parent) const
28+{
29+ return m_model->rowCount(parent);
30+}
31+
32+QList<QUrl> SessionsModel::iconSearchDirectories() const
33+{
34+ return m_iconSearchDirectories;
35+}
36+
37+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)
38+{
39+ // QML gives us a url with file:// prepended which breaks QFile::exists()
40+ // so convert the url to a local file
41+ QList<QUrl> localList = {};
42+ Q_FOREACH(const QUrl& searchDirectory, searchDirectories)
43+ {
44+ localList.append(searchDirectory.toLocalFile());
45+ }
46+ m_iconSearchDirectories = localList;
47+ Q_EMIT iconSearchDirectoriesChanged();
48+}
49+
50+QUrl SessionsModel::iconUrl(const QString sessionKey) const
51+{
52+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
53+ {
54+ // This is an established icon naming convention
55+ QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
56+ "/custom_" + sessionKey + "_badge.png";
57+ QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
58+ "/" + sessionKey + "_badge.png";
59+
60+ QFile customIconFile(customIconUrl);
61+ QFile iconFile(iconUrl);
62+ if (customIconFile.exists()) {
63+ return QUrl(customIconUrl);
64+ } else if (iconFile.exists()) {
65+ return QUrl(iconUrl);
66+ } else {
67+ // Search the legacy way
68+ QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
69+ bool iconFound = false;
70+ if (sessionKey == "ubuntu" || sessionKey == "ubuntu-2d") {
71+ path += "ubuntu_badge.png";
72+ iconFound = true;
73+ } else if(
74+ sessionKey == "gnome-classic" ||
75+ sessionKey == "gnome-flashback-compiz" ||
76+ sessionKey == "gnome-flashback-metacity" ||
77+ sessionKey == "gnome-shell" ||
78+ sessionKey == "gnome-wayland" ||
79+ sessionKey == "gnome"
80+ ){
81+ path += "gnome_badge.png";
82+ iconFound = true;
83+ } else if (sessionKey == "plasma") {
84+ path += "kde_badge.png";
85+ iconFound = true;
86+ } else if (sessionKey == "xterm") {
87+ path += "recovery_console_badge.png";
88+ iconFound = true;
89+ } else if (sessionKey == "remote-login") {
90+ path += "remote_login_help.png";
91+ iconFound = true;
92+ }
93+
94+ if (QFile(path).exists() && iconFound) {
95+ return path;
96+ }
97+ }
98+ }
99+
100+ // FIXME make this smarter
101+ return QUrl("./graphics/session_icons/unknown_badge.png");
102+}
103+
104+QVariant SessionsModel::data(const QModelIndex& index, int role) const
105+{
106+ switch (role) {
107+ case SessionsModel::IconRole:
108+ return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());
109+ default:
110+ return m_model->data(index, role);
111+ }
112+}
113+
114+SessionsModel::SessionsModel(QObject* parent)
115+ : UnitySortFilterProxyModelQML(parent)
116+{
117+ // Add a custom IconRole that isn't in either of the lightdm implementations
118+ m_model = new QLightDM::SessionsModel(this);
119+ m_roleNames = m_model->roleNames();
120+ m_roleNames[IconRole] = "icon_url";
121+
122+ // Update search locations to use $SNAP prefix if specified
123+ auto snapRoot = QFile::decodeName(qgetenv("SNAP"));
124+ if (!snapRoot.isEmpty()) {
125+ for (int i = 0; i < m_iconSearchDirectories.size(); i++) {
126+ m_iconSearchDirectories[i] = snapRoot + m_iconSearchDirectories[i].path();
127+ }
128+ }
129+
130+ setModel(m_model);
131+ setSortCaseSensitivity(Qt::CaseInsensitive);
132+ setSortLocaleAware(true);
133+ setSortRole(Qt::DisplayRole);
134+ sort(0);
135+}
plugins/LightDM/SessionsModel.hnew file+66
@@ -0,0 +1,66 @@
1+/*
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#pragma once
19+
20+#include <unitysortfilterproxymodelqml.h>
21+#include <QLightDM/SessionsModel>
22+#include <QtCore/QHash>
23+#include <QtCore/QObject>
24+#include <QtCore/QUrl>
25+
26+class SessionsModel : public UnitySortFilterProxyModelQML
27+{
28+ Q_OBJECT
29+
30+ Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
31+ WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
32+
33+Q_SIGNALS:
34+ void iconSearchDirectoriesChanged();
35+
36+public:
37+ enum SessionModelRoles {
38+ /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,
39+ * the _first_ value of this enum MUST be the _last_ value of
40+ * QLightDM::SessionsModel::SessionModelRoles and consquently, this must
41+ * also match the last value in the corresponding enum of the integrated lib
42+ */
43+ TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
44+ IconRole
45+ };
46+ Q_ENUM(SessionModelRoles)
47+
48+ explicit SessionsModel(QObject* parent=nullptr);
49+
50+ QHash<int, QByteArray> roleNames() const override;
51+ int rowCount(const QModelIndex& parent) const override;
52+ QVariant data(const QModelIndex& index, int role) const override;
53+ QList<QUrl> iconSearchDirectories() const;
54+ Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;
55+
56+ void setIconSearchDirectories(const QList<QUrl> searchDirectories);
57+
58+private:
59+ QLightDM::SessionsModel* m_model;
60+ QHash<int, QByteArray> m_roleNames;
61+ QList<QUrl> m_iconSearchDirectories{
62+ QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
63+ QUrl("/usr/local/share/unity-greeter"),
64+ QUrl("/usr/share/unity-greeter/")};
65+
66+};
plugins/LightDM/UsersModel.cppnew file+238
@@ -0,0 +1,238 @@
1+/*
2+ * Copyright (C) 2013,2015-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "Greeter.h"
18+#include "UsersModel.h"
19+#include <QIdentityProxyModel>
20+#include <QLightDM/UsersModel>
21+
22+#include <libintl.h>
23+
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
31+{
32+ Q_OBJECT
33+
34+public:
35+ explicit MangleModel(QObject* parent=0);
36+
37+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
38+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
39+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
40+
41+private:
42+ struct CustomRow {
43+ QString name;
44+ QString realName;
45+ };
46+
47+ int sourceRowCount() const;
48+
49+ void updateGuestRow();
50+ void updateManualRow();
51+ void updateCustomRows();
52+
53+ void addCustomRow(const CustomRow &newRow);
54+ void removeCustomRow(const QString &rowName);
55+
56+ QList<CustomRow> m_customRows;
57+ bool m_updatingCustomRows;
58+};
59+
60+MangleModel::MangleModel(QObject* parent)
61+ : QIdentityProxyModel(parent)
62+ , m_updatingCustomRows(false)
63+{
64+ setSourceModel(new QLightDM::UsersModel(this));
65+
66+ updateCustomRows();
67+
68+ // Would be nice if there were a rowCountChanged signal in the base class.
69+ // We redo all custom rows on any row count change, because (A) some of
70+ // custom rows (manual login) use row count information and (B) when
71+ // testing, we use a modelReset signal as a way to indicate that a custom
72+ // row has been toggled off or on.
73+ connect(this, &QIdentityProxyModel::modelReset,
74+ this, &MangleModel::updateCustomRows);
75+ connect(this, &QIdentityProxyModel::rowsInserted,
76+ this, &MangleModel::updateCustomRows);
77+ connect(this, &QIdentityProxyModel::rowsRemoved,
78+ this, &MangleModel::updateCustomRows);
79+}
80+
81+QVariant MangleModel::data(const QModelIndex &index, int role) const
82+{
83+ QVariant variantData;
84+
85+ if (index.row() >= rowCount())
86+ return QVariant();
87+
88+ bool isCustomRow = index.row() >= sourceRowCount();
89+ if (isCustomRow && index.column() == 0) {
90+ int customIndex = index.row() - sourceRowCount();
91+ if (role == QLightDM::UsersModel::NameRole) {
92+ variantData = m_customRows[customIndex].name;
93+ } else if (role == QLightDM::UsersModel::RealNameRole) {
94+ variantData = m_customRows[customIndex].realName;
95+ } else if (role == QLightDM::UsersModel::LoggedInRole) {
96+ variantData = false;
97+ } else if (role == QLightDM::UsersModel::SessionRole) {
98+ variantData = Greeter::instance()->defaultSessionHint();
99+ }
100+ } else {
101+ variantData = QIdentityProxyModel::data(index, role);
102+ }
103+
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;
110+ }
111+
112+ // Workaround for liblightdm returning "" when a user has no default session
113+ if (Q_UNLIKELY(role == QLightDM::UsersModel::SessionRole && variantData.toString().isEmpty())) {
114+ variantData = Greeter::instance()->defaultSessionHint();
115+ }
116+
117+ return variantData;
118+}
119+
120+void MangleModel::addCustomRow(const CustomRow &newRow)
121+{
122+ for (int i = 0; i < m_customRows.size(); i++) {
123+ if (m_customRows[i].name == newRow.name) {
124+ return; // we don't have custom rows that change content yet
125+ }
126+ }
127+
128+ beginInsertRows(QModelIndex(), rowCount(), rowCount());
129+ m_customRows << newRow;
130+ endInsertRows();
131+}
132+
133+void MangleModel::removeCustomRow(const QString &rowName)
134+{
135+ for (int i = 0; i < m_customRows.size(); i++) {
136+ if (m_customRows[i].name == rowName) {
137+ int rowNum = sourceRowCount() + i;
138+ beginRemoveRows(QModelIndex(), rowNum, rowNum);
139+ m_customRows.removeAt(i);
140+ endRemoveRows();
141+ break;
142+ }
143+ }
144+}
145+
146+void MangleModel::updateManualRow()
147+{
148+ bool hasAnotherEntry = sourceRowCount() > 0;
149+ for (int i = 0; !hasAnotherEntry && i < m_customRows.size(); i++) {
150+ if (m_customRows[i].name != QStringLiteral("*other")) {
151+ hasAnotherEntry = true;
152+ }
153+ }
154+
155+ // Show manual login if we are asked to OR if no other entry exists
156+ if (Greeter::instance()->showManualLoginHint() || !hasAnotherEntry)
157+ addCustomRow({QStringLiteral("*other"), gettext("Login")});
158+ else
159+ removeCustomRow(QStringLiteral("*other"));
160+}
161+
162+void MangleModel::updateGuestRow()
163+{
164+ if (Greeter::instance()->hasGuestAccount())
165+ addCustomRow({QStringLiteral("*guest"), gettext("Guest Session")});
166+ else
167+ removeCustomRow(QStringLiteral("*guest"));
168+}
169+
170+void MangleModel::updateCustomRows()
171+{
172+ // We update when rowCount changes, but we also insert/remove rows here.
173+ // So guard this function to avoid recursion.
174+ if (m_updatingCustomRows)
175+ return;
176+
177+ m_updatingCustomRows = true;
178+ updateGuestRow();
179+ updateManualRow();
180+ m_updatingCustomRows = false;
181+}
182+
183+int MangleModel::rowCount(const QModelIndex &parent) const
184+{
185+ if (parent.isValid())
186+ return 0;
187+ else
188+ return sourceRowCount() + m_customRows.size();
189+}
190+
191+int MangleModel::sourceRowCount() const
192+{
193+ return Greeter::instance()->hideUsersHint() ? 0 : sourceModel()->rowCount();
194+}
195+
196+QModelIndex MangleModel::index(int row, int column, const QModelIndex &parent) const
197+{
198+ if (row >= rowCount())
199+ return QModelIndex();
200+
201+ bool isCustomRow = row >= sourceRowCount();
202+ if (isCustomRow && !parent.isValid()) {
203+ return createIndex(row, column);
204+ } else {
205+ return QIdentityProxyModel::index(row, column, parent);
206+ }
207+}
208+
209+// **** Now we continue with actual UsersModel class ****
210+
211+UsersModel::UsersModel(QObject* parent)
212+ : UnitySortFilterProxyModelQML(parent)
213+{
214+ setModel(new MangleModel(this));
215+ setSortCaseSensitivity(Qt::CaseInsensitive);
216+ setSortLocaleAware(true);
217+ setSortRole(QLightDM::UsersModel::RealNameRole);
218+ sort(0);
219+}
220+
221+bool UsersModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
222+{
223+ auto leftName = source_left.data(QLightDM::UsersModel::NameRole);
224+ auto rightName = source_right.data(QLightDM::UsersModel::NameRole);
225+
226+ if (leftName == QStringLiteral("*guest"))
227+ return false;
228+ if (rightName == QStringLiteral("*guest"))
229+ return true;
230+ if (leftName == QStringLiteral("*other"))
231+ return false;
232+ if (rightName == QStringLiteral("*other"))
233+ return true;
234+
235+ return UnitySortFilterProxyModelQML::lessThan(source_left, source_right);
236+}
237+
238+#include "UsersModel.moc"
plugins/IntegratedLightDM/UsersModel.h → plugins/LightDM/UsersModel.hrenamed+6−8
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012,2013 Canonical, Ltd.
2+ * Copyright (C) 2012-2013,2015-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,19 +12,16 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917/* This class is a really tiny filter around QLightDM::UsersModel. There are
2018 some operations that we want to edit a bit for the benefit of Qml.
2119 Specifically, we want to sort users according to realName. */
2220
23−#ifndef UNITY_USERSMODEL_H
24−#define UNITY_USERSMODEL_H
21+#pragma once
2522
2623#include <unitysortfilterproxymodelqml.h>
27−#include <QtCore/QObject>
24+#include <QObject>
2825
2926class UsersModel : public UnitySortFilterProxyModelQML
3027{
@@ -32,6 +29,7 @@ class UsersModel : public UnitySortFilterProxyModelQML
3229
3330public:
3431 explicit UsersModel(QObject* parent=0);
35−};
3632
37−#endif
33+protected:
34+ bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
35+};
plugins/IntegratedLightDM/plugin.cpp → plugins/LightDM/plugin.cpprenamed+37−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012,2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,12 @@
1919#include "DBusGreeter.h"
2020#include "DBusGreeterList.h"
2121#include "Greeter.h"
22+#include "PromptsModel.h"
23+#include "SessionsModel.h"
2224#include "UsersModel.h"
2325#include <libusermetricsoutput/ColorTheme.h>
2426#include <libusermetricsoutput/UserMetrics.h>
27+#include <QLightDM/SessionsModel>
2528#include <QLightDM/UsersModel>
2629
2730#include <QAbstractItemModel>
@@ -30,16 +33,31 @@
3033
3134static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
3235{
33− Q_UNUSED(engine)
3436 Q_UNUSED(scriptEngine)
3537
36− Greeter *greeter = new Greeter();
38+ Greeter *greeter = Greeter::instance();
3739 new DBusGreeter(greeter, QStringLiteral("/"));
3840 new DBusGreeterList(greeter, QStringLiteral("/list"));
3941
42+ engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);
43+
4044 return greeter;
4145}
4246
47+static QObject *prompts_provider(QQmlEngine *engine, QJSEngine *)
48+{
49+ auto model = Greeter::instance()->promptsModel();
50+ engine->setObjectOwnership(model, QQmlEngine::CppOwnership);
51+ return model;
52+}
53+
54+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
55+{
56+ Q_UNUSED(engine)
57+ Q_UNUSED(scriptEngine)
58+ return new SessionsModel();
59+}
60+
4361static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
4462{
4563 Q_UNUSED(engine)
@@ -54,16 +72,28 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
5472 return UserMetricsOutput::UserMetrics::getInstance();
5573}
5674
57−void IntegratedLightDMPlugin::registerTypes(const char *uri)
75+void PLUGIN_CLASSNAME::registerTypes(const char *uri)
5876{
5977 qmlRegisterType<QAbstractItemModel>();
6078 qmlRegisterType<UserMetricsOutput::ColorTheme>();
6179
62− Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
63− qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
64− qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
80+#if defined INTEGRATED_LIGHTDM
81+ Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
6582 qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
83+#elif defined FULL_LIGHTDM
84+ Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));
85+ qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
86+#else
87+ #error No library defined in LightDM plugin
88+#endif
89+
90+ qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);
91+
92+ qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
93+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
94+
6695 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
6796 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
97+
6898 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
6999}
tests/mocks/IntegratedLightDM/plugin.h → plugins/LightDM/plugin.hrenamed+6−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014, 2015 Canonical, Ltd.
2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,15 +12,16 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
1516 */
1617
17−#ifndef MOCK_LIGHTDM_PLUGIN_H
18−#define MOCK_LIGHTDM_PLUGIN_H
18+#ifndef LIGHTDM_PLUGIN_H
19+#define LIGHTDM_PLUGIN_H
1920
2021#include <QtQml/QQmlEngine>
2122#include <QtQml/QQmlExtensionPlugin>
2223
23−class IntegratedLightDMPlugin : public QQmlExtensionPlugin
24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
2425{
2526 Q_OBJECT
2627 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +30,4 @@ public:
2930 void registerTypes(const char *uri) override;
3031};
3132
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 @@
11pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
3+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
34
45include_directories(
6+ SYSTEM
57 ${ANDROID_HEADERS_INCLUDE_DIRS}
68)
79
810add_library(Lights-qml MODULE
911 plugin.cpp
1012 Lights.cpp
13+ LegacyLights.cpp
14+ HfdLights.cpp
1115 )
1216
13−qt5_use_modules(Lights-qml Qml Gui)
14−target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})
17+target_link_libraries(Lights-qml
18+ Qt5::Qml Qt5::Gui Qt5::DBus
19+ ${ANDROID_HARDWARE_LIBRARIES}
20+ ${ANDROID_PROPERTIES_LIBRARIES}
21+ )
1522
1623add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
plugins/Lights/HfdLights.cppnew file+62
@@ -0,0 +1,62 @@
1+/*
2+ * Copyright (C) 2021 UBports Foundation.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Author: Florian Leeber <florian@ubports.com>
17+ */
18+
19+#include "HfdLights.h"
20+#include <QtCore/QDebug>
21+#include <QDBusArgument>
22+#include <QDBusConnection>
23+#include <iostream>
24+
25+#define HFD_SERVICE_NAME "com.lomiri.hfd"
26+#define HFD_SERVICE_PATH "/com/lomiri/hfd"
27+#define HFD_SERVICE_INTERFACE "com.lomiri.hfd.Leds"
28+
29+HfdLights::HfdLights(QObject* parent)
30+ : Lights(parent)
31+{
32+ m_hfdInterface = new QDBusInterface(
33+ QStringLiteral(HFD_SERVICE_NAME),
34+ QStringLiteral(HFD_SERVICE_PATH),
35+ QStringLiteral(HFD_SERVICE_INTERFACE),
36+ QDBusConnection::systemBus(),
37+ this
38+ );
39+}
40+
41+bool HfdLights::init()
42+{
43+ // hfd does not need any initalization to be used
44+ return true;
45+}
46+
47+void HfdLights::turnOn()
48+{
49+ m_hfdInterface->call(QStringLiteral("setState"), 0);
50+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)m_color.rgba());
51+ m_hfdInterface->call(QStringLiteral("setOnMs"), m_onMs);
52+ m_hfdInterface->call(QStringLiteral("setOffMs"), m_offMs);
53+ m_hfdInterface->call(QStringLiteral("setState"), 1);
54+}
55+
56+void HfdLights::turnOff()
57+{
58+ m_hfdInterface->call(QStringLiteral("setState"), 0);
59+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)0);
60+ m_hfdInterface->call(QStringLiteral("setOnMs"), 0);
61+ m_hfdInterface->call(QStringLiteral("setOffMs"), 0);
62+}
tests/mocks/Unity/DashCommunicator/plugin.h → plugins/Lights/HfdLights.hrenamed+17−9
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2021 UBports Foundation.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -13,22 +13,30 @@
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 *
16− * Authors: Michael Zanetti <michael.zanetti@canonical.com>
16+ * Author: Florian Leeber <florian@ubports.com>
1717 */
1818
19−#ifndef DASHCOMMUNICATOR_PLUGIN_H
20−#define DASHCOMMUNICATOR_PLUGIN_H
19+#ifndef UNITY_HFDLIGHTS_H
20+#define UNITY_HFDLIGHTS_H
2121
22−#include <QtQml/QQmlEngine>
23−#include <QtQml/QQmlExtensionPlugin>
22+#include <QtCore/QObject>
23+#include <QDBusInterface>
24+#include "Lights.h"
2425
25−class DashCommunicatorPlugin : public QQmlExtensionPlugin
26+class HfdLights: public Lights
2627{
2728 Q_OBJECT
28− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2929
3030public:
31− void registerTypes(const char *uri) override;
31+ explicit HfdLights(QObject *parent = 0);
32+
33+protected:
34+ bool init() override;
35+ void turnOff() override;
36+ void turnOn() override;
37+
38+private:
39+ QDBusInterface* m_hfdInterface;
3240};
3341
3442#endif
plugins/Lights/LegacyLights.cppnew file+91
@@ -0,0 +1,91 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ * Copyright (C) 2021 UBports Foundation.
4+ *
5+ * This program is free software; you can redistribute it and/or modify
6+ * it under the terms of the GNU General Public License as published by
7+ * the Free Software Foundation; version 3.
8+ *
9+ * This program is distributed in the hope that it will be useful,
10+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
11+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+ * GNU General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ *
17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
18+ */
19+
20+#include "LegacyLights.h"
21+#include <QtCore/QDebug>
22+
23+extern "C" {
24+#include "android-hardware.h"
25+#include <string.h>
26+}
27+
28+LegacyLights::~LegacyLights()
29+{
30+ if (m_lightDevice) {
31+ hw_device_t* device = (hw_device_t*) m_lightDevice;
32+ device->close(device);
33+ }
34+}
35+
36+bool LegacyLights::init()
37+{
38+ if (m_lightDevice) {
39+ return true;
40+ }
41+
42+ int err;
43+ hw_module_t* module;
44+
45+ err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
46+ if (err == 0) {
47+ hw_device_t* device;
48+ err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
49+ if (err == 0) {
50+ m_lightDevice = (light_device_t*)device;
51+ turnOff();
52+ return true;
53+ } else {
54+ qWarning() << "Failed to access notification lights";
55+ }
56+ } else {
57+ qWarning() << "Failed to initialize lights hardware.";
58+ }
59+ return false;
60+}
61+
62+void LegacyLights::turnOn()
63+{
64+ // pulse
65+ light_state_t state;
66+ memset(&state, 0, sizeof(light_state_t));
67+ state.color = m_color.rgba();
68+ state.flashMode = LIGHT_FLASH_TIMED;
69+ state.flashOnMS = m_onMs;
70+ state.flashOffMS = m_offMs;
71+ state.brightnessMode = BRIGHTNESS_MODE_USER;
72+
73+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
74+ qWarning() << "Failed to turn the light off";
75+ }
76+}
77+
78+void LegacyLights::turnOff()
79+{
80+ light_state_t state;
81+ memset(&state, 0, sizeof(light_state_t));
82+ state.color = 0x00000000;
83+ state.flashMode = LIGHT_FLASH_NONE;
84+ state.flashOnMS = 0;
85+ state.flashOffMS = 0;
86+ state.brightnessMode = 0;
87+
88+ if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
89+ qWarning() << "Failed to turn the light off";
90+ }
91+}
plugins/Unity/DashCommunicator/plugin.h → plugins/Lights/LegacyLights.hrenamed+19−8
@@ -1,5 +1,6 @@
11/*
22 * Copyright (C) 2014 Canonical, Ltd.
3+ * Copyright (C) 2021 UBports Foundation.
34 *
45 * This program is free software; you can redistribute it and/or modify
56 * it under the terms of the GNU General Public License as published by
@@ -13,22 +14,32 @@
1314 * You should have received a copy of the GNU General Public License
1415 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1516 *
16− * Authors: Michael Zanetti <michael.zanetti@canonical.com>
17+ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
1718 */
1819
19−#ifndef DASHCOMMUNICATOR_PLUGIN_H
20−#define DASHCOMMUNICATOR_PLUGIN_H
20+#ifndef UNITY_LEGACYLIGHTS_H
21+#define UNITY_LEGACYLIGHTS_H
2122
22−#include <QtQml/QQmlEngine>
23−#include <QtQml/QQmlExtensionPlugin>
23+#include <QtCore/QObject>
24+#include "Lights.h"
2425
25−class DashCommunicatorPlugin : public QQmlExtensionPlugin
26+struct light_device_t;
27+
28+class LegacyLights: public Lights
2629{
2730 Q_OBJECT
28− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2931
3032public:
31− void registerTypes(const char *uri) override;
33+ ~LegacyLights();
34+
35+protected:
36+ bool init() override;
37+ void turnOff() override;
38+ void turnOn() override;
39+
40+private:
41+ light_device_t* m_lightDevice;
42+
3243};
3344
3445#endif
plugins/Lights/Lights.cpp−65
@@ -26,20 +26,12 @@ extern "C" {
2626
2727Lights::Lights(QObject* parent)
2828 : QObject(parent),
29− m_lightDevice(0),
3029 m_color("blue"),
3130 m_state(Lights::Off),
3231 m_onMs(1000),
3332 m_offMs(3000)
3433{
35−}
3634
37−Lights::~Lights()
38−{
39− if (m_lightDevice) {
40− hw_device_t* device = (hw_device_t*) m_lightDevice;
41− device->close(device);
42− }
4335}
4436
4537void Lights::setState(Lights::State newState)
@@ -107,60 +99,3 @@ void Lights::setOffMillisec(int offMs)
10799 // FIXME: update the property if the light is already on
108100 }
109101}
110−
111−bool Lights::init()
112−{
113− if (m_lightDevice) {
114− return true;
115− }
116−
117− int err;
118− hw_module_t* module;
119−
120− err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
121− if (err == 0) {
122− hw_device_t* device;
123− err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
124− if (err == 0) {
125− m_lightDevice = (light_device_t*)device;
126− turnOff();
127− return true;
128− } else {
129− qWarning() << "Failed to access notification lights";
130− }
131− } else {
132− qWarning() << "Failed to initialize lights hardware.";
133− }
134− return false;
135−}
136−
137−void Lights::turnOn()
138−{
139− // pulse
140− light_state_t state;
141− memset(&state, 0, sizeof(light_state_t));
142− state.color = m_color.rgba();
143− state.flashMode = LIGHT_FLASH_TIMED;
144− state.flashOnMS = m_onMs;
145− state.flashOffMS = m_offMs;
146− state.brightnessMode = BRIGHTNESS_MODE_USER;
147−
148− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
149− qWarning() << "Failed to turn the light off";
150− }
151−}
152−
153−void Lights::turnOff()
154−{
155− light_state_t state;
156− memset(&state, 0, sizeof(light_state_t));
157− state.color = 0x00000000;
158− state.flashMode = LIGHT_FLASH_NONE;
159− state.flashOnMS = 0;
160− state.flashOffMS = 0;
161− state.brightnessMode = 0;
162−
163− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
164− qWarning() << "Failed to turn the light off";
165− }
166−}
plugins/Lights/Lights.h+5−9
@@ -22,12 +22,9 @@
2222#include <QtCore/QObject>
2323#include <QtGui/QColor>
2424
25−struct light_device_t;
26−
2725class Lights: public QObject
2826{
2927 Q_OBJECT
30− Q_ENUMS(State)
3128 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
3229 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
3330 Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
@@ -38,9 +35,9 @@ public:
3835 Off,
3936 On,
4037 };
38+ Q_ENUM(State)
4139
4240 explicit Lights(QObject *parent = 0);
43− ~Lights();
4441
4542 void setState(State newState);
4643 State state() const;
@@ -60,16 +57,15 @@ Q_SIGNALS:
6057 void onMillisecChanged(int onMs);
6158 void offMillisecChanged(int offMs);
6259
63−private:
64− light_device_t* m_lightDevice;
60+protected:
6561 QColor m_color;
6662 State m_state;
6763 int m_onMs;
6864 int m_offMs;
6965
70− bool init();
71− void turnOff();
72− void turnOn();
66+ virtual bool init() = 0;
67+ virtual void turnOff() = 0;
68+ virtual void turnOn() = 0;
7369};
7470
7571#endif
plugins/Lights/Lights.qmltypesdeleted−45
@@ -1,45 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Lights 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "Lights"
12− prototype: "QObject"
13− exports: ["Lights/Lights 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Enum {
18− name: "State"
19− values: {
20− "Off": 0,
21− "On": 1
22− }
23− }
24− Property { name: "state"; type: "State" }
25− Property { name: "color"; type: "QColor" }
26− Property { name: "onMillisec"; type: "int" }
27− Property { name: "offMillisec"; type: "int" }
28− Signal {
29− name: "stateChanged"
30− Parameter { name: "newState"; type: "State" }
31− }
32− Signal {
33− name: "colorChanged"
34− Parameter { name: "color"; type: "QColor" }
35− }
36− Signal {
37− name: "onMillisecChanged"
38− Parameter { name: "onMs"; type: "int" }
39− }
40− Signal {
41− name: "offMillisecChanged"
42− Parameter { name: "offMs"; type: "int" }
43− }
44− }
45−}
plugins/Lights/android-hardware.h−4
@@ -15,9 +15,5 @@
1515 *
1616 */
1717
18−// The purpose of this header wrapper is just to avoid having warnings being reported on
19−// code from external header files, as we can't do anything about them.
20−#pragma GCC system_header
21−
2218#include <hardware/hardware.h>
2319#include <hardware/lights.h>
plugins/Lights/plugin.cpp+20−1
@@ -18,6 +18,11 @@
1818
1919#include "plugin.h"
2020#include "Lights.h"
21+#include "HfdLights.h"
22+#include "LegacyLights.h"
23+
24+// libandroid-properties
25+#include <hybris/properties/properties.h>
2126
2227#include <QtQml/qqml.h>
2328
@@ -25,7 +30,21 @@ static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2530{
2631 Q_UNUSED(engine)
2732 Q_UNUSED(scriptEngine)
28− return new Lights();
33+
34+ bool use_hfd = false;
35+ char buffer[PROP_VALUE_MAX];
36+ auto result = property_get("ro.build.version.sdk", buffer, "0");
37+ if (result) {
38+ auto sdkVersion = QString(buffer).toInt();
39+ if (sdkVersion >= 27 || sdkVersion == 0) {
40+ use_hfd = true;
41+ }
42+ }
43+ if (use_hfd) {
44+ return new HfdLights();
45+ } else {
46+ return new LegacyLights();
47+ }
2948}
3049
3150void LightsPlugin::registerTypes(const char *uri)
plugins/Powerd/CMakeLists.txt+4−2
@@ -9,7 +9,9 @@ add_library(Powerd-qml MODULE
99 Powerd.cpp
1010 )
1111
12−qt5_use_modules(Powerd-qml DBus Qml)
13−target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
12+target_link_libraries(Powerd-qml
13+ Qt5::DBus Qt5::Qml
14+ ${GIO_LDFLAGS}
15+ )
1416
1517add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
plugins/Powerd/Powerd.h+2−2
@@ -27,8 +27,6 @@
2727class Powerd: public QObject
2828{
2929 Q_OBJECT
30− Q_ENUMS(Status)
31− Q_ENUMS(DisplayStateChangeReason)
3230 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
3331
3432public:
@@ -41,11 +39,13 @@ public:
4139 SnapDecision = 5, // Display changed state due to snap decision prompt
4240 CallDone = 6, // Display changed state due to voice call end
4341 };
42+ Q_ENUM(DisplayStateChangeReason)
4443
4544 enum Status {
4645 Off,
4746 On,
4847 };
48+ Q_ENUM(Status)
4949
5050 explicit Powerd(QObject *parent = 0);
5151 ~Powerd();
plugins/Powerd/Powerd.qmltypesdeleted−39
@@ -1,39 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Powerd 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "Powerd"
12− prototype: "QObject"
13− exports: ["Powerd/Powerd 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Enum {
18− name: "DisplayStateChangeReason"
19− values: {
20− "Unknown": 0,
21− "Inactivity": 1,
22− "PowerKey": 2,
23− "Proximity": 3
24− }
25− }
26− Enum {
27− name: "Status"
28− values: {
29− "Off": 0,
30− "On": 1
31− }
32− }
33− Property { name: "status"; type: "Status"; isReadonly: true }
34− Signal {
35− name: "statusChanged"
36− Parameter { name: "reason"; type: "DisplayStateChangeReason" }
37− }
38− }
39−}
plugins/ScreenGrabber/CMakeLists.txtdeleted−13
@@ -1,13 +0,0 @@
1−include_directories(
2− ${CMAKE_CURRENT_BINARY_DIR}
3−)
4−
5−set(SCREENGRABBERSOURCES
6− screengrabber.cpp
7− plugin.cpp
8−)
9−
10−add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})
11−qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)
12−
13−add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)
plugins/ScreenGrabber/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module ScreenGrabber
2−plugin ScreenGrabber-qml
3−typeinfo ScreenGrabber.qmltypes
plugins/ScreenGrabber/screengrabber.cppdeleted−115
@@ -1,115 +0,0 @@
1−/*
2− * Copyright (C) 2014-2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "screengrabber.h"
18−
19−#include <QDir>
20−#include <QDateTime>
21−#include <QStandardPaths>
22−#include <QTemporaryDir>
23−#include <QtGui/QImage>
24−#include <QtGui/QGuiApplication>
25−#include <QtQuick/QQuickWindow>
26−
27−#include <QDebug>
28−
29−QString saveScreenshot(const QImage &screenshot, const QString &filename, const QString &format, int quality)
30−{
31− if (screenshot.save(filename, format.toLatin1().data(), quality)) {
32− return filename;
33− } else {
34− qWarning() << "ScreenGrabber: failed to save snapshot!";
35− }
36− return QString();
37−}
38−
39−ScreenGrabber::ScreenGrabber(QObject *parent)
40− : QObject(parent)
41−{
42− QObject::connect(&m_watcher,
43− &QFutureWatcher<QString>::finished,
44− this,
45− &ScreenGrabber::onScreenshotSaved);
46−
47− QDir screenshotsDir;
48− if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
49− QTemporaryDir tDir;
50− tDir.setAutoRemove(false);
51− screenshotsDir = tDir.path();
52− } else {
53− screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
54− }
55− screenshotsDir.mkpath(QStringLiteral("Screenshots"));
56− screenshotsDir.cd(QStringLiteral("Screenshots"));
57− if (screenshotsDir.exists()) {
58− fileNamePrefix = screenshotsDir.absolutePath();
59− fileNamePrefix.append("/screenshot");
60− } else {
61− qWarning() << "ScreenGrabber: failed to create directory at: " << screenshotsDir.absolutePath();
62− }
63−}
64−
65−void ScreenGrabber::captureAndSave(int angle)
66−{
67− if (fileNamePrefix.isEmpty())
68− {
69− qWarning() << "ScreenShotter: no directory to save screenshot";
70− return;
71− }
72−
73− const QWindowList windows = QGuiApplication::topLevelWindows();
74− if (windows.empty())
75− {
76− qWarning() << "ScreenShotter: no top level windows found!";
77− return;
78− }
79−
80− QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);
81− if (!main_window)
82− {
83− qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";
84− return;
85− }
86−
87− const QImage screenshot = main_window->grabWindow().transformed(QTransform().rotate(angle));
88− const QString filename = makeFileName();
89− qDebug() << "Saving screenshot to" << filename;
90− QFuture<QString> saveFuture(QtConcurrent::run(saveScreenshot, screenshot, filename, getFormat(), screenshotQuality));
91− m_watcher.setFuture(saveFuture);
92−}
93−
94−void ScreenGrabber::onScreenshotSaved()
95−{
96− const QString filename = m_watcher.future().result();
97− if (!filename.isEmpty()) {
98− Q_EMIT screenshotSaved(filename);
99− }
100−}
101−
102−QString ScreenGrabber::makeFileName() const
103−{
104− QString fileName(fileNamePrefix);
105− fileName.append(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmsszzz")));
106− fileName.append(".");
107− fileName.append(getFormat());
108− return fileName;
109−}
110−
111−QString ScreenGrabber::getFormat() const
112−{
113− //TODO: This should be configurable (perhaps through gsettings?)
114− return QStringLiteral("png");
115−}
plugins/ScreenshotDirectory/CMakeLists.txtnew file+9
@@ -0,0 +1,9 @@
1+set(PLUGIN_SOURCES
2+ ScreenshotDirectory.cpp
3+ plugin.cpp
4+)
5+
6+add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)
8+
9+add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
plugins/ScreenGrabber/ScreenGrabber.qmltypes → plugins/ScreenshotDirectory/ScreenGrabber.qmltypesrenamed
The content is the same.
plugins/ScreenshotDirectory/ScreenshotDirectory.cppnew file+64
@@ -0,0 +1,64 @@
1+/*
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "ScreenshotDirectory.h"
18+
19+#include <QDir>
20+#include <QDateTime>
21+#include <QStandardPaths>
22+#include <QTemporaryDir>
23+
24+#include <QDebug>
25+
26+ScreenshotDirectory::ScreenshotDirectory(QObject *parent)
27+ : QObject(parent)
28+{
29+ QDir screenshotsDir;
30+ if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
31+ QTemporaryDir tDir;
32+ tDir.setAutoRemove(false);
33+ screenshotsDir = tDir.path();
34+ } else {
35+ screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
36+ }
37+ screenshotsDir.mkpath(QStringLiteral("Screenshots"));
38+ screenshotsDir.cd(QStringLiteral("Screenshots"));
39+ if (screenshotsDir.exists()) {
40+ m_fileNamePrefix = screenshotsDir.absolutePath();
41+ m_fileNamePrefix.append("/screenshot");
42+ } else {
43+ qWarning() << "ScreenshotDirectory: failed to create directory at:" << screenshotsDir.absolutePath();
44+ }
45+}
46+
47+QString ScreenshotDirectory::makeFileName() const
48+{
49+ if (m_fileNamePrefix.isEmpty()) {
50+ return QString();
51+ }
52+
53+ QString fileName(m_fileNamePrefix);
54+ fileName.append(QDateTime::currentDateTime().toString(QStringLiteral("yyyyMMdd_hhmmsszzz")));
55+ fileName.append(".");
56+ fileName.append(format());
57+ return fileName;
58+}
59+
60+QString ScreenshotDirectory::format() const
61+{
62+ //TODO: This should be configurable (perhaps through gsettings?)
63+ return QStringLiteral("png");
64+}
plugins/ScreenshotDirectory/ScreenshotDirectory.hnew file+39
@@ -0,0 +1,39 @@
1+/*
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef SCREENSHOTDIRECTORY_H
18+#define SCREENSHOTDIRECTORY_H
19+
20+#include <QObject>
21+#include <QString>
22+
23+class ScreenshotDirectory: public QObject
24+{
25+ Q_OBJECT
26+
27+public:
28+ explicit ScreenshotDirectory(QObject *parent = 0);
29+ ~ScreenshotDirectory() = default;
30+
31+public Q_SLOTS:
32+ QString makeFileName() const;
33+
34+private:
35+ QString format() const;
36+ QString m_fileNamePrefix;
37+};
38+
39+#endif // SCREENSHOTDIRECTORY_H
plugins/ScreenGrabber/plugin.cpp → plugins/ScreenshotDirectory/plugin.cpprenamed+5−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014,2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,17 +12,15 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
1715 */
1816
1917#include "plugin.h"
20−#include "screengrabber.h"
18+#include "ScreenshotDirectory.h"
2119
2220#include <QtQml/qqml.h>
2321
24−void ScreenGrabberPlugin::registerTypes(const char *uri)
22+void ScreenshotDirectoryPlugin::registerTypes(const char *uri)
2523{
26− Q_ASSERT(uri == QLatin1String("ScreenGrabber"));
27− qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");
24+ Q_ASSERT(uri == QLatin1String("ScreenshotDirectory"));
25+ qmlRegisterType<ScreenshotDirectory>(uri, 0, 1, "ScreenshotDirectory");
2826}
tests/mocks/Unity/fake_unity_plugin.h → plugins/ScreenshotDirectory/plugin.hrenamed+5−8
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014,2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,17 +12,14 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Nick Dedekind <nick.dedekind@canonical.com>
1715 */
1816
19−#ifndef FAKE_UNITY_PLUGIN_H
20−#define FAKE_UNITY_PLUGIN_H
17+#ifndef SCREENSHOTDIRECTORY_PLUGIN_H
18+#define SCREENSHOTDIRECTORY_PLUGIN_H
2119
22−// Qt
2320#include <QtQml/QQmlExtensionPlugin>
2421
25−class FakeUnityPlugin : public QQmlExtensionPlugin
22+class ScreenshotDirectoryPlugin : public QQmlExtensionPlugin
2623{
2724 Q_OBJECT
2825 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -31,4 +28,4 @@ public:
3128 void registerTypes(const char *uri) override;
3229};
3330
34−#endif
31+#endif // SCREENSHOTDIRECTORY_PLUGIN_H
plugins/ScreenshotDirectory/qmldirnew file+2
@@ -0,0 +1,2 @@
1+module ScreenshotDirectory
2+plugin ScreenshotDirectory-qml
plugins/SessionBroadcast/CMakeLists.txt+1−2
@@ -6,9 +6,8 @@ add_library(SessionBroadcast-qml MODULE
66 plugin.cpp
77 )
88
9−qt5_use_modules(SessionBroadcast-qml DBus Qml)
10−
119target_link_libraries(SessionBroadcast-qml
10+ Qt5::DBus Qt5::Qml
1211 ${GLIB_LIBRARIES}
1312 )
1413
plugins/SessionBroadcast/SessionBroadcast.cpp+35−9
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,12 +12,12 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917#include "SessionBroadcast.h"
2018#include <QDBusConnection>
19+#include <QDBusConnectionInterface>
20+#include <QDBusInterface>
2121
2222#include <glib.h>
2323
@@ -27,13 +27,39 @@ SessionBroadcast::SessionBroadcast(QObject* parent)
2727 m_username = QString::fromUtf8(g_get_user_name());
2828
2929 auto connection = QDBusConnection::SM_BUSNAME();
30+ auto interface = connection.interface();
31+ interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));
32+
33+ m_broadcaster = new QDBusInterface(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
34+ QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
35+ QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
36+ connection, this);
37+
38+ connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),
39+ this, SLOT(onStartUrl(const QString &, const QString &)));
40+
41+ connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),
42+ this, SLOT(onShowHome(const QString &)));
43+}
44+
45+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
46+{
47+ m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);
48+}
49+
50+void SessionBroadcast::requestHomeShown(const QString &username)
51+{
52+ m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);
53+}
3054
31− connection.connect(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
32− QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
33− QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
34− QStringLiteral("ShowHome"),
35− this,
36− SLOT(onShowHome(const QString &)));
55+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
56+{
57+ // Since this signal is just used for testing, we don't *really* care if
58+ // username matches, but just in case we do eventually use the signal, we
59+ // should only listen to our own requests.
60+ if (username == m_username) {
61+ Q_EMIT startUrl(url);
62+ }
3763}
3864
3965void SessionBroadcast::onShowHome(const QString &username)
plugins/SessionBroadcast/SessionBroadcast.h+10−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917#ifndef UNITY_SESSIONBROADCAST_H
@@ -31,14 +29,23 @@ class SessionBroadcast: public QObject
3129public:
3230 explicit SessionBroadcast(QObject *parent = 0);
3331
32+ Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
33+ Q_INVOKABLE void requestHomeShown(const QString &username);
34+
3435Q_SIGNALS:
36+ // This signal isn't actually used by the shell
37+ // (unity-greeter-session-broadcast handles launching an app for us), but
38+ // it's useful for testing the plugin.
39+ void startUrl(const QString &url);
3540 void showHome();
3641
3742private Q_SLOTS:
43+ void onStartUrl(const QString &username, const QString &url);
3844 void onShowHome(const QString &username);
3945
4046private:
4147 QString m_username;
48+ QDBusInterface *m_broadcaster;
4249};
4350
4451#endif
plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19
@@ -1,19 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "SessionBroadcast"
12− prototype: "QObject"
13− exports: ["SessionBroadcast/SessionBroadcast 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Signal { name: "showHome" }
18− }
19−}
plugins/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(UInput-qml MODULE
33 uinput.cpp
44)
55
6−qt5_use_modules(UInput-qml Qml)
6+target_link_libraries(UInput-qml Qt5::Qml)
77add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
plugins/UInput/UInput.qmltypesdeleted−44
@@ -1,44 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable UInput 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "UInput"
12− prototype: "QObject"
13− exports: ["UInput/UInput 0.1"]
14− exportMetaObjectRevisions: [0]
15− Enum {
16− name: "Button"
17− values: {
18− "ButtonLeft": 0,
19− "ButtonRight": 1,
20− "ButtonMiddle": 2
21− }
22− }
23− Method { name: "createMouse" }
24− Method { name: "removeMouse" }
25− Method {
26− name: "moveMouse"
27− Parameter { name: "dx"; type: "int" }
28− Parameter { name: "dy"; type: "int" }
29− }
30− Method {
31− name: "pressMouse"
32− Parameter { name: "button"; type: "Button" }
33− }
34− Method {
35− name: "releaseMouse"
36− Parameter { name: "button"; type: "Button" }
37− }
38− Method {
39− name: "scrollMouse"
40− Parameter { name: "dh"; type: "int" }
41− Parameter { name: "dv"; type: "int" }
42− }
43− }
44−}
plugins/UInput/uinput.h+1−1
@@ -27,7 +27,6 @@
2727class UInput : public QObject
2828{
2929 Q_OBJECT
30− Q_ENUMS(Button)
3130
3231public:
3332 enum Button {
@@ -35,6 +34,7 @@ public:
3534 ButtonRight,
3635 ButtonMiddle
3736 };
37+ Q_ENUM(Button)
3838
3939 explicit UInput(QObject *parent = nullptr);
4040 ~UInput();
plugins/Ubuntu/CMakeLists.txt−2
@@ -1,4 +1,2 @@
11add_subdirectory(Gestures)
22add_subdirectory(DownloadDaemonListener)
3−add_subdirectory(Payments)
4−add_subdirectory(SystemImage)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+6−3
@@ -1,7 +1,6 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
33 ${CMAKE_CURRENT_BINARY_DIR}
4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
54)
65
76set(DOWNLOADDAEMONLISTENER_SOURCES
@@ -12,6 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES
1211
1312add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
1413
15−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
16−
14+pkg_check_modules(DDLADAPTER REQUIRED udm-common)
15+add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
16+target_link_libraries(DownloadDaemonListener
17+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core
18+ ${DDLADAPTER_LIBRARIES}
19+ )
1720add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60
@@ -1,60 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "DownloadTracker"
12− prototype: "QObject"
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 }
18− Signal {
19− name: "serviceChanged"
20− Parameter { name: "service"; type: "string" }
21− }
22− Signal {
23− name: "dbusPathChanged"
24− Parameter { name: "dbusPath"; type: "string" }
25− }
26− Signal {
27− name: "serviceReadyChanged"
28− Parameter { name: "serviceReady"; type: "bool" }
29− }
30− Signal {
31− name: "canceled"
32− Parameter { name: "success"; type: "bool" }
33− }
34− Signal {
35− name: "error"
36− Parameter { name: "error"; type: "string" }
37− }
38− Signal {
39− name: "finished"
40− Parameter { name: "path"; type: "string" }
41− }
42− Signal {
43− name: "paused"
44− Parameter { name: "success"; type: "bool" }
45− }
46− Signal {
47− name: "progress"
48− Parameter { name: "received"; type: "qulonglong" }
49− Parameter { name: "total"; type: "qulonglong" }
50− }
51− Signal {
52− name: "resumed"
53− Parameter { name: "success"; type: "bool" }
54− }
55− Signal {
56− name: "started"
57− Parameter { name: "success"; type: "bool" }
58− }
59− }
60−}
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+2−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 - Canonical Ltd.
2+ * Copyright (C) 2013-2016 Canonical Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it
55 * under the terms of the GNU Lesser General Public License, as
@@ -78,6 +78,7 @@ void DownloadTracker::startService()
7878 connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
7979 connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
8080 connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
81+ connect(m_adaptor, &DownloadTrackerAdaptor::processing, this, &DownloadTracker::processing);
8182 }
8283 // FIXME find a better way of determining if the service is ready
8384 Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+2−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 - Canonical Ltd.
2+ * Copyright (C) 2013-2016 Canonical Ltd.
33 *
44 * This program is free software: you can redistribute it and/or modify it
55 * under the terms of the GNU Lesser General Public License, as
@@ -54,6 +54,7 @@ Q_SIGNALS:
5454 void error(const QString &error);
5555 void finished(const QString &path);
5656 void paused(bool success);
57+ void processing(const QString &path);
5758 void progress(qulonglong received, qulonglong total);
5859 void resumed(bool success);
5960 void started(bool success);
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp+2−2
@@ -1,8 +1,8 @@
11/*
22 * 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
44 *
5− * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
66 *
77 * This is an auto-generated file.
88 * This file may have been hand-edited. Look for HAND-EDIT comments
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h+71−4
@@ -1,15 +1,15 @@
11/*
22 * 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
44 *
5− * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
66 *
77 * This is an auto-generated file.
88 * Do not edit! All changes made to it will be lost.
99 */
1010
11−#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
12−#define DOWNLOADTRACKERADAPTOR_H_1374434371
11+#ifndef DOWNLOADTRACKERADAPTOR_H
12+#define DOWNLOADTRACKERADAPTOR_H
1313
1414#include <QtCore/QObject>
1515#include <QtCore/QByteArray>
@@ -36,6 +36,22 @@ public:
3636
3737 ~DownloadTrackerAdaptor();
3838
39+ Q_PROPERTY(QString ClickPackage READ clickPackage)
40+ inline QString clickPackage() const
41+ { return qvariant_cast< QString >(property("ClickPackage")); }
42+
43+ Q_PROPERTY(QString DestinationApp READ destinationApp)
44+ inline QString destinationApp() const
45+ { return qvariant_cast< QString >(property("DestinationApp")); }
46+
47+ Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
48+ inline bool showInIndicator() const
49+ { return qvariant_cast< bool >(property("ShowInIndicator")); }
50+
51+ Q_PROPERTY(QString Title READ title)
52+ inline QString title() const
53+ { return qvariant_cast< QString >(property("Title")); }
54+
3955public Q_SLOTS: // METHODS
4056 inline QDBusPendingReply<> allowGSMDownload(bool allowed)
4157 {
@@ -50,6 +66,24 @@ public Q_SLOTS: // METHODS
5066 return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
5167 }
5268
69+ inline QDBusPendingReply<> collected()
70+ {
71+ QList<QVariant> argumentList;
72+ return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
73+ }
74+
75+ inline QDBusPendingReply<QString> filePath()
76+ {
77+ QList<QVariant> argumentList;
78+ return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
79+ }
80+
81+ inline QDBusPendingReply<StringMap> headers()
82+ {
83+ QList<QVariant> argumentList;
84+ return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
85+ }
86+
5387 inline QDBusPendingReply<bool> isGSMDownloadAllowed()
5488 {
5589 QList<QVariant> argumentList;
@@ -80,6 +114,27 @@ public Q_SLOTS: // METHODS
80114 return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
81115 }
82116
117+ inline QDBusPendingReply<> setDestinationDir(const QString &path)
118+ {
119+ QList<QVariant> argumentList;
120+ argumentList << QVariant::fromValue(path);
121+ return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
122+ }
123+
124+ inline QDBusPendingReply<> setHeaders(StringMap headers)
125+ {
126+ QList<QVariant> argumentList;
127+ argumentList << QVariant::fromValue(headers);
128+ return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
129+ }
130+
131+ inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
132+ {
133+ QList<QVariant> argumentList;
134+ argumentList << QVariant::fromValue(data);
135+ return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
136+ }
137+
83138 inline QDBusPendingReply<> setThrottle(qulonglong speed)
84139 {
85140 QList<QVariant> argumentList;
@@ -93,6 +148,12 @@ public Q_SLOTS: // METHODS
93148 return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
94149 }
95150
151+ inline QDBusPendingReply<int> state()
152+ {
153+ QList<QVariant> argumentList;
154+ return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
155+ }
156+
96157 inline QDBusPendingReply<qulonglong> throttle()
97158 {
98159 QList<QVariant> argumentList;
@@ -106,10 +167,16 @@ public Q_SLOTS: // METHODS
106167 }
107168
108169Q_SIGNALS: // SIGNALS
170+ void authError(AuthErrorStruct error);
109171 void canceled(bool success);
110172 void error(const QString &error);
111173 void finished(const QString &path);
174+ void hashError(HashErrorStruct error);
175+ void httpError(HttpErrorStruct error);
176+ void networkError(NetworkErrorStruct error);
112177 void paused(bool success);
178+ void processError(ProcessErrorStruct error);
179+ void processing(const QString &path);
113180 void progress(qulonglong received, qulonglong total);
114181 void resumed(bool success);
115182 void started(bool success);
plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h+3−6
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This library is free software; you can redistribute it and/or
55 * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -19,10 +19,7 @@
1919#ifndef DOWNLOADER_LIB_APP_METATYPES_H
2020#define DOWNLOADER_LIB_APP_METATYPES_H
2121
22−#include <QMap>
23−
24−typedef QMap<QString, QString> StringMap;
25−
26−Q_DECLARE_METATYPE(StringMap)
22+// Just include the system file so we're always up to date.
23+#include <ubuntu/download_manager/metatypes.h>
2724
2825#endif // METATYPES_H
plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+1−1
@@ -21,7 +21,7 @@
2121#include "AxisVelocityCalculator.h"
2222#include <QtCore/QElapsedTimer>
2323
24−using namespace UbuntuGestures;
24+UG_USE_NAMESPACE
2525
2626AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
2727 : AxisVelocityCalculator(SharedTimeSource(new RealTimeSource), parent)
plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+4−4
@@ -24,7 +24,7 @@
2424#include "UbuntuGesturesQmlGlobal.h"
2525#include <stdint.h>
2626#include <QtCore/QObject>
27−#include "TimeSource.h"
27+#include <UbuntuGestures/private/timesource_p.h>
2828
2929/*
3030 Estimates the current velocity of a finger based on recent movement along an axis
@@ -68,7 +68,7 @@ public:
6868 /*
6969 Constructor that takes a TimeSource
7070 */
71− AxisVelocityCalculator(const UbuntuGestures::SharedTimeSource &timeSource, QObject *parent = 0);
71+ AxisVelocityCalculator(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource, QObject *parent = 0);
7272
7373 virtual ~AxisVelocityCalculator();
7474
@@ -90,7 +90,7 @@ public:
9090 /*
9191 Replaces the TimeSource with the given one. Useful for testing purposes.
9292 */
93− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
93+ void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);
9494
9595 /*
9696 The minimum amount of samples needed for a velocity calculation.
@@ -138,7 +138,7 @@ private:
138138 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
139139 int m_samplesWrite; /* index where the next sample will be written */
140140
141− UbuntuGestures::SharedTimeSource m_timeSource;
141+ UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource;
142142
143143 qreal m_trackedPosition;
144144};
plugins/Ubuntu/Gestures/CMakeLists.txt+11−8
@@ -4,27 +4,29 @@ remove_definitions(-DQT_NO_KEYWORDS)
44set(UbuntuGesturesQml_SOURCES
55 plugin.cpp
66 AxisVelocityCalculator.cpp
7− Damper.cpp
87 Direction.cpp
9− DirectionalDragArea.cpp
10− FloatingFlickable.cpp
8+ MouseEventGenerator.cpp
119 PressedOutsideNotifier.cpp
1210 TouchDispatcher.cpp
1311 TouchGate.cpp
1412 TouchGestureArea.cpp
1513)
1614
17−add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
15+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
1816
19−add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
20−target_link_libraries(UbuntuGesturesQml UbuntuGestures)
17+add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
2118
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)
2321
2422# So that Foo.cpp can #include "Foo.moc"
2523include_directories(${CMAKE_CURRENT_BINARY_DIR})
2624
27−include_directories(${CMAKE_SOURCE_DIR}/libs/UbuntuGestures)
25+include_directories(
26+ SYSTEM
27+ ${UBUNTUGESTURES_INCLUDE_DIRS}
28+ ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}
29+)
2830
2931# There's no cmake var for v8 include path :-/ so create one
3032LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
@@ -32,6 +34,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
3234
3335# DANGER! DANGER! Using Qt's private API!
3436include_directories(
37+ SYSTEM
3538 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
3639 ${Qt5Quick_INCLUDE_DIRS}
3740 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
plugins/Ubuntu/Gestures/Damper.hdeleted−89
@@ -1,89 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef UBUNTU_GESTURES_DAMPER_H
18−#define UBUNTU_GESTURES_DAMPER_H
19−
20−#include <QtCore/QPointF>
21−
22−/*
23− Decreases the oscillations of a value along an axis.
24− */
25−template <class Type> class Damper {
26−public:
27− Damper() : m_value(0), m_maxDelta(0) { }
28−
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;
33− }
34− Type maxDelta() const { return m_maxDelta; }
35−
36− void reset(Type value) {
37− m_value = value;
38− }
39−
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;
46− }
47−
48− return m_value;
49− }
50−
51− Type value() const { return m_value; }
52−
53−private:
54− Type m_value;
55− Type m_maxDelta;
56−};
57−
58−/*
59− A point that has its movement dampened.
60− */
61−class DampedPointF {
62−public:
63− void setMaxDelta(qreal maxDelta) {
64− m_x.setMaxDelta(maxDelta);
65− m_y.setMaxDelta(maxDelta);
66− }
67−
68− qreal maxDelta() const { return m_x.maxDelta(); }
69−
70− void reset(const QPointF point) {
71− m_x.reset(point.x());
72− m_y.reset(point.y());
73− }
74−
75− void update(const QPointF point) {
76− m_x.update(point.x());
77− m_y.update(point.y());
78− }
79−
80− qreal x() const { return m_x.value(); }
81− qreal y() const { return m_y.value(); }
82−private:
83− Damper<qreal> m_x;
84− Damper<qreal> m_y;
85−};
86−
87−QDebug operator<<(QDebug dbg, const DampedPointF &p);
88−
89−#endif // UBUNTU_GESTURES_DAMPER_H
plugins/Ubuntu/Gestures/Direction.h+2−1
@@ -26,9 +26,9 @@
2626 */
2727class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
2828 Q_OBJECT
29− Q_ENUMS(Type)
3029
3130public:
31+ // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
3232 enum Type {
3333 Rightwards, // Along the positive direction of the X axis
3434 Leftwards, // Along the negative direction of the X axis
@@ -37,6 +37,7 @@ public:
3737 Horizontal, // Along the X axis, in any direction
3838 Vertical // Along the Y axis, in any direction
3939 };
40+ Q_ENUM(Type)
4041
4142 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
4243 Q_INVOKABLE static bool isVertical(Direction::Type type);
plugins/Ubuntu/Gestures/DirectionalDragArea.cppdeleted−932
@@ -1,932 +0,0 @@
1−/*
2− * Copyright (C) 2013-2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#define ACTIVETOUCHESINFO_DEBUG 0
18−#define DIRECTIONALDRAGAREA_DEBUG 0
19−
20−#include "DirectionalDragArea.h"
21−
22−#include <QQuickWindow>
23−#include <QtCore/qmath.h>
24−#include <QScreen>
25−#include <QDebug>
26−
27−#pragma GCC diagnostic push
28−#pragma GCC diagnostic ignored "-pedantic"
29−#include <private/qquickwindow_p.h>
30−#pragma GCC diagnostic pop
31−
32−// local
33−#include "TouchOwnershipEvent.h"
34−#include "TouchRegistry.h"
35−#include "UnownedTouchEvent.h"
36−
37−#include "DirectionalDragArea_p.h"
38−
39−using namespace UbuntuGestures;
40−
41−#if DIRECTIONALDRAGAREA_DEBUG
42−#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params
43−#include "DebugHelpers.h"
44−
45−namespace {
46−const char *statusToString(DirectionalDragAreaPrivate::Status status)
47−{
48− if (status == DirectionalDragAreaPrivate::WaitingForTouch) {
49− return "WaitingForTouch";
50− } else if (status == DirectionalDragAreaPrivate::Undecided) {
51− return "Undecided";
52− } else {
53− return "Recognized";
54− }
55−}
56−
57−} // namespace {
58−#else // DIRECTIONALDRAGAREA_DEBUG
59−#define ddaDebug(params) ((void)0)
60−#endif // DIRECTIONALDRAGAREA_DEBUG
61−
62−DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
63− : QQuickItem(parent)
64− , d(new DirectionalDragAreaPrivate(this))
65−{
66− d->setRecognitionTimer(new Timer(this));
67− d->recognitionTimer->setInterval(d->maxTime);
68− d->recognitionTimer->setSingleShot(true);
69−
70− connect(this, &QQuickItem::enabledChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);
71− connect(this, &QQuickItem::visibleChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);
72−}
73−
74−Direction::Type DirectionalDragArea::direction() const
75−{
76− return d->direction;
77−}
78−
79−void DirectionalDragArea::setDirection(Direction::Type direction)
80−{
81− if (direction != d->direction) {
82− d->direction = direction;
83− Q_EMIT directionChanged(d->direction);
84− }
85−}
86−
87−void DirectionalDragAreaPrivate::setDistanceThreshold(qreal value)
88−{
89− if (distanceThreshold != value) {
90− distanceThreshold = value;
91− distanceThresholdSquared = distanceThreshold * distanceThreshold;
92− }
93−}
94−
95−void DirectionalDragAreaPrivate::setMaxTime(int value)
96−{
97− if (maxTime != value) {
98− maxTime = value;
99− recognitionTimer->setInterval(maxTime);
100− }
101−}
102−
103−void DirectionalDragAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
104−{
105− int interval = 0;
106− bool timerWasRunning = false;
107− bool wasSingleShot = false;
108−
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;
115− }
116− }
117−
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();
125− }
126−}
127−
128−void DirectionalDragAreaPrivate::setTimeSource(const SharedTimeSource &timeSource)
129−{
130− this->timeSource = timeSource;
131− activeTouches.m_timeSource = timeSource;
132−}
133−
134−qreal DirectionalDragArea::distance() const
135−{
136− if (Direction::isHorizontal(d->direction)) {
137− return d->publicPos.x() - d->startPos.x();
138− } else {
139− return d->publicPos.y() - d->startPos.y();
140− }
141−}
142−
143−void DirectionalDragAreaPrivate::updateSceneDistance()
144−{
145− QPointF totalMovement = publicScenePos - startScenePos;
146− sceneDistance = projectOntoDirectionVector(totalMovement);
147−}
148−
149−qreal DirectionalDragArea::sceneDistance() const
150−{
151− return d->sceneDistance;
152−}
153−
154−qreal DirectionalDragArea::touchX() const
155−{
156− return d->publicPos.x();
157−}
158−
159−qreal DirectionalDragArea::touchY() const
160−{
161− return d->publicPos.y();
162−}
163−
164−qreal DirectionalDragArea::touchSceneX() const
165−{
166− return d->publicScenePos.x();
167−}
168−
169−qreal DirectionalDragArea::touchSceneY() const
170−{
171− return d->publicScenePos.y();
172−}
173−
174−bool DirectionalDragArea::dragging() const
175−{
176− return d->status == DirectionalDragAreaPrivate::Recognized;
177−}
178−
179−bool DirectionalDragArea::pressed() const
180−{
181− return d->status != DirectionalDragAreaPrivate::WaitingForTouch;
182−}
183−
184−bool DirectionalDragArea::immediateRecognition() const
185−{
186− return d->immediateRecognition;
187−}
188−
189−void DirectionalDragArea::setImmediateRecognition(bool enabled)
190−{
191− if (d->immediateRecognition != enabled) {
192− d->immediateRecognition = enabled;
193− Q_EMIT immediateRecognitionChanged(enabled);
194− }
195−}
196−
197−bool DirectionalDragArea::monitorOnly() const
198−{
199− return d->monitorOnly;
200−}
201−
202−void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
203−{
204− if (d->monitorOnly != monitorOnly) {
205− d->monitorOnly = monitorOnly;
206−
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);
211− }
212−
213− Q_EMIT monitorOnlyChanged(monitorOnly);
214− }
215−}
216−
217−void DirectionalDragArea::removeTimeConstraints()
218−{
219− d->setMaxTime(60 * 60 * 1000);
220− d->compositionTime = 0;
221− ddaDebug("removed time constraints");
222−}
223−
224−bool DirectionalDragArea::event(QEvent *event)
225−{
226− if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
227− d->touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
228− return true;
229− } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
230− d->unownedTouchEvent(static_cast<UnownedTouchEvent *>(event));
231− return true;
232− } else {
233− return QQuickItem::event(event);
234− }
235−}
236−
237−void DirectionalDragAreaPrivate::touchOwnershipEvent(TouchOwnershipEvent *event)
238−{
239− if (event->gained()) {
240− QVector<int> ids;
241− ids.append(event->touchId());
242− ddaDebug("grabbing touch");
243− q->grabTouchPoints(ids);
244−
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.
248− //
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
251− if (q->window()) {
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();
256− }
257− }
258− } else {
259− // We still wanna know when it ends for keeping the composition time window up-to-date
260− TouchRegistry::instance()->addTouchWatcher(touchId, q);
261−
262− setStatus(WaitingForTouch);
263− }
264−}
265−
266−void DirectionalDragAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent)
267−{
268− QTouchEvent *event = unownedTouchEvent->touchEvent();
269−
270− Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
271−
272− ddaDebug("Unowned " << timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
273−
274− switch (status) {
275− case WaitingForTouch:
276− // do nothing
277− break;
278− case Undecided:
279− Q_ASSERT(q->isEnabled() && q->isVisible());
280− unownedTouchEvent_undecided(unownedTouchEvent);
281− break;
282− default: // Recognized:
283− if (monitorOnly) {
284− // Treat unowned event as if we owned it, but we are really just watching it
285− touchEvent_recognized(event);
286− }
287− break;
288− }
289−
290− activeTouches.update(event);
291−}
292−
293−void DirectionalDragAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent)
294−{
295− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(unownedTouchEvent->touchEvent());
296− if (!touchPoint) {
297− qCritical() << "DirectionalDragArea[status=Undecided]: touch " << touchId
298− << "missing from UnownedTouchEvent without first reaching state Qt::TouchPointReleased. "
299− "Considering it as released.";
300−
301− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
302− setStatus(WaitingForTouch);
303− return;
304− }
305−
306− const QPointF &touchScenePos = touchPoint->scenePos();
307−
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);
313− return;
314− }
315−
316− previousDampedScenePos.setX(dampedScenePos.x());
317− previousDampedScenePos.setY(dampedScenePos.y());
318− dampedScenePos.update(touchScenePos);
319−
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);
326− return;
327− }
328−
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.");
333− return;
334− }
335−
336− if (movedFarEnoughAlongGestureAxis()) {
337− if (!monitorOnly) {
338− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
339− }
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);
349− } else {
350− ddaDebug("Didn't move far enough yet. Let's wait more.");
351− }
352−}
353−
354−void DirectionalDragArea::touchEvent(QTouchEvent *event)
355−{
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.
358−
359− ddaDebug(d->timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
360−
361− if (!isEnabled() || !isVisible()) {
362− QQuickItem::touchEvent(event);
363− return;
364− }
365−
366− switch (d->status) {
367− case DirectionalDragAreaPrivate::WaitingForTouch:
368− d->touchEvent_absent(event);
369− break;
370− case DirectionalDragAreaPrivate::Undecided:
371− d->touchEvent_undecided(event);
372− break;
373− default: // Recognized:
374− d->touchEvent_recognized(event);
375− break;
376− }
377−
378− d->activeTouches.update(event);
379−}
380−
381−void DirectionalDragAreaPrivate::touchEvent_absent(QTouchEvent *event)
382−{
383− // TODO: accept/reject is for the whole event, not per touch id. See how that affects us.
384−
385− if (!event->touchPointStates().testFlag(Qt::TouchPointPressed)) {
386− // Nothing to see here. No touch starting in this event.
387− return;
388− }
389−
390− // to be proven wrong, if that's the case
391− bool allGood = true;
392−
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.");
397− allGood = false;
398− }
399−
400− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
401−
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
408− allGood = false;
409− } else {
410− // that's our candidate
411− newTouchPoint = &touchPoint;
412− }
413− }
414− }
415−
416− if (allGood) {
417− allGood = sanityCheckRecognitionProperties();
418− if (!allGood) {
419− qWarning("DirectionalDragArea: recognition properties are wrongly set. Gesture recognition"
420− " is impossible");
421− }
422− }
423−
424− if (allGood) {
425− Q_ASSERT(newTouchPoint);
426−
427− startPos = newTouchPoint->pos();
428− startScenePos = newTouchPoint->scenePos();
429− touchId = newTouchPoint->id();
430− dampedScenePos.reset(startScenePos);
431− setPublicPos(startPos);
432−
433− setPublicScenePos(startScenePos);
434− updateSceneDirectionVector();
435−
436− if (recognitionIsDisabled()) {
437− // Behave like a dumb TouchArea
438− ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
439− setStatus(Recognized);
440− if (monitorOnly) {
441− watchPressedTouchPoints(touchPoints);
442− event->ignore();
443− } else {
444− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
445− event->accept();
446− }
447− } else {
448− // just monitor the touch points for now.
449− if (monitorOnly) {
450− watchPressedTouchPoints(touchPoints);
451− } else {
452− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
453− }
454−
455− setStatus(Undecided);
456− // Let the item below have it. We will monitor it and grab it later if a gesture
457− // gets recognized.
458− event->ignore();
459− }
460− } else {
461− watchPressedTouchPoints(touchPoints);
462− event->ignore();
463− }
464−}
465−
466−void DirectionalDragAreaPrivate::touchEvent_undecided(QTouchEvent *event)
467−{
468− Q_ASSERT(fetchTargetTouchPoint(event) == nullptr);
469−
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
473− event->ignore();
474− watchPressedTouchPoints(event->touchPoints());
475−
476− if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
477− // multi-finger drags are not accepted
478− ddaDebug("Multi-finger drags are not accepted");
479−
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);
483−
484− setStatus(WaitingForTouch);
485− }
486−}
487−
488−void DirectionalDragAreaPrivate::touchEvent_recognized(QTouchEvent *event)
489−{
490− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
491−
492− if (!touchPoint) {
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);
497− } else {
498− setPublicPos(touchPoint->pos());
499− setPublicScenePos(touchPoint->scenePos());
500−
501− if (touchPoint->state() == Qt::TouchPointReleased) {
502− setStatus(WaitingForTouch);
503− }
504− }
505−}
506−
507−void DirectionalDragAreaPrivate::watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
508−{
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);
513− }
514− }
515−}
516−
517−bool DirectionalDragAreaPrivate::recognitionIsDisabled() const
518−{
519− return immediateRecognition || (distanceThreshold <= 0 && compositionTime <= 0);
520−}
521−
522−bool DirectionalDragAreaPrivate::sanityCheckRecognitionProperties()
523−{
524− return recognitionIsDisabled()
525− || (distanceThreshold < maxDistance && compositionTime < maxTime);
526−}
527−
528−const QTouchEvent::TouchPoint *DirectionalDragAreaPrivate::fetchTargetTouchPoint(QTouchEvent *event)
529−{
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);
535− break;
536− }
537− }
538− return touchPoint;
539−}
540−
541−bool DirectionalDragAreaPrivate::movingInRightDirection() const
542−{
543− if (direction == Direction::Horizontal || direction == Direction::Vertical) {
544− return true;
545− } else {
546− QPointF movementVector(dampedScenePos.x() - previousDampedScenePos.x(),
547− dampedScenePos.y() - previousDampedScenePos.y());
548−
549− qreal scalarProjection = projectOntoDirectionVector(movementVector);
550−
551− return scalarProjection >= 0.;
552− }
553−}
554−
555−bool DirectionalDragAreaPrivate::movedFarEnoughAlongGestureAxis() const
556−{
557− if (distanceThreshold <= 0.) {
558− // distance threshold check is disabled
559− return true;
560− } else {
561− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
562− dampedScenePos.y() - startScenePos.y());
563−
564− qreal scalarProjection = projectOntoDirectionVector(totalMovement);
565−
566− ddaDebug(" movedFarEnoughAlongGestureAxis: scalarProjection=" << scalarProjection
567− << ", distanceThreshold=" << distanceThreshold);
568−
569− if (direction == Direction::Horizontal || direction == Direction::Vertical) {
570− return qAbs(scalarProjection) > distanceThreshold;
571− } else {
572− return scalarProjection > distanceThreshold;
573− }
574− }
575−}
576−
577−bool DirectionalDragAreaPrivate::isPastMaxDistance() const
578−{
579− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
580− dampedScenePos.y() - startScenePos.y());
581−
582− qreal squaredDistance = totalMovement.x()*totalMovement.x() + totalMovement.y()*totalMovement.y();
583− return squaredDistance > maxDistance*maxDistance;
584−}
585−
586−void DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible()
587−{
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);
593− }
594−
595− if (status != WaitingForTouch) {
596− ddaDebug("Resetting status because got disabled or made invisible");
597− setStatus(WaitingForTouch);
598− }
599− }
600−}
601−
602−void DirectionalDragAreaPrivate::rejectGesture()
603−{
604− if (status == Undecided) {
605− ddaDebug("Rejecting gesture because it's taking too long to drag beyond the threshold.");
606−
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);
610−
611− setStatus(WaitingForTouch);
612− }
613−}
614−
615−void DirectionalDragAreaPrivate::setStatus(Status newStatus)
616−{
617− if (newStatus == status)
618− return;
619−
620− Status oldStatus = status;
621−
622− if (oldStatus == Undecided) {
623− recognitionTimer->stop();
624− }
625−
626− status = newStatus;
627− Q_EMIT statusChanged(status);
628−
629− ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
630−
631− switch (newStatus) {
632− case WaitingForTouch:
633− if (oldStatus == Recognized) {
634− Q_EMIT q->draggingChanged(false);
635− }
636− Q_EMIT q->pressedChanged(false);
637− break;
638− case Undecided:
639− recognitionTimer->start();
640− Q_EMIT q->pressedChanged(true);
641− break;
642− case Recognized:
643− if (oldStatus == WaitingForTouch) { // for immediate recognition
644− Q_EMIT q->pressedChanged(true);
645− }
646− Q_EMIT q->draggingChanged(true);
647− break;
648− default:
649− // no-op
650− break;
651− }
652−}
653−
654−void DirectionalDragAreaPrivate::setPublicPos(const QPointF point)
655−{
656− bool xChanged = publicPos.x() != point.x();
657− bool yChanged = publicPos.y() != point.y();
658−
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);
662−
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();
674− } else {
675− // no smoothing when initializing or if gesture recognition was immediate as there will
676− // be no jump.
677− publicPos = point;
678− }
679−
680− if (xChanged) {
681− Q_EMIT q->touchXChanged(publicPos.x());
682− if (Direction::isHorizontal(direction))
683− Q_EMIT q->distanceChanged(q->distance());
684− }
685−
686− if (yChanged) {
687− Q_EMIT q->touchYChanged(publicPos.y());
688− if (Direction::isVertical(direction))
689− Q_EMIT q->distanceChanged(q->distance());
690− }
691−}
692−
693−void DirectionalDragAreaPrivate::setPublicScenePos(const QPointF point)
694−{
695− bool xChanged = publicScenePos.x() != point.x();
696− bool yChanged = publicScenePos.y() != point.y();
697−
698− if (!xChanged && !yChanged)
699− return;
700−
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);
704−
705− qreal oldSceneDistance = sceneDistance;
706−
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();
718− } else {
719− // no smoothing when initializing or if gesture recognition was immediate as there will
720− // be no jump.
721− publicScenePos = point;
722− }
723−
724− updateSceneDistance();
725−
726− if (oldSceneDistance != sceneDistance) {
727− Q_EMIT q->sceneDistanceChanged(sceneDistance);
728− }
729−
730− if (xChanged) {
731− Q_EMIT q->touchSceneXChanged(publicScenePos.x());
732− }
733−
734− if (yChanged) {
735− Q_EMIT q->touchSceneYChanged(publicScenePos.y());
736− }
737−}
738−
739−bool DirectionalDragAreaPrivate::isWithinTouchCompositionWindow()
740−{
741− return
742− compositionTime > 0 &&
743− !activeTouches.isEmpty() &&
744− timeSource->msecsSinceReference() <=
745− activeTouches.mostRecentStartTime() + (qint64)compositionTime;
746−}
747−
748−void DirectionalDragArea::itemChange(ItemChange change, const ItemChangeData &value)
749−{
750− if (change == QQuickItem::ItemSceneChange) {
751− if (value.window != nullptr) {
752− value.window->installEventFilter(TouchRegistry::instance());
753−
754− // TODO: Handle window->screen() changes (ie window changing screens)
755−
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)
759− pixelsPerInch = 72;
760− }
761−
762− d->setPixelsPerMm(pixelsPerInch / 25.4);
763− }
764− }
765−}
766−
767−void DirectionalDragAreaPrivate::setPixelsPerMm(qreal pixelsPerMm)
768−{
769− dampedScenePos.setMaxDelta(1. * pixelsPerMm);
770− setDistanceThreshold(4. * pixelsPerMm);
771− maxDistance = 10. * pixelsPerMm;
772−}
773−
774−//************************** ActiveTouchesInfo **************************
775−
776−ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)
777− : m_timeSource(timeSource)
778−{
779−}
780−
781−void ActiveTouchesInfo::update(QTouchEvent *event)
782−{
783− if (!(event->touchPointStates() & (Qt::TouchPointPressed | Qt::TouchPointReleased))) {
784− // nothing to update
785− #if ACTIVETOUCHESINFO_DEBUG
786− qDebug("[DDA::ActiveTouchesInfo] Nothing to Update");
787− #endif
788− return;
789− }
790−
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());
798− }
799− }
800−}
801−
802−#if ACTIVETOUCHESINFO_DEBUG
803−QString ActiveTouchesInfo::toString()
804−{
805− QString string = "(";
806−
807− {
808− QTextStream stream(&string);
809− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
810− stream << "(id=" << touchInfo->id << ",startTime=" << touchInfo->startTime << ")";
811− return true;
812− });
813− }
814−
815− string.append(")");
816−
817− return string;
818−}
819−#endif // ACTIVETOUCHESINFO_DEBUG
820−
821−void ActiveTouchesInfo::addTouchPoint(int touchId)
822−{
823− ActiveTouchInfo &activeTouchInfo = m_touchInfoPool.getEmptySlot();
824− activeTouchInfo.id = touchId;
825− activeTouchInfo.startTime = m_timeSource->msecsSinceReference();
826−
827− #if ACTIVETOUCHESINFO_DEBUG
828− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
829− #endif
830−}
831−
832−qint64 ActiveTouchesInfo::touchStartTime(int touchId)
833−{
834− qint64 result = -1;
835−
836− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
837− if (touchId == touchInfo->id) {
838− result = touchInfo->startTime;
839− return false;
840− } else {
841− return true;
842− }
843− });
844−
845− Q_ASSERT(result != -1);
846− return result;
847−}
848−
849−void ActiveTouchesInfo::removeTouchPoint(int touchId)
850−{
851− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
852− if (touchId == touchInfo->id) {
853− m_touchInfoPool.freeSlot(touchInfo);
854− return false;
855− } else {
856− return true;
857− }
858− });
859−
860− #if ACTIVETOUCHESINFO_DEBUG
861− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
862− #endif
863−}
864−
865−qint64 ActiveTouchesInfo::mostRecentStartTime()
866−{
867− Q_ASSERT(!m_touchInfoPool.isEmpty());
868−
869− qint64 highestStartTime = -1;
870−
871− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &activeTouchInfo) {
872− if (activeTouchInfo->startTime > highestStartTime) {
873− highestStartTime = activeTouchInfo->startTime;
874− }
875− return true;
876− });
877−
878− return highestStartTime;
879−}
880−
881−void DirectionalDragAreaPrivate::updateSceneDirectionVector()
882−{
883− QPointF localOrigin(0., 0.);
884− QPointF localDirection;
885− switch (direction) {
886− case Direction::Upwards:
887− localDirection.rx() = 0.;
888− localDirection.ry() = -1.;
889− break;
890− case Direction::Downwards:
891− case Direction::Vertical:
892− localDirection.rx() = 0.;
893− localDirection.ry() = 1;
894− break;
895− case Direction::Leftwards:
896− localDirection.rx() = -1.;
897− localDirection.ry() = 0.;
898− break;
899− default: // Direction::Rightwards || Direction.Horizontal
900− localDirection.rx() = 1.;
901− localDirection.ry() = 0.;
902− break;
903− }
904− QPointF sceneOrigin = q->mapToScene(localOrigin);
905− QPointF sceneDirection = q->mapToScene(localDirection);
906− sceneDirectionVector = sceneDirection - sceneOrigin;
907−}
908−
909−qreal DirectionalDragAreaPrivate::projectOntoDirectionVector(const QPointF sceneVector) const
910−{
911− // same as dot product as sceneDirectionVector is a unit vector
912− return sceneVector.x() * sceneDirectionVector.x() +
913− sceneVector.y() * sceneDirectionVector.y();
914−}
915−
916−DirectionalDragAreaPrivate::DirectionalDragAreaPrivate(DirectionalDragArea *q)
917− : q(q)
918− , status(WaitingForTouch)
919− , sceneDistance(0)
920− , touchId(-1)
921− , direction(Direction::Rightwards)
922− , distanceThreshold(0)
923− , distanceThresholdSquared(0.)
924− , maxTime(400)
925− , compositionTime(60)
926− , immediateRecognition(false)
927− , recognitionTimer(nullptr)
928− , timeSource(new RealTimeSource)
929− , activeTouches(timeSource)
930− , monitorOnly(false)
931−{
932−}
plugins/Ubuntu/Gestures/DirectionalDragArea.hdeleted−143
@@ -1,143 +0,0 @@
1−/*
2− * Copyright (C) 2013,2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef DIRECTIONAL_DRAG_AREA_H
18−#define DIRECTIONAL_DRAG_AREA_H
19−
20−#include <QtQuick/QQuickItem>
21−#include "UbuntuGesturesQmlGlobal.h"
22−#include "Damper.h"
23−#include "Direction.h"
24−
25−// lib UbuntuGestures
26−#include <Pool.h>
27−#include <Timer.h>
28−
29−class TouchOwnershipEvent;
30−class UnownedTouchEvent;
31−class DirectionalDragAreaPrivate;
32−
33−/*
34− An area that detects axis-aligned single-finger drag gestures
35−
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
38− fidgety click
39−
40− See doc/DirectionalDragArea.svg
41− */
42−class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {
43− Q_OBJECT
44−
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)
47−
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)
51−
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)
55−
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)
59−
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)
63−
64− // Whether a drag gesture is taking place
65− Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
66−
67− // Whether the drag area is pressed.
68− Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
69−
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.
73− //
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)
79−
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)
83−
84− Q_ENUMS(Direction)
85−public:
86− DirectionalDragArea(QQuickItem *parent = 0);
87−
88− Direction::Type direction() const;
89− void setDirection(Direction::Type);
90−
91− qreal distance() const;
92− qreal sceneDistance() const;
93−
94− qreal touchX() const;
95− qreal touchY() const;
96−
97− qreal touchSceneX() const;
98− qreal touchSceneY() const;
99−
100− bool dragging() const;
101−
102− bool pressed() const;
103−
104− bool immediateRecognition() const;
105− void setImmediateRecognition(bool enabled);
106−
107− bool monitorOnly() const;
108− void setMonitorOnly(bool monitorOnly);
109−
110− bool event(QEvent *e) override;
111−
112− /*
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.
117−
118− This effectively makes the DirectionalDragArea easier to fool.
119− */
120− Q_INVOKABLE void removeTimeConstraints();
121−
122−Q_SIGNALS:
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);
134−
135−protected:
136− void touchEvent(QTouchEvent *event) override;
137− void itemChange(ItemChange change, const ItemChangeData &value) override;
138−
139−public: // so tests can access it
140− DirectionalDragAreaPrivate *d;
141−};
142−
143−#endif // DIRECTIONAL_DRAG_AREA_H
plugins/Ubuntu/Gestures/DirectionalDragArea_p.hdeleted−169
@@ -1,169 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef DIRECTIONAL_DRAG_AREA_PRIV_H
18−#define DIRECTIONAL_DRAG_AREA_PRIV_H
19−
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; }
25− int id;
26− qint64 startTime;
27−};
28−class UBUNTUGESTURESQML_EXPORT ActiveTouchesInfo {
29−public:
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;
36−private:
37− void addTouchPoint(int touchId);
38− void removeTouchPoint(int touchId);
39− #if ACTIVETOUCHESINFO_DEBUG
40− QString toString();
41− #endif
42−
43− Pool<ActiveTouchInfo> m_touchInfoPool;
44−};
45−
46−class UBUNTUGESTURESQML_EXPORT DirectionalDragAreaPrivate : public QObject {
47− Q_OBJECT
48−
49− Q_ENUMS(Status)
50−public:
51− DirectionalDragAreaPrivate(DirectionalDragArea *q);
52−
53−public Q_SLOTS:
54− void giveUpIfDisabledOrInvisible();
55− void rejectGesture();
56−
57−public:
58− // Describes the state of the directional drag gesture.
59− enum Status {
60− // Waiting for a new touch point to land on this area. No gesture is being processed
61− // or tracked.
62− WaitingForTouch,
63−
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,
69−
70− // There's a touch point in this area and it performed a drag in the correct
71− // direction.
72− //
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.
76− Recognized,
77− };
78−
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(); }
105−
106− // Replaces the existing Timer with the given one.
107− //
108− // Useful for providing a fake timer when testing.
109− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
110−
111− // Useful for testing, where a fake time source can be supplied
112− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
113−
114− DirectionalDragArea *q;
115−
116− // The current status of the directional drag gesture area.
117− Status status;
118−
119− QPointF startPos;
120− QPointF startScenePos;
121− qreal sceneDistance;
122− int touchId;
123−
124− // The touch position exposed in the public API.
125− // It only starts to move once the gesture gets recognized.
126− QPointF publicPos;
127− QPointF publicScenePos;
128−
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;
133−
134− // Unit vector in scene coordinates describing the direction of the gesture recognition
135− QPointF sceneDirectionVector;
136−
137− Direction::Type direction;
138−
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)
143−
144− // Maximum time (in milliseconds) the gesture can take to go beyond the distance threshold
145− int maxTime;
146−
147− // Maximum distance the gesture can go without crossing the axis-aligned distance threshold
148− qreal maxDistance;
149−
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;
154−
155− bool immediateRecognition;
156−
157− UbuntuGestures::AbstractTimer *recognitionTimer;
158−
159− UbuntuGestures::SharedTimeSource timeSource;
160−
161− ActiveTouchesInfo activeTouches;
162−
163− bool monitorOnly;
164−
165−Q_SIGNALS:
166− void statusChanged(Status value);
167−};
168−
169−#endif // DIRECTIONAL_DRAG_AREA_PRIV_H
plugins/Ubuntu/Gestures/FloatingFlickable.cppdeleted−150
@@ -1,150 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "FloatingFlickable.h"
18−
19−#include <private/qquickflickable_p.h>
20−#include "DirectionalDragArea.h"
21−
22−#include <QDebug>
23−
24−FloatingFlickable::FloatingFlickable(QQuickItem *parent)
25− : QQuickItem(parent)
26− , m_mousePressed(false)
27−{
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);
39−
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);
48−
49− connect(this, &QQuickItem::widthChanged, this, &FloatingFlickable::updateChildrenWidth);
50− connect(this, &QQuickItem::heightChanged, this, &FloatingFlickable::updateChildrenHeight);
51−}
52−
53−qreal FloatingFlickable::contentWidth() const
54−{
55− return m_flickable->contentWidth();
56−}
57−
58−void FloatingFlickable::setContentWidth(qreal contentWidth)
59−{
60− m_flickable->setContentWidth(contentWidth);
61−}
62−
63−qreal FloatingFlickable::contentHeight() const
64−{
65− return m_flickable->contentHeight();
66−}
67−
68−void FloatingFlickable::setContentHeight(qreal contentHeight)
69−{
70− m_flickable->setContentHeight(contentHeight);
71−}
72−
73−qreal FloatingFlickable::contentX() const
74−{
75− return m_flickable->contentX();
76−}
77−
78−void FloatingFlickable::setContentX(qreal contentX)
79−{
80− m_flickable->setContentX(contentX);
81−}
82−
83−qreal FloatingFlickable::contentY() const
84−{
85− return m_flickable->contentY();
86−}
87−
88−void FloatingFlickable::setContentY(qreal contentY)
89−{
90− m_flickable->setContentY(contentY);
91−}
92−
93−Direction::Type FloatingFlickable::direction() const
94−{
95− return m_dragArea->direction();
96−}
97−
98−void FloatingFlickable::setDirection(Direction::Type direction)
99−{
100− m_dragArea->setDirection(direction);
101− if (Direction::isHorizontal(direction)) {
102− m_flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);
103− } else {
104− m_flickable->setFlickableDirection(QQuickFlickable::VerticalFlick);
105− }
106−}
107−
108−void FloatingFlickable::updateChildrenWidth()
109−{
110− m_dragArea->setWidth(width());
111− m_flickable->setWidth(width());
112−}
113−
114−void FloatingFlickable::updateChildrenHeight()
115−{
116− m_dragArea->setHeight(height());
117− m_flickable->setHeight(height());
118−}
119−
120−void FloatingFlickable::onDragAreaTouchPosChanged(qreal)
121−{
122− if (m_mousePressed) {
123− QMouseEvent mouseEvent(QEvent::MouseMove,
124− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),
125− Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
126−
127− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
128−
129− }
130−}
131−
132−void FloatingFlickable::onDragAreaDraggingChanged(bool dragging)
133−{
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);
138−
139− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
140− m_mousePressed = true;
141−
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);
146−
147− QCoreApplication::sendEvent(m_flickable, &mouseEvent);
148− m_mousePressed = false;
149− }
150−}
plugins/Ubuntu/Gestures/FloatingFlickable.hdeleted−86
@@ -1,86 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef FLOATING_FLICKABLE_H
18−#define FLOATING_FLICKABLE_H
19−
20−#include <QQuickItem>
21−#include "UbuntuGesturesQmlGlobal.h"
22−#include "Direction.h"
23−
24−class DirectionalDragArea;
25−class QQuickFlickable;
26−
27−/*
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.
30−
31− Ie, it's a Flickable that, input-wise, is transparent to non-flick gestures.
32−
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
35− or limitation.
36− */
37−class UBUNTUGESTURESQML_EXPORT FloatingFlickable : public QQuickItem {
38− Q_OBJECT
39−
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)
44−
45− Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)
46−
47−Q_SIGNALS:
48− void contentWidthChanged();
49− void contentHeightChanged();
50− void contentXChanged();
51− void contentYChanged();
52− void directionChanged();
53−
54−public:
55− FloatingFlickable(QQuickItem *parent = nullptr);
56−
57− qreal contentWidth() const;
58− void setContentWidth(qreal contentWidth);
59−
60− qreal contentHeight() const;
61− void setContentHeight(qreal contentHeight);
62−
63− qreal contentX() const;
64− void setContentX(qreal contentX);
65−
66− qreal contentY() const;
67− void setContentY(qreal contentY);
68−
69− Direction::Type direction() const;
70− void setDirection(Direction::Type);
71−
72−private Q_SLOTS:
73− void updateChildrenWidth();
74− void updateChildrenHeight();
75− void onDragAreaTouchPosChanged(qreal);
76− void onDragAreaDraggingChanged(bool value);
77−
78−private:
79− DirectionalDragArea *m_dragArea;
80− QQuickFlickable *m_flickable;
81− bool m_mousePressed;
82−
83− friend class tst_FloatingFlickable;
84−};
85−
86−#endif // FLOATING_FLICKABLE_H
plugins/Ubuntu/Gestures/Gestures.qmltypesdeleted−209
@@ -1,209 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "AxisVelocityCalculator"
12− prototype: "QObject"
13− exports: ["Ubuntu.Gestures/AxisVelocityCalculator 0.1"]
14− exportMetaObjectRevisions: [0]
15− Property { name: "trackedPosition"; type: "double" }
16− Signal {
17− name: "trackedPositionChanged"
18− Parameter { name: "value"; type: "double" }
19− }
20− Method { name: "calculate"; type: "double" }
21− Method { name: "reset" }
22− }
23− Component {
24− name: "Direction"
25− prototype: "QObject"
26− exports: ["Ubuntu.Gestures/Direction 0.1"]
27− isCreatable: false
28− isSingleton: true
29− exportMetaObjectRevisions: [0]
30− Enum {
31− name: "Type"
32− values: {
33− "Rightwards": 0,
34− "Leftwards": 1,
35− "Downwards": 2,
36− "Upwards": 3,
37− "Horizontal": 4,
38− "Vertical": 5
39− }
40− }
41− Method {
42− name: "isHorizontal"
43− type: "bool"
44− Parameter { name: "type"; type: "Direction::Type" }
45− }
46− Method {
47− name: "isVertical"
48− type: "bool"
49− Parameter { name: "type"; type: "Direction::Type" }
50− }
51− Method {
52− name: "isPositive"
53− type: "bool"
54− Parameter { name: "type"; type: "Direction::Type" }
55− }
56− }
57− Component {
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" }
73− Signal {
74− name: "directionChanged"
75− Parameter { name: "direction"; type: "Direction::Type" }
76− }
77− Signal {
78− name: "draggingChanged"
79− Parameter { name: "value"; type: "bool" }
80− }
81− Signal {
82− name: "pressedChanged"
83− Parameter { name: "value"; type: "bool" }
84− }
85− Signal {
86− name: "distanceChanged"
87− Parameter { name: "value"; type: "double" }
88− }
89− Signal {
90− name: "sceneDistanceChanged"
91− Parameter { name: "value"; type: "double" }
92− }
93− Signal {
94− name: "touchXChanged"
95− Parameter { name: "value"; type: "double" }
96− }
97− Signal {
98− name: "touchYChanged"
99− Parameter { name: "value"; type: "double" }
100− }
101− Signal {
102− name: "touchSceneXChanged"
103− Parameter { name: "value"; type: "double" }
104− }
105− Signal {
106− name: "touchSceneYChanged"
107− Parameter { name: "value"; type: "double" }
108− }
109− Signal {
110− name: "immediateRecognitionChanged"
111− Parameter { name: "value"; type: "bool" }
112− }
113− Method { name: "removeTimeConstraints" }
114− }
115− Component {
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" }
126− }
127− Component {
128− name: "GestureTouchPoint"
129− prototype: "QObject"
130− exports: ["Ubuntu.Gestures/GestureTouchPoint 0.1"]
131− isCreatable: false
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 }
138− }
139− Component {
140− name: "PressedOutsideNotifier"
141− defaultProperty: "data"
142− prototype: "QQuickItem"
143− exports: ["Ubuntu.Gestures/PressedOutsideNotifier 0.1"]
144− exportMetaObjectRevisions: [0]
145− Signal { name: "pressedOutside" }
146− }
147− Component {
148− name: "TouchGate"
149− defaultProperty: "data"
150− prototype: "QQuickItem"
151− exports: ["Ubuntu.Gestures/TouchGate 0.1"]
152− exportMetaObjectRevisions: [0]
153− Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
154− Signal {
155− name: "targetItemChanged"
156− Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
157− }
158− }
159− Component {
160− name: "TouchGestureArea"
161− defaultProperty: "data"
162− prototype: "QQuickItem"
163− exports: ["Ubuntu.Gestures/TouchGestureArea 0.1"]
164− exportMetaObjectRevisions: [0]
165− Enum {
166− name: "Status"
167− values: {
168− "WaitingForTouch": 0,
169− "Undecided": 1,
170− "Recognized": 2,
171− "Rejected": 3
172− }
173− }
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" }
178− Signal {
179− name: "statusChanged"
180− Parameter { name: "status"; type: "Status" }
181− }
182− Signal { name: "touchPointsUpdated" }
183− Signal {
184− name: "draggingChanged"
185− Parameter { name: "dragging"; type: "bool" }
186− }
187− Signal {
188− name: "minimumTouchPointsChanged"
189− Parameter { name: "value"; type: "bool" }
190− }
191− Signal {
192− name: "maximumTouchPointsChanged"
193− Parameter { name: "value"; type: "bool" }
194− }
195− Signal {
196− name: "pressed"
197− Parameter { name: "points"; type: "QList<QObject*>" }
198− }
199− Signal {
200− name: "released"
201− Parameter { name: "points"; type: "QList<QObject*>" }
202− }
203− Signal {
204− name: "updated"
205− Parameter { name: "points"; type: "QList<QObject*>" }
206− }
207− Signal { name: "clicked" }
208− }
209−}
plugins/Ubuntu/Gestures/MouseEventGenerator.cppnew file+64
@@ -0,0 +1,64 @@
1+/*
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "MouseEventGenerator.h"
18+
19+#include <QCoreApplication>
20+#include <QMouseEvent>
21+#include <QQuickItem>
22+
23+MouseEventGenerator::MouseEventGenerator(QObject *parent)
24+ : QObject(parent)
25+{
26+}
27+
28+void MouseEventGenerator::move(const QPointF position)
29+{
30+ if (!m_mousePressed || !m_targetItem) {
31+ return;
32+ }
33+
34+ QMouseEvent mouseEvent(QEvent::MouseMove,
35+ QPointF(position.x(), position.y()), Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
36+
37+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
38+}
39+
40+void MouseEventGenerator::press(const QPointF position)
41+{
42+ if (m_mousePressed || !m_targetItem) {
43+ return;
44+ }
45+
46+ QMouseEvent mouseEvent(QEvent::MouseButtonPress,
47+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
48+
49+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
50+ m_mousePressed = true;
51+}
52+
53+void MouseEventGenerator::release(const QPointF position)
54+{
55+ if (!m_mousePressed || !m_targetItem) {
56+ return;
57+ }
58+
59+ QMouseEvent mouseEvent(QEvent::MouseButtonRelease,
60+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
61+
62+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);
63+ m_mousePressed = false;
64+}
plugins/Ubuntu/Gestures/MouseEventGenerator.hnew file+48
@@ -0,0 +1,48 @@
1+/*
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef MOUSEEVENTGENERATOR_H
18+#define MOUSEEVENTGENERATOR_H
19+
20+#include <QObject>
21+#include <QPointF>
22+
23+#include "UbuntuGesturesQmlGlobal.h"
24+
25+class QQuickItem;
26+
27+class UBUNTUGESTURESQML_EXPORT MouseEventGenerator : public QObject {
28+ Q_OBJECT
29+ Q_PROPERTY(QQuickItem* targetItem MEMBER m_targetItem NOTIFY targetItemChanged)
30+
31+public:
32+ MouseEventGenerator(QObject *parent = nullptr);
33+
34+ Q_INVOKABLE void move(const QPointF position);
35+ Q_INVOKABLE void press(const QPointF position);
36+ Q_INVOKABLE void release(const QPointF position);
37+
38+Q_SIGNALS:
39+ void targetItemChanged(QQuickItem *);
40+
41+private:
42+ bool m_mousePressed {false};
43+ QQuickItem *m_targetItem {nullptr};
44+
45+ friend class tst_FloatingFlickable;
46+};
47+
48+#endif // MOUSEEVENTGENERATOR_H
plugins/Ubuntu/Gestures/PressedOutsideNotifier.h+1−1
@@ -23,7 +23,7 @@
2323#include <QPointer>
2424#include <QTimer>
2525
26−#include "UbuntuGesturesGlobal.h"
26+#include <ubuntugesturesglobal.h>
2727
2828/*
2929 Notifies when a point, mouse or touch, is pressed outside its area.
plugins/Ubuntu/Gestures/TouchDispatcher.cpp+1−5
@@ -19,11 +19,7 @@
1919#include <QGuiApplication>
2020#include <QScopedPointer>
2121#include <QStyleHints>
22−
23−#pragma GCC diagnostic push
24−#pragma GCC diagnostic ignored "-pedantic"
2522#include <private/qquickitem_p.h>
26−#pragma GCC diagnostic pop
2723
2824#define TOUCHDISPATCHER_DEBUG 0
2925
@@ -225,7 +221,7 @@ void TouchDispatcher::dispatchAsMouse(
225221 QEvent::Type eventType;
226222 if (touchMouse->state() == Qt::TouchPointPressed) {
227223 eventType = QEvent::MouseButtonPress;
228− } if (touchMouse->state() == Qt::TouchPointReleased) {
224+ } else if (touchMouse->state() == Qt::TouchPointReleased) {
229225 eventType = QEvent::MouseButtonRelease;
230226 m_touchMouseId = -1;
231227 } else {
plugins/Ubuntu/Gestures/TouchGate.cpp+10−5
@@ -20,16 +20,18 @@
2020#include <QDebug>
2121#include <QQuickWindow>
2222
23−#include <TouchOwnershipEvent.h>
24−#include <TouchRegistry.h>
23+#include <UbuntuGestures/private/touchownershipevent_p.h>
24+#include <UbuntuGestures/private/touchregistry_p.h>
2525
2626#if TOUCHGATE_DEBUG
2727#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params
28−#include <DebugHelpers.h>
28+#include <UbuntuGestures/private/debughelpers_p.h>
2929#else // TOUCHGATE_DEBUG
3030#define ugDebug(params) ((void)0)
3131#endif // TOUCHGATE_DEBUG
3232
33+UG_USE_NAMESPACE
34+
3335TouchGate::TouchGate(QQuickItem *parent)
3436 : QQuickItem(parent)
3537{
@@ -40,7 +42,7 @@ TouchGate::TouchGate(QQuickItem *parent)
4042bool TouchGate::event(QEvent *e)
4143{
4244 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
43− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));
45+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(e));
4446 return true;
4547 } else {
4648 return QQuickItem::event(e);
@@ -59,7 +61,10 @@ void TouchGate::touchEvent(QTouchEvent *event)
5961 const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
6062
6163 if (touchPoint.state() == Qt::TouchPointPressed) {
62− Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
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.
67+// Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
6368 m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
6469 m_touchInfoMap[touchPoint.id()].ended = false;
6570 TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
plugins/Ubuntu/Gestures/TouchGate.h+3−2
@@ -19,6 +19,7 @@
1919
2020#include "UbuntuGesturesQmlGlobal.h"
2121#include "TouchDispatcher.h"
22+#include <UbuntuGestures/ubuntugesturesglobal.h>
2223
2324#include <QQuickItem>
2425#include <QList>
@@ -26,7 +27,7 @@
2627
2728#define TOUCHGATE_DEBUG 0
2829
29−class TouchOwnershipEvent;
30+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)
3031
3132/*
3233 Blocks the passage of events until ownership over the related touch points is granted.
@@ -82,7 +83,7 @@ private:
8283 ulong timestamp;
8384 };
8485
85− void touchOwnershipEvent(TouchOwnershipEvent *event);
86+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);
8687 bool isTouchPointOwned(int touchId) const;
8788 void storeTouchEvent(QTouchDevice *device,
8889 Qt::KeyboardModifiers modifiers,
plugins/Ubuntu/Gestures/TouchGestureArea.cpp+28−24
@@ -16,15 +16,18 @@
1616
1717#include "TouchGestureArea.h"
1818
19−// local
20−#include "TouchOwnershipEvent.h"
21−#include "TouchRegistry.h"
22−#include "UnownedTouchEvent.h"
19+#include <UbuntuGestures/private/touchownershipevent_p.h>
20+#include <UbuntuGestures/private/touchregistry_p.h>
21+#include <UbuntuGestures/private/unownedtouchevent_p.h>
22+// #include "TouchRegistry.h"
23+// #include "UnownedTouchEvent.h"
2324
2425#include <QGuiApplication>
2526#include <QStyleHints>
2627#include <private/qquickwindow_p.h>
2728
29+UG_USE_NAMESPACE
30+
2831#define TOUCHGESTUREAREA_DEBUG 0
2932
3033// TODO - understand more about why we lose touch event releases.
@@ -134,7 +137,7 @@ TouchGestureArea::TouchGestureArea(QQuickItem* parent)
134137 , m_recognitionPeriod(50)
135138 , m_releaseRejectPeriod(100)
136139{
137− setRecognitionTimer(new UbuntuGestures::Timer(this));
140+ setRecognitionTimer(new Timer(this));
138141 m_recognitionTimer->setInterval(m_recognitionPeriod);
139142 m_recognitionTimer->setSingleShot(true);
140143}
@@ -152,10 +155,10 @@ bool TouchGestureArea::event(QEvent *event)
152155{
153156 // Process unowned touch events (handles update/release for incomplete gestures)
154157 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
155− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
158+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(event));
156159 return true;
157160 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
158− unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());
161+ unownedTouchEvent(static_cast<UnownedTouchEvent*>(event)->touchEvent());
159162 return true;
160163 }
161164
@@ -325,6 +328,12 @@ void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)
325328 }
326329 }
327330 }
331+
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.
336+ event->ignore();
328337}
329338
330339void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
@@ -374,7 +383,7 @@ void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *even
374383 }
375384 }
376385
377− if (m_candidateTouches.count() == 0) {
386+ if (m_candidateTouches.isEmpty()) {
378387 setInternalStatus(InternalStatus::WaitingForTouch);
379388 }
380389}
@@ -438,7 +447,7 @@ void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)
438447 }
439448 }
440449
441− if (m_watchedTouches.count() == 0) {
450+ if (m_watchedTouches.isEmpty()) {
442451 setInternalStatus(InternalStatus::WaitingForTouch);
443452 }
444453}
@@ -526,7 +535,7 @@ void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)
526535 if (updateable) {
527536 if (!dragging() && m_status == InternalStatus::Recognized) {
528537 bool allWantDrag = !m_liveTouchPoints.isEmpty();
529− Q_FOREACH(auto point, m_liveTouchPoints) {
538+ Q_FOREACH(const auto &point, m_liveTouchPoints) {
530539 allWantDrag &= point->dragging();
531540 }
532541 // only dragging if all points are dragging.
@@ -588,13 +597,15 @@ void TouchGestureArea::setInternalStatus(uint newStatus)
588597 resyncCachedTouchPoints();
589598 break;
590599 case InternalStatus::WaitingForMoreTouches:
591− m_recognitionTimer->start(m_recognitionPeriod);
600+ m_recognitionTimer->setInterval(m_recognitionPeriod);
601+ m_recognitionTimer->start();
592602 break;
593603 case InternalStatus::Recognized:
594604 resyncCachedTouchPoints();
595605 break;
596606 case InternalStatus::WaitingForRejection:
597− m_recognitionTimer->start(m_releaseRejectPeriod);
607+ m_recognitionTimer->setInterval(m_releaseRejectPeriod);
608+ m_recognitionTimer->start();
598609 break;
599610 case InternalStatus::Rejected:
600611 resyncCachedTouchPoints();
@@ -605,7 +616,7 @@ void TouchGestureArea::setInternalStatus(uint newStatus)
605616 }
606617}
607618
608−void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
619+void TouchGestureArea::setRecognitionTimer(AbstractTimer *timer)
609620{
610621 int interval = 0;
611622 bool timerWasRunning = false;
@@ -643,11 +654,9 @@ bool TouchGestureArea::dragging() const
643654QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()
644655{
645656 return QQmlListProperty<GestureTouchPoint>(this,
646− 0,
647− nullptr,
648− TouchGestureArea::touchPoint_count,
649− TouchGestureArea::touchPoint_at,
650− 0);
657+ nullptr,
658+ TouchGestureArea::touchPoint_count,
659+ TouchGestureArea::touchPoint_at);
651660}
652661
653662int TouchGestureArea::minimumTouchPoints() const
@@ -718,7 +727,7 @@ void TouchGestureArea::rejectGesture()
718727 }
719728 m_candidateTouches.clear();
720729
721− if (m_watchedTouches.count() == 0) {
730+ if (m_watchedTouches.isEmpty()) {
722731 setInternalStatus(InternalStatus::WaitingForTouch);
723732 } else {
724733 setInternalStatus(InternalStatus::Rejected);
@@ -732,7 +741,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
732741 bool added = false;
733742 bool ended = false;
734743 bool moved = false;
735− bool wantsDrag = false;
736744
737745 // list of deletes
738746 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
@@ -762,10 +770,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
762770 }
763771 }
764772
765− if (wantsDrag && !dragging()) {
766− setDragging(true);
767− }
768−
769773 if (ended) {
770774 if (m_cachedTouchPoints.isEmpty()) {
771775 if (!dragging()) Q_EMIT clicked();
plugins/Ubuntu/Gestures/TouchGestureArea.h+18−18
@@ -21,11 +21,11 @@
2121
2222#include <QQuickItem>
2323
24−// lib UbuntuGestures
25−#include <Timer.h>
24+#include <UbuntuGestures/ubuntugesturesglobal.h>
25+#include <UbuntuGestures/private/timer_p.h>
2626
27−class TouchOwnershipEvent;
28−class UnownedTouchEvent;
27+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)
28+UG_FORWARD_DECLARE_CLASS(UnownedTouchEvent)
2929
3030class GestureTouchPoint : public QObject
3131{
@@ -76,7 +76,7 @@ public:
7676 return *this;
7777 }
7878
79− bool operator=(const GestureTouchPoint& rhs) const {
79+ bool operator==(const GestureTouchPoint& rhs) const {
8080 if (&rhs == this) return true;
8181 return m_id == rhs.m_id &&
8282 m_pressed == rhs.m_pressed &&
@@ -84,7 +84,7 @@ public:
8484 m_y == rhs.m_y &&
8585 m_dragging == rhs.m_dragging;
8686 }
87− bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
8888
8989 void setPos(const QPointF &pos);
9090
@@ -106,15 +106,14 @@ private:
106106/*
107107 An area that detects multi-finger gestures.
108108
109− We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.
110− This components uses the touch registry to apply for ownership of touch points.
109+ We can use this to detect gestures constrained by a minimum and/or maximum number of touch points.
110+ This component uses the touch registry to apply for ownership of touch points.
111111 This way we can use the component in conjuntion with the directional drag area to compete for ownwership
112112 or gestures; unlike the MultiPointTouchArea.
113113 */
114114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
115115{
116116 Q_OBJECT
117− Q_ENUMS(Status)
118117
119118 Q_PROPERTY(int status READ status NOTIFY statusChanged)
120119 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
@@ -137,12 +136,13 @@ public:
137136 Recognized,
138137 Rejected
139138 };
140− TouchGestureArea(QQuickItem* parent = NULL);
139+ Q_ENUM(Status)
140+ TouchGestureArea(QQuickItem* parent = nullptr);
141141 ~TouchGestureArea();
142142
143143 bool event(QEvent *e) override;
144144
145− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
145+ void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);
146146
147147 int status() const;
148148 bool dragging() const;
@@ -165,10 +165,10 @@ Q_SIGNALS:
165165
166166 void touchPointsUpdated();
167167 void draggingChanged(bool dragging);
168− void minimumTouchPointsChanged(bool value);
169− void maximumTouchPointsChanged(bool value);
170− void recognitionPeriodChanged(bool value);
171− void releaseRejectPeriodChanged(bool value);
168+ void minimumTouchPointsChanged(int value);
169+ void maximumTouchPointsChanged(int value);
170+ void recognitionPeriodChanged(int value);
171+ void releaseRejectPeriodChanged(int value);
172172
173173 void pressed(const QList<QObject*>& points);
174174 void released(const QList<QObject*>& points);
@@ -176,7 +176,7 @@ Q_SIGNALS:
176176 void clicked();
177177
178178protected:
179− void itemChange(ItemChange change, const ItemChangeData &value);
179+ void itemChange(ItemChange change, const ItemChangeData &value) override;
180180
181181private Q_SLOTS:
182182 void rejectGesture();
@@ -195,7 +195,7 @@ private:
195195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
196196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
197197
198− void touchOwnershipEvent(TouchOwnershipEvent *event);
198+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);
199199 void updateTouchPoints(QTouchEvent *event);
200200
201201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
@@ -210,7 +210,7 @@ private:
210210 uint m_status;
211211 QSet<int> m_candidateTouches;
212212 QSet<int> m_watchedTouches;
213− UbuntuGestures::AbstractTimer *m_recognitionTimer;
213+ UG_PREPEND_NAMESPACE(AbstractTimer) *m_recognitionTimer;
214214
215215 bool m_dragging;
216216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;
plugins/Ubuntu/Gestures/plugin.cpp+3−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013,2015 Canonical, Ltd.
2+ * Copyright (C) 2013,2015,2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
1717#include "plugin.h"
1818#include "AxisVelocityCalculator.h"
1919#include "Direction.h"
20−#include "DirectionalDragArea.h"
21−#include "FloatingFlickable.h"
20+#include "MouseEventGenerator.h"
2221#include "PressedOutsideNotifier.h"
2322#include "TouchGate.h"
2423#include "TouchGestureArea.h"
@@ -34,9 +33,8 @@ static QObject* directionSingleton(QQmlEngine* engine, QJSEngine* scriptEngine)
3433void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
3534{
3635 qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
37− qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
3836 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
39− qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
37+ qmlRegisterType<MouseEventGenerator>(uri, 0, 1, "MouseEventGenerator");
4038 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
4139 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
4240 qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");
plugins/Ubuntu/Payments/CMakeLists.txtdeleted−20
@@ -1,20 +0,0 @@
1−include_directories(
2− ${CMAKE_CURRENT_SOURCE_DIR}
3− ${CMAKE_CURRENT_BINARY_DIR}
4−)
5−
6−set(PAYMENTS_SOURCES
7− plugin.cpp
8− Payments.cpp
9−)
10−
11−add_library(Payments MODULE ${PAYMENTS_SOURCES})
12−
13−qt5_use_modules(Payments Qml Quick DBus Core)
14−
15−add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
16−
17−pkg_check_modules(LIBPAY REQUIRED pay-2)
18−add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
19−
20−target_link_libraries(Payments ${LIBPAY_LDFLAGS})
plugins/Ubuntu/Payments/Payments.cppdeleted−136
@@ -1,136 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "Payments.h"
18−
19−#include <QLocale>
20−
21−#include <libpay/pay-package.h>
22−
23−
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
30−
31− Payments *self = static_cast<Payments*>(user_data);
32−
33− // If the item ID is different, ignore it.
34− if (itemid != self->storeItemId()) {
35− return;
36− }
37−
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
40− switch (status) {
41− case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
42− Q_EMIT self->purchaseCompleted();
43− break;
44− case PAY_PACKAGE_ITEM_STATUS_PURCHASING:
45− self->setPurchasing(true);
46− break;
47− case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
48− if (self->purchasing()) {
49− self->setPurchasing(false);
50− Q_EMIT self->purchaseCancelled();
51− }
52− break;
53− default:
54− break;
55− }
56−}
57−
58−Payments::Payments(QObject *parent)
59− : QObject(parent),
60− m_purchasing(false)
61−{
62− m_package = pay_package_new("click-scope");
63− pay_package_item_observer_install(m_package, observer, this);
64−}
65−
66−Payments::~Payments()
67−{
68− pay_package_item_observer_uninstall(m_package, observer, this);
69− pay_package_delete(m_package);
70−}
71−
72−QString Payments::currency() const
73−{
74− return m_currency;
75−}
76−
77−double Payments::price() const
78−{
79− return m_price;
80−}
81−
82−QString Payments::storeItemId() const
83−{
84− return m_store_item_id;
85−}
86−
87−QString Payments::formattedPrice() const
88−{
89− QLocale locale;
90− return locale.toCurrencyString(m_price, m_currency);
91−}
92−
93−bool Payments::purchasing() const
94−{
95− return m_purchasing;
96−}
97−
98−void Payments::setCurrency(const QString ¤cy)
99−{
100− if(m_currency != currency) {
101− m_currency = currency;
102− Q_EMIT currencyChanged(currency);
103− Q_EMIT formattedPriceChanged(formattedPrice());
104− }
105−}
106−
107−void Payments::setPrice(const double price)
108−{
109− if(m_price != price) {
110− m_price = price;
111− Q_EMIT priceChanged(price);
112− Q_EMIT formattedPriceChanged(formattedPrice());
113− }
114−}
115−
116−void Payments::setStoreItemId(const QString &store_item_id)
117−{
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);
121− }
122−
123− if (m_store_item_id.isEmpty()) {
124− return;
125− }
126−}
127−
128−void Payments::setPurchasing(bool is_purchasing)
129−{
130− m_purchasing = is_purchasing;
131−}
132−
133−void Payments::start()
134−{
135− pay_package_item_start_purchase(m_package, m_store_item_id.toLocal8Bit().data());
136−}
plugins/Ubuntu/Payments/Payments.hdeleted−69
@@ -1,69 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef PAYMENTS_H
18−#define PAYMENTS_H
19−
20−#include <QObject>
21−
22−#include <libpay/pay-package.h>
23−
24−
25−class Payments : public QObject
26−{
27− Q_OBJECT
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)
33−
34−public:
35− explicit Payments(QObject *parent = 0);
36− virtual ~Payments();
37−
38− QString currency() const;
39− double price() const;
40− QString storeItemId() const;
41− QString formattedPrice() const;
42− bool purchasing() const;
43−
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();
49−
50−Q_SIGNALS:
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);
55−
56− void purchaseError(const QString &error);
57− void purchaseCompleted();
58− void purchaseCancelled();
59−
60−private:
61− QString m_currency;
62− double m_price;
63− QString m_store_item_id;
64− bool m_purchasing;
65−
66− PayPackage *m_package;
67−};
68−
69−#endif // PAYMENTS_H
plugins/Ubuntu/Payments/Payments.qmltypesdeleted−43
@@ -1,43 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Payments 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "Payments"
12− prototype: "QObject"
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 }
19− Signal {
20− name: "currencyChanged"
21− Parameter { name: "currency"; type: "string" }
22− }
23− Signal {
24− name: "priceChanged"
25− Parameter { name: "price"; type: "double" }
26− }
27− Signal {
28− name: "storeItemIdChanged"
29− Parameter { name: "store_item_id"; type: "string" }
30− }
31− Signal {
32− name: "formattedPriceChanged"
33− Parameter { name: "formatted_price"; type: "string" }
34− }
35− Signal {
36− name: "purchaseError"
37− Parameter { name: "error"; type: "string" }
38− }
39− Signal { name: "purchaseCompleted" }
40− Signal { name: "purchaseCancelled" }
41− Method { name: "start" }
42− }
43−}
plugins/Ubuntu/Payments/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module Ubuntu.Payments
2−plugin Payments
3−typeinfo Payments.qmltypes
plugins/Ubuntu/SystemImage/CMakeLists.txtdeleted−10
@@ -1,10 +0,0 @@
1−set(SYSTEMIMAGE_SOURCES
2− plugin.cpp
3− SystemImage.cpp
4−)
5−
6−add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})
7−
8−qt5_use_modules(SystemImage Qml DBus Core)
9−
10−add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)
plugins/Ubuntu/SystemImage/SystemImage.cppdeleted−33
@@ -1,33 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "SystemImage.h"
18−#include <QDBusConnection>
19−#include <QDBusPendingCall>
20−
21−SystemImage::SystemImage(QObject *parent)
22− : QObject(parent)
23−{
24−}
25−
26−void SystemImage::factoryReset()
27−{
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);
33−}
plugins/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−19
@@ -1,19 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "SystemImage"
12− prototype: "QObject"
13− exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Method { name: "factoryReset" }
18− }
19−}
plugins/Ubuntu/SystemImage/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module Ubuntu.SystemImage
2−plugin SystemImage
3−typeinfo SystemImage.qmltypes
plugins/Unity/ApplicationMenu/CMakeLists.txtnew file+19
@@ -0,0 +1,19 @@
1+find_package(Qt5DBus REQUIRED)
2+
3+include_directories(
4+ ${CMAKE_CURRENT_SOURCE_DIR}
5+ ${CMAKE_CURRENT_BINARY_DIR}
6+)
7+
8+set(applicationMenu_SRCS
9+ applicationmenuregistry.cpp
10+ dbusapplicationmenuregistry.cpp
11+ plugin.cpp)
12+
13+qt5_add_dbus_adaptor(applicationMenu_SRCS com.ubuntu.MenuRegistrar.xml dbusapplicationmenuregistry.h DBusApplicationMenuRegistry)
14+
15+add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})
16+
17+target_link_libraries(ApplicationMenu-qml Qt5::DBus Qt5::Qml)
18+
19+add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)
plugins/Unity/ApplicationMenu/applicationmenuregistry.cppnew file+141
@@ -0,0 +1,141 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "applicationmenuregistry.h"
18+
19+#include <QQmlEngine>
20+#include <QDebug>
21+
22+Q_LOGGING_CATEGORY(UNITY_APPMENU, "unity.appmenu", QtDebugMsg)
23+
24+#define DEBUG_MSG qCDebug(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
25+#define WARNING_MSG qCWarning(UNITY_APPMENU).nospace().noquote() << "ApplicationMenuRegistry::" << __func__
26+
27+ApplicationMenuRegistry::ApplicationMenuRegistry(QObject *parent)
28+ : QObject(parent)
29+{
30+}
31+
32+ApplicationMenuRegistry::~ApplicationMenuRegistry()
33+{
34+ qDeleteAll(m_appMenus);
35+ m_appMenus.clear();
36+
37+ qDeleteAll(m_surfaceMenus);
38+ m_surfaceMenus.clear();
39+}
40+
41+void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
42+ const QDBusObjectPath &menuObjectPath,
43+ const QDBusObjectPath &actionObjectPath,
44+ const QString &service)
45+{
46+ DEBUG_MSG << "(pid=" << processId
47+ << ", menuPath=" << menuObjectPath.path()
48+ << ", actionPath=" << actionObjectPath.path()
49+ << ", service=" << service;
50+
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() << ")";
57+ return;
58+ }
59+ ++i;
60+ }
61+
62+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
63+ QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
64+
65+ m_appMenus.insert(processId, menu);
66+ Q_EMIT appMenuRegistered(processId);
67+}
68+
69+void ApplicationMenuRegistry::UnregisterAppMenu(pid_t processId, const QDBusObjectPath &menuObjectPath)
70+{
71+ DEBUG_MSG << "(pid=" << processId
72+ << ", menuPath=" << menuObjectPath.path();
73+
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();
78+ m_appMenus.erase(i);
79+ Q_EMIT appMenuUnregistered(processId);
80+ break;
81+ }
82+ ++i;
83+ }
84+}
85+
86+void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
87+ const QDBusObjectPath &menuObjectPath,
88+ const QDBusObjectPath &actionObjectPath,
89+ const QString &service)
90+{
91+ DEBUG_MSG << "(surfaceId=" << surfaceId
92+ << ", menuPath=" << menuObjectPath.path()
93+ << ", actionPath=" << actionObjectPath.path()
94+ << ", service=" << service;
95+
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() << ")";
102+ return;
103+ }
104+ ++i;
105+ }
106+
107+ auto menu = new MenuServicePath(service, menuObjectPath, actionObjectPath);
108+ QQmlEngine::setObjectOwnership(menu, QQmlEngine::CppOwnership);
109+
110+ m_surfaceMenus.insert(surfaceId, menu);
111+ Q_EMIT surfaceMenuRegistered(surfaceId);
112+}
113+
114+void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)
115+{
116+ DEBUG_MSG << "(surfaceId=" << surfaceId
117+ << ", menuPath=" << menuObjectPath.path();
118+
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);
125+ break;
126+ }
127+ ++i;
128+ }
129+}
130+
131+QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId) const
132+{
133+ QList<QObject*> list;
134+
135+ auto i = m_surfaceMenus.find(surfaceId);
136+ while (i != m_surfaceMenus.constEnd() && i.key() == surfaceId) {
137+ list << i.value();
138+ ++i;
139+ }
140+ return list;
141+}
plugins/Unity/ApplicationMenu/applicationmenuregistry.hnew file+83
@@ -0,0 +1,83 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef APPLICATIONMENUREGISTRY_H
18+#define APPLICATIONMENUREGISTRY_H
19+
20+#include <QObject>
21+#include <QDBusContext>
22+#include <QDBusObjectPath>
23+#include <QtQml>
24+
25+Q_DECLARE_LOGGING_CATEGORY(UNITY_APPMENU)
26+
27+class MenuServicePath : public QObject
28+{
29+ Q_OBJECT
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)
33+public:
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())
40+ {}
41+
42+ const QByteArray m_service;
43+ const QByteArray m_menuPath;
44+ const QByteArray m_actionPath;
45+};
46+
47+class ApplicationMenuRegistry : public QObject
48+{
49+ Q_OBJECT
50+public:
51+ virtual ~ApplicationMenuRegistry();
52+
53+ // for qml
54+ Q_INVOKABLE QList<QObject*> getMenusForSurface(const QString &surfaceId) const;
55+
56+ // for dbus
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);
62+
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);
68+
69+Q_SIGNALS:
70+ void appMenuRegistered(uint processId);
71+ void appMenuUnregistered(uint processId);
72+
73+ void surfaceMenuRegistered(const QString& surfaceId);
74+ void surfaceMenuUnregistered(const QString& surfaceId);
75+
76+protected:
77+ explicit ApplicationMenuRegistry(QObject *parent = 0);
78+
79+ QMultiMap<pid_t, MenuServicePath*> m_appMenus;
80+ QMultiMap<QString, MenuServicePath*> m_surfaceMenus;
81+};
82+
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">
3+ <dox:d><![CDATA[
4+ @mainpage
5+
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.
8+
9+ The actual menus are transported using the gmenumodel protocol
10+ ]]></dox:d>
11+ <interface name="com.ubuntu.MenuRegistrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
12+ <dox:d>
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.
16+ </dox:d>
17+ <method name="RegisterAppMenu">
18+ <dox:d><![CDATA[
19+ Associates a gmenumodel with an application
20+
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.
24+ ]]></dox:d>
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>
27+ </arg>
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>
30+ </arg>
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>
33+ </arg>
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>
36+ </arg>
37+ </method>
38+ <method name="UnregisterAppMenu">
39+ <dox:d>
40+ A method to allow removing an application menu from the database.
41+ </dox:d>
42+ <arg name="pid" type="u" direction="in">
43+ <dox:d>The process id of the application</dox:d>
44+ </arg>
45+ <arg name="menuObjectPath" type="o" direction="in">
46+ <dox:d>The dbus path for the registered application menu to be unregistered</dox:d>
47+ </arg>
48+ </method>
49+
50+ <method name="RegisterSurfaceMenu">
51+ <dox:d><![CDATA[
52+ Associates a gmenumodel with a surface
53+
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.
57+ ]]></dox:d>
58+ <arg name="surface" type="s" direction="in">
59+ <dox:d>The surface ID of the surface</dox:d>
60+ </arg>
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>
63+ </arg>
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>
66+ </arg>
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>
69+ </arg>
70+ </method>
71+ <method name="UnregisterSurfaceMenu">
72+ <dox:d>
73+ A method to allow removing a surface menu from the database.
74+ </dox:d>
75+ <arg name="surfaceId" type="s" direction="in">
76+ <dox:d>The surface id of the surface</dox:d>
77+ </arg>
78+ <arg name="menuObjectPath" type="o" direction="in">
79+ <dox:d>The dbus path for the registered surface menu to be unregistered</dox:d>
80+ </arg>
81+ </method>
82+ </interface>
83+</node>
plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cppnew file+44
@@ -0,0 +1,44 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "dbusapplicationmenuregistry.h"
18+#include "menuregistraradaptor.h"
19+
20+DBusApplicationMenuRegistry::DBusApplicationMenuRegistry(QObject *parent)
21+ : ApplicationMenuRegistry(parent)
22+{
23+ new MenuRegistrarAdaptor(this);
24+
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";
28+ }
29+ if (!connection.registerService("com.ubuntu.MenuRegistrar")) {
30+ qCWarning(UNITY_APPMENU) << "Unable to register DBus service com.ubuntu.MenuRegistrar";
31+ }
32+}
33+
34+DBusApplicationMenuRegistry::~DBusApplicationMenuRegistry()
35+{
36+ QDBusConnection connection = QDBusConnection::sessionBus();
37+ connection.unregisterObject("/com/ubuntu/MenuRegistrar");
38+}
39+
40+ApplicationMenuRegistry *DBusApplicationMenuRegistry::instance()
41+{
42+ static ApplicationMenuRegistry* reg(new DBusApplicationMenuRegistry());
43+ return reg;
44+}
plugins/ScreenGrabber/plugin.h → plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hrenamed+12−11
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,22 +12,23 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
1715 */
1816
19−#ifndef SCREENGRABBER_PLUGIN_H
20−#define SCREENGRABBER_PLUGIN_H
17+#ifndef DBUSAPPLICATIONMENUREGISTRY_H
18+#define DBUSAPPLICATIONMENUREGISTRY_H
2119
22−#include <QtQml/QQmlExtensionPlugin>
20+#include "applicationmenuregistry.h"
2321
24−class ScreenGrabberPlugin : public QQmlExtensionPlugin
22+class DBusApplicationMenuRegistry : public ApplicationMenuRegistry,
23+ protected QDBusContext
2524{
2625 Q_OBJECT
27− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
28−
2926public:
30− void registerTypes(const char *uri) override;
27+ ~DBusApplicationMenuRegistry();
28+ static ApplicationMenuRegistry* instance();
29+
30+protected:
31+ explicit DBusApplicationMenuRegistry(QObject *parent = 0);
3132};
3233
33−#endif // SCREENGRABBER_PLUGIN_H
34+#endif // DBUSAPPLICATIONMENUREGISTRY_H
plugins/Unity/ApplicationMenu/plugin.cppnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "plugin.h"
18+#include "dbusapplicationmenuregistry.h"
19+
20+#include <QtQml>
21+
22+static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)
23+{
24+ Q_UNUSED(engine)
25+ Q_UNUSED(scriptEngine)
26+ return DBusApplicationMenuRegistry::instance();
27+}
28+
29+void ApplicationMenuPlugin::registerTypes(const char *uri)
30+{
31+ Q_ASSERT(uri == QLatin1String("Unity.ApplicationMenu"));
32+
33+ qmlRegisterUncreatableType<MenuServicePath>(uri, 0, 1, "MenuServicePath", "You cannot create a MenuServicePath");
34+ qmlRegisterSingletonType<DBusApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);
35+}
36+
37+void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
38+{
39+ QQmlExtensionPlugin::initializeEngine(engine, uri);
40+
41+ menuRegistry(nullptr, nullptr);
42+}
plugins/Ubuntu/SystemImage/plugin.h → plugins/Unity/ApplicationMenu/plugin.hrenamed+6−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,18 +14,19 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef SYSTEMIMAGE_PLUGIN_H
18−#define SYSTEMIMAGE_PLUGIN_H
17+#ifndef APPLICATIONMENU_PLUGIN_H
18+#define APPLICATIONMENU_PLUGIN_H
1919
2020#include <QQmlExtensionPlugin>
2121
22−class BackendPlugin : public QQmlExtensionPlugin
22+class ApplicationMenuPlugin : public QQmlExtensionPlugin
2323{
2424 Q_OBJECT
2525 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2626
2727public:
2828 void registerTypes(const char *uri) override;
29+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
2930};
3031
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)
12add_subdirectory(Connectivity)
23add_subdirectory(Indicators)
34add_subdirectory(Launcher)
45add_subdirectory(Session)
5−add_subdirectory(DashCommunicator)
66add_subdirectory(InputInfo)
77add_subdirectory(Platform)
plugins/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(CONNECTIVITY_SOURCES
55
66add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
77
8−qt5_use_modules(Connectivity Qml DBus Core)
8+target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)
99
1010add_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
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "Connectivity"
12− prototype: "QObject"
13− exports: ["Unity.Connectivity/Connectivity 0.1"]
14− isCreatable: false
15− isSingleton: true
16− exportMetaObjectRevisions: [0]
17− Method { name: "unlockAllModems" }
18− }
19−}
plugins/Unity/DashCommunicator/CMakeLists.txtdeleted−25
@@ -1,25 +0,0 @@
1−include_directories(
2− ${CMAKE_CURRENT_SOURCE_DIR}
3− ${libunity8-private_SOURCE_DIR}
4−)
5−
6−set(QMLDASHCOMMUNICATORPLUGIN_SRC
7− plugin.cpp
8− dbusdashcommunicatorservice.cpp
9− dashcommunicatorservice.cpp
10− dashcommunicator.cpp
11− dashconnection.cpp
12−)
13−
14−add_library(DashCommunicator-qml MODULE
15− ${QMLDASHCOMMUNICATORPLUGIN_SRC}
16−)
17−
18−qt5_use_modules(DashCommunicator-qml DBus Qml)
19−
20−target_link_libraries(DashCommunicator-qml
21− unity8-private
22−)
23−
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
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "DashCommunicator"
12− prototype: "QThread"
13− exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
14− exportMetaObjectRevisions: [0]
15− Method {
16− name: "setCurrentScope"
17− Parameter { name: "index"; type: "int" }
18− Parameter { name: "animate"; type: "bool" }
19− Parameter { name: "isSwipe"; type: "bool" }
20− }
21− }
22− Component {
23− name: "DashCommunicatorService"
24− prototype: "QObject"
25− exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
26− exportMetaObjectRevisions: [0]
27− Signal {
28− name: "setCurrentScopeRequested"
29− Parameter { name: "index"; type: "int" }
30− Parameter { name: "animate"; type: "bool" }
31− Parameter { name: "isSwipe"; type: "bool" }
32− }
33− }
34− Component {
35− name: "QThread"
36− prototype: "QObject"
37− Signal { name: "started" }
38− Signal { name: "finished" }
39− Method {
40− name: "start"
41− Parameter { type: "Priority" }
42− }
43− Method { name: "start" }
44− Method { name: "terminate" }
45− Method { name: "quit" }
46− }
47−}
plugins/Unity/DashCommunicator/dashcommunicator.cppdeleted−58
@@ -1,58 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "dashcommunicator.h"
18−#include "dashconnection.h"
19−
20−#include <QObject>
21−
22−DashCommunicator::DashCommunicator(QObject *parent):
23− QThread(parent),
24− m_dashConnection(nullptr),
25− m_created(false)
26−{
27− start();
28−}
29−
30−DashCommunicator::~DashCommunicator()
31−{
32− quit();
33− wait();
34−}
35−
36−void DashCommunicator::setCurrentScope(int index, bool animate, bool isSwipe)
37−{
38− m_mutex.lock();
39− if (m_created) {
40− QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",
41− Q_ARG(int, index),
42− Q_ARG(bool, animate),
43− Q_ARG(bool, isSwipe));
44− }
45− m_mutex.unlock();
46−}
47−
48−void DashCommunicator::run()
49−{
50− m_dashConnection = new DashConnection(QStringLiteral("com.canonical.UnityDash"),
51− QStringLiteral("/com/canonical/UnityDash"),
52− QLatin1String(""), this);
53− m_mutex.lock();
54− m_created = true;
55− m_mutex.unlock();
56−
57− exec();
58−}
plugins/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−38
@@ -1,38 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef DASHCOMMUNICATORSERVICE_H
18−#define DASHCOMMUNICATORSERVICE_H
19−
20−#include "dbusdashcommunicatorservice.h"
21−
22−#include <QObject>
23−
24−class DashCommunicatorService: public QObject
25−{
26− Q_OBJECT
27−public:
28− DashCommunicatorService(QObject *parent = 0);
29− ~DashCommunicatorService();
30−
31−Q_SIGNALS:
32− void setCurrentScopeRequested(int index, bool animate, bool isSwipe);
33−
34−private:
35− DBusDashCommunicatorService *m_dbusService;
36−};
37−
38−#endif // DBUSUNITYSESSIONSERVICE_H
plugins/Unity/DashCommunicator/dashconnection.cppdeleted−63
@@ -1,63 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "dashconnection.h"
18−
19−#include <QDBusInterface>
20−#include <QDBusPendingCall>
21−
22−/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service
23− * appears on the bus.
24− *
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.
28− *
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.
32− */
33−class AsyncDBusInterface : public QDBusAbstractInterface
34−{
35−public:
36− AsyncDBusInterface(const QString &service, const QString &path,
37− const QString &interface, const QDBusConnection &connection,
38− QObject *parent = 0)
39− : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
40− {}
41− ~AsyncDBusInterface() = default;
42−};
43−
44−
45−DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
46− AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
47−{
48−
49−}
50−
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)
54−{
55− return new AsyncDBusInterface(service, path, interface, connection);
56−}
57−
58−void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
59−{
60− if (dbusInterface()) {
61− dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);
62− }
63−}
plugins/Unity/DashCommunicator/dashconnection.hdeleted−37
@@ -1,37 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef THREADEDDASHCONNECTION_H
18−#define THREADEDDASHCONNECTION_H
19−
20−// local
21−#include "abstractdbusservicemonitor.h"
22−
23−class DashConnection: public AbstractDBusServiceMonitor
24−{
25− Q_OBJECT
26−public:
27− DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);
28−
29−public Q_SLOTS:
30− void setCurrentScope(int index, bool animate, bool isSwipe);
31−
32−private:
33− QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
34− const QString &interface, const QDBusConnection &connection) override;
35−};
36−
37−#endif
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppdeleted−35
@@ -1,35 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "dbusdashcommunicatorservice.h"
18−
19−#include <QDBusConnection>
20−#include <QDBusInterface>
21−#include <QDebug>
22−
23−DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):
24− UnityDBusObject(QStringLiteral("/com/canonical/UnityDash"), QStringLiteral("com.canonical.UnityDash"), false, parent)
25−{
26−}
27−
28−DBusDashCommunicatorService::~DBusDashCommunicatorService()
29−{
30−}
31−
32−void DBusDashCommunicatorService::SetCurrentScope(int index, bool animate, bool isSwipe)
33−{
34− Q_EMIT setCurrentScopeRequested(index, animate, isSwipe);
35−}
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hdeleted−39
@@ -1,39 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software: you can redistribute it and/or modify it under
5− * the terms of the GNU Lesser General Public License version 3, as published by
6− * the Free Software Foundation.
7− *
8− * This program is distributed in the hope that it will be useful, but WITHOUT
9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11− * Lesser General Public License for more details.
12− *
13− * You should have received a copy of the GNU Lesser General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#ifndef DBUSDASHCOMMUNICATORSERVICE_H
18−#define DBUSDASHCOMMUNICATORSERVICE_H
19−
20−#include "unitydbusobject.h"
21−
22−class DBusDashCommunicatorService: public UnityDBusObject
23−{
24− Q_OBJECT
25− Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
26−
27−public:
28− DBusDashCommunicatorService(QObject *parent = 0);
29− ~DBusDashCommunicatorService();
30−
31−Q_SIGNALS:
32− void setCurrentScopeRequested(int index, bool animate, bool isSwipe);
33−
34−public Q_SLOTS:
35− Q_SCRIPTABLE void SetCurrentScope(int index, bool animate, bool isSwipe);
36−
37−};
38−
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)
66include_directories(
77 ${CMAKE_CURRENT_SOURCE_DIR}
88 ${CMAKE_CURRENT_BINARY_DIR}
9+)
10+
11+include_directories(
12+ SYSTEM
913 ${GLIB_INCLUDE_DIRS}
14+)
15+include_directories(
16+ SYSTEM
1017 ${GIO_INCLUDE_DIRS}
1118 ${QMENUMODEL_INCLUDE_DIRS}
1219)
@@ -37,8 +44,7 @@ target_link_libraries(IndicatorsQml
3744 ${GLIB_LIBRARIES}
3845 ${GIO_LIBRARIES}
3946 ${QMENUMODEL_LDFLAGS}
47+ Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus
4048)
4149
42−qt5_use_modules(IndicatorsQml Core Qml Quick DBus)
43−
4450add_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
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
8−
9−Module {
10− Component {
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" }
17− }
18− Component {
19− name: "ActionState"
20− prototype: "QObject"
21− exports: ["Unity.Indicators/ActionState 0.1"]
22− isCreatable: false
23− exportMetaObjectRevisions: [0]
24− Enum {
25− name: "ActionStates"
26− values: {
27− "Label": 0,
28− "IconSource": 1,
29− "AccessableName": 2,
30− "Visible": 3
31− }
32− }
33− }
34− Component {
35− name: "FlatMenuProxyModelRole"
36− prototype: "QObject"
37− exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]
38− isCreatable: false
39− exportMetaObjectRevisions: [0]
40− Enum {
41− name: "Roles"
42− values: {
43− "Action": 1,
44− "Label": 2,
45− "Extra": 3,
46− "Depth": 4,
47− "hasSection": 5,
48− "hasSubMenu": 6
49− }
50− }
51− }
52− Component {
53− name: "IndicatorsManager"
54− prototype: "QObject"
55− exports: ["Unity.Indicators/IndicatorsManager 0.1"]
56− exportMetaObjectRevisions: [0]
57− Property { name: "loaded"; type: "bool"; isReadonly: true }
58− Property { name: "profile"; type: "string" }
59− Signal {
60− name: "loadedChanged"
61− Parameter { type: "bool" }
62− }
63− Signal {
64− name: "profileChanged"
65− Parameter { type: "string" }
66− }
67− Signal {
68− name: "indicatorLoaded"
69− Parameter { name: "indicator_name"; type: "string" }
70− }
71− Signal {
72− name: "indicatorAboutToBeUnloaded"
73− Parameter { name: "indicator_name"; type: "string" }
74− }
75− Method { name: "load" }
76− Method { name: "unload" }
77− }
78− Component {
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" }
85− Signal {
86− name: "indicatorDataChanged"
87− Parameter { name: "data"; type: "QVariant" }
88− }
89− Method { name: "load" }
90− Method { name: "unload" }
91− Method {
92− name: "data"
93− type: "QVariant"
94− Parameter { name: "row"; type: "int" }
95− Parameter { name: "role"; type: "int" }
96− }
97− }
98− Component {
99− name: "IndicatorsModelRole"
100− prototype: "QObject"
101− exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]
102− isCreatable: false
103− exportMetaObjectRevisions: [0]
104− Enum {
105− name: "Roles"
106− values: {
107− "Identifier": 0,
108− "Position": 1,
109− "IndicatorProperties": 2
110− }
111− }
112− }
113− Component {
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 }
122− Signal {
123− name: "baseIndexChanged"
124− Parameter { name: "baseIndex"; type: "int" }
125− }
126− Signal {
127− name: "deltaChanged"
128− Parameter { name: "delta"; type: "int" }
129− }
130− Signal {
131− name: "runningChanged"
132− Parameter { name: "running"; type: "bool" }
133− }
134− Signal {
135− name: "countChanged"
136− Parameter { name: "count"; type: "int" }
137− }
138− Method { name: "restart" }
139− Method { name: "stop" }
140− Method { name: "clear" }
141− Method {
142− name: "isMenuContentActive"
143− type: "bool"
144− Parameter { name: "index"; type: "int" }
145− }
146− }
147− Component {
148− name: "MenuContentState"
149− prototype: "QObject"
150− exports: ["Unity.Indicators/MenuContentState 0.1"]
151− isCreatable: false
152− exportMetaObjectRevisions: [0]
153− Property { name: "active"; type: "bool"; isReadonly: true }
154− }
155− Component {
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" }
162− }
163− Component {
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" }
171− }
172− Component {
173− name: "NetworkActionState"
174− prototype: "QObject"
175− exports: ["Unity.Indicators/NetworkActionState 0.1"]
176− isCreatable: false
177− exportMetaObjectRevisions: [0]
178− Enum {
179− name: "NetworkActionStates"
180− values: {
181− "Connection": 1,
182− "SignalStrength": 2
183− }
184− }
185− }
186− Component {
187− name: "NetworkConnection"
188− prototype: "QObject"
189− exports: ["Unity.Indicators/NetworkConnection 0.1"]
190− isCreatable: false
191− exportMetaObjectRevisions: [0]
192− Enum {
193− name: "NetworkConnectionStates"
194− values: {
195− "Initial": 0,
196− "Activating": 1,
197− "Activated": 2,
198− "Deactivating": 3
199− }
200− }
201− }
202− Component {
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" }
213− }
214− Component {
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 }
223− }
224− Component {
225− name: "UnityMenuModelCache"
226− prototype: "QObject"
227− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
228− isCreatable: false
229− isSingleton: true
230− exportMetaObjectRevisions: [0]
231− Method {
232− name: "contains"
233− type: "bool"
234− Parameter { name: "path"; type: "QByteArray" }
235− }
236− }
237− Component {
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 }
245− Signal {
246− name: "headChanged"
247− Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }
248− }
249− Signal {
250− name: "tailChanged"
251− Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }
252− }
253− Signal {
254− name: "countChanged"
255− Parameter { name: "count"; type: "int" }
256− }
257− Method {
258− name: "push"
259− Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }
260− Parameter { name: "menuIndex"; type: "int" }
261− }
262− Method { name: "pop"; type: "UnityMenuModel*" }
263− }
264−}
plugins/Unity/Indicators/actionrootstate.cpp+1−1
@@ -44,7 +44,7 @@ void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
4444 connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
4545 connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
4646 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(); });
4848
4949 connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
5050 }
plugins/Unity/Indicators/indicators.h+5−5
@@ -27,13 +27,13 @@ class UNITYINDICATORS_EXPORT ActionState : public QObject
2727{
2828 Q_OBJECT
2929public:
30− Q_ENUMS(ActionStates)
3130 enum ActionStates {
3231 Label = 0x00,
3332 IconSource = 0x01,
3433 AccessableName = 0x02,
3534 Visible = 0x03,
3635 };
36+ Q_ENUM(ActionStates)
3737
3838 ActionState(QObject*parent=0):QObject(parent) {}
3939};
@@ -42,11 +42,11 @@ class UNITYINDICATORS_EXPORT NetworkActionState : public QObject
4242{
4343 Q_OBJECT
4444public:
45− Q_ENUMS(NetworkActionStates)
4645 enum NetworkActionStates {
4746 Connection = 0x01,
4847 SignalStrength = 0x02,
4948 };
49+ Q_ENUM(NetworkActionStates)
5050
5151 NetworkActionState(QObject*parent=0):QObject(parent) {}
5252};
@@ -55,13 +55,13 @@ class UNITYINDICATORS_EXPORT NetworkConnection : public QObject
5555{
5656 Q_OBJECT
5757public:
58− Q_ENUMS(NetworkConnectionStates)
5958 enum NetworkConnectionStates {
6059 Initial = 0x00,
6160 Activating = 0x01,
6261 Activated = 0x02,
6362 Deactivating = 0x03,
6463 };
64+ Q_ENUM(NetworkConnectionStates)
6565
6666 NetworkConnection(QObject*parent=0):QObject(parent) {}
6767};
@@ -70,12 +70,12 @@ class UNITYINDICATORS_EXPORT IndicatorsModelRole : public QObject
7070{
7171 Q_OBJECT
7272public:
73− Q_ENUMS(Roles)
7473 enum Roles {
7574 Identifier = 0,
7675 Position,
7776 IndicatorProperties
7877 };
78+ Q_ENUM(Roles)
7979
8080 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
8181};
@@ -84,7 +84,6 @@ class UNITYINDICATORS_EXPORT FlatMenuProxyModelRole : public QObject
8484{
8585 Q_OBJECT
8686public:
87− Q_ENUMS(Roles)
8887 enum Roles {
8988 Action = Qt::DisplayRole + 1,
9089 Label,
@@ -93,6 +92,7 @@ public:
9392 hasSection,
9493 hasSubMenu
9594 };
95+ Q_ENUM(Roles)
9696
9797 FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
9898};
plugins/Unity/Indicators/indicatorsmanager.cpp+3−8
@@ -114,10 +114,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
114114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
115115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
116116
117− if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
118− return; // convergence: skip this indicator until it works in Mir
119− }
120−
121117 auto iter = m_indicatorsData.constFind(name);
122118 if (iter != m_indicatorsData.constEnd())
123119 {
@@ -285,13 +281,12 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
285281
286282 // convergence:
287283 // 1) enable session indicator
288− // 2) on a PC, switch the battery/power indicator to desktop mode,
289− // can't control brightness for now and phone-on-desktop broken (FIXME)
284+ // 2) enable keyboard indicator
290285 //
291286 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
292287 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
293− || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
294− new_indicator->setProfile(QStringLiteral("desktop"));
288+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
289+ new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
295290 } else {
296291 new_indicator->setProfile(m_profile);
297292 }
plugins/Unity/Indicators/indicatorsmanager.h−2
@@ -76,8 +76,6 @@ private:
7676 QSharedPointer<QFileSystemWatcher> m_fsWatcher;
7777 bool m_loaded;
7878 QString m_profile;
79−
80− Platform m_platform;
8179};
8280
8381#endif // INDICATORS_MANAGER_H
plugins/Unity/Indicators/indicatorsmodel.cpp+13
@@ -103,6 +103,19 @@ void IndicatorsModel::setProfile(const QString &profile)
103103 m_manager->setProfile(profile);
104104}
105105
106+bool IndicatorsModel::light() const
107+{
108+ return m_light;
109+}
110+
111+void IndicatorsModel::setLight(const bool &light)
112+{
113+ if (m_light != light) {
114+ m_light = light;
115+ Q_EMIT lightChanged();
116+ }
117+}
118+
106119/*!
107120 \qmlmethod IndicatorsModel::unload()
108121
plugins/Unity/Indicators/indicatorsmodel.h+9−1
@@ -32,10 +32,12 @@ class IndicatorsManager;
3232class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
3333{
3434 Q_OBJECT
35− Q_ENUMS(Roles)
3635 Q_PROPERTY(int count READ count NOTIFY countChanged)
3736 Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
3837
38+ // Used for tests
39+ Q_PROPERTY(bool light READ light WRITE setLight NOTIFY lightChanged)
40+
3941public:
4042
4143 IndicatorsModel(QObject *parent=nullptr);
@@ -49,6 +51,9 @@ public:
4951 QString profile() const;
5052 void setProfile(const QString& profile);
5153
54+ bool light() const;
55+ void setLight(const bool &light);
56+
5257 /* QAbstractItemModel */
5358 QHash<int, QByteArray> roleNames() const override;
5459 int columnCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -61,6 +66,7 @@ Q_SIGNALS:
6166 void countChanged();
6267 void profileChanged();
6368 void indicatorDataChanged(const QVariant& data);
69+ void lightChanged();
6470
6571private Q_SLOTS:
6672 void onIdentifierChanged();
@@ -75,6 +81,8 @@ private:
7581
7682 void notifyDataChanged(QObject *sender, int role);
7783 int count() const;
84+
85+ bool m_light;
7886};
7987
8088#endif // INDICATORSMODEL_H
plugins/Unity/Indicators/modelprinter.cpp+19−4
@@ -105,12 +105,25 @@ QString ModelPrinter::getRowSring(UnityMenuModel* sourceModel, int row, int dept
105105
106106 Q_FOREACH(int role, roles) {
107107 const QByteArray& roleName = roleNames[role];
108− stream << tabify(depth) << getVariantString(roleName, sourceModel->get(row, roleName));
108+ stream << getVariantString(roleName, sourceModel->get(row, roleName), depth);
109109 }
110110 return str;
111111}
112112
113−QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData) const
113+QString ModelPrinter::getVariantString(const QVariant& vData) const
114+{
115+ if (vData.type() == QVariant::List) {
116+ QStringList strList;
117+ for (const auto& v : vData.toList())
118+ strList.append(getVariantString(v));
119+
120+ return '[' + strList.join(", ") + ']';
121+ }
122+
123+ return vData.toString();
124+}
125+
126+QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData, int depth) const
114127{
115128 QString str;
116129 QTextStream stream(&str);
@@ -119,18 +132,20 @@ QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &
119132 QMapIterator<QString, QVariant> iter(vData.toMap());
120133 while (iter.hasNext()) {
121134 iter.next();
135+ stream << tabify(depth);
122136 stream << roleName
123137 << "."
124138 << iter.key()
125139 << ": "
126− << iter.value().toString()
140+ << getVariantString(iter.value())
127141 << endl;
128142 }
129143 }
130144 else {
145+ stream << tabify(depth);
131146 stream << roleName
132147 << ": "
133− << vData.toString()
148+ << getVariantString(vData)
134149 << endl;
135150 }
136151 return str;
plugins/Unity/Indicators/modelprinter.h+2−1
@@ -46,7 +46,8 @@ Q_SIGNALS:
4646private:
4747 QString getModelDataString(UnityMenuModel* sourceModel, int level);
4848 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;
5051
5152 UnityMenuModel* m_model;
5253 QList<UnityMenuModel*> m_children;
plugins/Unity/Indicators/sharedunitymenumodel.cpp+4
@@ -81,12 +81,16 @@ void SharedUnityMenuModel::initialize()
8181 }
8282 } else {
8383 QSharedPointer<UnityMenuModel> model = UnityMenuModelCache::singleton()->model(m_menuObjectPath);
84+
8485 if (model != m_model) {
8586 if (model->busName() != m_busName) model->setBusName(m_busName);
8687 if (model->actions() != m_actions) model->setActions(m_actions);
8788
8889 m_model = model;
8990 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);
9094 }
9195 }
9296}
plugins/Unity/InputInfo/CMakeLists.txt+1−2
@@ -32,8 +32,7 @@ add_library(InputInfo SHARED
3232target_link_libraries(InputInfo
3333 ${LIBUDEV_LDFLAGS}
3434 ${LIBEVDEV_LDFLAGS}
35+ Qt5::Core Qt5::Qml Qt5::Quick
3536)
3637
37−qt5_use_modules(InputInfo Core Qml Quick)
38−
3938add_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
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'
8−
9−Module {
10− Component {
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 }
17− Signal {
18− name: "deviceAdded"
19− Parameter { name: "devicePath"; type: "string" }
20− }
21− Signal {
22− name: "deviceRemoved"
23− Parameter { name: "devicePath"; type: "string" }
24− }
25− Signal {
26− name: "deviceFilterChanged"
27− Parameter { name: "filter"; type: "QInputDevice::InputType" }
28− }
29− Method { name: "updateDeviceList" }
30− Method {
31− name: "indexOf"
32− type: "int"
33− Parameter { name: "devicePath"; type: "string" }
34− }
35− Method {
36− name: "get"
37− type: "QInputDevice*"
38− Parameter { name: "index"; type: "int" }
39− }
40− }
41− Component {
42− name: "QInputDevice"
43− prototype: "QObject"
44− exports: ["Unity.InputInfo/InputInfo 0.1"]
45− exportMetaObjectRevisions: [0]
46− Enum {
47− name: "InputType"
48− values: {
49− "Unknown": 0,
50− "Button": 1,
51− "Mouse": 2,
52− "TouchPad": 4,
53− "TouchScreen": 8,
54− "Keyboard": 16,
55− "Switch": 32
56− }
57− }
58− Enum {
59− name: "InputTypeFlags"
60− values: {
61− "Unknown": 0,
62− "Button": 1,
63− "Mouse": 2,
64− "TouchPad": 4,
65− "TouchScreen": 8,
66− "Keyboard": 16,
67− "Switch": 32
68− }
69− }
70− }
71−}
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+7−2
@@ -44,6 +44,7 @@
4444#include <libudev.h>
4545#include <libevdev/libevdev.h>
4646#include <fcntl.h>
47+#include <unistd.h>
4748#include <QDebug>
4849#include <QSocketNotifier>
4950#include <QTimer>
@@ -52,6 +53,7 @@
5253QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
5354 QObject(parent),
5455 currentFilter(QInputDevice::Unknown),
56+ udevMonitor(0),
5557 udevice(0)
5658{
5759 QTimer::singleShot(250,this,SLOT(init()));
@@ -83,9 +85,9 @@ void QInputDeviceManagerPrivate::init()
8385 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
8486
8587 udev_monitor_enable_receiving(udevMonitor);
86− notifierFd = udev_monitor_get_fd(udevMonitor);
88+ int notifierFd = udev_monitor_get_fd(udevMonitor);
8789
88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
8991 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
9092
9193 udev_enumerate_scan_devices(enumerate);
@@ -168,6 +170,7 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
168170 rc = libevdev_new_from_fd(fd, &dev);
169171 if (rc < 0) {
170172 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
173+ close(fd);
171174 return Q_NULLPTR;
172175 }
173176
@@ -195,6 +198,8 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
195198 }
196199 }
197200
201+ libevdev_free(dev);
202+ close(fd);
198203 return inputDevice;
199204}
200205
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2
@@ -83,8 +83,6 @@ private:
8383
8484 QInputDevice *addDevice(const QString &path);
8585 void removeDevice(const QString &path);
86− QSocketNotifier *notifier;
87− int notifierFd;
8886 struct udev_monitor *udevMonitor;
8987 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
9088 struct udev *udevice;
plugins/Unity/InputInfo/plugin.h+1−1
@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin
2424 Q_OBJECT
2525 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2626public:
27− void registerTypes(const char *uri);
27+ void registerTypes(const char *uri) override;
2828};
2929
3030#endif // INPUTINFO_PLUGIN_H
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3
@@ -69,8 +69,8 @@ public:
6969 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
7070 virtual ~QDeclarativeInputDeviceModel();
7171
72− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
73− int rowCount(const QModelIndex &parent = QModelIndex()) const;
72+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
73+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
7474
7575 void setDeviceFilter(QInputDevice::InputType filter);
7676 QInputDevice::InputType deviceFilter();
@@ -78,7 +78,7 @@ public:
7878 Q_INVOKABLE int indexOf(const QString &devicePath) const;
7979
8080 Q_INVOKABLE QInputDevice *get(int index) const;
81− QHash<int, QByteArray> roleNames() const;
81+ QHash<int, QByteArray> roleNames() const override;
8282
8383Q_SIGNALS:
8484 void deviceAdded(const QString &devicePath);
plugins/Unity/InputInfo/qinputinfo.h+2−3
This diff is too big to show here.
plugins/Unity/Launcher/CMakeLists.txt+17−6
This diff is too big to show here.
plugins/Unity/Launcher/Launcher.qmltypesdeleted−182
This diff is too big to show here.
plugins/Unity/Launcher/appdrawermodel.cppnew file+192
This diff is too big to show here.
plugins/Unity/Launcher/appdrawermodel.hnew file+64
This diff is too big to show here.
plugins/Unity/Launcher/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+65−10
This diff is too big to show here.
plugins/Unity/Launcher/launcheritem.h+11
This diff is too big to show here.
plugins/Unity/Launcher/launchermodel.cpp+118−59
This diff is too big to show here.
plugins/Unity/Launcher/launchermodel.h+6−9
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−5
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−9
This diff is too big to show here.
plugins/Utils/plugin.h−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/windowscreenshotprovider.cppdeleted−59
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.
plugins/Wizard/qmldir−1
This diff is too big to show here.
plugins/Wizard/test.shdeleted−18
This diff is too big to show here.
plugins/Wizard/timezonemodel.cpp+5−5
This diff is too big to show here.
po/aa.po+424−311
This diff is too big to show here.
po/am.po+743−398
This diff is too big to show here.
po/ar.po+700−468
This diff is too big to show here.
po/ast.po+782−438
This diff is too big to show here.
po/az.po+456−323
This diff is too big to show here.
po/be.po+655−462
This diff is too big to show here.
po/bg.po+400−311
This diff is too big to show here.
po/bn.po+624−442
This diff is too big to show here.
po/br.po+669−395
This diff is too big to show here.
po/bs.po+547−361
This diff is too big to show here.
po/ca.po+817−436
This diff is too big to show here.
po/ca@valencia.po+517−359
This diff is too big to show here.
po/ce.po+369−289
This diff is too big to show here.
po/ckb.po+393−307
This diff is too big to show here.
po/co.ponew file+1061
This diff is too big to show here.
po/cs.po+744−462
This diff is too big to show here.
po/cy.po+541−354
This diff is too big to show here.
po/da.po+578−394
This diff is too big to show here.
po/de.po+786−429
This diff is too big to show here.
po/el.po+677−428
This diff is too big to show here.
po/en_AU.po+779−405
This diff is too big to show here.
po/en_GB.po+730−398
This diff is too big to show here.
po/en_US.ponew file+814
This diff is too big to show here.
po/eo.po+439−321
This diff is too big to show here.
po/es.po+775−421
This diff is too big to show here.
po/et.ponew file+816
This diff is too big to show here.
po/eu.po+547−364
This diff is too big to show here.
po/fa.po+783−405
This diff is too big to show here.
po/fi.po+764−409
This diff is too big to show here.
po/fo.po+503−353
This diff is too big to show here.
po/fr.po+807−450
This diff is too big to show here.
po/ga.po+537−356
This diff is too big to show here.
po/gd.po+754−417
This diff is too big to show here.
po/gl.po+771−415
This diff is too big to show here.
po/gu.ponew file+814
This diff is too big to show here.
po/gv.po+429−323
This diff is too big to show here.
po/he.po+599−444
This diff is too big to show here.
po/hi.po+386−302
This diff is too big to show here.
po/hr.po+787−420
This diff is too big to show here.
po/hu.po+777−427
This diff is too big to show here.
po/hy.po+503−373
This diff is too big to show here.
po/ia.po+736−400
This diff is too big to show here.
po/id.po+500−341
This diff is too big to show here.
po/is.po+481−338
This diff is too big to show here.
po/it.po+771−416
This diff is too big to show here.
po/ja.po+522−362
This diff is too big to show here.
po/kk.ponew file+841
This diff is too big to show here.
po/km.po+525−361
This diff is too big to show here.
po/kn.po+377−299
This diff is too big to show here.
po/ko.po+637−435
This diff is too big to show here.
po/ku.po+461−324
This diff is too big to show here.
po/ky.po+377−299
This diff is too big to show here.
po/lo.po+377−297
This diff is too big to show here.
po/lt.po+637−391
This diff is too big to show here.
po/lv.po+552−368
This diff is too big to show here.
po/ml.po+394−309
This diff is too big to show here.
po/mr.po+397−299
This diff is too big to show here.
po/ms.po+727−413
This diff is too big to show here.
po/my.po+441−318
This diff is too big to show here.
po/nb.po+757−406
This diff is too big to show here.
po/ne.po+377−294
This diff is too big to show here.
po/nl.po+819−458
This diff is too big to show here.
po/nn.po+369−289
This diff is too big to show here.
po/oc.po+716−425
This diff is too big to show here.
po/or.po+369−289
This diff is too big to show here.
po/pa.po+540−360
This diff is too big to show here.
po/pl.po+781−427
This diff is too big to show here.
po/pt.po+769−415
This diff is too big to show here.
po/pt_BR.po+634−436
This diff is too big to show here.
po/ro.po+550−372
This diff is too big to show here.
po/ru.po+782−425
This diff is too big to show here.
po/sc.ponew file+904
This diff is too big to show here.
po/shn.po+370−290
This diff is too big to show here.
po/si.po+400−313
This diff is too big to show here.
po/sk.po+813−414
This diff is too big to show here.
po/sl.po+723−404
This diff is too big to show here.
po/sq.po+513−349
This diff is too big to show here.
po/sr.po+739−405
This diff is too big to show here.
po/sv.po+757−405
This diff is too big to show here.
po/sw.po+513−345
This diff is too big to show here.
po/ta.po+393−308
This diff is too big to show here.
po/te.po+402−308
This diff is too big to show here.
po/th.po+389−308
This diff is too big to show here.
po/tr.po+815−441
This diff is too big to show here.
po/ug.po+602−379
This diff is too big to show here.
po/uk.po+749−412
This diff is too big to show here.
po/unity8.pot+366−287
This diff is too big to show here.
po/update-unity-pot+17
This diff is too big to show here.
po/ur.po+393−310
This diff is too big to show here.
po/uz.po+369−289
This diff is too big to show here.
po/vi.po+369−289
This diff is too big to show here.
po/wo.po+546−363
This diff is too big to show here.
po/xh.po+369−289
This diff is too big to show here.
po/zh_CN.po+751−400
This diff is too big to show here.
po/zh_HK.po+415−313
This diff is too big to show here.
po/zh_TW.po+712−428
This diff is too big to show here.
qml/ApplicationMenus/ApplicationMenuItemFactory.qmlnew file+135
This diff is too big to show here.
qml/ApplicationMenus/ApplicationMenusLimits.qmlnew file+24
This diff is too big to show here.
qml/ApplicationMenus/MenuBar.qmlnew file+513
This diff is too big to show here.
qml/ApplicationMenus/MenuItem.qmlnew file+146
This diff is too big to show here.
qml/ApplicationMenus/MenuNavigator.qmlnew file+101
This diff is too big to show here.
qml/ApplicationMenus/MenuPopup.qmlnew file+510
This diff is too big to show here.
qml/ApplicationMenus/RegisteredApplicationMenuModel.qmlnew file+56
This diff is too big to show here.
qml/ApplicationMenus/qmldirnew file+1
This diff is too big to show here.
qml/CMakeLists.txt+2−2
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/ScreenGrabber.qml → qml/Components/ItemGrabber.qmlrenamed+28−18
This diff is too big to show here.
qml/Components/WindowScreenshot.qml → qml/Components/ItemSnapshot.qmlrenamed+13−3
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+3−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.
plugins/Ubuntu/Payments/plugin.cpp → qml/Components/ListView.qmlrenamed+8−12
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.qml+3−10
This diff is too big to show here.
qml/Components/MediaServices/MediaServicesHeader.qml−1
This diff is too big to show here.
qml/Components/MediaServices/VideoPlayer.qml+1
This diff is too big to show here.
qml/Components/MediaServices/VideoPlayerControls.qml+1−3
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+27−6
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+270−2
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/Dash/DashApplication.qml → qml/Components/flickableUtils.jsrenamed+10−13
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−85
This diff is too big to show here.
qml/Dash/CardHorizontalList.qmldeleted−65
This diff is too big to show here.
qml/Dash/CardTool.qmldeleted−221
This diff is too big to show here.
qml/Dash/CardVerticalJournal.qmldeleted−84
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−60
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−80
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−835
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−71
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−72
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−99
This diff is too big to show here.
qml/Dash/Previews/PreviewZoomableImage.qmldeleted−97
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.
qml/Greeter/Clock.qml−2
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.
plugins/Utils/windowscreenshotprovider.h → qml/Greeter/FullLightDMImpl.qmlrenamed+12−12
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+16−22
This diff is too big to show here.
qml/Launcher/LauncherPanel.qml+183−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+43−17
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+117−57
This diff is too big to show here.
qml/Panel/PanelMenuPage.qmlnew file+226
This diff is too big to show here.
qml/Panel/graphics/rectangular_dropshadow@30.png
Binary file not shown.
qml/Rotation/HalfLoopRotationAnimation.qml+2−1
This diff is too big to show here.
qml/Rotation/ImmediateRotationAction.qml+11−22
This diff is too big to show here.
qml/Rotation/NinetyRotationAnimation.qml+14−16
This diff is too big to show here.
qml/Rotation/RotationStates.qml+27−16
This diff is too big to show here.
qml/Rotation/UpdateShellTransformations.qmlnew file+42
This diff is too big to show here.
qml/ScopeTool.qmldeleted−165
This diff is too big to show here.
qml/Shell.qml+456−262
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−79
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−665
This diff is too big to show here.
qml/Stages/PhoneStage.qmldeleted−798
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−1182
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.
qml/Wizard/Page.qml+16−1
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.
run.shdeleted−70
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.
src/CMakeLists.txt+17−10
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+9
This diff is too big to show here.
src/ShellApplication.cpp+39−6
This diff is too big to show here.
src/ShellApplication.h+1−3
This diff is too big to show here.
src/ShellView.cpp+22
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.
src/main.cpp+28−3
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.
tests/mocks/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.
plugins/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/MockGreeter.hdeleted−37
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+1−1
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/mediaplayer.cpp+6−6
This diff is too big to show here.
tests/mocks/QtMultimedia/mediaplayer.h+20−13
This diff is too big to show here.
tests/mocks/QtMultimedia/videooutput.h+1−1
This diff is too big to show here.
tests/mocks/SessionBroadcast/CMakeLists.txtnew file+8
This diff is too big to show here.
tests/mocks/Ubuntu/SystemImage/plugin.cpp → tests/mocks/SessionBroadcast/SessionBroadcast.cpprenamed+12−12
This diff is too big to show here.
tests/mocks/SessionBroadcast/SessionBroadcast.hnew file+39
This diff is too big to show here.
tests/mocks/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.
qml/Dash/Filters/FilterWidget.qml → tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qmlrenamed+10−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+90−54
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationInfo.h+13−15
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+29−14
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.
qml/Dash/Previews/PreviewInlineVideo.qml → tests/mocks/Unity/Application/resources/KateDialog.qmlrenamed+25−24
This diff is too big to show here.
qml/Stages/ShimStage.qml → tests/mocks/Unity/Application/resources/KateMenu.qmlrenamed+17−20
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−61
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/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_filters.h → tests/mocks/Unity/Launcher/MockAppDrawerModel.hrenamed+14−17
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherItem.cpp+41−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherItem.h+12
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+12−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−158
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_filters.cppdeleted−125
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_optionselectoroptions.hdeleted−47
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−90
This diff is too big to show here.
tests/mocks/Unity/fake_resultsmodel.hdeleted−52
This diff is too big to show here.
tests/mocks/Unity/fake_scope.cppdeleted−358
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−5
This diff is too big to show here.
tests/plugins/ScreenGrabber/grabber.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−9
This diff is too big to show here.
tests/mocks/Utils/plugin.h+1−2
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−4
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/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/ScreenGrabber/CMakeLists.txtdeleted−14
This diff is too big to show here.
tests/plugins/ScreenGrabber/ScreenGrabberTest.cppdeleted−77
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+165−26
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.
plugins/ScreenGrabber/screengrabber.h → tests/plugins/Unity/Launcher/xdgwatcher.hrenamed+14−24
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+44−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.qml+5−4
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−113
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−58
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−148
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−126
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_PreviewInlineVideo.qmldeleted−106
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−104
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmldeleted−116
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−645
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.qmldeleted−664
This diff is too big to show here.
tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svgdeleted−60
This diff is too big to show here.
tests/qmltests/Dash/tst_PreviewView.qmldeleted−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+454−85
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.
tools/menutool/README+11
This diff is too big to show here.
tools/menutool/menutool.cpp+62
This diff is too big to show here.
tools/menutool/menutool.qml+118
This diff is too big to show here.
tools/registry-tracker.cpp−146
This diff is too big to show here.
tools/registry-tracker.h−49
This diff is too big to show here.
tools/scopetool.cpp−112
This diff is too big to show here.
tools/unlock-device+16
This diff is too big to show here.