1323 files changed+91794−93480
.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+34−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,21 +62,31 @@ 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=18)
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)
65−
83+pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
84+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)
6685pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
86+pkg_check_modules(QTDBUSTEST REQUIRED
87+ libqtdbustest-1
88+ libqtdbusmock-1
89+ )
6790
6891### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them
6992find_path(UBUNTUGESTUREPRIV
@@ -125,9 +148,8 @@ include(autopilot)
125148declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
126149
127150set(SHELL_APP unity8)
128−set(DASH_APP unity8-dash)
129−set(SCOPE_TOOL unity-scope-tool)
130151set(INDICATORS_CLIENT_APP indicators-client)
152+set(GREETER_APP unity8-greeter)
131153set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
132154
133155include_directories(
@@ -136,8 +158,6 @@ include_directories(
136158 ${APPLICATION_API_INCLUDE_DIRS}
137159)
138160
139−set(ARTIFACTS_DIR "" CACHE PATH "Store test artifacts in this directory.")
140−
141161# Quiet logger
142162set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")
143163if(NOT QUIET_LOGGER)
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+39−16
@@ -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
67start 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
@@ -51,6 +65,9 @@ pre-start script
5165 # reduces lag seen in apps:
5266 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1
5367
68+ # Workaround for text not rendering correctly
69+ initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1
70+
5471 if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then
5572 # On Ubuntu Touch, we currently use a trick where we auto-login the
5673 # user without a LightDM greeter at all. In this case, we want to
@@ -60,6 +77,12 @@ pre-start script
6077 else
6178 initctl set-env MODE=full-shell
6279 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
6386end script
6487
6588exec ${BINARY:-unity8} --mode=$MODE $ARGS
@@ -70,7 +93,7 @@ end script
7093
7194post-stop script
7295 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
73− initctl unset-env --global UNITY_MIR_SOCKET
7496 initctl unset-env --global MIR_SERVER_PROMPT_FILE
7597 initctl emit application-end
98+ initctl emit indicator-services-end
7699end script
debian/changelog+909−20
@@ -1,3 +1,887 @@
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+
1885unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium
2886
3887 [ Michael Terry ]
@@ -340,7 +1224,7 @@ unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium
3401224unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
3411225
3421226 [ Michael Terry ]
343− *
1227+ *
3441228 * Fix setting OSK layout in OOBE wizard
3451229 * Stop the left edge tutorial from being shown when the bottom edge
3461230 tutorial wants to be shown after receiving a call.
@@ -3052,7 +3936,7 @@ unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium
30523936 * Re-architecture unity8 to use the QtMirCompositor library so that
30533937 the Qt scenegraph renderer is used as the Mir compositor, and
30543938 application surfaces are added to the QML scene as items.
3055−
3939+
30563940 [ Michael Zanetti ]
30573941 * Port phone right-edge spread code to use QtCompositor
30583942 * Add right-edge spread animation for tablet
@@ -3326,8 +4210,8 @@ unity8 (7.90+14.10.20140703.1-0ubuntu1) utopic; urgency=low
33264210
33274211unity8 (7.90+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
33284212
3329− * debian/control:
3330− list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
4213+ * debian/control:
4214+ list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
33314215 choice, since provides are not versionned, should restore installability
33324216 on amd64 and i386
33334217
@@ -6429,7 +7313,7 @@ unity8 (7.81.2) saucy; urgency=low
64297313 [ Michał Sawicz ]
64307314 * Fix icons in ApplicationsFilterGrid.qml.
64317315 * Support flipped image in run_on_device.
6432−
7316+
64337317 [ Michael Zanetti ]
64347318 * Don't clear lockscreen when it's fading out.
64357319 * Reworked Launcher folding.
@@ -6514,7 +7398,7 @@ qml-phone-shell (1.79) raring; urgency=low
65147398
65157399 [ Michael Terry ]
65167400 * Make greeter look like the desktop one
6517−
7401+
65187402 [ Gerry Boland ]
65197403 * Fix a bug where a minimized app gets focus after closing another app
65207404 * Applied a workaround to reduce flickering when launching apps
@@ -6530,7 +7414,7 @@ qml-phone-shell (1.79) raring; urgency=low
65307414qml-phone-shell (1.78) raring; urgency=low
65317415
65327416 [ Sergio Schvezov ]
6533− * 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
65347418 the launcher (LP: #1178262).
65357419
65367420 [ Daniel d'Andrada ]
@@ -6572,7 +7456,7 @@ qml-phone-shell (1.77) raring; urgency=low
65727456 [ Mathieu Trudel-Lapierre ]
65737457 * debian/control:
65747458 - Drop indicators-client-plugin* Depends for qml-phone-shell to Recommends.
6575− - 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.
65767460 * debian/copyright: fix syntax.
65777461
65787462 [ Michał Sawicz ]
@@ -6582,7 +7466,7 @@ qml-phone-shell (1.77) raring; urgency=low
65827466 * Renamed Media player files to match with new application name.
65837467
65847468 [ Daniel d'Andrada ]
6585− * New: DirectionalDragArea component. An area that detects axis-aligned
7469+ * New: DirectionalDragArea component. An area that detects axis-aligned
65867470 single-finger drag gestures.
65877471 * Make it possible to send touch events from within QML test code.
65887472
@@ -7019,7 +7903,7 @@ qml-phone-shell (1.39) quantal; urgency=low
70197903
70207904qml-phone-shell (1.38) quantal; urgency=low
70217905
7022− * fix launching of notepad
7906+ * fix launching of notepad
70237907
70247908 -- Bill Filler <bill.filler@canonical.com> Fri, 01 Feb 2013 03:21:29 -0500
70257909
@@ -7032,14 +7916,14 @@ qml-phone-shell (1.37) quantal; urgency=low
70327916
70337917qml-phone-shell (1.36) quantal; urgency=low
70347918
7035− * launch real notepad app
7919+ * launch real notepad app
70367920 * fix launching of mock apps
70377921
70387922 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 21:36:05 -0500
70397923
70407924qml-phone-shell (1.35) quantal; urgency=low
70417925
7042− * integrate ubuntu-browser instead of snowshoe
7926+ * integrate ubuntu-browser instead of snowshoe
70437927
70447928 -- Bill Filler <bill.filler@canonical.com> Thu, 31 Jan 2013 17:33:37 -0500
70457929
@@ -7123,7 +8007,7 @@ qml-phone-shell (1.22) quantal; urgency=low
71238007
71248008qml-phone-shell (1.21) quantal; urgency=low
71258009
7126− * New release with fullscreen launcher fixes
8010+ * New release with fullscreen launcher fixes
71278011
71288012 -- Bill Filler <bill.filler@canonical.com> Fri, 07 Dec 2012 09:36:37 +0000
71298013
@@ -7135,7 +8019,7 @@ qml-phone-shell (1.20) quantal; urgency=low
71358019
71368020qml-phone-shell (1.19) quantal; urgency=low
71378021
7138− * enable multi-threaded render for apps
8022+ * enable multi-threaded render for apps
71398023
71408024 -- Bill Filler <bill.filler@canonical.com> Wed, 05 Dec 2012 17:34:09 +0000
71418025
@@ -7143,7 +8027,7 @@ qml-phone-shell (1.18) quantal; urgency=low
71438027
71448028 [ Bill Filler ]
71458029 * update launcher to use wk2-render (chromeless webkit) for facebook
7146− and twitter
8030+ and twitter
71478031
71488032 -- Florian Boucault <florian.boucault@canonical.com> Wed, 05 Dec 2012 12:20:50 +0000
71498033
@@ -7155,7 +8039,7 @@ qml-phone-shell (1.17) quantal; urgency=low
71558039
71568040qml-phone-shell (1.16) quantal; urgency=low
71578041
7158− * fix to launch new gallery with correct args
8042+ * fix to launch new gallery with correct args
71598043
71608044 -- Bill Filler <bill.filler@canonical.com> Thu, 29 Nov 2012 17:04:36 -0500
71618045
@@ -7217,7 +8101,7 @@ qml-phone-shell (1.2) quantal; urgency=low
72178101
72188102qml-phone-shell (1.1) quantal; urgency=low
72198103
7220− * comment out console.log() to prevent crash
8104+ * comment out console.log() to prevent crash
72218105
72228106 -- Bill Filler <bill.filler@canonical.com> Sun, 28 Oct 2012 22:18:36 +0100
72238107
@@ -7245,19 +8129,19 @@ qml-phone-shell (0.7) quantal; urgency=low
72458129 * qml-phone-shell.conf: better setup of env vars and launch
72468130 via dbus-luanch to properly setup session bus
72478131 * shellapplication.cpp: don't setup custom env before launching
7248− processes
8132+ processes
72498133
72508134 -- Bill Filler <bill.filler@canonical.com> Sun, 21 Oct 2012 11:32:42 +0200
72518135
72528136qml-phone-shell (0.6) quantal; urgency=low
72538137
7254− * added additional Android env vars to upstart script
8138+ * added additional Android env vars to upstart script
72558139
72568140 -- Bill Filler <bill.filler@canonical.com> Fri, 19 Oct 2012 09:35:25 -0400
72578141
72588142qml-phone-shell (0.5) quantal; urgency=low
72598143
7260− * added support to launch telephony-app
8144+ * added support to launch telephony-app
72618145
72628146 -- Bill Filler <bill.filler@canonical.com> Thu, 18 Oct 2012 13:45:25 -0400
72638147
@@ -7284,3 +8168,8 @@ qml-phone-shell (0.1) quantal; urgency=low
72848168 * Initial release
72858169
72868170 -- 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−169
@@ -2,217 +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− dh-apparmor,
9− doxyqml,
10−# To allow cross-compiling to work, we also must append :native
11−# to g++ so we don't try to run armhf g++
12−# on an x86 CPU for example, when cross-compiling.
13− g++:native,
14− libandroid-properties-dev,
15− graphviz,
16− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
17− libconnectivity-qt1-dev (>= 0.7.1),
18− libevdev-dev,
19− libgeonames-dev (>= 0.2),
20− libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
21− libgl1-mesa-dri,
22− libgles2-mesa-dev[armhf],
23− libglib2.0-dev,
24− libgsettings-qt-dev,
25− libhardware-dev,
26− libpam0g-dev,
27− libpay2-dev,
28− libpulse-dev,
29− libqmenumodel-dev (>= 0.2.9),
30− libqt5svg5-dev,
31− libqt5xmlpatterns5-dev,
32− libsystemsettings-dev,
33− libubuntugestures5-dev,
34− libubuntugestures5-private-dev,
35− libudev-dev,
36− libunity-api-dev (>= 7.115),
37− libusermetricsoutput1-dev,
38−# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
39− libx11-dev[!armhf],
40− libxcb1-dev[!armhf],
41− libxi-dev[!armhf],
42−# End of X11 libs
43− pkg-config,
44− python3-all:any,
45− python3-setuptools,
46− qml-module-qt-labs-folderlistmodel,
47− qml-module-qtquick-layouts,
48− qml-module-qtquick-xmllistmodel,
49− qml-module-qtquick2,
50− qml-module-qtsysteminfo,
51− qml-module-qttest,
52− qt5-default,
53− qtbase5-dev (>= 5.4),
54− qtbase5-dev-tools,
55− qtbase5-private-dev (>= 5.4),
56− qtdeclarative5-dev (>= 5.4),
57− qtdeclarative5-dev-tools,
58− qtdeclarative5-private-dev (>= 5.4),
59− qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
60− qtdeclarative5-ubuntu-content1,
61− qtdeclarative5-ubuntu-settings-components (>= 0.7),
62− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
63− qtdeclarative5-ubuntu-web-plugin,
64− 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,
6576Standards-Version: 3.9.4
66−Homepage: http://launchpad.net/unity
67−# If you aren't a member of ~unity-team but need to upload
68−# packaging changes, just go ahead. ~unity-team will notice
69−# and sync up the code again.
70−Vcs-Bzr: https://code.launchpad.net/unity8
71−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
7279XS-Testsuite: autopkgtest
7380X-Ubuntu-Use-Langpack: yes
7481
7582Package: indicators-client
76−Architecture: amd64 armhf i386
77−Depends: qmenumodel-qml (>= 0.2.9),
78− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
79− unity8 (= ${binary:Version}),
80− ${misc:Depends},
81− ${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},
8290Description: Indicators client test application
8391 This package contains the client application for indicators used by autopilot
8492
85−Package: unity-scope-tool
93+Package: unity8-greeter
8694Architecture: any
87−Depends: unity8-common (= ${source:Version}),
88− unity8-private (= ${binary:Version}),
89− ${misc:Depends},
90− ${shlibs:Depends},
91−# We do call pkg-config libunity-scopes from the code
92− pkg-config,
93− libunity-scopes-dev,
94−Description: Development tool for Unity scopes
95− This package contains the development tool for new generation Unity scopes, based
96− 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.
97106
98107Package: unity8
99108Architecture: any
100−Provides: indicator-renderer,
101−Depends: dmz-cursor-theme,
102− gsettings-desktop-schemas,
103− libcap2-bin,
104− libglib2.0-bin,
105− qmenumodel-qml (>= 0.2.9),
106− qml-module-qt-labs-folderlistmodel,
107− qml-module-qtquick-xmllistmodel,
108− qml-module-qtsysteminfo,
109− qtdeclarative5-qtmir-plugin (>= 0.4.8),
110− qtdeclarative5-ubuntu-telephony0.1,
111− qtdeclarative5-ubuntu-web-plugin,
112− ubuntu-system-settings (>= 0.4),
113− unity-launcher-impl-7,
114− unity8-common (= ${source:Version}),
115− unity8-private (= ${binary:Version}),
116− unity8-private | unity-launcher-impl,
117− ${misc:Depends},
118− ${shlibs:Depends},
119−Recommends: indicator-session,
120− unity-scope-click,
121− unity-scope-mediascanner2,
122−Breaks: indicator-network (<< 0.5.1+14.10.20141014),
123− ubuntu-touch-session (<< 0.107),
124− unity8-greeter (<< 7.89),
125−Replaces: ubuntu-touch-session (<< 0.82~),
126− unity8-greeter (<< 7.89),
127−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,
128148Description: Unity 8 shell
129149 The Unity 8 shell is the primary user interface for Ubuntu devices.
130150
131151Package: unity8-common
132152Architecture: all
133−Depends: qml-module-qtquick-layouts,
134− qtdeclarative5-ubuntu-settings-components (>= 0.7),
135− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
136− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
137− qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
138− ubuntu-thumbnailer-impl-0,
139− unity-application-impl-17,
140− unity-notifications-impl-3,
141− unity-plugin-scopes | unity-scopes-impl,
142− unity-scopes-impl-12,
143− unity8-fake-env | unity-application-impl,
144− ${misc:Depends},
145−Breaks: unity8 (<< 7.86),
146−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),
147170Description: Unity 8 shell (common files)
148171 The Unity 8 shell is the primary user interface for Ubuntu devices.
149172 .
150− This package contains the QML, graphics and locale files shared between
151− unity8 and unity-scope-tool.
173+ This package contains the QML, graphics and locale files for unity8.
152174
153175Package: unity8-autopilot
154176Architecture: all
155−Depends: autopilot-qt5 (>= 1.4),
156− gir1.2-glib-2.0,
157− gir1.2-notify-0.7,
158− libqt5test5,
159− libqt5widgets5,
160− ofono-phonesim,
161− python3-autopilot,
162− python3-evdev,
163− python3-fixtures,
164− python3-gi,
165− qttestability-autopilot (>= 1.4),
166− ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
167− unity-scope-click,
168− unity8 (= ${source:Version}),
169− unity8-fake-env (= ${source:Version}),
170− url-dispatcher-tools,
171− xvfb,
172− ${misc:Depends},
173− ${python3:Depends},
174− ${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},
175196Description: Test package for Unity 8 shell
176197 Autopilot tests for the unity8 package
177198
178−Package: unity8-fake-env
199+Package: unity8-tests
179200Architecture: any
180201Multi-Arch: same
181−Pre-Depends: ${misc:Pre-Depends},
182−Depends: ${misc:Depends},
183− ${shlibs:Depends},
184−Provides: unity-application-impl,
185− unity-application-impl-16,
186−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
187−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
188224 Provides fake implementations of some QML modules used by Unity 8 shell
189− (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.
190227
191228Package: unity8-private
192229Architecture: any
193230Multi-Arch: same
194−Pre-Depends: ${misc:Pre-Depends},
195−Depends: accountsservice-ubuntu-schemas (>= 0.0.5),
196− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
197− libhardware2,
198− pay-service,
199− unity-schemas (>= 7.3.1+14.10.20140915),
200− qtdeclarative5-gsettings1.0,
201− qml-module-qtmultimedia,
202− ${misc:Depends},
203− ${shlibs:Depends},
204−Provides: unity-launcher-impl,
205− 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,
206245Description: Unity 8 private libs
207246 The Unity 8 shell is the primary user interface for Ubuntu devices.
208247 .
209248 This package contains the private libraries for QML and other components
210249 only used by the shell.
211250
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+
212265Package: unity8-doc
213266Section: doc
214267Architecture: all
215268Multi-Arch: foreign
216−Depends: ${misc:Depends},
269+Depends:
270+ ${misc:Depends},
217271Description: Documentation for Unity8
218272 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
debian/rules+23−8
@@ -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
@@ -29,14 +47,11 @@ override_dh_install:
2947 cd $(CURDIR)
3048 dh_install -X'*.pyc' --fail-missing
3149
32−override_dh_installdeb:
33− dh_apparmor --profile-name=usr.bin.unity8-dash -punity8-dash
34− dh_installdeb
35−
3650# use private lib directories
3751override_dh_makeshlibs:
38− dh_makeshlibs -Nunity8-private -Nunity8-fake-env
52+ dh_makeshlibs -Nunity8-private -Nunity8-tests
3953
40−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
4154override_dh_shlibdeps:
42− 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+2−3
@@ -1,17 +1,16 @@
11usr/lib/*/libunity8-private.*
22usr/lib/*/unity8/qml/AccountsService
33usr/lib/*/unity8/qml/Cursor
4−usr/lib/*/unity8/qml/Dash
54usr/lib/*/unity8/qml/GlobalShortcut
65usr/lib/*/unity8/qml/Greeter
7−usr/lib/*/unity8/qml/IntegratedLightDM
6+usr/lib/*/unity8/qml/LightDM
87usr/lib/*/unity8/qml/Lights
98usr/lib/*/unity8/qml/Powerd
109usr/lib/*/unity8/qml/ScreenshotDirectory
1110usr/lib/*/unity8/qml/SessionBroadcast
11+usr/lib/*/unity8/qml/UInput
1212usr/lib/*/unity8/qml/Ubuntu
1313usr/lib/*/unity8/qml/Unity
14−usr/lib/*/unity8/qml/UInput
1514usr/lib/*/unity8/qml/Utils
1615usr/lib/*/unity8/qml/WindowManager
1716usr/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−11
@@ -1,22 +1,19 @@
1−debian/usr.bin.unity8-dash etc/apparmor.d
2−var/lib/unity8/version
3−data/unity8-dash.conf usr/share/upstart/sessions/
1+data/devices.conf etc/ubuntu/
2+data/test.sensors etc/ubuntusensors/
43data/unity8-filewatcher.conf usr/share/upstart/sessions/
54data/unity8.conf usr/share/upstart/sessions/
6−data/devices.conf etc/ubuntu/
75usr/bin/unity8
8−usr/bin/unity8-dash
9−usr/share/applications/unity8-dash.desktop
106usr/share/applications/unity8.desktop
7+usr/share/unity8/ApplicationMenus
8+usr/share/unity8/DeviceConfiguration.qml
9+usr/share/unity8/DisabledScreenNotice.qml
1110usr/share/unity8/Greeter
1211usr/share/unity8/Launcher
12+usr/share/unity8/OrientedShell.qml
1313usr/share/unity8/Panel
1414usr/share/unity8/Rotation
15−usr/share/unity8/DeviceConfiguration.qml
16−usr/share/unity8/OrientedShell.qml
17−usr/share/unity8/DisabledScreenNotice.qml
1815usr/share/unity8/Shell.qml
19−usr/share/unity8/Stages
16+usr/share/unity8/Stage
2017usr/share/unity8/Tutorial
2118usr/share/unity8/Wizard
22−usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
19+var/lib/unity8/version
debian/usr.bin.unity8-dashdeleted−21
@@ -1,21 +0,0 @@
1−# vim:syntax=apparmor
2−
3−#include <tunables/global>
4−
5−# v2 compatible wildly permissive profile
6−profile unity8-dash /usr/bin/unity8-dash (attach_disconnected) {
7− capability,
8− network,
9− / rwkl,
10− /** rwlkm,
11− /** pix,
12−
13− mount,
14− remount,
15− umount,
16− pivot_root,
17− dbus,
18− signal,
19− ptrace,
20− unix,
21−}
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
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/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+2−3
@@ -1,4 +1,4 @@
1−include(QmlPlugins)
1+find_package(QmlPlugins)
22
33# Set up and install a plugin for unity8.
44#
@@ -15,9 +15,8 @@ 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)
2221add_subdirectory(ScreenshotDirectory)
2322add_subdirectory(SessionBroadcast)
plugins/Cursor/CMakeLists.txt+6−3
@@ -3,6 +3,10 @@ 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
@@ -22,8 +26,7 @@ add_library(Cursor-qml SHARED
2226target_link_libraries(Cursor-qml
2327 xcursorloader-static
2428 ${QT5PLATFORM_SUPPORT_LDFLAGS}
29+ Qt5::Qml Qt5::Quick Qt5::Svg
2530)
2631
27−qt5_use_modules(Cursor-qml Qml Quick DBus Network Gui Sql Concurrent Svg)
28−
29−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+29−11
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.4
1818import Cursor 1.1
19+import Powerd 0.1
1920
2021MousePointer {
2122 id: mousePointer
@@ -24,21 +25,38 @@ MousePointer {
2425 id: imageInfo
2526 themeName: mousePointer.themeName
2627 cursorName: mousePointer.cursorName
28+ cursorHeight: mousePointer.height
2729 }
2830
29− AnimatedSprite {
30− x: -imageInfo.hotspot.x
31− y: -imageInfo.hotspot.y
32− source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName
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
3337
34− interpolate: false
38+ interpolate: false
3539
36− width: imageInfo.frameWidth
37− height: imageInfo.frameHeight
40+ width: imageInfo.frameWidth
41+ height: imageInfo.frameHeight
3842
39− frameCount: imageInfo.frameCount
40− frameDuration: imageInfo.frameDuration
41− frameWidth: imageInfo.frameWidth
42− frameHeight: imageInfo.frameHeight
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+ }
4361 }
4462}
plugins/Cursor/CursorImageInfo.cpp+20−1
@@ -28,6 +28,15 @@ void CursorImageInfo::setCursorName(const QString &cursorName)
2828 update();
2929 Q_EMIT cursorNameChanged();
3030 }
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+ }
3140}
3241
3342void CursorImageInfo::setThemeName(const QString &themeName)
@@ -41,13 +50,14 @@ void CursorImageInfo::setThemeName(const QString &themeName)
4150
4251void CursorImageInfo::update()
4352{
44− m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName);
53+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName, (int) m_cursorHeight);
4554
4655 Q_EMIT hotspotChanged();
4756 Q_EMIT frameWidthChanged();
4857 Q_EMIT frameHeightChanged();
4958 Q_EMIT frameCountChanged();
5059 Q_EMIT frameDurationChanged();
60+ Q_EMIT imageSourceChanged();
5161}
5262
5363QPoint CursorImageInfo::hotspot() const
@@ -94,3 +104,12 @@ int CursorImageInfo::frameDuration() const
94104 return 0;
95105 }
96106}
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.h+10
@@ -21,6 +21,7 @@
2121
2222#include <QObject>
2323#include <QString>
24+#include <QUrl>
2425
2526class CursorImageInfo : public QObject
2627{
@@ -28,12 +29,14 @@ class CursorImageInfo : public QObject
2829
2930 Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)
3031 Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)
32+ Q_PROPERTY(qreal cursorHeight READ cursorHeight WRITE setCursorHeight NOTIFY cursorHeightChanged)
3133
3234 Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)
3335 Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)
3436 Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)
3537 Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)
3638 Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)
39+ Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)
3740
3841public:
3942 CursorImageInfo(QObject *parent = nullptr);
@@ -44,20 +47,26 @@ public:
4447 QString cursorName() const { return m_cursorName; }
4548 void setCursorName(const QString &);
4649
50+ qreal cursorHeight() const { return m_cursorHeight; }
51+ void setCursorHeight(qreal);
52+
4753 QPoint hotspot() const;
4854 qreal frameWidth() const;
4955 qreal frameHeight() const;
5056 int frameCount() const;
5157 int frameDuration() const;
58+ QUrl imageSource() const;
5259
5360Q_SIGNALS:
5461 void themeNameChanged();
5562 void cursorNameChanged();
63+ void cursorHeightChanged();
5664 void hotspotChanged();
5765 void frameWidthChanged();
5866 void frameHeightChanged();
5967 void frameCountChanged();
6068 void frameDurationChanged();
69+ void imageSourceChanged();
6170
6271private Q_SLOTS:
6372 void update();
@@ -65,6 +74,7 @@ private Q_SLOTS:
6574private:
6675 QString m_themeName;
6776 QString m_cursorName;
77+ qreal m_cursorHeight{0};
6878
6979 CursorImage *m_cursorImage{nullptr};
7080};
plugins/Cursor/CursorImageProvider.cpp+35−21
@@ -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,12 +42,14 @@ 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
4950 frameWidth = qimage.width();
5051 frameHeight = qimage.height();
52+ requestedHeight = cursorHeight;
5153
5254 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));
5355 svgRenderer->render(&imagePainter);
@@ -81,11 +83,9 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)
8183/////
8284// XCursorImage
8385
84−XCursorImage::XCursorImage(const QString &theme, const QString &file)
86+XCursorImage::XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx)
8587{
86− // TODO: Consider grid unit value
87− // Hardcoding to a medium size for now
88− int preferredCursorHeightPx = 32;
88+ requestedHeight = preferredCursorHeightPx;
8989
9090 XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),
9191 preferredCursorHeightPx);
@@ -96,7 +96,7 @@ XCursorImage::XCursorImage(const QString &theme, const QString &file)
9696 frameCount = xcursorImages->nimage;
9797
9898 for (int i = 0; i < xcursorImages->nimage; ++i) {
99− XcursorImage *xcursorImage = xcursorImages->images[0];
99+ XcursorImage *xcursorImage = xcursorImages->images[i];
100100 if (frameWidth < (int)xcursorImage->width) {
101101 frameWidth = xcursorImage->width;
102102 }
@@ -174,6 +174,8 @@ CursorImageProvider::CursorImageProvider()
174174 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("not-allowed"));
175175 m_fallbackNames[QStringLiteral("forbidden")].append(QStringLiteral("circle"));
176176
177+ m_fallbackNames[QStringLiteral("grabbing")].append(QStringLiteral("closedhand")); // Breeze
178+
177179 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));
178180 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));
179181
@@ -235,34 +237,43 @@ CursorImageProvider::~CursorImageProvider()
235237 m_instance = nullptr;
236238}
237239
238−QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSize *size, const QSize & /*requestedSize*/)
240+QImage CursorImageProvider::requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize & /*requestedSize*/)
239241{
240− CursorImage *cursorImage = fetchCursor(cursorThemeAndName);
242+ CursorImage *cursorImage = fetchCursor(cursorThemeAndNameAndHeight);
241243 size->setWidth(cursorImage->qimage.width());
242244 size->setHeight(cursorImage->qimage.height());
243245
244246 return cursorImage->qimage;
245247}
246248
247−CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)
249+CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndNameAndHeight)
248250{
249251 QString themeName;
250252 QString cursorName;
253+ int cursorHeight;
251254 {
252− QStringList themeAndNameList = cursorThemeAndName.split('/');
253− if (themeAndNameList.size() != 2) {
255+ QStringList themeAndNameList = cursorThemeAndNameAndHeight.split('/');
256+ if (themeAndNameList.size() != 3) {
254257 return nullptr;
255258 }
256259 themeName = themeAndNameList[0];
257260 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+ }
258269 }
259270
260− return fetchCursor(themeName, cursorName);
271+ return fetchCursor(themeName, cursorName, cursorHeight);
261272}
262273
263−CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName)
274+CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight)
264275{
265− CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName);
276+ CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName, cursorHeight);
266277
267278 // Try some fallbacks
268279 if (cursorImage->qimage.isNull()) {
@@ -271,7 +282,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
271282 int i = 0;
272283 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {
273284 qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);
274− cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i));
285+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i), cursorHeight);
275286 ++i;
276287 }
277288 }
@@ -281,14 +292,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
281292 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {
282293 qDebug() << "CursorImageProvider:" << cursorName
283294 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";
284− cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"));
295+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"), cursorHeight);
285296 }
286297
287298 if (cursorImage->qimage.isNull()) {
288299 // finally, go for the built-in cursor
289300 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";
290− if (!m_builtInCursorImage) {
291− m_builtInCursorImage.reset(new BuiltInCursorImage);
301+ if (!m_builtInCursorImage || m_builtInCursorImage->requestedHeight != cursorHeight) {
302+ m_builtInCursorImage.reset(new BuiltInCursorImage(cursorHeight));
292303 }
293304 cursorImage = m_builtInCursorImage.data();
294305 }
@@ -296,7 +307,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS
296307 return cursorImage;
297308}
298309
299−CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)
310+CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight)
300311{
301312 if (cursorName == QLatin1String("blank")) {
302313 return &m_blankCursorImage;
@@ -306,7 +317,10 @@ CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, co
306317 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];
307318
308319 if (!themeCursors.contains(cursorName)) {
309− 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);
310324 }
311325
312326 return themeCursors[cursorName];
plugins/Cursor/CursorImageProvider.h+9−6
@@ -42,17 +42,20 @@ public:
4242 int frameHeight{0};
4343 int frameCount{1};
4444 int frameDuration{40};
45+
46+ // Requested height when creating this cursor.
47+ int requestedHeight{0};
4548};
4649
4750class XCursorImage : public CursorImage {
4851public:
49− XCursorImage(const QString &theme, const QString &file);
52+ XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx);
5053 virtual ~XCursorImage();
5154};
5255
5356class BuiltInCursorImage : public CursorImage {
5457public:
55− BuiltInCursorImage();
58+ BuiltInCursorImage(int cursorHeight);
5659};
5760
5861class BlankCursorImage : public CursorImage {
@@ -74,15 +77,15 @@ public:
7477 static CursorImageProvider *instance() { return m_instance; }
7578
7679
77− QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;
80+ QImage requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize &requestedSize) override;
7881
79− CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);
82+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight);
8083
8184 void setCustomCursor(const QCursor &customCursor);
8285
8386private:
84− CursorImage *fetchCursor(const QString &cursorThemeAndName);
85− 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);
8689
8790 // themeName -> (cursorName -> cursorImage)
8891 // TODO: discard old, unused, cursors
plugins/Cursor/MousePointer.cpp+90−13
@@ -22,6 +22,7 @@
2222
2323#include <QQuickWindow>
2424#include <QGuiApplication>
25+#include <QtMath>
2526
2627#include <qpa/qwindowsysteminterface.h>
2728
@@ -49,28 +50,77 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse
4950 m_accumulatedMovement -= appliedMovement;
5051
5152 qreal newX = x() + appliedMovement.x();
52− if (newX < 0) {
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
5374 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
54− newX = 0;
55− } else if (newX > parentItem()->width()) {
56− Q_EMIT pushedRightBoundary(newX - parentItem()->width(), buttons);
57− 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+ }
5887 }
59− setX(newX);
6088
61− qreal newY = y() + appliedMovement.y();
62− if (newY < 0) {
63− newY = 0;
64− } else if (newY > parentItem()->height()) {
65− newY = parentItem()->height();
66− }
67− setY(newY);
89+ applyItemConfinement(newX, newY);
90+
91+ setX(qBound(0.0, newX, sceneWidth - 1));
92+ setY(qBound(0.0, newY, sceneHeight - 1));
6893
6994 QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
7095 QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
7196 buttons, modifiers);
7297}
7398
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+
74124void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
75125{
76126 if (!parentItem()) {
@@ -82,6 +132,20 @@ void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::Keyb
82132 QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
83133}
84134
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+
85149void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
86150{
87151 if (change == ItemSceneChange) {
@@ -156,3 +220,16 @@ void MousePointer::setCustomCursor(const QCursor &customCursor)
156220{
157221 CursorImageProvider::instance()->setCustomCursor(customCursor);
158222}
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+23
@@ -27,6 +27,8 @@
2727
2828class MousePointer : public MirMousePointerInterface {
2929 Q_OBJECT
30+ Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)
31+ Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)
3032public:
3133 MousePointer(QQuickItem *parent = nullptr);
3234
@@ -38,6 +40,12 @@ public:
3840
3941 void setCustomCursor(const QCursor &) override;
4042
43+ QQuickItem* confiningItem() const;
44+ void setConfiningItem(QQuickItem*);
45+
46+ int topBoundaryOffset() const;
47+ void setTopBoundaryOffset(int topBoundaryOffset);
48+
4149public Q_SLOTS:
4250 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
4351 Qt::KeyboardModifiers modifiers) override;
@@ -46,7 +54,16 @@ public Q_SLOTS:
4654Q_SIGNALS:
4755 void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
4856 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();
4963 void mouseMoved();
64+ void confiningItemChanged();
65+
66+ void topBoundaryOffsetChanged(int topBoundaryOffset);
5067
5168protected:
5269 void itemChange(ItemChange change, const ItemChangeData &value) override;
@@ -56,6 +73,7 @@ private Q_SLOTS:
5673
5774private:
5875 void registerWindow(QWindow *window);
76+ void applyItemConfinement(qreal &newX, qreal &newY);
5977
6078 QPointer<QWindow> m_registeredWindow;
6179 QPointer<QScreen> m_registeredScreen;
@@ -64,6 +82,11 @@ private:
6482
6583 // Accumulated, unapplied, mouse movement.
6684 QPointF m_accumulatedMovement;
85+
86+ QPointer<QQuickItem> m_confiningItem;
87+
88+ int m_topBoundaryOffset{0};
89+ bool m_pushing{false};
6790};
6891
6992#endif // MOUSEPOINTER_H
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: theme.palette.normal.activity
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−1000
@@ -1,1000 +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 the aspect of the UbuntuShape
63−var kArtUbuntuShapeCode = 'UbuntuShape { \n\
64− anchors.fill: parent; \n\
65− source: artImage; \n\
66− sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
67− radius: "medium"; \n\
68− aspect: %1; \n\
69− }';
70−
71−var kArtProportionalShapeCode = 'ProportionalShape { \n\
72− anchors.left: parent.left; \n\
73− anchors.right: parent.right; \n\
74− source: artImage; \n\
75− aspect: UbuntuShape.DropShadow; \n\
76− }';
77−
78−// %1 is used as anchors of artShapeHolder
79−// %2 is used as image width
80−// %3 is used as image height
81−// %4 is whether the image should be visible
82−// %5 is whether the loader should be asynchronous or not
83−// %6 is the shape code we want to use
84−// %7 is injected as code to artImage
85−// %8 is used as image fallback
86−var kArtShapeHolderCode = 'Item { \n\
87− id: artShapeHolder; \n\
88− height: root.fixedArtShapeSize.height; \n\
89− width: root.fixedArtShapeSize.width; \n\
90− anchors { %1 } \n\
91− Loader { \n\
92− id: artShapeLoader; \n\
93− objectName: "artShapeLoader"; \n\
94− readonly property string cardArt: cardData && cardData["art"] || %8; \n\
95− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
96− active: cardArt != ""; \n\
97− asynchronous: %5; \n\
98− visible: status == Loader.Ready; \n\
99− sourceComponent: Item { \n\
100− id: artShape; \n\
101− objectName: "artShape"; \n\
102− visible: image.status == Image.Ready; \n\
103− readonly property alias image: artImage; \n\
104− %6 \n\
105− width: root.fixedArtShapeSize.width; \n\
106− height: root.fixedArtShapeSize.height; \n\
107− CroppedImageMinimumSourceSize { \n\
108− id: artImage; \n\
109− objectName: "artImage"; \n\
110− source: artShapeLoader.cardArt; \n\
111− asynchronous: %5; \n\
112− visible: %4; \n\
113− width: %2; \n\
114− height: %3; \n\
115− %7 \n\
116− } \n\
117− } \n\
118− } \n\
119− }\n';
120−
121−// %1 is used as anchors of artShapeHolder
122−// %2 is used as image width
123−// %3 is used as image height
124−// %4 is whether the image should be visible
125−// %5 is whether the loader should be asynchronous or not
126−// %6 is the shape code we want to use
127−// %7 is injected as code to artImage
128−// %8 is used as image fallback
129−var kArtShapeHolderCodeCardToolCard = 'Item { \n\
130− id: artShapeHolder; \n\
131− height: artShapeLoader.height; \n\
132− width: artShapeLoader.width; \n\
133− anchors { %1 } \n\
134− Loader { \n\
135− id: artShapeLoader; \n\
136− objectName: "artShapeLoader"; \n\
137− readonly property string cardArt: cardData && cardData["art"] || %8; \n\
138− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
139− active: cardArt != ""; \n\
140− asynchronous: %5; \n\
141− visible: status == Loader.Ready; \n\
142− sourceComponent: Item { \n\
143− id: artShape; \n\
144− objectName: "artShape"; \n\
145− visible: image.status == Image.Ready; \n\
146− readonly property alias image: artImage; \n\
147− %6 \n\
148− width: image.status !== Image.Ready ? 0 : image.width; \n\
149− height: image.status !== Image.Ready ? 0 : image.height; \n\
150− CroppedImageMinimumSourceSize { \n\
151− id: artImage; \n\
152− objectName: "artImage"; \n\
153− source: artShapeLoader.cardArt; \n\
154− asynchronous: %5; \n\
155− visible: %4; \n\
156− width: %2; \n\
157− height: %3; \n\
158− %7 \n\
159− } \n\
160− } \n\
161− } \n\
162− }\n';
163−
164−// %1 is anchors.fill
165−// %2 is width
166−// %3 is height
167−// %4 is whether the icon should be asynchronous or not
168−var kAudioButtonCode = 'AbstractButton { \n\
169− id: audioButton; \n\
170− anchors.fill: %1; \n\
171− width: %2; \n\
172− height: %3; \n\
173− readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
174− UbuntuShape { \n\
175− anchors.fill: parent; \n\
176− visible: parent.pressed; \n\
177− radius: "medium"; \n\
178− } \n\
179− Rectangle { \n\
180− color: Qt.rgba(0, 0, 0, 0.5); \n\
181− anchors.centerIn: parent; \n\
182− width: parent.width * 0.5; \n\
183− height: width; \n\
184− radius: width / 2; \n\
185− } \n\
186− Icon { \n\
187− anchors.centerIn: parent; \n\
188− width: parent.width * 0.3; \n\
189− height: width; \n\
190− opacity: 0.9; \n\
191− name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
192− color: "white"; \n\
193− asynchronous: %4; \n\
194− } \n\
195− onClicked: { \n\
196− if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
197− if (DashAudioPlayer.playing) { \n\
198− DashAudioPlayer.pause(); \n\
199− } else { \n\
200− DashAudioPlayer.play(); \n\
201− } \n\
202− } else { \n\
203− var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\
204− DashAudioPlayer.playSource(source, playlist); \n\
205− } \n\
206− } \n\
207− onPressAndHold: { \n\
208− root.pressAndHold(); \n\
209− } \n\
210− }';
211−
212−// %1 is whether the loader should be asynchronous or not
213−// %2 is the header height code
214−var kOverlayLoaderCode = 'Loader { \n\
215− id: overlayLoader; \n\
216− readonly property real overlayHeight: %2 + units.gu(2); \n\
217− anchors.fill: artShapeHolder; \n\
218− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
219− asynchronous: %1; \n\
220− visible: showHeader && status == Loader.Ready; \n\
221− sourceComponent: UbuntuShapeOverlay { \n\
222− id: overlay; \n\
223− property real luminance: Style.luminance(overlayColor); \n\
224− aspect: UbuntuShape.Flat; \n\
225− radius: "medium"; \n\
226− overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
227− overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\
228− } \n\
229− }\n';
230−
231−// multiple row version of HeaderRowCode
232−function kHeaderRowCodeGenerator() {
233− var kHeaderRowCodeTemplate = 'Row { \n\
234− id: row; \n\
235− objectName: "outerRow"; \n\
236− property real margins: units.gu(1); \n\
237− spacing: margins; \n\
238− %2\
239− anchors { %1 } \n\
240− anchors.right: parent.right; \n\
241− anchors.margins: margins; \n\
242− anchors.rightMargin: 0; \n\
243− data: [ \n\
244− %3 \n\
245− ] \n\
246− }\n';
247− var args = Array.prototype.slice.call(arguments);
248− var isCardTool = args.shift();
249− var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
250− var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
251− return code;
252−}
253−
254−// multiple item version of kHeaderContainerCode
255−function kHeaderContainerCodeGenerator() {
256− var headerContainerCodeTemplate = 'Item { \n\
257− id: headerTitleContainer; \n\
258− anchors { %1 } \n\
259− width: parent.width - x; \n\
260− implicitHeight: %2; \n\
261− data: [ \n\
262− %3 \n\
263− ]\n\
264− }\n';
265− var args = Array.prototype.slice.call(arguments);
266− var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));
267− return code;
268−}
269−
270−// %1 is used as anchors of mascotShapeLoader
271−// %2 is whether the loader should be asynchronous or not
272−var kMascotShapeLoaderCode = 'Loader { \n\
273− id: mascotShapeLoader; \n\
274− objectName: "mascotShapeLoader"; \n\
275− asynchronous: %2; \n\
276− active: mascotImage.status === Image.Ready; \n\
277− visible: showHeader && active && status == Loader.Ready; \n\
278− width: units.gu(6); \n\
279− height: units.gu(5.625); \n\
280− sourceComponent: UbuntuShape { image: mascotImage } \n\
281− anchors { %1 } \n\
282− }\n';
283−
284−// %1 is used as anchors of mascotImage
285−// %2 is used as visible of mascotImage
286−// %3 is injected as code to mascotImage
287−// %4 is used as fallback image
288−var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
289− id: mascotImage; \n\
290− objectName: "mascotImage"; \n\
291− anchors { %1 } \n\
292− source: cardData && cardData["mascot"] || %4; \n\
293− width: units.gu(6); \n\
294− height: units.gu(5.625); \n\
295− horizontalAlignment: Image.AlignHCenter; \n\
296− verticalAlignment: Image.AlignVCenter; \n\
297− visible: %2; \n\
298− %3 \n\
299− }\n';
300−
301−// %1 is used as anchors of titleLabel
302−// %2 is used as color of titleLabel
303−// %3 is used as extra condition for visible of titleLabel
304−// %4 is used as title width
305−// %5 is used as horizontal alignment
306−var kTitleLabelCode = 'Label { \n\
307− id: titleLabel; \n\
308− objectName: "titleLabel"; \n\
309− anchors { %1 } \n\
310− elide: Text.ElideRight; \n\
311− fontSize: "small"; \n\
312− wrapMode: Text.Wrap; \n\
313− maximumLineCount: 2; \n\
314− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
315− color: %2; \n\
316− visible: showHeader %3; \n\
317− width: %4; \n\
318− text: root.title; \n\
319− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
320− horizontalAlignment: %5; \n\
321− }\n';
322−
323−// %1 is used as extra anchors of emblemIcon
324−// %2 is used as color of emblemIcon
325−// FIXME The width code is a
326−// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
327−var kEmblemIconCode = 'Icon { \n\
328− id: emblemIcon; \n\
329− objectName: "emblemIcon"; \n\
330− anchors { \n\
331− bottom: titleLabel.baseline; \n\
332− right: parent.right; \n\
333− %1 \n\
334− } \n\
335− source: cardData && cardData["emblem"] || ""; \n\
336− color: %2; \n\
337− height: source != "" ? titleLabel.font.pixelSize : 0; \n\
338− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
339− }\n';
340−
341−// %1 is used as anchors of touchdown effect
342−var kTouchdownCode = 'UbuntuShape { \n\
343− id: touchdown; \n\
344− objectName: "touchdown"; \n\
345− anchors { %1 } \n\
346− visible: root.pressed; \n\
347− radius: "medium"; \n\
348− borderSource: "radius_pressed.sci" \n\
349− }\n';
350−
351−// %1 is used as anchors of subtitleLabel
352−// %2 is used as color of subtitleLabel
353−var kSubtitleLabelCode = 'Label { \n\
354− id: subtitleLabel; \n\
355− objectName: "subtitleLabel"; \n\
356− anchors { %1 } \n\
357− anchors.topMargin: units.dp(2); \n\
358− elide: Text.ElideRight; \n\
359− maximumLineCount: 1; \n\
360− fontSize: "x-small"; \n\
361− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
362− color: %2; \n\
363− visible: titleLabel.visible && titleLabel.text; \n\
364− text: cardData && cardData["subtitle"] || ""; \n\
365− font.weight: Font.Light; \n\
366− }\n';
367−
368−// %1 is used as anchors of attributesRow
369−// %2 is used as color of attributesRow
370−var kAttributesRowCode = 'CardAttributes { \n\
371− id: attributesRow; \n\
372− objectName: "attributesRow"; \n\
373− anchors { %1 } \n\
374− color: %2; \n\
375− fontScale: root.fontScale; \n\
376− model: cardData && cardData["attributes"]; \n\
377− }\n';
378−
379−// %1 is used as anchors of socialActionsRow
380−// %2 is used as color of socialActionsRow
381−var kSocialActionsRowCode = 'CardSocialActions { \n\
382− id: socialActionsRow; \n\
383− objectName: "socialActionsRow"; \n\
384− anchors { %1 } \n\
385− color: %2; \n\
386− model: cardData && cardData["socialActions"]; \n\
387− onClicked: root.action(actionId); \n\
388− }\n';
389−
390−// %1 is used as top anchor of summary
391−// %2 is used as topMargin anchor of summary
392−// %3 is used as color of summary
393−var kSummaryLabelCode = 'Label { \n\
394− id: summary; \n\
395− objectName: "summaryLabel"; \n\
396− anchors { \n\
397− top: %1; \n\
398− left: parent.left; \n\
399− right: parent.right; \n\
400− margins: units.gu(1); \n\
401− topMargin: %2; \n\
402− } \n\
403− wrapMode: Text.Wrap; \n\
404− maximumLineCount: 5; \n\
405− elide: Text.ElideRight; \n\
406− text: cardData && cardData["summary"] || ""; \n\
407− height: text ? implicitHeight : 0; \n\
408− fontSize: "small"; \n\
409− color: %3; \n\
410− }\n';
411−
412−// %1 is used as bottom anchor of audio progress bar
413−// %2 is used as left anchor of audio progress bar
414−// %3 is used as text color
415−var kAudioProgressBarCode = 'CardAudioProgress { \n\
416− id: audioProgressBar; \n\
417− duration: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["duration"]) || 0; \n\
418− source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\
419− anchors { \n\
420− bottom: %1; \n\
421− left: %2; \n\
422− right: parent.right; \n\
423− margins: units.gu(1); \n\
424− } \n\
425− color: %3; \n\
426− }';
427−
428−function sanitizeColor(colorString) {
429− if (colorString !== undefined) {
430− if (colorString.match(/^[#a-z0-9]*$/i) === null) {
431− // This is not the perfect regexp for color
432− // but what we're trying to do here is just protect
433− // against injection so it's ok
434− return "";
435− }
436− }
437− return colorString;
438−}
439−
440−function cardString(template, components, isCardTool, artShapeStyle) {
441− var code;
442−
443− var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
444−
445− code = 'AbstractButton { \n\
446− id: root; \n\
447− property var cardData; \n\
448− property string backgroundShapeStyle: "inset"; \n\
449− property real fontScale: 1.0; \n\
450− property var scopeStyle: null; \n\
451− readonly property string title: cardData && cardData["title"] || ""; \n\
452− property bool showHeader: true; \n\
453− implicitWidth: childrenRect.width; \n\
454− enabled: %1; \n\
455− \n'.arg(templateInteractive);
456−
457− if (!isCardTool) {
458− code += "property int fixedHeaderHeight: -1; \n\
459− property size fixedArtShapeSize: Qt.size(-1, -1); \n";
460− }
461−
462− var hasArt = components["art"] && components["art"]["field"] || false;
463− var hasSummary = components["summary"] || false;
464− var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
465− var artAndSummary = hasArt && hasSummary && !isConciergeMode;
466− var isHorizontal = template["card-layout"] === "horizontal";
467− var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
468− (hasSummary && (template["card-background"] || components["background"]));
469− var hasTitle = components["title"] || false;
470− var hasMascot = components["mascot"] || false;
471− var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
472− var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
473− var hasSubtitle = hasTitle && components["subtitle"] || false;
474− var hasHeaderRow = hasMascot && hasTitle;
475− var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
476− var hasSocialActions = hasTitle && components["social-actions"] || false;
477− var isAudio = template["quick-preview-type"] === "audio";
478− var asynchronous = isCardTool ? "false" : "true";
479−
480− code += 'signal action(var actionId);\n';
481− if (isAudio) {
482− // For now we only support audio cards with [optional] art, title, subtitle
483− // in horizontal mode
484− // Anything else makes it behave not like an audio card
485− if (hasSummary) isAudio = false;
486− if (!isHorizontal) isAudio = false;
487− if (hasMascot) isAudio = false;
488− if (hasEmblem) isAudio = false;
489− if (headerAsOverlay) isAudio = false;
490− if (hasAttributes) isAudio = false;
491− }
492−
493− if (hasBackground) {
494− var templateCardBackground;
495− if (template && typeof template["card-background"] === "string") {
496− templateCardBackground = 'decodeURI("' + encodeURI(template["card-background"]) + '")';
497− } else {
498− templateCardBackground = '""';
499− }
500−
501− var backgroundElements0;
502− var backgroundElements1;
503− if (template && typeof template["card-background"] === "object" && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
504− var element0 = sanitizeColor(template["card-background"]["elements"][0]);
505− var element1 = sanitizeColor(template["card-background"]["elements"][1]);
506− if (element0 !== undefined) {
507− backgroundElements0 = '"%1"'.arg(element0);
508− }
509− if (element1 !== undefined) {
510− backgroundElements1 = '"%1"'.arg(element1);
511− }
512− }
513− code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
514− }
515−
516− if (hasArt) {
517− code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
518−
519− var artShapeAspect;
520− if (isCardTool) {
521− var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;
522− if (isNaN(artShapeAspect)) {
523− artShapeAspect = 1;
524− }
525− } else {
526− artShapeAspect = "(root.fixedArtShapeSize.width / root.fixedArtShapeSize.height)";
527− }
528−
529− var widthCode, heightCode;
530− var artAnchors;
531− if (isHorizontal) {
532− artAnchors = 'left: parent.left';
533− if (hasMascot || hasTitle) {
534− widthCode = 'height * ' + artShapeAspect;
535− heightCode = 'headerHeight + 2 * units.gu(1)';
536− } else {
537− // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?
538− // So we define a "random" height of the image height + 2 gu for the margins
539− widthCode = 'height * ' + artShapeAspect
540− heightCode = 'units.gu(7.625)';
541− }
542− } else {
543− artAnchors = 'horizontalCenter: parent.horizontalCenter;';
544− widthCode = 'root.width'
545− heightCode = 'width / ' + artShapeAspect;
546− }
547−
548− var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";
549− fallback = encodeURI(fallback);
550− var fallbackStatusCode = "";
551− var fallbackURICode = '""';
552− if (fallback !== "") {
553− // fallbackStatusCode has %8 in it because we want to substitute it for fallbackURICode
554− // which in kArtShapeHolderCode is %8
555− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
556− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
557− }
558− var artShapeHolderShapeCode;
559− if (!isConciergeMode) {
560− if (artShapeStyle === "icon") {
561− artShapeHolderShapeCode = kArtProportionalShapeCode;
562− } else {
563− var artShapeHolderShapeAspect;
564− switch (artShapeStyle) {
565− case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;
566− case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;
567− default:
568− case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;
569− }
570− artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(artShapeHolderShapeAspect);
571− }
572− } else {
573− artShapeHolderShapeCode = "";
574− }
575− var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;
576− code += artShapeHolderCode.arg(artAnchors)
577− .arg(widthCode)
578− .arg(heightCode)
579− .arg(isConciergeMode ? "true" : "false")
580− .arg(asynchronous)
581− .arg(artShapeHolderShapeCode)
582− .arg(fallbackStatusCode)
583− .arg(fallbackURICode);
584− } else {
585− code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
586− }
587−
588− if (headerAsOverlay) {
589− var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
590− code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
591− }
592−
593− var headerVerticalAnchors;
594− if (headerAsOverlay) {
595− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\
596− bottomMargin: units.gu(1);\n';
597− } else {
598− if (hasArt) {
599− if (isHorizontal) {
600− headerVerticalAnchors = 'top: artShapeHolder.top; \n\
601− topMargin: units.gu(1);\n';
602− } else {
603− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\
604− topMargin: units.gu(1);\n';
605− }
606− } else {
607− headerVerticalAnchors = 'top: parent.top; \n\
608− topMargin: units.gu(1);\n';
609− }
610− }
611−
612− var headerLeftAnchor;
613− var headerLeftAnchorHasMargin = false;
614− if (isHorizontal && hasArt) {
615− headerLeftAnchor = 'left: artShapeHolder.right; \n\
616− leftMargin: units.gu(1);\n';
617− headerLeftAnchorHasMargin = true;
618− } else if (isHorizontal && isAudio) {
619− headerLeftAnchor = 'left: audioButton.right; \n\
620− leftMargin: units.gu(1);\n';
621− headerLeftAnchorHasMargin = true;
622− } else {
623− headerLeftAnchor = 'left: parent.left;\n';
624− }
625−
626− var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary && !isAudio;
627−
628− if (hasHeaderRow) {
629− code += 'readonly property int headerHeight: row.height;\n'
630− } else if (hasMascot) {
631− code += 'readonly property int headerHeight: mascotImage.height;\n'
632− } else if (hasAttributes) {
633− if (hasTitle && hasSubtitle) {
634− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'
635− } else if (hasTitle) {
636− code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'
637− } else {
638− code += 'readonly property int headerHeight: attributesRow.height;\n'
639− }
640− } else if (isAudio) {
641− if (hasSubtitle) {
642− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
643− } else if (hasTitle) {
644− code += 'readonly property int headerHeight: titleLabel.height + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'
645− } else {
646− code += 'readonly property int headerHeight: audioProgressBar.height;\n'
647− }
648− } else if (hasSubtitle) {
649− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'
650− } else if (hasTitle) {
651− code += 'readonly property int headerHeight: titleLabel.height;\n'
652− } else {
653− code += 'readonly property int headerHeight: 0;\n'
654− }
655−
656− var mascotShapeCode = '';
657− var mascotCode = '';
658− if (hasMascot) {
659− var useMascotShape = !hasBackground && !headerAsOverlay;
660− var mascotAnchors = '';
661− if (!hasHeaderRow) {
662− mascotAnchors += headerLeftAnchor;
663− mascotAnchors += headerVerticalAnchors;
664− if (!headerLeftAnchorHasMargin) {
665− mascotAnchors += 'leftMargin: units.gu(1);\n'
666− }
667− } else {
668− mascotAnchors = 'verticalCenter: parent.verticalCenter;'
669− }
670−
671− if (useMascotShape) {
672− mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
673− }
674−
675− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
676− var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
677− fallback = encodeURI(fallback);
678− var fallbackStatusCode = "";
679− var fallbackURICode = '""';
680− if (fallback !== "") {
681− // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode
682− // which in kMascotImageCode is %4
683− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %4;';
684− fallbackURICode = 'decodeURI("%1")'.arg(fallback);
685− }
686− mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackStatusCode).arg(fallbackURICode);
687− }
688−
689− 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")';
690−
691− var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
692− var titleSubtitleCode = '';
693− if (hasTitle) {
694− var titleColor;
695− if (headerAsOverlay) {
696− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
697− } else if (hasSummary) {
698− titleColor = 'summary.color';
699− } else if (hasBackground) {
700− titleColor = summaryColorWithBackground;
701− } else {
702− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
703− }
704−
705− var titleAnchors;
706− var subtitleAnchors;
707− var attributesAnchors;
708− var titleContainerAnchors;
709− var titleRightAnchor;
710− var titleWidth = "undefined";
711−
712− var extraRightAnchor = '';
713− var extraLeftAnchor = '';
714− if (!touchdownOnArtShape) {
715− extraRightAnchor = 'rightMargin: units.gu(1); \n';
716− extraLeftAnchor = 'leftMargin: units.gu(1); \n';
717− } else if (headerAsOverlay && !hasEmblem) {
718− extraRightAnchor = 'rightMargin: units.gu(1); \n';
719− }
720−
721− if (hasMascot) {
722− titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
723− } else {
724− titleContainerAnchors = 'right: parent.right; ';
725− titleContainerAnchors += headerLeftAnchor;
726− titleContainerAnchors += headerVerticalAnchors;
727− if (!headerLeftAnchorHasMargin) {
728− titleContainerAnchors += extraLeftAnchor;
729− }
730− }
731− if (hasEmblem) {
732− titleRightAnchor = 'right: emblemIcon.left; \n\
733− rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';
734− } else {
735− titleRightAnchor = 'right: parent.right; \n'
736− titleRightAnchor += extraRightAnchor;
737− }
738−
739− if (hasTitleContainer) {
740− // Using headerTitleContainer
741− titleAnchors = titleRightAnchor;
742− titleAnchors += 'left: parent.left; \n\
743− top: parent.top;';
744− subtitleAnchors = 'right: parent.right; \n\
745− left: parent.left; \n';
746− subtitleAnchors += extraRightAnchor;
747− if (hasSubtitle) {
748− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
749− subtitleAnchors += 'top: titleLabel.bottom;\n';
750− } else {
751− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
752− }
753− } else if (hasMascot) {
754− // Using row without titleContainer
755− titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
756− titleWidth = "parent.width - x";
757− } else {
758− if (headerAsOverlay) {
759− // Using anchors to the overlay
760− titleAnchors = titleRightAnchor;
761− titleAnchors += 'left: parent.left; \n\
762− leftMargin: units.gu(1); \n\
763− top: overlayLoader.top; \n\
764− topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';
765− } else {
766− // Using anchors to the mascot/parent
767− titleAnchors = titleRightAnchor;
768− titleAnchors += headerLeftAnchor;
769− titleAnchors += headerVerticalAnchors;
770− if (!headerLeftAnchorHasMargin) {
771− titleAnchors += extraLeftAnchor;
772− }
773− }
774− subtitleAnchors = 'left: titleLabel.left; \n\
775− leftMargin: titleLabel.leftMargin; \n';
776− subtitleAnchors += extraRightAnchor;
777− if (hasEmblem) {
778− // using container
779− subtitleAnchors += 'right: parent.right; \n';
780− } else {
781− subtitleAnchors += 'right: titleLabel.right; \n';
782− }
783−
784− if (hasSubtitle) {
785− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
786− subtitleAnchors += 'top: titleLabel.bottom;\n';
787− } else {
788− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
789− }
790− }
791−
792− var titleAlignment = "Text.AlignHCenter";
793− if (template["card-layout"] === "horizontal"
794− || typeof components["title"] !== "object"
795− || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
796− var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
797− for (var key in keys) {
798− key = keys[key];
799− try {
800− if (typeof components[key] === "string"
801− || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
802− } catch (e) {
803− continue;
804− }
805− }
806−
807− // code for different elements
808− var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
809− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
810− var subtitleCode;
811− var attributesCode;
812−
813− // code for the title container
814− var containerCode = [];
815− var containerHeight = 'titleLabel.height';
816− containerCode.push(titleCode);
817− if (hasSubtitle) {
818− subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);
819− containerCode.push(subtitleCode);
820− containerHeight += ' + subtitleLabel.height';
821− }
822− if (hasEmblem) {
823− containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));
824− }
825− if (hasAttributes) {
826− attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
827− containerCode.push(attributesCode);
828− containerHeight += ' + attributesRow.height';
829− }
830−
831− if (hasTitleContainer) {
832− // use container
833− titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);
834− } else {
835− // no container
836− titleSubtitleCode = titleCode;
837− if (hasSubtitle) {
838− titleSubtitleCode += subtitleCode;
839− }
840− if (hasAttributes) {
841− titleSubtitleCode += attributesCode;
842− }
843− }
844− }
845−
846− if (hasHeaderRow) {
847− var rowCode = [mascotCode, titleSubtitleCode];
848− if (mascotShapeCode != '') {
849− rowCode.unshift(mascotShapeCode);
850− }
851− code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
852− } else {
853− code += mascotShapeCode + mascotCode + titleSubtitleCode;
854− }
855−
856− if (isAudio) {
857− var audioProgressBarLeftAnchor = 'audioButton.right';
858− var audioProgressBarBottomAnchor = 'audioButton.bottom';
859− var audioProgressBarTextColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
860−
861− code += kAudioProgressBarCode.arg(audioProgressBarBottomAnchor)
862− .arg(audioProgressBarLeftAnchor)
863− .arg(audioProgressBarTextColor);
864−
865− var audioButtonAnchorsFill;
866− var audioButtonWidth;
867− var audioButtonHeight;
868− if (hasArt) {
869− audioButtonAnchorsFill = 'artShapeHolder';
870− audioButtonWidth = 'undefined';
871− audioButtonHeight = 'undefined';
872− } else {
873− audioButtonAnchorsFill = 'undefined';
874− audioButtonWidth = 'height';
875− audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
876− : 'root.fixedHeaderHeight + 2 * units.gu(1)';
877− }
878− code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
879− }
880−
881− if (hasSummary) {
882− var summaryTopAnchor;
883− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
884− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
885− else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
886− else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
887− else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
888− else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
889− else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
890− else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
891− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
892− else summaryTopAnchor = 'parent.top';
893−
894− var summaryColor;
895− if (hasBackground) {
896− summaryColor = summaryColorWithBackground;
897− } else {
898− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
899− }
900−
901− var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
902−
903− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
904− }
905−
906− if (hasSocialActions) {
907− var socialAnchors;
908− var socialTopAnchor;
909−
910− if (hasSummary) socialTopAnchor = 'summary.bottom;';
911− else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
912− else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
913− else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';
914− else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';
915− else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';
916− else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';
917− else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';
918− else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';
919− else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
920− else socialTopAnchor = 'parent.top';
921−
922− socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'
923−
924− var socialColor;
925− if (hasBackground) {
926− socialColor = summaryColorWithBackground;
927− } else {
928− socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
929− }
930−
931− code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
932− }
933−
934− if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
935− var touchdownAnchors;
936− if (hasBackground) {
937− touchdownAnchors = 'fill: backgroundLoader';
938− } else if (touchdownOnArtShape) {
939− touchdownAnchors = 'fill: artShapeHolder';
940− } else {
941− touchdownAnchors = 'fill: root'
942− }
943− code += kTouchdownCode.arg(touchdownAnchors);
944− }
945−
946− var implicitHeight = 'implicitHeight: ';
947− if (hasSocialActions) {
948− implicitHeight += 'socialActionsRow.y + socialActionsRow.height + units.gu(1);\n';
949− } else if (hasSummary) {
950− implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
951− } else if (isAudio) {
952− implicitHeight += 'audioButton.height;\n';
953− } else if (headerAsOverlay) {
954− implicitHeight += 'artShapeHolder.height;\n';
955− } else if (hasHeaderRow) {
956− implicitHeight += 'row.y + row.height + units.gu(1);\n';
957− } else if (hasMascot) {
958− implicitHeight += 'mascotImage.y + mascotImage.height;\n';
959− } else if (hasTitleContainer) {
960− implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';
961− } else if (hasAttributes) {
962− implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';
963− } else if (hasSubtitle) {
964− implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
965− } else if (hasTitle) {
966− implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
967− } else if (hasArt) {
968− implicitHeight += 'artShapeHolder.height;\n';
969− } else {
970− implicitHeight = '';
971− }
972−
973− // Close the AbstractButton
974− code += implicitHeight + '}\n';
975−
976− return code;
977−}
978−
979−function createCardComponent(parent, template, components, isCardTool, artShapeStyle, identifier) {
980− var imports = 'import QtQuick 2.4; \n\
981− import Ubuntu.Components 1.3; \n\
982− import Ubuntu.Settings.Components 0.1; \n\
983− import Dash 0.1;\n\
984− import Utils 0.1;\n';
985− var card = cardString(template, components, isCardTool, artShapeStyle);
986− var code = imports + 'Component {\n' + card + '}\n';
987−
988− try {
989− return Qt.createQmlObject(code, parent, identifier);
990− } catch (e) {
991− console.error("ERROR: Invalid component created.");
992− console.error("Template:");
993− console.error(JSON.stringify(template));
994− console.error("Components:");
995− console.error(JSON.stringify(components));
996− console.error("Code:");
997− console.error(code);
998− throw e;
999− }
1000−}
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, artShapeStyle) {
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 + artShapeStyle;
33− var component = cache[allString];
34− if (component === undefined) {
35− component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);
36− cache[allString] = component;
37− }
38− return component;
39− }
40−}
plugins/Dash/CardSocialActions.qmldeleted−94
@@ -1,94 +0,0 @@
1−/*
2− * Copyright 2016 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
20−
21−Column {
22− id: socialActions
23− spacing: units.gu(0.5)
24−
25− property alias model: repeater.model
26− property color color: theme.palette.normal.baseText
27−
28− signal clicked(var actionId)
29−
30− Rectangle {
31− id: divider
32− visible: repeater.count > 0
33− anchors {
34− left: parent.left;
35− right: parent.right;
36− leftMargin:units.dp(1);
37− rightMargin: units.dp(1);
38− }
39− color: Qt.darker(theme.palette.normal.background, 1.12)
40− height: visible ? units.dp(1) : 0
41− }
42−
43− Row {
44− id: row
45− anchors {
46− left: parent.left
47− right: parent.right
48− leftMargin: units.gu(1)
49− rightMargin: units.gu(1)
50− }
51− spacing: units.gu(2)
52− readonly property int visibleItems: {
53− if (width <= units.gu(12)) // small card
54− return 2;
55− else if (width <= units.gu(21)) // medium card
56− return 3;
57− else // large or horizontal card
58− return 4;
59− }
60−
61− Repeater {
62− id: repeater
63− delegate: Loader {
64− height: units.gu(2)
65− active: index < row.visibleItems
66− sourceComponent: AbstractButton {
67− objectName: "delegate" + index
68− height: units.gu(2)
69− width: icon.width
70− Icon {
71− id: icon
72− objectName: "icon"
73−
74− readonly property url urlIcon: modelData && modelData["icon"] || ""
75− readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
76−
77− height: units.gu(2)
78− // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
79− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
80− source: urlIcon
81− color: socialActions.color
82−
83− onUrlIconChanged: {
84− if (urlIcon) source = urlIcon
85− }
86− }
87−
88− onClicked: socialActions.clicked(modelData["id"]);
89− onPressedChanged: if (pressed && icon.urlTemporaryIcon != "") icon.source = icon.urlTemporaryIcon
90− }
91− }
92− }
93− }
94−}
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/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"] : theme.palette.normal.positive
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−1397
@@ -1,1397 +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/qqmlcontext_p.h>
101−#include <private/qqmldelegatemodel_p.h>
102−#include <private/qqmlglobal_p.h>
103−#include <private/qquickitem_p.h>
104−#include <private/qquickanimation_p.h>
105−#pragma GCC diagnostic pop
106−// #include <private/qquickrectangle_p.h>
107−
108−qreal ListViewWithPageHeader::ListItem::height() const
109−{
110− return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
111−}
112−
113−qreal ListViewWithPageHeader::ListItem::y() const
114−{
115− return m_item->y() - (m_sectionItem ? m_sectionItem->height() : 0);
116−}
117−
118−void ListViewWithPageHeader::ListItem::setY(qreal newY)
119−{
120− if (m_sectionItem) {
121− m_sectionItem->setY(newY);
122− m_item->setY(newY + m_sectionItem->height());
123− } else {
124− m_item->setY(newY);
125− }
126−}
127−
128−bool ListViewWithPageHeader::ListItem::culled() const
129−{
130− return QQuickItemPrivate::get(m_item)->culled;
131−}
132−
133−void ListViewWithPageHeader::ListItem::setCulled(bool culled)
134−{
135− QQuickItemPrivate::get(m_item)->setCulled(culled);
136− if (m_sectionItem)
137− QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
138−}
139−
140−void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
141−{
142− m_sectionItem = sectionItem;
143−}
144−
145−ListViewWithPageHeader::ListViewWithPageHeader()
146− : m_delegateModel(nullptr)
147− , m_asyncRequestedIndex(-1)
148− , m_delegateValidated(false)
149− , m_firstVisibleIndex(-1)
150− , m_minYExtent(0)
151− , m_contentHeightDirty(false)
152− , m_headerItem(nullptr)
153− , m_previousContentY(0)
154− , m_headerItemShownHeight(0)
155− , m_sectionDelegate(nullptr)
156− , m_topSectionItem(nullptr)
157− , m_forceNoClip(false)
158− , m_inLayout(false)
159− , m_inContentHeightKeepHeaderShown(false)
160− , m_cacheBuffer(0)
161−{
162− m_clipItem = new QQuickItem(contentItem());
163−// m_clipItem = new QQuickRectangle(contentItem());
164−// ((QQuickRectangle*)m_clipItem)->setColor(Qt::gray);
165−
166− m_contentYAnimation = new QQuickNumberAnimation(this);
167− m_contentYAnimation->setEasing(QEasingCurve::OutQuad);
168− m_contentYAnimation->setProperty(QStringLiteral("contentY"));
169− m_contentYAnimation->setDuration(200);
170− m_contentYAnimation->setTargetObject(this);
171−
172− connect(contentItem(), &QQuickItem::widthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);
173− connect(this, &ListViewWithPageHeader::contentHeightChanged, this, &ListViewWithPageHeader::onContentHeightChanged);
174− connect(this, &ListViewWithPageHeader::heightChanged, this, &ListViewWithPageHeader::onHeightChanged);
175− connect(m_contentYAnimation, &QQuickNumberAnimation::runningChanged, this, &ListViewWithPageHeader::contentYAnimationRunningChanged);
176−
177− setFlickableDirection(VerticalFlick);
178−}
179−
180−ListViewWithPageHeader::~ListViewWithPageHeader()
181−{
182−}
183−
184−QAbstractItemModel *ListViewWithPageHeader::model() const
185−{
186− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
187−}
188−
189−void ListViewWithPageHeader::setModel(QAbstractItemModel *model)
190−{
191− if (model != this->model()) {
192− if (!m_delegateModel) {
193− createDelegateModel();
194− } else {
195− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
196− }
197− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
198− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);
199− Q_EMIT modelChanged();
200− polish();
201− // TODO?
202−// Q_EMIT contentHeightChanged();
203−// Q_EMIT contentYChanged();
204− }
205−}
206−
207−QQmlComponent *ListViewWithPageHeader::delegate() const
208−{
209− return m_delegateModel ? m_delegateModel->delegate() : nullptr;
210−}
211−
212−void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
213−{
214− if (delegate != this->delegate()) {
215− if (!m_delegateModel) {
216− createDelegateModel();
217− }
218−
219− // Cleanup the existing items
220− Q_FOREACH(ListItem *item, m_visibleItems)
221− releaseItem(item);
222− m_visibleItems.clear();
223− initializeValuesForEmptyList();
224−
225− m_delegateModel->setDelegate(delegate);
226−
227− Q_EMIT delegateChanged();
228− m_delegateValidated = false;
229− m_contentHeightDirty = true;
230− polish();
231− }
232−}
233−
234−void ListViewWithPageHeader::initializeValuesForEmptyList()
235−{
236− m_firstVisibleIndex = -1;
237− adjustMinYExtent();
238− setContentY(0);
239− m_clipItem->setY(0);
240− if (m_topSectionItem) {
241− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
242− }
243−}
244−
245−QQuickItem *ListViewWithPageHeader::header() const
246−{
247− return m_headerItem;
248−}
249−
250−void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)
251−{
252− if (m_headerItem != headerItem) {
253− qreal oldHeaderHeight = 0;
254− qreal oldHeaderY = 0;
255− if (m_headerItem) {
256− oldHeaderHeight = m_headerItem->height();
257− oldHeaderY = m_headerItem->y();
258− m_headerItem->setParentItem(nullptr);
259− }
260− m_headerItem = headerItem;
261− if (m_headerItem) {
262− m_headerItem->setParentItem(contentItem());
263− m_headerItem->setZ(1);
264− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();
265− QQuickItemPrivate::get(m_headerItem)->addItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);
266− }
267− qreal newHeaderHeight = m_headerItem ? m_headerItem->height() : 0;
268− if (!m_visibleItems.isEmpty() && newHeaderHeight != oldHeaderHeight) {
269− headerHeightChanged(newHeaderHeight, oldHeaderHeight, oldHeaderY);
270− polish();
271− m_contentHeightDirty = true;
272− }
273− Q_EMIT headerChanged();
274− }
275−}
276−
277−QQmlComponent *ListViewWithPageHeader::sectionDelegate() const
278−{
279− return m_sectionDelegate;
280−}
281−
282−void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)
283−{
284− if (delegate != m_sectionDelegate) {
285− // TODO clean existing sections
286−
287− m_sectionDelegate = delegate;
288−
289− m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);
290− if (m_topSectionItem) {
291− m_topSectionItem->setZ(3);
292− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
293− connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);
294− }
295−
296− // TODO create sections for existing items
297−
298− Q_EMIT sectionDelegateChanged();
299− Q_EMIT stickyHeaderHeightChanged();
300− }
301−}
302−
303−QString ListViewWithPageHeader::sectionProperty() const
304−{
305− return m_sectionProperty;
306−}
307−
308−void ListViewWithPageHeader::setSectionProperty(const QString &property)
309−{
310− if (property != m_sectionProperty) {
311− m_sectionProperty = property;
312−
313− updateWatchedRoles();
314−
315− // TODO recreate sections
316−
317− Q_EMIT sectionPropertyChanged();
318− }
319−}
320−
321−bool ListViewWithPageHeader::forceNoClip() const
322−{
323− return m_forceNoClip;
324−}
325−
326−void ListViewWithPageHeader::setForceNoClip(bool noClip)
327−{
328− if (noClip != m_forceNoClip) {
329− m_forceNoClip = noClip;
330− updateClipItem();
331− Q_EMIT forceNoClipChanged();
332− }
333−}
334−
335−int ListViewWithPageHeader::stickyHeaderHeight() const
336−{
337− return m_topSectionItem ? m_topSectionItem->height() : 0;
338−}
339−
340−qreal ListViewWithPageHeader::headerItemShownHeight() const
341−{
342− return m_headerItemShownHeight;
343−}
344−
345−int ListViewWithPageHeader::cacheBuffer() const
346−{
347− return m_cacheBuffer;
348−}
349−
350−void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
351−{
352− if (cacheBuffer < 0) {
353− qmlInfo(this) << "Cannot set a negative cache buffer";
354− return;
355− }
356−
357− if (cacheBuffer != m_cacheBuffer) {
358− m_cacheBuffer = cacheBuffer;
359− Q_EMIT cacheBufferChanged();
360− polish();
361− }
362−}
363−
364−void ListViewWithPageHeader::positionAtBeginning()
365−{
366− if (m_delegateModel->count() <= 0)
367− return;
368−
369− qreal headerHeight = (m_headerItem ? m_headerItem->height() : 0);
370− if (m_firstVisibleIndex != 0) {
371− // TODO This could be optimized by trying to reuse the interesection
372− // of items that may end up intersecting between the existing
373− // m_visibleItems and the items we are creating in the next loop
374− Q_FOREACH(ListItem *item, m_visibleItems)
375− releaseItem(item);
376− m_visibleItems.clear();
377− m_firstVisibleIndex = -1;
378−
379− // Create the item 0, it will be already correctly positioned at createItem()
380− m_clipItem->setY(0);
381− ListItem *item = createItem(0, false);
382− // Create the subsequent items
383− int modelIndex = 1;
384− qreal pos = item->y() + item->height();
385− const qreal bufferTo = height() + m_cacheBuffer;
386− while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
387− if (!(item = createItem(modelIndex, false)))
388− break;
389− pos += item->height();
390− ++modelIndex;
391− }
392−
393− m_previousContentY = m_visibleItems.first()->y() - headerHeight;
394− }
395− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);
396− if (m_headerItem) {
397− // TODO This should not be needed and the code that adjust the m_headerItem position
398− // in viewportMoved() should be enough but in some cases we have not found a way to reproduce
399− // yet the code of viewportMoved() fails so here we make sure that at least if we are calling
400− // positionAtBeginning the header item will be correctly positioned
401− m_headerItem->setY(-m_minYExtent);
402− }
403−}
404−
405−static inline bool uFuzzyCompare(qreal r1, qreal r2)
406−{
407− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
408−}
409−
410−void ListViewWithPageHeader::showHeader()
411−{
412− if (!m_headerItem)
413− return;
414−
415− const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
416− if (!uFuzzyCompare(to, contentY())) {
417− const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();
418− if (headerShownByItsOwn && m_headerItemShownHeight == 0) {
419− // We are not clipping since we are just at the top of the viewport
420− // but because of the showHeader animation we will need to, so
421− // enable the clipping without logically moving the items
422− m_headerItemShownHeight = m_headerItem->y() + m_headerItem->height() - contentY();
423− if (!m_visibleItems.isEmpty()) {
424− updateClipItem();
425− ListItem *firstItem = m_visibleItems.first();
426− firstItem->setY(firstItem->y() - m_headerItemShownHeight);
427− layout();
428− }
429− Q_EMIT headerItemShownHeightChanged();
430− }
431− m_contentYAnimation->setTo(to);
432− contentYAnimationType = ContentYAnimationShowHeader;
433− m_contentYAnimation->start();
434− }
435−}
436−
437−int ListViewWithPageHeader::firstCreatedIndex() const
438−{
439− return m_firstVisibleIndex;
440−}
441−
442−int ListViewWithPageHeader::createdItemCount() const
443−{
444− return m_visibleItems.count();
445−}
446−
447−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
448−{
449− ListItem *item = itemAtIndex(modelIndex);
450− if (item)
451− return item->m_item;
452− else
453− return nullptr;
454−}
455−
456−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)
457−{
458− ListItem *listItem = itemAtIndex(modelIndex);
459− if (listItem) {
460− return maximizeVisibleArea(listItem, listItem->height());
461− }
462−
463− return false;
464−}
465−
466−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)
467−{
468− if (itemHeight < 0)
469− return false;
470−
471− ListItem *listItem = itemAtIndex(modelIndex);
472− if (listItem) {
473− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));
474− }
475−
476− return false;
477−}
478−
479−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)
480−{
481− if (listItem) {
482− layout();
483− const auto listItemY = m_clipItem->y() + listItem->y();
484− if (listItemY > contentY() && listItemY + listItemHeight > contentY() + height()) {
485− // we can scroll the list up to show more stuff
486− const auto to = qMin(listItemY, listItemY + listItemHeight - height());
487− m_contentYAnimation->setTo(to);
488− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
489− m_contentYAnimation->start();
490− } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||
491− (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))
492− {
493− // we can scroll the list down to show more stuff
494− auto realVisibleListItemY = listItemY;
495− if (m_topSectionItem) {
496− // If we are showing the top section sticky item and this item doesn't have a section
497− // item we have to make sure to scroll it a bit more so that it is not underlapping
498− // the top section sticky item
499− bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;
500− if (topSectionShown && !listItem->sectionItem()) {
501− realVisibleListItemY -= m_topSectionItem->height();
502− }
503− }
504− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());
505− m_contentYAnimation->setTo(to);
506− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
507− m_contentYAnimation->start();
508− }
509− return true;
510− }
511− return false;
512−}
513−
514−qreal ListViewWithPageHeader::minYExtent() const
515−{
516−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;
517− return m_minYExtent;
518−}
519−
520−qreal ListViewWithPageHeader::maxYExtent() const
521−{
522− return height() - contentHeight();
523−}
524−
525−void ListViewWithPageHeader::componentComplete()
526−{
527− if (m_delegateModel)
528− m_delegateModel->componentComplete();
529−
530− QQuickFlickable::componentComplete();
531−
532− polish();
533−}
534−
535−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
536−{
537− // Check we are not being taken down and don't paint anything
538− // TODO Check if we still need this in 5.2
539− // For reproduction just inifnite loop testDash or testDashContent
540− if (!QQmlEngine::contextForObject(this)->parentContext())
541− return;
542−
543− QQuickFlickable::viewportMoved(orient);
544−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();
545− const qreal diff = m_previousContentY - contentY();
546− adjustHeader(diff);
547− m_previousContentY = contentY();
548− layout();
549− polish();
550−}
551−
552−void ListViewWithPageHeader::adjustHeader(qreal diff)
553−{
554− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;
555− if (m_headerItem) {
556− const auto oldHeaderItemShownHeight = m_headerItemShownHeight;
557− if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {
558− m_headerItem->setHeight(m_headerItem->implicitHeight());
559− // We are going down (but it's not because of the rebound at the end)
560− // (but the header was not shown by it's own position)
561− // or the header is partially shown and we are not doing a maximizeVisibleArea either
562− const bool scrolledUp = m_previousContentY > contentY();
563− const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());
564− const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
565− const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
566−
567− if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {
568− m_headerItemShownHeight = 0;
569− m_headerItem->setY(-m_minYExtent);
570− } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {
571− if (maximizeVisibleAreaRunning && diff > 0) {
572− // If we are maximizing and the header was shown, make sure we hide it
573− m_headerItemShownHeight -= diff;
574− } else {
575− m_headerItemShownHeight += diff;
576− }
577− if (uFuzzyCompare(contentY(), -m_minYExtent)) {
578− m_headerItemShownHeight = 0;
579− } else {
580− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());
581− }
582− if (m_headerItemShownHeight > 0) {
583− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {
584− m_headerItem->setY(contentY());
585− m_headerItemShownHeight = m_headerItem->height();
586− } else {
587− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);
588− }
589− } else {
590− m_headerItem->setY(-m_minYExtent);
591− }
592− }
593− Q_EMIT headerItemShownHeightChanged();
594− } else {
595− // Stick the header item to the top when dragging down
596− m_headerItem->setY(contentY());
597− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));
598− }
599− // We will be changing the clip item, need to accomadate for it
600− // otherwise we move the firstItem down/up twice (unless the
601− // show header animation is running, where we want to keep the viewport stable)
602− if (!showHeaderAnimationRunning) {
603− diff += oldHeaderItemShownHeight - m_headerItemShownHeight;
604− } else {
605− diff = -diff;
606− }
607− }
608− if (!m_visibleItems.isEmpty()) {
609− updateClipItem();
610− ListItem *firstItem = m_visibleItems.first();
611− firstItem->setY(firstItem->y() + diff);
612− if (showHeaderAnimationRunning) {
613− adjustMinYExtent();
614− }
615− }
616−}
617−
618−void ListViewWithPageHeader::createDelegateModel()
619−{
620− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);
621− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &ListViewWithPageHeader::itemCreated);
622− if (isComponentComplete())
623− m_delegateModel->componentComplete();
624− updateWatchedRoles();
625−}
626−
627−void ListViewWithPageHeader::refill()
628−{
629− if (m_inLayout) {
630− return;
631− }
632− if (!isComponentComplete()) {
633− return;
634− }
635−
636− const qreal from = contentY();
637− const qreal to = from + height();
638− const qreal bufferFrom = from - m_cacheBuffer;
639− const qreal bufferTo = to + m_cacheBuffer;
640−
641− bool added = addVisibleItems(from, to, false);
642− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
643− added |= addVisibleItems(bufferFrom, bufferTo, true);
644−
645− if (added || removed) {
646− m_contentHeightDirty = true;
647− }
648−}
649−
650−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)
651−{
652− if (!delegate())
653− return false;
654−
655− if (m_delegateModel->count() == 0)
656− return false;
657−
658− ListItem *item;
659−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;
660−
661− int modelIndex = 0;
662− qreal pos = 0;
663− if (!m_visibleItems.isEmpty()) {
664− modelIndex = m_firstVisibleIndex + m_visibleItems.count();
665− item = m_visibleItems.last();
666− pos = item->y() + item->height() + m_clipItem->y();
667− }
668− bool changed = false;
669−// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;
670− while (modelIndex < m_delegateModel->count() && pos <= fillTo) {
671−// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;
672− if (!(item = createItem(modelIndex, asynchronous)))
673− break;
674− pos += item->height();
675− ++modelIndex;
676− changed = true;
677− }
678−
679− modelIndex = 0;
680− pos = 0;
681− if (!m_visibleItems.isEmpty()) {
682− modelIndex = m_firstVisibleIndex - 1;
683− item = m_visibleItems.first();
684− pos = item->y() + m_clipItem->y();
685− }
686− while (modelIndex >= 0 && pos > fillFrom) {
687−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;
688− if (!(item = createItem(modelIndex, asynchronous)))
689− break;
690− pos -= item->height();
691− --modelIndex;
692− changed = true;
693− }
694−
695− return changed;
696−}
697−
698−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)
699−{
700− QQuickItem *item = listItem->m_item;
701− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);
702− if (flags & QQmlDelegateModel::Destroyed) {
703− item->setParentItem(nullptr);
704− }
705− listItem->sectionItem()->deleteLater();
706− delete listItem;
707−}
708−
709−void ListViewWithPageHeader::releaseItem(ListItem *listItem)
710−{
711− QQuickItemPrivate::get(listItem->m_item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
712− if (listItem->sectionItem()) {
713− QQuickItemPrivate::get(listItem->sectionItem())->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
714− }
715− m_itemsToRelease << listItem;
716−}
717−
718−void ListViewWithPageHeader::updateWatchedRoles()
719−{
720− if (m_delegateModel) {
721− QList<QByteArray> roles;
722− if (!m_sectionProperty.isEmpty())
723− roles << m_sectionProperty.toUtf8();
724− m_delegateModel->setWatchedRoles(roles);
725− }
726−}
727−
728−QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)
729−{
730− if (!m_sectionDelegate)
731− return nullptr;
732−
733− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
734−
735− if (modelIndex > 0) {
736− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
737− if (section == prevSection)
738− return nullptr;
739− }
740− if (modelIndex + 1 < model()->rowCount() && !alreadyInserted) {
741− // Already inserted items can't steal next section header
742− const QString nextSection = m_delegateModel->stringValue(modelIndex + 1, m_sectionProperty);
743− if (section == nextSection) {
744− // Steal the section header
745− ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems
746− if (nextItem) {
747− QQuickItem *sectionItem = nextItem->sectionItem();
748− nextItem->setSectionItem(nullptr);
749− return sectionItem;
750− }
751− }
752− }
753−
754− return getSectionItem(section);
755−}
756−
757−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString §ionText, bool watchGeometry)
758−{
759− QQuickItem *sectionItem = nullptr;
760−
761− QQmlContext *creationContext = m_sectionDelegate->creationContext();
762− QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));
763− QObject *nobj = m_sectionDelegate->beginCreate(context);
764− if (nobj) {
765− QQml_setParent_noEvent(context, nobj);
766− sectionItem = qobject_cast<QQuickItem *>(nobj);
767− if (!sectionItem) {
768− delete nobj;
769− } else {
770− sectionItem->setProperty("text", sectionText);
771− sectionItem->setProperty("delegateIndex", -1);
772− sectionItem->setZ(2);
773− QQml_setParent_noEvent(sectionItem, m_clipItem);
774− sectionItem->setParentItem(m_clipItem);
775− }
776− } else {
777− delete context;
778− }
779− m_sectionDelegate->completeCreate();
780−
781− if (watchGeometry && sectionItem) {
782− QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
783− }
784−
785− return sectionItem;
786−}
787−
788−void ListViewWithPageHeader::updateSectionItem(int modelIndex)
789−{
790− ListItem *item = itemAtIndex(modelIndex);
791− if (item) {
792− const QString sectionText = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
793−
794− bool needSectionHeader = true;
795− // if it is the same section as the previous item need to drop the section
796− if (modelIndex > 0) {
797− const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
798− if (sectionText == prevSection) {
799− needSectionHeader = false;
800− }
801− }
802−
803− if (needSectionHeader) {
804− if (!item->sectionItem()) {
805− item->setSectionItem(getSectionItem(sectionText));
806− } else {
807− item->sectionItem()->setProperty("text", sectionText);
808− }
809− } else {
810− if (item->sectionItem()) {
811− item->sectionItem()->deleteLater();
812− item->setSectionItem(nullptr);
813− }
814− }
815− }
816−}
817−
818−bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
819−{
820−// qDebug() << "ListViewWithPageHeader::removeNonVisibleItems" << bufferFrom << bufferTo;
821− // Do not remove items if we are overshooting up or down, since we'll come back
822− // to the "stable" position and delete/create items without any reason
823− if (contentY() < -m_minYExtent) {
824− return false;
825− } else if (contentY() + height() > contentHeight()) {
826− return false;
827− }
828− bool changed = false;
829−
830− bool foundVisible = false;
831− int i = 0;
832− int removedItems = 0;
833− const auto oldFirstVisibleIndex = m_firstVisibleIndex;
834− while (i < m_visibleItems.count()) {
835− ListItem *item = m_visibleItems[i];
836− const qreal pos = item->y() + m_clipItem->y();
837−// qDebug() << i << pos << (pos + item->height()) << bufferFrom << bufferTo;
838− if (pos + item->height() < bufferFrom || pos > bufferTo) {
839−// qDebug() << "Releasing" << i << (pos + item->height() < bufferFrom) << pos + item->height() << bufferFrom << (pos > bufferTo) << pos << bufferTo;
840− releaseItem(item);
841− m_visibleItems.removeAt(i);
842− changed = true;
843− ++removedItems;
844− } else {
845− if (!foundVisible) {
846− foundVisible = true;
847− const int itemIndex = m_firstVisibleIndex + removedItems + i;
848− m_firstVisibleIndex = itemIndex;
849− }
850− ++i;
851− }
852− }
853− if (!foundVisible) {
854− initializeValuesForEmptyList();
855− }
856− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
857− adjustMinYExtent();
858− }
859−
860− return changed;
861−}
862−
863−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)
864−{
865−// qDebug() << "CREATE ITEM" << modelIndex;
866− if (asynchronous && m_asyncRequestedIndex != -1)
867− return nullptr;
868−
869− m_asyncRequestedIndex = -1;
870− QObject* object = m_delegateModel->object(modelIndex, asynchronous);
871− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
872− if (!item) {
873− if (object) {
874− m_delegateModel->release(object);
875− if (!m_delegateValidated) {
876− m_delegateValidated = true;
877− QObject* delegateObj = delegate();
878− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";
879− }
880− } else {
881− m_asyncRequestedIndex = modelIndex;
882− }
883− return 0;
884− } else {
885−// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;
886− ListItem *listItem = new ListItem;
887− listItem->m_item = item;
888− listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));
889− QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
890− ListItem *prevItem = itemAtIndex(modelIndex - 1);
891− bool lostItem = false; // Is an item that we requested async but because of model changes
892− // it is no longer attached to any of the existing items (has no prev nor next item)
893− // nor is the first item
894− if (prevItem) {
895− listItem->setY(prevItem->y() + prevItem->height());
896− } else {
897− ListItem *currItem = itemAtIndex(modelIndex);
898− if (currItem) {
899− // There's something already in m_visibleItems at out index, meaning this is an insert, so attach to its top
900− listItem->setY(currItem->y() - listItem->height());
901− } else {
902− ListItem *nextItem = itemAtIndex(modelIndex + 1);
903− if (nextItem) {
904− listItem->setY(nextItem->y() - listItem->height());
905− } else if (modelIndex == 0) {
906− listItem->setY(-m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0));
907− } else if (!m_visibleItems.isEmpty()) {
908− lostItem = true;
909− }
910− }
911− }
912− if (lostItem) {
913− listItem->setCulled(true);
914− releaseItem(listItem);
915− listItem = nullptr;
916− } else {
917− listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());
918− if (m_visibleItems.isEmpty()) {
919− m_visibleItems << listItem;
920− } else {
921− m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);
922− }
923− if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {
924− m_firstVisibleIndex = modelIndex;
925− polish();
926− }
927− if (listItem->sectionItem()) {
928− listItem->sectionItem()->setProperty("delegateIndex", modelIndex);
929− }
930− adjustMinYExtent();
931− m_contentHeightDirty = true;
932− }
933− return listItem;
934− }
935−}
936−
937−void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)
938−{
939− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
940− if (!item) {
941− qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;
942− return;
943− }
944−// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;
945− // Check we are not being taken down and don't paint anything
946− // TODO Check if we still need this in 5.2
947− // For reproduction just inifnite loop testDash or testDashContent
948− if (!QQmlEngine::contextForObject(this)->parentContext())
949− return;
950−
951− item->setParentItem(m_clipItem);
952− // FIXME Why do we need the refreshExpressions call?
953− QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
954− QQmlContextPrivate::get(context)->data->refreshExpressions();
955− item->setProperty("heightToClip", QVariant::fromValue<int>(0));
956− if (modelIndex == m_asyncRequestedIndex) {
957− createItem(modelIndex, false);
958− refill();
959− }
960−}
961−
962−void ListViewWithPageHeader::updateClipItem()
963−{
964− m_clipItem->setHeight(height() - m_headerItemShownHeight);
965− m_clipItem->setY(contentY() + m_headerItemShownHeight);
966− m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);
967−}
968−
969−void ListViewWithPageHeader::onContentHeightChanged()
970−{
971− updateClipItem();
972−}
973−
974−void ListViewWithPageHeader::onContentWidthChanged()
975−{
976− m_clipItem->setWidth(contentItem()->width());
977−}
978−
979−void ListViewWithPageHeader::onHeightChanged()
980−{
981− polish();
982−}
983−
984−
985−void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)
986−{
987− // TODO Do something with reset
988−// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
989− const auto oldFirstVisibleIndex = m_firstVisibleIndex;
990−
991− Q_FOREACH(const QQmlChangeSet::Change remove, changeSet.removes()) {
992−// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
993− if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
994− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
995− // If all the items we are removing are either not created or culled
996− // we have to grow down to avoid viewport changing
997− bool growDown = true;
998− for (int i = 0; growDown && i < remove.count; ++i) {
999− const int modelIndex = remove.index + i;
1000− ListItem *item = itemAtIndex(modelIndex);
1001− if (item && !item->culled()) {
1002− growDown = false;
1003− }
1004− }
1005− for (int i = remove.count - 1; i >= 0; --i) {
1006− const int visibleIndex = remove.index + i - m_firstVisibleIndex;
1007− if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {
1008− ListItem *item = m_visibleItems[visibleIndex];
1009− // Pass the section item down if needed
1010− if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {
1011− ListItem *nextItem = m_visibleItems[visibleIndex + 1];
1012− if (!nextItem->sectionItem()) {
1013− nextItem->setSectionItem(item->sectionItem());
1014− item->setSectionItem(nullptr);
1015− }
1016− }
1017− releaseItem(item);
1018− m_visibleItems.removeAt(visibleIndex);
1019− }
1020− }
1021− if (growDown) {
1022− adjustMinYExtent();
1023− } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {
1024− m_visibleItems.first()->setY(oldFirstValidIndexPos);
1025− }
1026− if (m_visibleItems.isEmpty()) {
1027− m_firstVisibleIndex = -1;
1028− } else {
1029− m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);
1030− }
1031− } else if (remove.index + remove.count <= m_firstVisibleIndex) {
1032− m_firstVisibleIndex -= remove.count;
1033− }
1034− for (int i = remove.count - 1; i >= 0; --i) {
1035− const int modelIndex = remove.index + i;
1036− if (modelIndex == m_asyncRequestedIndex) {
1037− m_asyncRequestedIndex = -1;
1038− } else if (modelIndex < m_asyncRequestedIndex) {
1039− m_asyncRequestedIndex--;
1040− }
1041− }
1042− }
1043−
1044− Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {
1045−// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
1046− const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
1047− const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
1048− if (insertingInValidIndexes || firstItemWithViewOnTop)
1049− {
1050− // If the items we are adding won't be really visible
1051− // we grow up instead of down to not change the viewport
1052− bool growUp = false;
1053− if (!firstItemWithViewOnTop) {
1054− for (int i = 0; i < m_visibleItems.count(); ++i) {
1055− if (!m_visibleItems[i]->culled()) {
1056− if (insert.index <= m_firstVisibleIndex + i) {
1057− growUp = true;
1058− }
1059− break;
1060− }
1061− }
1062− }
1063−
1064− const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
1065− for (int i = insert.count - 1; i >= 0; --i) {
1066− const int modelIndex = insert.index + i;
1067− ListItem *item = createItem(modelIndex, false);
1068− if (growUp) {
1069− ListItem *firstItem = m_visibleItems.first();
1070− firstItem->setY(firstItem->y() - item->height());
1071− }
1072− // Adding an item may break a "same section" chain, so check
1073− // if we need adding a new section item
1074− if (m_sectionDelegate) {
1075− ListItem *nextItem = itemAtIndex(modelIndex + 1);
1076− if (nextItem && !nextItem->sectionItem()) {
1077− nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));
1078− if (growUp && nextItem->sectionItem()) {
1079− ListItem *firstItem = m_visibleItems.first();
1080− firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());
1081− }
1082− }
1083− }
1084− }
1085− if (firstItemWithViewOnTop) {
1086− ListItem *firstItem = m_visibleItems.first();
1087− firstItem->setY(oldFirstValidIndexPos);
1088− }
1089− adjustMinYExtent();
1090− } else if (insert.index <= m_firstVisibleIndex) {
1091− m_firstVisibleIndex += insert.count;
1092− }
1093−
1094− for (int i = insert.count - 1; i >= 0; --i) {
1095− const int modelIndex = insert.index + i;
1096− if (modelIndex <= m_asyncRequestedIndex) {
1097− m_asyncRequestedIndex++;
1098− }
1099− }
1100− }
1101−
1102− Q_FOREACH(const QQmlChangeSet::Change change, changeSet.changes()) {
1103− for (int i = change.start(); i < change.end(); ++i) {
1104− updateSectionItem(i);
1105− }
1106− // Also update the section header for the next item after the change since it may be influenced
1107− updateSectionItem(change.end());
1108− }
1109−
1110− if (m_firstVisibleIndex != oldFirstVisibleIndex) {
1111− if (m_visibleItems.isEmpty()) {
1112− initializeValuesForEmptyList();
1113− } else {
1114− adjustMinYExtent();
1115− }
1116− }
1117−
1118− for (int i = 0; i < m_visibleItems.count(); ++i) {
1119− ListItem *item = m_visibleItems[i];
1120− if (item->sectionItem()) {
1121− item->sectionItem()->setProperty("delegateIndex", m_firstVisibleIndex + i);
1122− }
1123− }
1124−
1125− layout();
1126− polish();
1127− m_contentHeightDirty = true;
1128−}
1129−
1130−void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)
1131−{
1132− setInteractive(!running);
1133− if (!running) {
1134− m_contentHeightDirty = true;
1135− polish();
1136− }
1137−}
1138−
1139−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
1140−{
1141− const qreal heightDiff = newGeometry.height() - oldGeometry.height();
1142− if (heightDiff != 0) {
1143− if (!m_visibleItems.isEmpty()) {
1144− ListItem *firstItem = m_visibleItems.first();
1145− const auto prevFirstItemY = firstItem->y();
1146− if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY()) {
1147− firstItem->setY(firstItem->y() - heightDiff);
1148− } else if (item == firstItem->sectionItem()) {
1149− firstItem->setY(firstItem->y() + heightDiff);
1150− }
1151−
1152− if (firstItem->y() != prevFirstItemY) {
1153− adjustMinYExtent();
1154− layout();
1155− }
1156− }
1157− refill();
1158− adjustMinYExtent();
1159− polish();
1160− m_contentHeightDirty = true;
1161− }
1162−}
1163−
1164−void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)
1165−{
1166− if (item == m_headerItem) {
1167− const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;
1168− if (diff != 0) {
1169− adjustHeader(diff);
1170− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();
1171− layout();
1172− polish();
1173− m_contentHeightDirty = true;
1174− }
1175− }
1176−}
1177−
1178−void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)
1179−{
1180− const qreal heightDiff = newHeaderHeight - oldHeaderHeight;
1181− if (m_headerItemShownHeight > 0) {
1182− // If the header is shown because of the clip
1183− // Change its size
1184− m_headerItemShownHeight += heightDiff;
1185− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);
1186− updateClipItem();
1187− adjustMinYExtent();
1188− Q_EMIT headerItemShownHeightChanged();
1189− } else {
1190− if (oldHeaderY + oldHeaderHeight > contentY()) {
1191− // If the header is shown because its position
1192− // Change its size
1193− ListItem *firstItem = m_visibleItems.first();
1194− firstItem->setY(firstItem->y() + heightDiff);
1195− layout();
1196− } else {
1197− // If the header is not on screen, just change the start of the list
1198− // so the viewport is not changed
1199− adjustMinYExtent();
1200− }
1201− }
1202−}
1203−
1204−
1205−void ListViewWithPageHeader::adjustMinYExtent()
1206−{
1207− if (m_visibleItems.isEmpty() || (contentHeight() + m_minYExtent < height())) {
1208− m_minYExtent = 0;
1209− } else {
1210− qreal nonCreatedHeight = 0;
1211− if (m_firstVisibleIndex != 0) {
1212− // Calculate the average height of items to estimate the position of the list start
1213− const int visibleItems = m_visibleItems.count();
1214− qreal visibleItemsHeight = 0;
1215− Q_FOREACH(ListItem *item, m_visibleItems) {
1216− visibleItemsHeight += item->height();
1217− }
1218− nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
1219−// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;
1220− }
1221− const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);
1222− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;
1223− if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {
1224− m_minYExtent = 0;
1225− m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);
1226− }
1227− }
1228−}
1229−
1230−ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const
1231−{
1232− const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;
1233− if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())
1234− return m_visibleItems[visibleIndexedModelIndex];
1235−
1236− return nullptr;
1237−}
1238−
1239−void ListViewWithPageHeader::layout()
1240−{
1241− if (m_inLayout)
1242− return;
1243−
1244− m_inLayout = true;
1245− if (!m_visibleItems.isEmpty()) {
1246− const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;
1247− const qreal visibleTo = contentY() + height() - m_clipItem->y();
1248−
1249− qreal pos = m_visibleItems.first()->y();
1250−
1251−// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
1252− int firstReallyVisibleItem = -1;
1253− int modelIndex = m_firstVisibleIndex;
1254− Q_FOREACH(ListItem *item, m_visibleItems) {
1255− const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;
1256− item->setCulled(cull);
1257− item->setY(pos);
1258− if (!cull && firstReallyVisibleItem == -1) {
1259− firstReallyVisibleItem = modelIndex;
1260− if (m_topSectionItem) {
1261− // Positing the top section sticky item is a two step process
1262− // First we set it either we cull it (because it doesn't need to be sticked to the top)
1263− // or stick it to the top
1264− // Then after the loop we'll make sure that if there's another section just below it
1265− // pushed the sticky section up to make it disappear
1266− const qreal topSectionStickPos = m_headerItemShownHeight + contentY() - m_clipItem->y();
1267− bool showStickySectionItem;
1268− // We need to show the "top section sticky item" when the position at the "top" of the
1269− // viewport is bigger than the start of the position of the first visible item
1270− // i.e. the first visible item starts before the viewport, or when the first
1271− // visible item starts just at the viewport start and it does not have its own section item
1272− if (topSectionStickPos > pos) {
1273− showStickySectionItem = true;
1274− } else if (topSectionStickPos == pos) {
1275− showStickySectionItem = !item->sectionItem();
1276− } else {
1277− showStickySectionItem = false;
1278− }
1279− if (!showStickySectionItem) {
1280− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
1281− if (item->sectionItem()) {
1282− // This seems it should happen since why would we cull the top section
1283− // if the first visible item has no section header? This only happens briefly
1284− // when increasing the height of a list that is at the bottom, the m_topSectionItem
1285− // gets shown shortly in the next polish call
1286− QQuickItemPrivate::get(item->sectionItem())->setCulled(false);
1287− }
1288− } else {
1289− // Update the top sticky section header
1290− const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
1291− m_topSectionItem->setProperty("text", 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− m_topSectionItem->setProperty("delegateIndex", delegateIndex);
1304− if (item->sectionItem()) {
1305− QQuickItemPrivate::get(item->sectionItem())->setCulled(true);
1306− }
1307− }
1308− }
1309− }
1310− const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);
1311− if (!cull && pos < clipFrom) {
1312− item->m_item->setProperty("heightToClip", clipFrom - pos);
1313− } else {
1314− item->m_item->setProperty("heightToClip", QVariant::fromValue<int>(0));
1315− }
1316−// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;
1317− pos += item->height();
1318− ++modelIndex;
1319− }
1320−
1321− // Second step of section sticky item positioning
1322− // Look at the next section header, check if it's pushing up the sticky one
1323− if (m_topSectionItem) {
1324− if (firstReallyVisibleItem >= 0) {
1325− for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {
1326− ListItem *item = m_visibleItems[i];
1327− if (item->sectionItem()) {
1328− if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {
1329− m_topSectionItem->setY(item->y() - m_topSectionItem->height());
1330− }
1331− break;
1332− }
1333− }
1334− }
1335− }
1336− }
1337− m_inLayout = false;
1338−}
1339−
1340−void ListViewWithPageHeader::updatePolish()
1341−{
1342− // Check we are not being taken down and don't paint anything
1343− // TODO Check if we still need this in 5.2
1344− // For reproduction just inifnite loop testDash or testDashContent
1345− if (!QQmlEngine::contextForObject(this)->parentContext())
1346− return;
1347−
1348− Q_FOREACH(ListItem *item, m_itemsToRelease)
1349− reallyReleaseItem(item);
1350− m_itemsToRelease.clear();
1351−
1352− if (!model())
1353− return;
1354−
1355− layout();
1356−
1357− refill();
1358−
1359− if (m_contentHeightDirty) {
1360− qreal contentHeight;
1361− if (m_visibleItems.isEmpty()) {
1362− contentHeight = m_headerItem ? m_headerItem->height() : 0;
1363− } else {
1364− const int modelCount = model()->rowCount();
1365− const int visibleItems = m_visibleItems.count();
1366− const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;
1367− qreal nonCreatedHeight = 0;
1368− if (lastValidIndex != modelCount - 1) {
1369− const int visibleItems = m_visibleItems.count();
1370− qreal visibleItemsHeight = 0;
1371− Q_FOREACH(ListItem *item, m_visibleItems) {
1372− visibleItemsHeight += item->height();
1373− }
1374− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);
1375− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;
1376− }
1377− ListItem *item = m_visibleItems.last();
1378− contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();
1379− if (m_firstVisibleIndex != 0) {
1380− // Make sure that if we are shrinking we tell the view we still fit
1381− m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));
1382− }
1383− }
1384−
1385− m_contentHeightDirty = false;
1386− adjustMinYExtent();
1387− if (contentHeight + m_minYExtent < height()) {
1388− // need this since in the previous call to adjustMinYExtent contentHeight is not set yet
1389− m_minYExtent = 0;
1390− }
1391− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
1392− setContentHeight(contentHeight);
1393− m_inContentHeightKeepHeaderShown = false;
1394− }
1395−}
1396−
1397−#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−11
@@ -1,11 +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−CardSocialActions 0.1 CardSocialActions.qml
9−CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml
10−AudioProgressBar 0.1 AudioProgressBar.qml
11−CardAudioProgress 0.1 CardAudioProgress.qml
plugins/Dash/verticaljournal.cppdeleted−273
@@ -1,273 +0,0 @@
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.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=9)
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/launcheritem.cpp+19
@@ -76,6 +76,25 @@ void LauncherItem::setIcon(const QString &icon)
7676 }
7777}
7878
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+
7998bool LauncherItem::pinned() const
8099{
81100 return m_pinned;
plugins/Greeter/Unity/Launcher/launcheritem.h+4
@@ -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;
@@ -49,6 +51,7 @@ public:
4951private:
5052 void setName(const QString &name);
5153 void setIcon(const QString &icon);
54+ void setKeywords(const QStringList &keywords);
5255 void setPinned(bool pinned);
5356 void setRunning(bool running);
5457 void setRecent(bool recent);
@@ -63,6 +66,7 @@ private:
6366 QString m_appId;
6467 QString m_name;
6568 QString m_icon;
69+ QStringList m_keywords;
6670 bool m_pinned;
6771 bool m_running;
6872 bool m_recent;
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/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}
plugins/Dash/plugin.h → plugins/LightDM/plugin.hrenamed+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012 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
@@ -15,13 +15,13 @@
1515 *
1616 */
1717
18−#ifndef DASH_PLUGIN_H
19−#define DASH_PLUGIN_H
18+#ifndef LIGHTDM_PLUGIN_H
19+#define LIGHTDM_PLUGIN_H
2020
2121#include <QtQml/QQmlEngine>
2222#include <QtQml/QQmlExtensionPlugin>
2323
24−class DashPlugin : public QQmlExtensionPlugin
24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
2525{
2626 Q_OBJECT
2727 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -30,4 +30,4 @@ public:
3030 void registerTypes(const char *uri) override;
3131};
3232
33−#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/fake_unity_plugin.h → plugins/Lights/HfdLights.hrenamed+17−9
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 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− * Author: Nick Dedekind <nick.dedekind@canonical.com>
16+ * Author: Florian Leeber <florian@ubports.com>
1717 */
1818
19−#ifndef FAKE_UNITY_PLUGIN_H
20−#define FAKE_UNITY_PLUGIN_H
19+#ifndef UNITY_HFDLIGHTS_H
20+#define UNITY_HFDLIGHTS_H
2121
22−// Qt
23−#include <QtQml/QQmlExtensionPlugin>
22+#include <QtCore/QObject>
23+#include <QDBusInterface>
24+#include "Lights.h"
2425
25−class FakeUnityPlugin : 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/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/ScreenshotDirectory/CMakeLists.txt+1−1
@@ -4,6 +4,6 @@ set(PLUGIN_SOURCES
44)
55
66add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
7−qt5_use_modules(ScreenshotDirectory-qml Qml Gui Quick)
7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)
88
99add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS 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/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.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/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>
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+8−5
@@ -16,15 +16,17 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
1616
1717add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
1818
19−add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
20−target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
21−
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(${UBUNTUGESTURES_INCLUDE_DIRS})
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/Direction.h+1−1
@@ -26,7 +26,6 @@
2626 */
2727class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
2828 Q_OBJECT
29− Q_ENUMS(Type)
3029
3130public:
3231 // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
@@ -38,6 +37,7 @@ public:
3837 Horizontal, // Along the X axis, in any direction
3938 Vertical // Along the Y axis, in any direction
4039 };
40+ Q_ENUM(Type)
4141
4242 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
4343 Q_INVOKABLE static bool isVertical(Direction::Type type);
plugins/Ubuntu/Gestures/TouchDispatcher.cpp−4
@@ -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
plugins/Ubuntu/Gestures/TouchGate.cpp+10−5
@@ -20,16 +20,18 @@
2020#include <QDebug>
2121#include <QQuickWindow>
2222
23−#include <TouchOwnershipEvent>
24−#include <TouchRegistry>
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+15−12
@@ -16,9 +16,9 @@
1616
1717#include "TouchGestureArea.h"
1818
19−#include <UbuntuGestures/TouchOwnershipEvent>
20−#include <UbuntuGestures/TouchRegistry>
21−#include <UbuntuGestures/UnownedTouchEvent>
19+#include <UbuntuGestures/private/touchownershipevent_p.h>
20+#include <UbuntuGestures/private/touchregistry_p.h>
21+#include <UbuntuGestures/private/unownedtouchevent_p.h>
2222// #include "TouchRegistry.h"
2323// #include "UnownedTouchEvent.h"
2424
@@ -26,6 +26,8 @@
2626#include <QStyleHints>
2727#include <private/qquickwindow_p.h>
2828
29+UG_USE_NAMESPACE
30+
2931#define TOUCHGESTUREAREA_DEBUG 0
3032
3133// TODO - understand more about why we lose touch event releases.
@@ -135,7 +137,7 @@ TouchGestureArea::TouchGestureArea(QQuickItem* parent)
135137 , m_recognitionPeriod(50)
136138 , m_releaseRejectPeriod(100)
137139{
138− setRecognitionTimer(new UbuntuGestures::Timer(this));
140+ setRecognitionTimer(new Timer(this));
139141 m_recognitionTimer->setInterval(m_recognitionPeriod);
140142 m_recognitionTimer->setSingleShot(true);
141143}
@@ -153,10 +155,10 @@ bool TouchGestureArea::event(QEvent *event)
153155{
154156 // Process unowned touch events (handles update/release for incomplete gestures)
155157 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
156− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
158+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(event));
157159 return true;
158160 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
159− unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());
161+ unownedTouchEvent(static_cast<UnownedTouchEvent*>(event)->touchEvent());
160162 return true;
161163 }
162164
@@ -326,6 +328,12 @@ void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)
326328 }
327329 }
328330 }
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();
329337}
330338
331339void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
@@ -608,7 +616,7 @@ void TouchGestureArea::setInternalStatus(uint newStatus)
608616 }
609617}
610618
611−void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
619+void TouchGestureArea::setRecognitionTimer(AbstractTimer *timer)
612620{
613621 int interval = 0;
614622 bool timerWasRunning = false;
@@ -733,7 +741,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
733741 bool added = false;
734742 bool ended = false;
735743 bool moved = false;
736− bool wantsDrag = false;
737744
738745 // list of deletes
739746 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
@@ -763,10 +770,6 @@ void TouchGestureArea::resyncCachedTouchPoints()
763770 }
764771 }
765772
766− if (wantsDrag && !dragging()) {
767− setDragging(true);
768− }
769−
770773 if (ended) {
771774 if (m_cachedTouchPoints.isEmpty()) {
772775 if (!dragging()) Q_EMIT clicked();
plugins/Ubuntu/Gestures/TouchGestureArea.h+10−9
@@ -21,10 +21,11 @@
2121
2222#include <QQuickItem>
2323
24−#include <UbuntuGestures/Timer>
24+#include <UbuntuGestures/ubuntugesturesglobal.h>
25+#include <UbuntuGestures/private/timer_p.h>
2526
26−class TouchOwnershipEvent;
27−class UnownedTouchEvent;
27+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)
28+UG_FORWARD_DECLARE_CLASS(UnownedTouchEvent)
2829
2930class GestureTouchPoint : public QObject
3031{
@@ -75,7 +76,7 @@ public:
7576 return *this;
7677 }
7778
78− bool operator=(const GestureTouchPoint& rhs) const {
79+ bool operator==(const GestureTouchPoint& rhs) const {
7980 if (&rhs == this) return true;
8081 return m_id == rhs.m_id &&
8182 m_pressed == rhs.m_pressed &&
@@ -83,7 +84,7 @@ public:
8384 m_y == rhs.m_y &&
8485 m_dragging == rhs.m_dragging;
8586 }
86− bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
8788
8889 void setPos(const QPointF &pos);
8990
@@ -113,7 +114,6 @@ private:
113114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
114115{
115116 Q_OBJECT
116− Q_ENUMS(Status)
117117
118118 Q_PROPERTY(int status READ status NOTIFY statusChanged)
119119 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
@@ -136,12 +136,13 @@ public:
136136 Recognized,
137137 Rejected
138138 };
139+ Q_ENUM(Status)
139140 TouchGestureArea(QQuickItem* parent = nullptr);
140141 ~TouchGestureArea();
141142
142143 bool event(QEvent *e) override;
143144
144− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
145+ void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);
145146
146147 int status() const;
147148 bool dragging() const;
@@ -194,7 +195,7 @@ private:
194195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
195196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
196197
197− void touchOwnershipEvent(TouchOwnershipEvent *event);
198+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);
198199 void updateTouchPoints(QTouchEvent *event);
199200
200201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
@@ -209,7 +210,7 @@ private:
209210 uint m_status;
210211 QSet<int> m_candidateTouches;
211212 QSet<int> m_watchedTouches;
212− UbuntuGestures::AbstractTimer *m_recognitionTimer;
213+ UG_PREPEND_NAMESPACE(AbstractTimer) *m_recognitionTimer;
213214
214215 bool m_dragging;
215216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;
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/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/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/IntegratedLightDM/plugin.h → plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hrenamed+12−11
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012,2013, 2015 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− *
1615 */
1716
18−#ifndef INTEGRATED_LIGHTDM_PLUGIN_H
19−#define INTEGRATED_LIGHTDM_PLUGIN_H
17+#ifndef DBUSAPPLICATIONMENUREGISTRY_H
18+#define DBUSAPPLICATIONMENUREGISTRY_H
2019
21−#include <QtQml/QQmlEngine>
22−#include <QtQml/QQmlExtensionPlugin>
20+#include "applicationmenuregistry.h"
2321
24−class IntegratedLightDMPlugin : 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 /* INTEGRATED_LIGHTDM_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+}
tests/mocks/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 MOCK_SYSTEMIMAGE_PLUGIN_H
18−#define MOCK_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 // MOCK_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/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.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.cppdeleted−30
@@ -1,30 +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 "dashcommunicatorservice.h"
18−
19−DashCommunicatorService::DashCommunicatorService(QObject *parent):
20− QObject(parent),
21− m_dbusService(new DBusDashCommunicatorService(this))
22−{
23− connect(m_dbusService, &DBusDashCommunicatorService::setCurrentScopeRequested, this, &DashCommunicatorService::setCurrentScopeRequested);
24−}
25−
26−
27−DashCommunicatorService::~DashCommunicatorService()
28−{
29−
30−}
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/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/qinputinfo.h+2−3
@@ -57,8 +57,6 @@ class QInputDeviceManager;
5757class QInputDevice : public QObject
5858{
5959 Q_OBJECT
60− Q_ENUMS(InputType)
61− Q_FLAGS(InputType InputTypeFlags)
6260 friend class QInputDeviceManagerPrivate;
6361
6462public:
@@ -72,8 +70,9 @@ public:
7270 Keyboard = 16,
7371 Switch = 32
7472 };
75− Q_ENUMS(InputType)
73+ Q_FLAG(InputType)
7674 Q_DECLARE_FLAGS(InputTypeFlags, InputType)
75+ Q_FLAG(InputTypeFlags)
7776
7877 explicit QInputDevice(QObject *parent = 0);
7978 QString name() const;
plugins/Unity/Launcher/CMakeLists.txt+15−6
@@ -1,4 +1,3 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
21pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
32
43add_definitions(-DSM_BUSNAME=systemBus)
@@ -6,11 +5,16 @@ add_definitions(-DSM_BUSNAME=systemBus)
65include_directories(
76 ${CMAKE_CURRENT_SOURCE_DIR}
87 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
9− ${GSETTINGS_QT_INCLUDE_DIRS}
10− ${GLIB_INCLUDE_DIRS}
118 ${libunity8-private_SOURCE_DIR}
129)
1310
11+include_directories(
12+ SYSTEM
13+ ${GSETTINGS_QT_INCLUDE_DIRS}
14+ ${GLIB_INCLUDE_DIRS}
15+ ${UAL_INCLUDE_DIRS}
16+ )
17+
1418set(QMLLAUNCHERPLUGIN_SRC
1519 plugin.cpp
1620 launchermodel.cpp
@@ -19,15 +23,20 @@ set(QMLLAUNCHERPLUGIN_SRC
1923 quicklistentry.cpp
2024 dbusinterface.cpp
2125 gsettings.cpp
22− desktopfilehandler.cpp
2326 asadapter.cpp
27+ appdrawermodel.cpp
28+ ualwrapper.cpp
29+ xdgwatcher.cpp
2430 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
2531 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
2632 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
2733 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
34+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
35+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
2836 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
2937 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
3038 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
39+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
3140 )
3241
3342add_library(UnityLauncher-qml MODULE
@@ -38,8 +47,8 @@ target_link_libraries(UnityLauncher-qml
3847 unity8-private
3948 ${GSETTINGS_QT_LDFLAGS}
4049 ${GLIB_LIBRARIES}
50+ ${UAL_LIBRARIES}
51+ Qt5::DBus Qt5::Qml Qt5::Gui Qt5::Concurrent
4152 )
4253
43−qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
44−
4554add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/appdrawermodel.cppnew file+192
@@ -0,0 +1,192 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ * Copyright (C) 2020 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+
18+#include "appdrawermodel.h"
19+#include "ualwrapper.h"
20+#include "xdgwatcher.h"
21+
22+#include <QDebug>
23+#include <QDateTime>
24+#include <QtConcurrentRun>
25+
26+static std::shared_ptr<LauncherItem> makeSharedLauncherItem(
27+ const QString &appId, const QString &name, const QString &icon, QObject * parent)
28+{
29+ return std::shared_ptr<LauncherItem>(
30+ new LauncherItem(appId, name, icon, parent),
31+ [] (LauncherItem *item) { item->deleteLater(); });
32+}
33+
34+AppDrawerModel::AppDrawerModel(QObject *parent):
35+ AppDrawerModelInterface(parent),
36+ m_ual(new UalWrapper(this)),
37+ m_xdgWatcher(new XdgWatcher(this)),
38+ m_refreshing(false)
39+{
40+ connect(&m_refreshFutureWatcher, &QFutureWatcher<ItemList>::finished,
41+ this, &AppDrawerModel::onRefreshFinished);
42+
43+ // keep this a queued connection as it's coming from another thread.
44+ connect(m_xdgWatcher, &XdgWatcher::appAdded, this, &AppDrawerModel::appAdded, Qt::QueuedConnection);
45+ connect(m_xdgWatcher, &XdgWatcher::appRemoved, this, &AppDrawerModel::appRemoved, Qt::QueuedConnection);
46+ connect(m_xdgWatcher, &XdgWatcher::appInfoChanged, this, &AppDrawerModel::appInfoChanged, Qt::QueuedConnection);
47+
48+ refresh();
49+}
50+
51+int AppDrawerModel::rowCount(const QModelIndex &parent) const
52+{
53+ Q_UNUSED(parent)
54+ return m_list.count();
55+}
56+
57+QVariant AppDrawerModel::data(const QModelIndex &index, int role) const
58+{
59+ switch (role) {
60+ case RoleAppId:
61+ return m_list.at(index.row())->appId();
62+ case RoleName:
63+ return m_list.at(index.row())->name();
64+ case RoleIcon:
65+ return m_list.at(index.row())->icon();
66+ case RoleKeywords:
67+ return m_list.at(index.row())->keywords();
68+ case RoleUsage:
69+ return m_list.at(index.row())->popularity();
70+ }
71+
72+ return QVariant();
73+}
74+
75+void AppDrawerModel::appAdded(const QString &appId)
76+{
77+ if (m_refreshing)
78+ // Will be replaced by the refresh result anyway.
79+ return;
80+
81+ UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);
82+ if (!info.valid) {
83+ qWarning() << "App added signal received but failed to get app info for app" << appId;
84+ return;
85+ }
86+
87+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
88+ auto item = makeSharedLauncherItem(appId, info.name, info.icon, /* parent */ nullptr);
89+ item->setKeywords(info.keywords);
90+ item->setPopularity(info.popularity);
91+ m_list.append(std::move(item));
92+ endInsertRows();
93+}
94+
95+void AppDrawerModel::appRemoved(const QString &appId)
96+{
97+ if (m_refreshing)
98+ // Will be replaced by the refresh result anyway.
99+ return;
100+
101+ int idx = -1;
102+ for (int i = 0; i < m_list.count(); i++) {
103+ if (m_list.at(i)->appId() == appId) {
104+ idx = i;
105+ break;
106+ }
107+ }
108+ if (idx < 0) {
109+ qWarning() << "App removed signal received but app doesn't seem to be in the drawer model";
110+ return;
111+ }
112+ beginRemoveRows(QModelIndex(), idx, idx);
113+ m_list.removeAt(idx);
114+ endRemoveRows();
115+}
116+
117+void AppDrawerModel::appInfoChanged(const QString &appId)
118+{
119+ if (m_refreshing)
120+ // Will be replaced by the refresh result anyway.
121+ return;
122+
123+ std::shared_ptr<LauncherItem> item;
124+ int idx = -1;
125+
126+ for(int i = 0; i < m_list.count(); i++) {
127+ if (m_list.at(i)->appId() == appId) {
128+ item = m_list.at(i);
129+ idx = i;
130+ break;
131+ }
132+ }
133+
134+ if (!item) {
135+ return;
136+ }
137+
138+ UalWrapper::AppInfo info = m_ual->getApplicationInfo(appId);
139+ item->setPopularity(info.popularity);
140+ Q_EMIT dataChanged(index(idx), index(idx), {AppDrawerModelInterface::RoleUsage});
141+}
142+
143+bool AppDrawerModel::refreshing() {
144+ return m_refreshing;
145+}
146+
147+void AppDrawerModel::refresh() {
148+ if (m_refreshing)
149+ return;
150+
151+ m_refreshFutureWatcher.setFuture(QtConcurrent::run([](QThread *thread) {
152+ ItemList list;
153+
154+ Q_FOREACH (const QString &appId, UalWrapper::installedApps()) {
155+ UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);
156+ if (!info.valid) {
157+ qWarning() << "Failed to get app info for app" << appId;
158+ continue;
159+ }
160+ // We don't pass parent in because this may run after the model is destroyed.
161+ // (And, in fact, we can't, because the model is in a diferent thread.)
162+ auto item = makeSharedLauncherItem(appId, info.name, info.icon, /* parent */ nullptr);
163+ item->setKeywords(info.keywords);
164+ item->setPopularity(info.popularity);
165+ item->moveToThread(thread);
166+ list.append(std::move(item));
167+ }
168+
169+ return list;
170+ }, this->thread()));
171+
172+ m_refreshing = true;
173+ Q_EMIT refreshingChanged();
174+}
175+
176+void AppDrawerModel::onRefreshFinished() {
177+ if (m_refreshFutureWatcher.isCanceled())
178+ // This is the result of setting canceled future below.
179+ return;
180+
181+ beginResetModel();
182+
183+ m_list = m_refreshFutureWatcher.result();
184+ // Remove the future & its result, so that future modifications won't
185+ // create a copy.
186+ m_refreshFutureWatcher.setFuture(QFuture<ItemList>());
187+
188+ endResetModel();
189+
190+ m_refreshing = false;
191+ Q_EMIT refreshingChanged();
192+}
plugins/Unity/Launcher/appdrawermodel.hnew file+64
@@ -0,0 +1,64 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ * Copyright (C) 2020 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+
18+#include <memory>
19+#include <QFutureWatcher>
20+#include <unity/shell/launcher/AppDrawerModelInterface.h>
21+
22+#include "launcheritem.h"
23+
24+class UalWrapper;
25+class XdgWatcher;
26+
27+class AppDrawerModel: public AppDrawerModelInterface
28+{
29+ Q_OBJECT
30+ // TODO: Add this to AppDrawerModelInterface in unity-api.
31+ // Or, better yet, remove AppDrawerModelInterface from unity-api.
32+ Q_PROPERTY(bool refreshing READ refreshing NOTIFY refreshingChanged)
33+public:
34+ AppDrawerModel(QObject* parent = nullptr);
35+
36+ int rowCount(const QModelIndex &parent) const override;
37+ QVariant data(const QModelIndex &index, int role) const override;
38+
39+ // TODO: add these to AppDrawerModelInterface too.
40+ bool refreshing();
41+ Q_INVOKABLE void refresh();
42+
43+Q_SIGNALS:
44+ void refreshingChanged();
45+
46+private Q_SLOTS:
47+ void appAdded(const QString &appId);
48+ void appRemoved(const QString &appId);
49+ void appInfoChanged(const QString &appId);
50+
51+ void onRefreshFinished();
52+
53+private:
54+ // Using shared_ptr is unavoidable in order to share the refresh result
55+ // from the worker thread safely without a memory leak, in case the model
56+ // is destructed before the worker finishes.
57+ typedef QList<std::shared_ptr<LauncherItem>> ItemList;
58+
59+ ItemList m_list;
60+ UalWrapper *m_ual;
61+ XdgWatcher *m_xdgWatcher;
62+ QFutureWatcher<ItemList> m_refreshFutureWatcher;
63+ bool m_refreshing;
64+};
plugins/Unity/Launcher/desktopfilehandler.cppdeleted−155
@@ -1,155 +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 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− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
18− */
19−
20−#include "desktopfilehandler.h"
21−
22−#include <QStringList>
23−#include <QStandardPaths>
24−#include <QDir>
25−#include <QSettings>
26−#include <QLocale>
27−
28−#include <libintl.h>
29−
30−DesktopFileHandler::DesktopFileHandler(const QString &appId, QObject *parent):
31− QObject(parent),
32− m_appId(appId)
33−{
34− load();
35−}
36−
37−QString DesktopFileHandler::appId() const
38−{
39− return m_appId;
40−}
41−
42−void DesktopFileHandler::setAppId(const QString &appId)
43−{
44− if (m_appId != appId) {
45− m_appId = appId;
46− load();
47− }
48−}
49−
50−QString DesktopFileHandler::filename() const
51−{
52− return m_filename;
53−}
54−
55−bool DesktopFileHandler::isValid() const
56−{
57− return !m_filename.isEmpty();
58−}
59−
60−void DesktopFileHandler::load()
61−{
62− m_filename.clear();
63−
64− if (m_appId.isEmpty()) {
65− return;
66− }
67−
68− int dashPos = -1;
69− QString helper = m_appId;
70−
71− QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
72−#ifdef LAUNCHER_TESTING
73− searchDirs << QStringLiteral(".");
74−#endif
75−
76− QString path;
77− do {
78− if (dashPos != -1) {
79− helper.replace(dashPos, 1, '/');
80− }
81−
82− if (helper.contains('/')) {
83− path += helper.split('/').at(0) + '/';
84− helper.remove(QRegExp("^" + path));
85− }
86−
87− Q_FOREACH(const QString &searchDirName, searchDirs) {
88− QDir searchDir(searchDirName + "/" + path);
89− const QString desktop = QStringLiteral("*.desktop");
90− Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << desktop)) {
91− if (desktopFile.startsWith(helper)) {
92− QFileInfo fileInfo(searchDir, desktopFile);
93− m_filename = fileInfo.absoluteFilePath();
94− return;
95− }
96− }
97− }
98−
99− dashPos = helper.indexOf('-');
100− } while (dashPos != -1);
101−}
102−
103−QString DesktopFileHandler::displayName() const
104−{
105− if (!isValid()) {
106− return QString();
107− }
108−
109− QSettings settings(m_filename, QSettings::IniFormat);
110− settings.setIniCodec("UTF-8");
111− settings.beginGroup(QStringLiteral("Desktop Entry"));
112−
113− // First try to find Name[xx_YY] and Name[xx] in .desktop file
114− const QString locale = QLocale().name();
115− const QStringList splitLocale = locale.split(QLatin1Char('_'));
116− const QString shortLocale = splitLocale.first();
117−
118− if (locale != shortLocale && settings.contains(QStringLiteral("Name[%1]").arg(locale))) {
119− return settings.value(QStringLiteral("Name[%1]").arg(locale)).toString();
120− }
121−
122− if (settings.contains(QStringLiteral("Name[%1]").arg(shortLocale))) {
123− return settings.value(QStringLiteral("Name[%1]").arg(shortLocale)).toString();
124− }
125−
126− // No translation found in desktop file. Get the untranslated one and have a go with gettext.
127− QString displayName = settings.value(QStringLiteral("Name")).toString();
128−
129− if (settings.contains(QStringLiteral("X-Ubuntu-Gettext-Domain"))) {
130− const QString domain = settings.value(QStringLiteral("X-Ubuntu-Gettext-Domain")).toString();
131− return dgettext(domain.toUtf8().constData(), displayName.toUtf8().constData());
132− }
133−
134− return displayName;
135−}
136−
137−QString DesktopFileHandler::icon() const
138−{
139− if (!isValid()) {
140− return QString();
141− }
142−
143− QSettings settings(m_filename, QSettings::IniFormat);
144− settings.setIniCodec("UTF-8");
145− settings.beginGroup(QStringLiteral("Desktop Entry"));
146− QString iconString = settings.value(QStringLiteral("Icon")).toString();
147− QString pathString = settings.value(QStringLiteral("Path")).toString();
148−
149− if (QFileInfo::exists(iconString)) {
150− return QFileInfo(iconString).absoluteFilePath();
151− } else if (QFileInfo::exists(pathString + '/' + iconString)) {
152− return pathString + '/' + iconString;
153− }
154− return "image://theme/" + iconString;
155−}
plugins/Unity/Launcher/desktopfilehandler.hdeleted−56
@@ -1,56 +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 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− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
18− */
19−
20−#ifndef DESKTOPFILEHANDLER_H
21−#define DESKTOPFILEHANDLER_H
22−
23−#include <QObject>
24−
25−/**
26− * When an object of this class is created or whenever setAppId(appId) is called,
27− * this will search for a .desktop file matching the give appId. If a file is
28− * found, isValid() will return true and the other methods return the contents
29− * of the .desktop file.
30− *
31− * Note that this class will consider the user's locale and do a best effort
32− * to return localized values.
33− */
34−
35−class DesktopFileHandler: public QObject
36−{
37− Q_OBJECT
38−public:
39− DesktopFileHandler(const QString &appId = QString(), QObject *parent = nullptr);
40−
41− QString appId() const;
42− void setAppId(const QString &appId);
43−
44− bool isValid() const;
45− QString filename() const;
46− QString displayName() const;
47− QString icon() const;
48−
49−private:
50− void load();
51−
52− QString m_appId;
53− QString m_filename;
54−};
55−
56−#endif
plugins/Unity/Launcher/launcheritem.cpp+57−7
@@ -35,23 +35,24 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
3535 m_countVisible(false),
3636 m_focused(false),
3737 m_alerting(false),
38− m_surfaceCount(0),
3938 m_quickList(new QuickListModel(this))
4039{
41− Q_ASSERT(parent != nullptr);
4240 QuickListEntry nameAction;
4341 nameAction.setActionId(QStringLiteral("launch_item"));
4442 nameAction.setText(m_name);
43+ nameAction.setHasSeparator(true);
4544 m_quickList->appendAction(nameAction);
4645
4746 QuickListEntry pinningAction;
4847 pinningAction.setActionId(QStringLiteral("pin_item"));
4948 pinningAction.setText(gettext("Pin shortcut"));
49+ pinningAction.setIsPrivate(true);
5050 m_quickList->appendAction(pinningAction);
5151
5252 m_quitAction.setActionId(QStringLiteral("stop_item"));
5353 m_quitAction.setIcon(QStringLiteral("application-exit"));
5454 m_quitAction.setText(gettext("Quit"));
55+ m_quitAction.setIsPrivate(true);
5556}
5657
5758QString LauncherItem::appId() const
@@ -89,6 +90,19 @@ void LauncherItem::setIcon(const QString &icon)
8990 }
9091}
9192
93+QStringList LauncherItem::keywords() const
94+{
95+ return m_keywords;
96+}
97+
98+void LauncherItem::setKeywords(const QStringList &keywords)
99+{
100+ if (m_keywords != keywords) {
101+ m_keywords = keywords;
102+ Q_EMIT keywordsChanged(keywords);
103+ }
104+}
105+
92106bool LauncherItem::pinned() const
93107{
94108 return m_pinned;
@@ -106,6 +120,7 @@ void LauncherItem::setPinned(bool pinned)
106120 QuickListEntry entry;
107121 entry.setActionId(QStringLiteral("pin_item"));
108122 entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
123+ entry.setIsPrivate(true);
109124 m_quickList->updateAction(entry);
110125}
111126
@@ -207,14 +222,49 @@ void LauncherItem::setAlerting(bool alerting)
207222
208223int LauncherItem::surfaceCount() const
209224{
210− return m_surfaceCount;
225+ return m_surfaces.count();
226+}
227+
228+void LauncherItem::setSurfaces(const QList<QPair<QString, QString> > &surfaces)
229+{
230+ if (m_surfaces != surfaces) {
231+ m_surfaces = surfaces;
232+
233+ QList<QuickListEntry> removedEntries;
234+ for (int i = 0; i < m_quickList->rowCount(); ++i) {
235+ QuickListEntry entry = m_quickList->get(i);
236+ if (entry.actionId().startsWith(QStringLiteral("surface_"))) {
237+ removedEntries.append(entry);
238+ }
239+ }
240+ Q_FOREACH (const QuickListEntry &entry, removedEntries) {
241+ m_quickList->removeAction(entry);
242+ }
243+ for (int i = 0; i < surfaces.count(); ++i) {
244+ QuickListEntry entry;
245+ entry.setActionId(QStringLiteral("surface_") + surfaces.at(i).first);
246+ entry.setText(surfaces.at(i).second);
247+ entry.setIsPrivate(true);
248+ if (i == surfaces.count() - 1) {
249+ entry.setHasSeparator(true);
250+ }
251+ m_quickList->insertAction(entry, i + 1);
252+ }
253+
254+ Q_EMIT surfaceCountChanged(m_surfaces.count());
255+ }
256+}
257+
258+uint LauncherItem::popularity() const
259+{
260+ return m_popularity;
211261}
212262
213−void LauncherItem::setSurfaceCount(int surfaceCount)
263+void LauncherItem::setPopularity(uint popularity)
214264{
215− if (m_surfaceCount != surfaceCount) {
216− m_surfaceCount = surfaceCount;
217− Q_EMIT surfaceCountChanged(surfaceCount);
265+ if (m_popularity != popularity) {
266+ m_popularity = popularity;
267+ Q_EMIT popularityChanged(popularity);
218268 }
219269}
220270
plugins/Unity/Launcher/launcheritem.h+10−2
@@ -23,6 +23,7 @@
2323#include "quicklistmodel.h"
2424
2525#include <unity/shell/launcher/LauncherItemInterface.h>
26+#include <unity/shell/application/MirSurfaceInterface.h>
2627
2728class QuickListModel;
2829
@@ -37,6 +38,8 @@ public:
3738 QString appId() const override;
3839 QString name() const override;
3940 QString icon() const override;
41+ QStringList keywords() const override;
42+ uint popularity() const override;
4043 bool pinned() const override;
4144 bool running() const override;
4245 bool recent() const override;
@@ -52,6 +55,8 @@ public:
5255private:
5356 void setName(const QString &name);
5457 void setIcon(const QString &icon);
58+ void setKeywords(const QStringList &keywords);
59+ void setPopularity(uint popularity);
5560 void setPinned(bool pinned);
5661 void setRunning(bool running);
5762 void setRecent(bool recent);
@@ -60,12 +65,14 @@ private:
6065 void setCountVisible(bool countVisible);
6166 void setFocused(bool focused);
6267 void setAlerting(bool alerting);
63− void setSurfaceCount(int surfaceCount);
68+ void setSurfaces(const QList<QPair<QString, QString >> &surfaces);
6469
6570private:
6671 QString m_appId;
6772 QString m_name;
6873 QString m_icon;
74+ QStringList m_keywords;
75+ uint m_popularity;
6976 bool m_pinned;
7077 bool m_running;
7178 bool m_recent;
@@ -74,11 +81,12 @@ private:
7481 bool m_countVisible;
7582 bool m_focused;
7683 bool m_alerting;
77− int m_surfaceCount;
84+ QList<QPair<QString, QString> > m_surfaces;
7885 QuickListModel *m_quickList;
7986 QuickListEntry m_quitAction;
8087
8188 friend class LauncherModel;
89+ friend class AppDrawerModel;
8290};
8391
8492#endif // LAUNCHERITEM_H
plugins/Unity/Launcher/launchermodel.cpp+73−46
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 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 Lesser General Public License as published by
@@ -12,20 +12,18 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
1815 */
1916
2017#include "launchermodel.h"
2118#include "launcheritem.h"
2219#include "gsettings.h"
23−#include "desktopfilehandler.h"
2420#include "dbusinterface.h"
2521#include "asadapter.h"
22+#include "ualwrapper.h"
2623
2724#include <unity/shell/application/ApplicationInfoInterface.h>
2825#include <unity/shell/application/MirSurfaceListInterface.h>
26+#include <unity/shell/application/MirSurfaceInterface.h>
2927
3028#include <QDesktopServices>
3129#include <QDebug>
@@ -157,18 +155,19 @@ void LauncherModel::pin(const QString &appId, int index)
157155 index = m_list.count();
158156 }
159157
160− DesktopFileHandler desktopFile(appId);
161− if (!desktopFile.isValid()) {
162− qWarning() << "Can't pin this application, there is no .desktop file available.";
158+ UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(appId);
159+ if (!appInfo.valid) {
160+ qWarning() << "Can't pin application, appId not found:" << appId;
163161 return;
164162 }
165163
166164 beginInsertRows(QModelIndex(), index, index);
167165 LauncherItem *item = new LauncherItem(appId,
168− desktopFile.displayName(),
169− desktopFile.icon(),
166+ appInfo.name,
167+ appInfo.icon,
170168 this);
171169 item->setPinned(true);
170+ item->setPopularity(appInfo.popularity);
172171 m_list.insert(index, item);
173172 endInsertRows();
174173 }
@@ -201,12 +200,26 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
201200 } else {
202201 pin(appId);
203202 }
204− } else if (actionId == QLatin1String("launch_item")) {
203+ } else if (actionId == QStringLiteral("launch_item")) {
205204 QDesktopServices::openUrl(getUrlForAppId(appId));
206− } else if (actionId == QLatin1String("stop_item")) { // Quit
205+ } else if (actionId == QStringLiteral("stop_item")) { // Quit
207206 if (m_appManager) {
208207 m_appManager->stopApplication(appId);
209208 }
209+ } else if (actionId.startsWith(QStringLiteral("surface_"))){
210+ ApplicationInfoInterface *appInfo = m_appManager->findApplication(appId);
211+ if (appInfo) {
212+ for (int i = 0; i < appInfo->surfaceList()->count(); ++i) {
213+ MirSurfaceInterface *iface = appInfo->surfaceList()->get(i);
214+ QString id = actionId;
215+ id.remove(QRegExp("^surface_"));
216+ if (id == iface->persistentId()) {
217+ iface->activate();
218+ }
219+ }
220+ } else {
221+ qWarning() << "App for" << appId << "not found in launcher. Cannot invoke quicklist action";
222+ }
210223 // Nope, we don't know this action, let the backend forward it to the application
211224 } else {
212225 // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -217,7 +230,6 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
217230void LauncherModel::setUser(const QString &username)
218231{
219232 Q_UNUSED(username)
220− qWarning() << "This backend doesn't support multiple users";
221233}
222234
223235QString LauncherModel::getUrlForAppId(const QString &appId) const
@@ -365,7 +377,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, bool countVisible)
365377 if (idx >= 0) {
366378 LauncherItem *item = m_list.at(idx);
367379 item->setCountVisible(countVisible);
368− QVector<int> changedRoles = {RoleCount};
380+ QVector<int> changedRoles = {RoleCountVisible};
369381 if (countVisible && !item->alerting() && !item->focused()) {
370382 changedRoles << RoleAlerting;
371383 item->setAlerting(true);
@@ -380,11 +392,11 @@ void LauncherModel::countVisibleChanged(const QString &appId, bool countVisible)
380392 }
381393 } else {
382394 // Need to create a new LauncherItem and show the highlight
383− DesktopFileHandler desktopFile(appId);
384− if (countVisible && desktopFile.isValid()) {
395+ UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(appId);
396+ if (countVisible && appInfo.valid) {
385397 LauncherItem *item = new LauncherItem(appId,
386− desktopFile.displayName(),
387− desktopFile.icon(),
398+ appInfo.name,
399+ appInfo.icon,
388400 this);
389401 item->setCountVisible(true);
390402 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
@@ -400,28 +412,28 @@ void LauncherModel::refresh()
400412 // First walk through all the existing items and see if we need to remove something
401413 QList<LauncherItem*> toBeRemoved;
402414 Q_FOREACH (LauncherItem* item, m_list) {
403− DesktopFileHandler desktopFile(item->appId());
404− if (!desktopFile.isValid()) {
405− // Desktop file not available for this app => drop it!
415+ UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(item->appId());
416+ if (!appInfo.valid) {
417+ // Application no longer available => drop it!
406418 toBeRemoved << item;
407419 } else if (!m_settings->storedApplications().contains(item->appId())) {
408420 // Item not in settings any more => drop it!
409421 toBeRemoved << item;
410422 } else {
411423 int idx = m_list.indexOf(item);
412− item->setName(desktopFile.displayName());
424+ item->setName(appInfo.name);
413425 item->setPinned(item->pinned()); // update pinned text if needed
414426 item->setRunning(item->running());
415427 Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleRunning});
416428
417429 const QString oldIcon = item->icon();
418− if (oldIcon == desktopFile.icon()) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
430+ if (oldIcon == appInfo.icon) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
419431 item->setIcon(QString());
420432 Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
421433 }
422434
423435 // now set the icon for real
424− item->setIcon(desktopFile.icon());
436+ item->setIcon(appInfo.icon);
425437 Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
426438 }
427439 }
@@ -452,15 +464,14 @@ void LauncherModel::refresh()
452464 if (itemIndex == -1) {
453465 // Need to add it. Just add it into the addedIndex to keep same ordering as the list
454466 // in the settings.
455− DesktopFileHandler desktopFile(entry);
456− if (!desktopFile.isValid()) {
457− qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
467+ UalWrapper::AppInfo appInfo = UalWrapper::getApplicationInfo(entry);
468+ if (!appInfo.valid) {
458469 continue;
459470 }
460471
461472 LauncherItem *item = new LauncherItem(entry,
462− desktopFile.displayName(),
463− desktopFile.icon(),
473+ appInfo.name,
474+ appInfo.icon,
464475 this);
465476 item->setPinned(true);
466477 beginInsertRows(QModelIndex(), addedIndex, addedIndex);
@@ -510,11 +521,6 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
510521 return;
511522 }
512523
513− if (app->appId() == QLatin1String("unity8-dash")) {
514− // Not adding the dash app
515− return;
516− }
517−
518524 const int itemIndex = findApplication(app->appId());
519525 if (itemIndex != -1) {
520526 LauncherItem *item = m_list.at(itemIndex);
@@ -522,40 +528,61 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
522528 item->setRecent(true);
523529 Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
524530 }
525− if (item->surfaceCount() != app->surfaceCount()) {
526− item->setSurfaceCount(app->surfaceCount());
527− Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleSurfaceCount});
528− }
529−
530531 item->setRunning(true);
531532 } else {
532533 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
533534 item->setRecent(true);
534535 item->setRunning(true);
535536 item->setFocused(app->focused());
536− item->setSurfaceCount(app->surfaceCount());
537537 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
538538 m_list.append(item);
539539 endInsertRows();
540540 }
541− connect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);
541+ connect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::updateSurfaceList);
542542 m_asAdapter->syncItems(m_list);
543543 Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRunning});
544544}
545545
546−void LauncherModel::applicationSurfaceCountChanged(int count)
546+void LauncherModel::updateSurfaceList()
547547{
548548 ApplicationInfoInterface *app = static_cast<ApplicationInfoInterface*>(sender());
549+ updateSurfaceListForApp(app);
550+}
551+
552+void LauncherModel::updateSurfaceListForSurface()
553+{
554+ MirSurfaceInterface *iface = static_cast<MirSurfaceInterface*>(sender());
555+ ApplicationInfoInterface* app = m_appManager->findApplication(iface->appId());
556+ if (!app) {
557+ return;
558+ }
559+ updateSurfaceListForApp(app);
560+}
561+
562+void LauncherModel::updateSurfaceListForApp(ApplicationInfoInterface* app)
563+{
549564 int idx = findApplication(app->appId());
550565 if (idx < 0) {
551566 qWarning() << "Received a surface count changed event from an app that's not in the Launcher model";
552567 return;
553568 }
554569 LauncherItem *item = m_list.at(idx);
555− if (item->surfaceCount() != count) {
556− item->setSurfaceCount(count);
557− Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});
570+ QList<QPair<QString, QString> > surfaces;
571+ for (int i = 0; i < app->surfaceList()->count(); ++i) {
572+ MirSurfaceInterface* iface = app->surfaceList()->get(i);
573+ if (iface->type() == Mir::NormalType || iface->type() == Mir::DialogType) {
574+ // Avoid duplicate connections, so let's just disconnect first to be sure
575+ disconnect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);
576+ connect(iface, &MirSurfaceInterface::nameChanged, this, &LauncherModel::updateSurfaceListForSurface);
577+ QString name = iface->name();
578+ if (name.isEmpty()) {
579+ name = app->name();
580+ }
581+ surfaces.append({iface->persistentId(), name});
582+ }
558583 }
584+ item->setSurfaces(surfaces);
585+ Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});
559586}
560587
561588void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
@@ -576,7 +603,7 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
576603 return;
577604 }
578605
579− disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);
606+ disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::updateSurfaceList);
580607
581608 LauncherItem * item = m_list.at(appIndex);
582609
plugins/Unity/Launcher/launchermodel.h+6−9
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 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 Lesser General Public License as published by
@@ -12,14 +12,11 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
1815 */
1916
20−#ifndef LAUNCHERMODEL_H
21−#define LAUNCHERMODEL_H
17+#pragma once
2218
19+#include <memory>
2320#include <unity/shell/launcher/LauncherModelInterface.h>
2421#include <unity/shell/application/ApplicationManagerInterface.h>
2522
@@ -78,7 +75,9 @@ private Q_SLOTS:
7875 void applicationAdded(const QModelIndex &parent, int row);
7976 void applicationRemoved(const QModelIndex &parent, int row);
8077 void focusedAppIdChanged();
81− void applicationSurfaceCountChanged(int);
78+ void updateSurfaceList();
79+ void updateSurfaceListForApp(ApplicationInfoInterface *app);
80+ void updateSurfaceListForSurface();
8281
8382private:
8483 QList<LauncherItem*> m_list;
@@ -91,5 +90,3 @@ private:
9190
9291 friend class LauncherModelTest;
9392};
94−
95−#endif // LAUNCHERMODEL_H
plugins/Unity/Launcher/plugin.cpp+2−1
@@ -26,7 +26,7 @@
2626// local
2727#include "launchermodel.h"
2828#include "launcheritem.h"
29−
29+#include "appdrawermodel.h"
3030
3131using namespace unity::shell::launcher;
3232
@@ -46,4 +46,5 @@ void UnityLauncherPlugin::registerTypes(const char *uri)
4646 qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
4747 qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", QStringLiteral("Can't create new Launcher Items in QML. Get them from the LauncherModel."));
4848 qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", QStringLiteral("Can't create a QuickListModel in QML. Get them from the LauncherItems."));
49+ qmlRegisterType<AppDrawerModel>(uri, 0, 1, "AppDrawerModel");
4950}
plugins/Unity/Launcher/quicklistentry.cpp+22
@@ -19,6 +19,8 @@
1919#include "quicklistentry.h"
2020
2121QuickListEntry::QuickListEntry()
22+ : m_hasSeparator(false)
23+ , m_isPrivate(false)
2224{
2325}
2426
@@ -57,7 +59,27 @@ bool QuickListEntry::clickable() const
5759 return !m_actionId.isEmpty();
5860}
5961
62+void QuickListEntry::setHasSeparator(bool hasSeparator)
63+{
64+ m_hasSeparator = hasSeparator;
65+}
66+
67+bool QuickListEntry::hasSeparator() const
68+{
69+ return m_hasSeparator;
70+}
71+
6072bool QuickListEntry::operator==(const QuickListEntry &other)
6173{
6274 return !other.actionId().isEmpty() && other.actionId() == m_actionId;
6375}
76+
77+bool QuickListEntry::isPrivate() const
78+{
79+ return m_isPrivate;
80+}
81+
82+void QuickListEntry::setIsPrivate(bool isPrivate)
83+{
84+ m_isPrivate = isPrivate;
85+}
plugins/Unity/Launcher/quicklistentry.h+8
@@ -37,12 +37,20 @@ public:
3737
3838 bool clickable() const;
3939
40+ void setHasSeparator(bool hasSeparator);
41+ bool hasSeparator() const;
42+
4043 bool operator==(const QuickListEntry & other);
4144
45+ bool isPrivate() const;
46+ void setIsPrivate(bool isPrivate);
47+
4248private:
4349 QString m_actionId;
4450 QString m_text;
4551 QString m_icon;
52+ bool m_hasSeparator;
53+ bool m_isPrivate;
4654};
4755
4856#endif // QUICKLISTENTRY
plugins/Unity/Launcher/quicklistmodel.cpp+11
@@ -37,6 +37,13 @@ void QuickListModel::appendAction(const QuickListEntry &entry)
3737 endInsertRows();
3838}
3939
40+void QuickListModel::insertAction(const QuickListEntry &entry, int index)
41+{
42+ beginInsertRows(QModelIndex(), index, index);
43+ m_list.insert(index, entry);
44+ endInsertRows();
45+}
46+
4047void QuickListModel::updateAction(const QuickListEntry &entry)
4148{
4249 for (int i = 0; i < m_list.count(); ++i) {
@@ -79,6 +86,10 @@ QVariant QuickListModel::data(const QModelIndex &index, int role) const
7986 return m_list.at(index.row()).icon();
8087 case RoleClickable:
8188 return m_list.at(index.row()).clickable();
89+ case RoleHasSeparator:
90+ return m_list.at(index.row()).hasSeparator();
91+ case RoleIsPrivate:
92+ return m_list.at(index.row()).isPrivate();
8293 }
8394 return QVariant();
8495}
plugins/Unity/Launcher/quicklistmodel.h+1
@@ -36,6 +36,7 @@ public:
3636 ~QuickListModel();
3737
3838 void appendAction(const QuickListEntry &entry);
39+ void insertAction(const QuickListEntry &entry, int index);
3940
4041 /**
4142 * @brief Update an existing action
plugins/Unity/Launcher/ualwrapper.cppnew file+74
@@ -0,0 +1,74 @@
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 <QDebug>
18+
19+#include "ualwrapper.h"
20+
21+#include <ubuntu-app-launch/registry.h>
22+using namespace ubuntu::app_launch;
23+
24+UalWrapper::UalWrapper(QObject *parent):
25+ QObject(parent)
26+{
27+}
28+
29+QStringList UalWrapper::installedApps()
30+{
31+ QStringList appIds;
32+ try {
33+ for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
34+ if (!app->appId().package.value().empty()) {
35+ appIds << QString::fromStdString(app->appId().package.value() + "_" + app->appId().appname.value());
36+ } else {
37+ appIds << QString::fromStdString(app->appId().appname);
38+ }
39+ }
40+ } catch (const std::runtime_error &e) {
41+ qWarning() << "ubuntu-app-launch threw an exception listing apps:" << e.what();
42+ }
43+
44+ return appIds;
45+}
46+
47+UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
48+{
49+ AppInfo info;
50+
51+ try {
52+ AppID ualAppId = AppID::find(appId.toStdString());
53+ if (ualAppId.empty()) {
54+ qWarning() << "Empty ualAppId result for" << appId;
55+ return info;
56+ }
57+
58+ std::shared_ptr<Application> ualApp;
59+ ualApp = Application::create(ualAppId, Registry::getDefault());
60+
61+ info.appId = appId;
62+ info.name = QString::fromStdString(ualApp->info()->name());
63+ info.icon = QString::fromStdString(ualApp->info()->iconPath());
64+ for (const std::string &keyword : ualApp->info()->keywords().value()) {
65+ info.keywords << QString::fromStdString(keyword);
66+ }
67+ //info.popularity = ualApp->info()->popularity();
68+ info.valid = true;
69+ } catch (const std::runtime_error &e) {
70+ qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
71+ }
72+
73+ return info;
74+}
plugins/Unity/Launcher/ualwrapper.hnew file+36
@@ -0,0 +1,36 @@
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 <QObject>
18+
19+class UalWrapper: public QObject
20+{
21+ Q_OBJECT
22+public:
23+ struct AppInfo {
24+ QString appId;
25+ bool valid = false;
26+ QString name;
27+ QString icon;
28+ QStringList keywords;
29+ uint popularity = 0;
30+ };
31+
32+ UalWrapper(QObject* parent = nullptr);
33+
34+ static QStringList installedApps();
35+ static AppInfo getApplicationInfo(const QString &appId);
36+};
plugins/Unity/Launcher/xdgwatcher.cppnew file+129
@@ -0,0 +1,129 @@
1+/*
2+ * Copyright (C) 2019 UBports Foundation
3+ * Author(s): Marius Gripsgard <marius@ubports.com>
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+
18+#include "xdgwatcher.h"
19+
20+#include <QDebug>
21+#include <QDir>
22+#include <QFile>
23+#include <QStandardPaths>
24+#include <QTextStream>
25+
26+XdgWatcher::XdgWatcher(QObject* parent)
27+ : QObject(parent),
28+ m_watcher(new QFileSystemWatcher(this))
29+{
30+ connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &XdgWatcher::onDirectoryChanged);
31+ connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &XdgWatcher::onFileChanged);
32+
33+ const auto paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
34+ for (const auto &path: paths) {
35+ const auto qdir = QDir(path);
36+ if (!qdir.exists()) {
37+ continue;
38+ }
39+
40+ // Add the path itself to watch for newly added apps
41+ m_watcher->addPath(path);
42+
43+ // Add watcher for eatch app to watch for changes
44+ const auto files = qdir.entryInfoList(QDir::Files);
45+ for (const auto &file: files) {
46+ if (file.suffix() == "desktop") {
47+ const auto path = file.absoluteFilePath();
48+ m_watcher->addPath(path);
49+ m_registry.insert(path, getAppId(file));
50+ }
51+ }
52+ }
53+}
54+
55+// "Ubuntu style" appID is filename without versionNumber after last "_"
56+const QString XdgWatcher::stripAppIdVersion(const QString rawAppID) const {
57+ auto appIdComponents = rawAppID.split("_");
58+ appIdComponents.removeLast();
59+ return appIdComponents.join("_");
60+}
61+
62+// Standard appID see:
63+// https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id
64+const QString XdgWatcher::toStandardAppId(const QFileInfo fileInfo) const {
65+ const auto paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
66+ for (const auto &path: paths) {
67+ if (fileInfo.absolutePath() == path) {
68+ break;
69+ }
70+ if (fileInfo.absolutePath().contains(path)) {
71+ auto fileStr = fileInfo.absoluteFilePath();
72+ fileStr.replace(path, "");
73+ fileStr.replace("/", "-");
74+ fileStr.replace(".desktop", "");
75+ return fileStr;
76+ }
77+ }
78+ return fileInfo.completeBaseName();
79+}
80+
81+const QString XdgWatcher::getAppId(const QFileInfo fileInfo) const {
82+ // We need to open the file to check if its and Ual application
83+ // as we cant just rely on the app name as "normal" apps can also
84+ // contain 3 _ causing us to belive its an ubuntu app
85+ // Example kde_org_kate would become kde_org
86+ QFile qFile(fileInfo.absoluteFilePath());
87+ qFile.open(QIODevice::ReadOnly);
88+ QTextStream fileStream(&qFile);
89+ QString line;
90+ while (fileStream.readLineInto(&line)) {
91+ if (line.startsWith("X-Ubuntu-Application-ID=")) {
92+ auto rawAppID = line.replace("X-Ubuntu-Application-ID=", "");
93+ qFile.close();
94+ return stripAppIdVersion(rawAppID);
95+ }
96+ }
97+ qFile.close();
98+
99+ // If it's not an "Ubuntu" appID, we follow freedesktop standard
100+ return toStandardAppId(fileInfo);
101+}
102+
103+// Watch for newly added apps
104+void XdgWatcher::onDirectoryChanged(const QString &path) {
105+ const auto files = QDir(path).entryInfoList(QDir::Files);
106+ const auto watchedFiles = m_watcher->files();
107+ for (const auto &file: files) {
108+ const auto appPath = file.absoluteFilePath();
109+ if (file.suffix() == "desktop" && !watchedFiles.contains(appPath)) {
110+ m_watcher->addPath(appPath);
111+
112+ const auto appId = getAppId(file);
113+ m_registry.insert(appPath, appId);
114+ Q_EMIT appAdded(appId);
115+ }
116+ }
117+}
118+
119+void XdgWatcher::onFileChanged(const QString &path) {
120+ QFileInfo file(path);
121+ if (file.exists()) {
122+ // The file exists, this must be an modify event
123+ Q_EMIT appInfoChanged(m_registry.value(path));
124+ } else {
125+ // File does not exist, assume this is an remove event.
126+ // onDirectoryChanged will handle rename event
127+ Q_EMIT appRemoved(m_registry.take(path));
128+ }
129+}
plugins/Unity/Launcher/xdgwatcher.hnew file+46
@@ -0,0 +1,46 @@
1+/*
2+ * Copyright (C) 2019 UBports Foundation
3+ * Author(s): Marius Gripsgard <marius@ubports.com>
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+
18+#include <QFileSystemWatcher>
19+#include <QHash>
20+#include <QFileInfo>
21+
22+class QFileInfo;
23+
24+class XdgWatcher: public QObject
25+{
26+ Q_OBJECT
27+public:
28+ XdgWatcher(QObject* parent = nullptr);
29+
30+Q_SIGNALS:
31+ void appAdded(const QString &appId);
32+ void appRemoved(const QString &appId);
33+ void appInfoChanged(const QString &appId);
34+
35+private Q_SLOTS:
36+ void onDirectoryChanged(const QString &path);
37+ void onFileChanged(const QString &path);
38+
39+private:
40+ const QString toStandardAppId(const QFileInfo fileInfo) const;
41+ const QString getAppId(const QFileInfo file) const;
42+ const QString stripAppIdVersion(const QString rawAppID) const;
43+
44+ QFileSystemWatcher* m_watcher;
45+ QHash<const QString, QString> m_registry;
46+};
plugins/Unity/Platform/CMakeLists.txt+1−1
@@ -6,6 +6,6 @@ set(platformplugin_SRCS
66
77add_library(Platform-qml SHARED ${platformplugin_SRCS})
88
9−qt5_use_modules(Platform-qml DBus Qml)
9+target_link_libraries(Platform-qml Qt5::DBus Qt5::Qml)
1010
1111add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)
plugins/Unity/Platform/platform.cpp+16−2
@@ -17,9 +17,11 @@
1717#include "platform.h"
1818
1919#include <QDBusConnection>
20+#include <QSet>
21+#include <QString>
2022
2123Platform::Platform(QObject *parent)
22− : QObject(parent)
24+ : QObject(parent), m_isPC(true), m_isMultiSession(true)
2325{
2426 QMetaObject::invokeMethod(this, "init");
2527}
@@ -31,8 +33,20 @@ void Platform::init()
3133 QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",
3234 QDBusConnection::systemBus(), this);
3335
36+ // From the source at https://cgit.freedesktop.org/systemd/systemd/tree/src/hostname/hostnamed.c#n130
37+ // "vm\0"
38+ // "container\0"
39+ // "desktop\0"
40+ // "laptop\0"
41+ // "server\0"
42+ // "tablet\0"
43+ // "handset\0"
44+ // "watch\0"
45+ // "embedded\0",
3446 m_chassis = iface.property("Chassis").toString();
35− m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");
47+
48+ // A PC is not a handset, tablet or watch.
49+ m_isPC = !QSet<QString>{"handset", "tablet", "watch"}.contains(m_chassis);
3650 m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();
3751}
3852
plugins/Unity/Session/CMakeLists.txt+3−1
@@ -6,6 +6,8 @@ include_directories(
66 ${libunity8-private_SOURCE_DIR}
77)
88
9+add_definitions(-DSM_BUSNAME=systemBus)
10+
911set(QMLSESSIONPLUGIN_SRC
1012 plugin.cpp
1113 dbusunitysessionservice.cpp
@@ -16,8 +18,8 @@ add_library(UnitySession-qml MODULE
1618 ${QMLSESSIONPLUGIN_SRC}
1719 )
1820
19−qt5_use_modules(UnitySession-qml DBus Qml)
2021target_link_libraries(UnitySession-qml
22+ Qt5::DBus Qt5::Qml
2123 unity8-private
2224 ${GIO_LDFLAGS}
2325 ${GLIB_LIBRARIES}
plugins/Unity/Session/dbusunitysessionservice.cpp+102−22
@@ -18,6 +18,7 @@
1818#include "dbusunitysessionservice.h"
1919
2020// system
21+#include <grp.h>
2122#include <sys/types.h>
2223#include <unistd.h>
2324#include <pwd.h>
@@ -64,19 +65,19 @@ public:
6465 QStringLiteral("GetSessionByPID"));
6566 msg << (quint32) getpid();
6667
67− QDBusReply<QDBusObjectPath> reply = QDBusConnection::systemBus().call(msg);
68+ QDBusReply<QDBusObjectPath> reply = QDBusConnection::SM_BUSNAME().call(msg);
6869 if (reply.isValid()) {
6970 logindSessionPath = reply.value().path();
7071
7172 // start watching the Active property
72− QDBusConnection::systemBus().connect(LOGIN1_SERVICE, logindSessionPath, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
73− this, SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
73+ QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, logindSessionPath, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
74+ this, SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
7475
7576 setupSystemdInhibition();
7677
7778 // re-enable the inhibition upon resume from sleep
78− QDBusConnection::systemBus().connect(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("PrepareForSleep"),
79− this, SLOT(onResuming(bool)));
79+ QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("PrepareForSleep"),
80+ this, SLOT(onResuming(bool)));
8081 } else {
8182 qWarning() << "Failed to get logind session path" << reply.error().message();
8283 }
@@ -96,7 +97,7 @@ public:
9697 msg << "Unity8 handles power events"; // why
9798 msg << "block"; // mode
9899
99− QDBusPendingCall pendingCall = QDBusConnection::systemBus().asyncCall(msg);
100+ QDBusPendingCall pendingCall = QDBusConnection::SM_BUSNAME().asyncCall(msg);
100101 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
101102 connect(watcher, &QDBusPendingCallWatcher::finished,
102103 this, [this](QDBusPendingCallWatcher* watcher) {
@@ -114,7 +115,7 @@ public:
114115 bool checkLogin1Call(const QString &method) const
115116 {
116117 QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, method);
117− QDBusReply<QString> reply = QDBusConnection::systemBus().call(msg);
118+ QDBusReply<QString> reply = QDBusConnection::SM_BUSNAME().call(msg);
118119 return reply.isValid() && (reply == QStringLiteral("yes") || reply == QStringLiteral("challenge"));
119120 }
120121
@@ -125,7 +126,7 @@ public:
125126 LOGIN1_IFACE,
126127 method);
127128 msg.setArguments(args);
128− QDBusConnection::systemBus().asyncCall(msg);
129+ QDBusConnection::SM_BUSNAME().asyncCall(msg);
129130 }
130131
131132 void setActive(bool active)
@@ -157,7 +158,7 @@ public:
157158 msg << LOGIN1_SESSION_IFACE;
158159 msg << ACTIVE_KEY;
159160
160− QDBusPendingCall pendingCall = QDBusConnection::systemBus().asyncCall(msg);
161+ QDBusPendingCall pendingCall = QDBusConnection::SM_BUSNAME().asyncCall(msg);
161162 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
162163 connect(watcher, &QDBusPendingCallWatcher::finished,
163164 this, [this](QDBusPendingCallWatcher* watcher) {
@@ -191,7 +192,7 @@ public:
191192 msg << LOGIN1_SESSION_IFACE;
192193 msg << IDLE_SINCE_KEY;
193194
194− QDBusReply<QVariant> reply = QDBusConnection::systemBus().call(msg);
195+ QDBusReply<QVariant> reply = QDBusConnection::SM_BUSNAME().call(msg);
195196 if (reply.isValid()) {
196197 return reply.value().value<quint64>();
197198 } else {
@@ -208,7 +209,24 @@ public:
208209 LOGIN1_SESSION_IFACE,
209210 QStringLiteral("SetIdleHint"));
210211 msg << idle;
211− QDBusConnection::systemBus().asyncCall(msg);
212+ QDBusConnection::SM_BUSNAME().asyncCall(msg);
213+ }
214+
215+ bool isUserInGroup(const QString &user, const QString &groupName) const
216+ {
217+ auto group = getgrnam(groupName.toUtf8().data());
218+
219+ if (group && group->gr_mem)
220+ {
221+ for (int i = 0; group->gr_mem[i]; ++i)
222+ {
223+ if (g_strcmp0(group->gr_mem[i], user.toUtf8().data()) == 0) {
224+ return true;
225+ }
226+ }
227+ }
228+
229+ return false;
212230 }
213231
214232private Q_SLOTS:
@@ -244,10 +262,10 @@ DBusUnitySessionService::DBusUnitySessionService()
244262{
245263 if (!d->logindSessionPath.isEmpty()) {
246264 // connect our PromptLock() slot to the logind's session Lock() signal
247− QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Lock"), this, SLOT(PromptLock()));
265+ QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Lock"), this, SLOT(PromptLock()));
248266 // ... and our Unlocked() signal to the logind's session Unlock() signal
249267 // (lightdm handles the unlocking by calling logind's Unlock method which in turn emits this signal we connect to)
250− QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SIGNAL(Unlocked()));
268+ QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SLOT(doUnlock()));
251269 connect(d, &DBusUnitySessionServicePrivate::prepareForSleep, this, &DBusUnitySessionService::PromptLock);
252270 } else {
253271 qWarning() << "Failed to connect to logind's session Lock/Unlock signals";
@@ -297,7 +315,13 @@ bool DBusUnitySessionService::CanShutdown() const
297315
298316bool DBusUnitySessionService::CanLock() const
299317{
300− return true; // FIXME
318+ auto user = UserName();
319+ if (user.startsWith(QStringLiteral("guest-")) ||
320+ d->isUserInGroup(user, QStringLiteral("nopasswdlogin"))) {
321+ return false;
322+ } else {
323+ return true;
324+ }
301325}
302326
303327QString DBusUnitySessionService::UserName() const
@@ -332,14 +356,20 @@ QString DBusUnitySessionService::HostName() const
332356
333357void DBusUnitySessionService::PromptLock()
334358{
335− // Fast lock (no animation)
336− Q_EMIT LockRequested();
337− Q_EMIT lockRequested();
359+ // Prompt as in quick. No locking animation needed. Usually used by
360+ // indicator-session in combination with a switch to greeter or other
361+ // user session.
362+ if (CanLock()) {
363+ Q_EMIT LockRequested();
364+ Q_EMIT lockRequested();
365+ }
338366}
339367
340368void DBusUnitySessionService::Lock()
341369{
342− // Slower lock (with animation)
370+ // Normal lock (with animation, as compared to PromptLock above). Usually
371+ // used by indicator-session to lock the session in place.
372+ //
343373 // FIXME: We also -- as a bit of a hack around indicator-session not fully
344374 // supporting a phone profile -- switch to greeter here. The unity7 flow is
345375 // that the user chooses "Lock/Switch" from the indicator, and then can go
@@ -357,9 +387,8 @@ void DBusUnitySessionService::Lock()
357387 // time the indicator locks without also asking the display manager to
358388 // switch sessions on us. And since we are switching screens, we also
359389 // don't bother respecting the animate request, simply doing a PromptLock.
360− switchToGreeter();
361−
362390 PromptLock();
391+ switchToGreeter();
363392}
364393
365394void DBusUnitySessionService::switchToGreeter()
@@ -371,7 +400,7 @@ void DBusUnitySessionService::switchToGreeter()
371400 QStringLiteral("org.freedesktop.DisplayManager.Session"),
372401 QStringLiteral("Lock"));
373402
374− QDBusPendingCall pendingCall = QDBusConnection::systemBus().asyncCall(msg);
403+ QDBusPendingCall pendingCall = QDBusConnection::SM_BUSNAME().asyncCall(msg);
375404 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
376405 connect(watcher, &QDBusPendingCallWatcher::finished,
377406 this, [this](QDBusPendingCallWatcher* watcher) {
@@ -388,6 +417,12 @@ void DBusUnitySessionService::switchToGreeter()
388417 });
389418}
390419
420+void DBusUnitySessionService::doUnlock()
421+{
422+ Q_EMIT Unlocked();
423+ Q_EMIT unlocked();
424+}
425+
391426bool DBusUnitySessionService::IsLocked() const
392427{
393428 return !d->isSessionActive;
@@ -459,11 +494,56 @@ void performAsyncUnityCall(const QString &method)
459494
460495
461496DBusGnomeSessionManagerWrapper::DBusGnomeSessionManagerWrapper()
497+ : UnityDBusObject(QStringLiteral("/org/gnome/SessionManager"), QStringLiteral("org.gnome.SessionManager"))
498+{
499+}
500+
501+void DBusGnomeSessionManagerWrapper::Logout(quint32 mode)
502+{
503+ auto call = QStringLiteral("RequestLogout");
504+
505+ // These modes are documented as bitwise flags, not an enum, even though
506+ // they only ever seem to be used as enums.
507+
508+ if (mode & 1) // without dialog
509+ call = QStringLiteral("Logout");
510+ if (mode & 2) // without dialog, ignoring inhibitors (which we don't have)
511+ call = QStringLiteral("Logout");
512+
513+ performAsyncUnityCall(call);
514+}
515+
516+void DBusGnomeSessionManagerWrapper::Reboot()
517+{
518+ // GNOME's Reboot means with dialog (they use Request differently than us).
519+ performAsyncUnityCall(QStringLiteral("RequestReboot"));
520+}
521+
522+void DBusGnomeSessionManagerWrapper::RequestReboot()
523+{
524+ // GNOME's RequestReboot means no dialog (they use Request differently than us).
525+ performAsyncUnityCall(QStringLiteral("Reboot"));
526+}
527+
528+void DBusGnomeSessionManagerWrapper::RequestShutdown()
529+{
530+ // GNOME's RequestShutdown means no dialog (they use Request differently than us).
531+ performAsyncUnityCall(QStringLiteral("Shutdown"));
532+}
533+
534+void DBusGnomeSessionManagerWrapper::Shutdown()
535+{
536+ // GNOME's Shutdown means with dialog (they use Request differently than us).
537+ performAsyncUnityCall(QStringLiteral("RequestShutdown"));
538+}
539+
540+
541+DBusGnomeSessionManagerDialogWrapper::DBusGnomeSessionManagerDialogWrapper()
462542 : UnityDBusObject(QStringLiteral("/org/gnome/SessionManager/EndSessionDialog"), QStringLiteral("com.canonical.Unity"))
463543{
464544}
465545
466−void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)
546+void DBusGnomeSessionManagerDialogWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)
467547{
468548 Q_UNUSED(arg_1);
469549 Q_UNUSED(max_wait);
plugins/Unity/Session/dbusunitysessionservice.h+22−4
@@ -106,6 +106,7 @@ Q_SIGNALS:
106106 * Emitted after the session has been unlocked.
107107 */
108108 Q_SCRIPTABLE void Unlocked();
109+ void unlocked();
109110
110111public Q_SLOTS:
111112 /**
@@ -259,6 +260,9 @@ public Q_SLOTS:
259260 */
260261 Q_SCRIPTABLE bool IsLocked() const;
261262
263+private Q_SLOTS:
264+ void doUnlock();
265+
262266private:
263267 void switchToGreeter();
264268};
@@ -266,17 +270,31 @@ private:
266270class DBusGnomeSessionManagerWrapper : public UnityDBusObject
267271{
268272 Q_OBJECT
269− Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")
273+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager")
270274
271275public:
272276 DBusGnomeSessionManagerWrapper();
273277 ~DBusGnomeSessionManagerWrapper() = default;
274278
275279public Q_SLOTS:
276− Q_SCRIPTABLE void Open(const unsigned int type, const unsigned int arg_1, const unsigned int max_wait, const QList<QDBusObjectPath> &inhibitors);
280+ Q_SCRIPTABLE void Logout(quint32 mode);
281+ Q_SCRIPTABLE void Reboot();
282+ Q_SCRIPTABLE void RequestReboot();
283+ Q_SCRIPTABLE void RequestShutdown();
284+ Q_SCRIPTABLE void Shutdown();
285+};
277286
278−private:
279− void performAsyncCall(const QString &method);
287+class DBusGnomeSessionManagerDialogWrapper : public UnityDBusObject
288+{
289+ Q_OBJECT
290+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")
291+
292+public:
293+ DBusGnomeSessionManagerDialogWrapper();
294+ ~DBusGnomeSessionManagerDialogWrapper() = default;
295+
296+public Q_SLOTS:
297+ Q_SCRIPTABLE void Open(const unsigned int type, const unsigned int arg_1, const unsigned int max_wait, const QList<QDBusObjectPath> &inhibitors);
280298};
281299
282300class DBusGnomeScreensaverWrapper: public UnityDBusObject
plugins/Unity/Session/plugin.cpp+1
@@ -26,6 +26,7 @@
2626
2727static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
2828{
29+ new DBusGnomeSessionManagerDialogWrapper();
2930 new DBusGnomeSessionManagerWrapper();
3031 new DBusGnomeScreensaverWrapper();
3132 new DBusScreensaverWrapper();
plugins/Utils/CMakeLists.txt+16−4
@@ -1,15 +1,23 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
33 ${CMAKE_CURRENT_BINARY_DIR}
4+)
5+
6+include_directories(
7+ SYSTEM
48 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
59 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
6− ${GIO_INCLUDE_DIRS}
710)
811
912set(QMLPLUGIN_SRC
1013 activefocuslogger.cpp
1114 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
15+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
1216 applicationsfiltermodel.cpp
17+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
18+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
19+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
20+ appdrawerproxymodel.cpp
1321 constants.cpp
1422 WindowInputMonitor.cpp
1523 inputwatcher.cpp
@@ -24,6 +32,10 @@ set(QMLPLUGIN_SRC
2432 inputeventgenerator.cpp
2533 deviceconfigparser.cpp
2634 globalfunctions.cpp
35+ URLDispatcher.cpp
36+ tabfocusfence.cpp
37+ expressionfiltermodel.cpp
38+ quicklistproxymodel.cpp
2739 plugin.cpp
2840 )
2941
@@ -31,7 +43,9 @@ add_library(Utils-qml SHARED
3143 ${QMLPLUGIN_SRC}
3244 )
3345
34−target_link_libraries(Utils-qml ${GIO_LDFLAGS})
46+target_link_libraries(Utils-qml
47+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent
48+ )
3549
3650# Because this is an internal support library, we want
3751# to expose all symbols in it. Consider changing this
@@ -39,6 +53,4 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
3953# files directly in targets.
4054set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
4155
42−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)
43−
4456add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/Utils/ElapsedTimer.h+1−1
@@ -41,7 +41,7 @@ class ElapsedTimer : public AbstractElapsedTimer {
4141public:
4242 void start() override { m_timer.start(); }
4343 qint64 msecsSinceReference() const override { return m_timer.msecsSinceReference(); }
44− qint64 elapsed() const override { return m_timer.elapsed(); }
44+ qint64 elapsed() const override { return m_timer.isValid() ? m_timer.elapsed() : 0; }
4545private:
4646 QElapsedTimer m_timer;
4747};
plugins/Utils/Timer.cpp+5−2
@@ -37,13 +37,16 @@ void Timer::setInterval(int msecs)
3737void Timer::start()
3838{
3939 m_timer.start();
40− AbstractTimer::start();
4140}
4241
4342void Timer::stop()
4443{
4544 m_timer.stop();
46− AbstractTimer::stop();
45+}
46+
47+bool Timer::isRunning() const
48+{
49+ return m_timer.isActive();
4750}
4851
4952bool Timer::isSingleShot() const
plugins/Utils/Timer.h+5−6
@@ -30,18 +30,16 @@ class AbstractTimer : public QObject
3030{
3131 Q_OBJECT
3232public:
33− AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}
33+ AbstractTimer(QObject *parent) : QObject(parent) {}
3434 virtual int interval() const = 0;
3535 virtual void setInterval(int msecs) = 0;
36− virtual void start() { m_isRunning = true; }
37− virtual void stop() { m_isRunning = false; }
38− bool isRunning() const { return m_isRunning; }
36+ virtual void start() = 0;
37+ virtual void stop() = 0;
38+ virtual bool isRunning() const = 0;
3939 virtual bool isSingleShot() const = 0;
4040 virtual void setSingleShot(bool value) = 0;
4141Q_SIGNALS:
4242 void timeout();
43−private:
44− bool m_isRunning;
4543};
4644
4745/** A QTimer wrapper */
@@ -55,6 +53,7 @@ public:
5553 void setInterval(int msecs) override;
5654 void start() override;
5755 void stop() override;
56+ bool isRunning() const override;
5857 bool isSingleShot() const override;
5958 void setSingleShot(bool value) override;
6059private:
plugins/Utils/URLDispatcher.cppnew file+80
@@ -0,0 +1,80 @@
1+/*
2+ * Copyright (C) 2016-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+#include "URLDispatcher.h"
18+
19+#include <QDBusConnection>
20+#include <QDebug>
21+
22+class URLDispatcherInterface : public QObject
23+{
24+ Q_OBJECT
25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
26+
27+public:
28+ explicit URLDispatcherInterface(URLDispatcher *parent);
29+
30+ Q_SCRIPTABLE void DispatchURL(const QString &url, const QString &package);
31+};
32+
33+URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
34+ : QObject(parent)
35+{
36+}
37+
38+void URLDispatcherInterface::DispatchURL(const QString &url, const QString &package)
39+{
40+ Q_UNUSED(package);
41+ Q_EMIT static_cast<URLDispatcher *>(parent())->urlRequested(url);
42+}
43+
44+URLDispatcher::URLDispatcher(QObject *parent)
45+ : QObject(parent)
46+ , m_dispatcher(nullptr)
47+{
48+}
49+
50+bool URLDispatcher::active() const
51+{
52+ return m_dispatcher != nullptr;
53+}
54+
55+void URLDispatcher::setActive(bool value)
56+{
57+ if (value == active())
58+ return;
59+
60+ QDBusConnection connection = QDBusConnection::sessionBus();
61+
62+ if (value) {
63+ URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
64+ connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),
65+ dispatcher,
66+ QDBusConnection::ExportScriptableContents);
67+ if (!connection.registerService(QStringLiteral("com.canonical.URLDispatcher"))) {
68+ qWarning() << "Unable to register DBus service com.canonical.URLDispatcher";
69+ }
70+ m_dispatcher = dispatcher;
71+ } else {
72+ connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));
73+ delete m_dispatcher;
74+ m_dispatcher = nullptr;
75+ }
76+
77+ Q_EMIT activeChanged();
78+}
79+
80+#include "URLDispatcher.moc"
plugins/Utils/URLDispatcher.hnew file+47
@@ -0,0 +1,47 @@
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 UNITY_URLDISPATCHER_H
18+#define UNITY_URLDISPATCHER_H
19+
20+#include <QObject>
21+#include <QString>
22+
23+// This class manages our url-dispatcher interception. We intercept
24+// url-dispatcher because rather than spawning the handler for the URL
25+// in our own session, we want to notify the user session to do it for us
26+// (and start an unlock in the process).
27+
28+class URLDispatcher : public QObject
29+{
30+ Q_OBJECT
31+ Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
32+
33+public:
34+ explicit URLDispatcher(QObject *parent=0);
35+
36+ bool active() const;
37+ void setActive(bool active);
38+
39+Q_SIGNALS:
40+ void urlRequested(const QString &url);
41+ void activeChanged();
42+
43+private:
44+ QObject *m_dispatcher;
45+};
46+
47+#endif
plugins/Utils/WindowInputMonitor.cpp+3
@@ -73,6 +73,9 @@ void WindowInputMonitor::update(QEvent *event)
7373 && m_windowLastTouchedTimer->elapsed() >= msecsWithoutTouches) {
7474 m_pressedHomeKey = keyEvent->key();
7575 m_activationTimer->start();
76+ } else if (m_pressedHomeKey != 0 && !m_homeKeys.contains(keyEvent->key())) {
77+ // something else came in... cancel activation
78+ m_activationTimer->stop();
7679 }
7780
7881 } else if (event->type() == QEvent::KeyRelease) {
plugins/Utils/appdrawerproxymodel.cppnew file+189
@@ -0,0 +1,189 @@
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 "appdrawerproxymodel.h"
18+
19+#include <unity/shell/launcher/LauncherItemInterface.h>
20+
21+#include <QDebug>
22+
23+AppDrawerProxyModel::AppDrawerProxyModel(QObject *parent):
24+ QSortFilterProxyModel(parent)
25+{
26+ setSortRole(AppDrawerModelInterface::RoleName);
27+ setSortLocaleAware(true);
28+ sort(0);
29+
30+ connect(this, &QAbstractListModel::rowsInserted, this, &AppDrawerProxyModel::countChanged);
31+ connect(this, &QAbstractListModel::rowsRemoved, this, &AppDrawerProxyModel::countChanged);
32+ connect(this, &QAbstractListModel::layoutChanged, this, &AppDrawerProxyModel::countChanged);
33+}
34+
35+QAbstractItemModel *AppDrawerProxyModel::source() const
36+{
37+ return m_source;
38+}
39+
40+void AppDrawerProxyModel::setSource(QAbstractItemModel *source)
41+{
42+ if (m_source != source) {
43+ m_source = source;
44+ setSourceModel(m_source);
45+ setSortRole(m_sortBy == SortByAToZ ? AppDrawerModelInterface::RoleName : AppDrawerModelInterface::RoleUsage);
46+ connect(m_source, &QAbstractItemModel::rowsRemoved, this, &AppDrawerProxyModel::invalidate);
47+ connect(m_source, &QAbstractItemModel::rowsInserted, this, &AppDrawerProxyModel::invalidate);
48+ Q_EMIT sourceChanged();
49+ }
50+}
51+
52+AppDrawerProxyModel::GroupBy AppDrawerProxyModel::group() const
53+{
54+ return m_group;
55+}
56+
57+void AppDrawerProxyModel::setGroup(AppDrawerProxyModel::GroupBy group)
58+{
59+ if (m_group != group) {
60+ m_group = group;
61+ Q_EMIT groupChanged();
62+ invalidateFilter();
63+ }
64+}
65+
66+QString AppDrawerProxyModel::filterLetter() const
67+{
68+ return m_filterLetter;
69+}
70+
71+void AppDrawerProxyModel::setFilterLetter(const QString &filterLetter)
72+{
73+ if (m_filterLetter != filterLetter) {
74+ m_filterLetter = filterLetter;
75+ Q_EMIT filterLetterChanged();
76+ invalidateFilter();
77+ }
78+}
79+
80+QString AppDrawerProxyModel::filterString() const
81+{
82+ return m_filterString;
83+}
84+
85+void AppDrawerProxyModel::setFilterString(const QString &filterString)
86+{
87+ if (m_filterString != filterString) {
88+ m_filterString = filterString;
89+ Q_EMIT filterStringChanged();
90+ invalidateFilter();
91+ }
92+}
93+
94+AppDrawerProxyModel::SortBy AppDrawerProxyModel::sortBy() const
95+{
96+ return m_sortBy;
97+}
98+
99+void AppDrawerProxyModel::setSortBy(AppDrawerProxyModel::SortBy sortBy)
100+{
101+ if (m_sortBy != sortBy) {
102+ m_sortBy = sortBy;
103+ Q_EMIT sortByChanged();
104+ setSortRole(m_sortBy == SortByAToZ ? AppDrawerModelInterface::RoleName : AppDrawerModelInterface::RoleUsage);
105+ sort(0);
106+ }
107+}
108+
109+int AppDrawerProxyModel::count() const
110+{
111+ return rowCount();
112+}
113+
114+QVariant AppDrawerProxyModel::data(const QModelIndex &index, int role) const
115+{
116+ QModelIndex idx = mapToSource(index);
117+ if (role == Qt::UserRole) {
118+ QString name = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
119+ return name.length() > 0 ? QString(name.at(0)).toUpper() : QChar();
120+ }
121+ return m_source->data(idx, role);
122+}
123+
124+QHash<int, QByteArray> AppDrawerProxyModel::roleNames() const
125+{
126+ if (m_source) {
127+ QHash<int, QByteArray> roles = m_source->roleNames();
128+ roles.insert(Qt::UserRole, "letter");
129+ return roles;
130+ }
131+ return QHash<int, QByteArray>();
132+}
133+
134+bool AppDrawerProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
135+{
136+ Q_UNUSED(source_parent)
137+
138+ if (m_group == GroupByAToZ && source_row > 0) {
139+ QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
140+ QChar currentLetter = currentName.length() > 0 ? currentName.at(0) : QChar();
141+ QString previousName = m_source->data(m_source->index(source_row - 1,0 ), AppDrawerModelInterface::RoleName).toString();
142+ QChar previousLetter = previousName.length() > 0 ? previousName.at(0) : QChar();
143+ if (currentLetter.toLower() == previousLetter.toLower()) {
144+ return false;
145+ }
146+ } else if(m_group == GroupByAll && source_row > 0) {
147+ return false;
148+ }
149+ if (!m_filterLetter.isEmpty()) {
150+ QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
151+ QString currentLetter = currentName.length() > 0 ? QString(currentName.at(0)) : QString();
152+ if (currentLetter.toLower() != m_filterLetter.toLower()) {
153+ return false;
154+ }
155+ }
156+ if (!m_filterString.isEmpty()) {
157+ QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
158+ allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
159+ bool found = false;
160+ Q_FOREACH (const QString ¤tWord, allWords) {
161+ if (currentWord.contains(m_filterString, Qt::CaseInsensitive)) {
162+ found = true;
163+ break;
164+ }
165+ }
166+ if (!found) {
167+ return false;
168+ }
169+ }
170+ return true;
171+}
172+
173+QString AppDrawerProxyModel::appId(int index) const
174+{
175+ if (index >= 0 && index < rowCount()) {
176+ QModelIndex sourceIndex = mapToSource(this->index(index, 0));
177+
178+ AppDrawerModelInterface* adm = dynamic_cast<AppDrawerModelInterface*>(m_source);
179+ if (adm) {
180+ return adm->data(sourceIndex, AppDrawerModelInterface::RoleAppId).toString();
181+ }
182+
183+ AppDrawerProxyModel* adpm = qobject_cast<AppDrawerProxyModel*>(m_source);
184+ if (adpm) {
185+ return adpm->appId(sourceIndex.row());
186+ }
187+ }
188+ return QString();
189+}
plugins/Utils/appdrawerproxymodel.hnew file+87
@@ -0,0 +1,87 @@
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 <QSortFilterProxyModel>
18+
19+#include <unity/shell/launcher/AppDrawerModelInterface.h>
20+
21+using namespace unity::shell::launcher;
22+
23+class AppDrawerProxyModel: public QSortFilterProxyModel
24+{
25+ Q_OBJECT
26+ Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
27+ Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)
28+ Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)
29+ Q_PROPERTY(QString filterString READ filterString WRITE setFilterString NOTIFY filterStringChanged)
30+ Q_PROPERTY(SortBy sortBy READ sortBy WRITE setSortBy NOTIFY sortByChanged)
31+ Q_PROPERTY(int count READ count NOTIFY countChanged)
32+
33+public:
34+ enum GroupBy {
35+ GroupByNone,
36+ GroupByAll,
37+ GroupByAToZ
38+ };
39+ Q_ENUM(GroupBy)
40+ enum SortBy {
41+ SortByAToZ,
42+ SortByUsage
43+ };
44+ Q_ENUM(SortBy)
45+
46+ AppDrawerProxyModel(QObject* parent = nullptr);
47+
48+ QAbstractItemModel* source() const;
49+ void setSource(QAbstractItemModel* source);
50+
51+ GroupBy group() const;
52+ void setGroup(GroupBy group);
53+
54+ QString filterLetter() const;
55+ void setFilterLetter(const QString &filterLetter);
56+
57+ QString filterString() const;
58+ void setFilterString(const QString &filterString);
59+
60+ SortBy sortBy() const;
61+ void setSortBy(SortBy sortBy);
62+
63+ int count() const;
64+
65+ QVariant data(const QModelIndex &index, int role) const override;
66+ QHash<int, QByteArray> roleNames() const override;
67+
68+ Q_INVOKABLE QString appId(int index) const;
69+
70+protected:
71+ bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
72+
73+Q_SIGNALS:
74+ void sourceChanged();
75+ void groupChanged();
76+ void filterLetterChanged();
77+ void filterStringChanged();
78+ void sortByChanged();
79+ void countChanged();
80+
81+private:
82+ QAbstractItemModel* m_source = nullptr;
83+ GroupBy m_group = GroupByNone;
84+ QString m_filterLetter;
85+ QString m_filterString;
86+ SortBy m_sortBy = SortByAToZ;
87+};
plugins/Utils/constants.cpp+6−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2015 Canonical Ltd.
2+ * Copyright 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 Lesser General Public License as published by
@@ -16,6 +16,8 @@
1616
1717#include "constants.h"
1818
19+#include <QFile>
20+
1921Constants::Constants(QObject *parent)
2022 : QObject(parent)
2123{
@@ -24,4 +26,7 @@ Constants::Constants(QObject *parent)
2426 } else {
2527 m_indicatorValueTimeout = 5000;
2628 }
29+
30+ QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
31+ m_defaultWallpaper = snapRoot + "/usr/share/backgrounds/warty-final-ubuntu.png";
2732}
plugins/Utils/constants.h+5−5
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2015 Canonical Ltd.
2+ * Copyright 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 Lesser General Public License as published by
@@ -14,8 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−#ifndef CONSTANTS_H
18−#define CONSTANTS_H
17+#pragma once
1918
2019#include <QObject>
2120
@@ -30,14 +29,15 @@ class Constants: public QObject
3029{
3130 Q_OBJECT
3231 Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT)
32+ Q_PROPERTY(QString defaultWallpaper READ defaultWallpaper CONSTANT)
3333
3434public:
3535 Constants(QObject *parent = 0);
3636
3737 int indicatorValueTimeout() const { return m_indicatorValueTimeout; }
38+ QString defaultWallpaper() const { return m_defaultWallpaper; }
3839
3940private:
4041 int m_indicatorValueTimeout;
42+ QString m_defaultWallpaper;
4143};
42−
43−#endif
plugins/Utils/deviceconfigparser.cpp+19−1
@@ -26,7 +26,7 @@ DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
2626 // Local files have highest priority
2727 QString path;
2828 Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
29− if (QFileInfo(standardPath + "/devices.conf").exists()) {
29+ if (QFileInfo::exists(standardPath + "/devices.conf")) {
3030 path = standardPath + "/devices.conf";
3131 break;
3232 }
@@ -116,6 +116,24 @@ QString DeviceConfigParser::category() const
116116 return value;
117117}
118118
119+bool DeviceConfigParser::supportsMultiColorLed() const
120+{
121+ return readBoolFromConfig("SupportsMultiColorLed", true);
122+}
123+
124+bool DeviceConfigParser::readBoolFromConfig(const QString &key, bool defaultValue) const
125+{
126+ m_config->beginGroup(m_name);
127+
128+ bool ret = defaultValue;
129+ if (m_config->contains(key)) {
130+ ret = m_config->value(key).toBool();
131+ }
132+
133+ m_config->endGroup();
134+ return ret;
135+}
136+
119137QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const
120138{
121139 m_config->beginGroup(m_name);
plugins/Utils/deviceconfigparser.h+3
@@ -33,6 +33,7 @@ class DeviceConfigParser: public QObject
3333 Q_PROPERTY(Qt::ScreenOrientation portraitOrientation READ portraitOrientation NOTIFY changed)
3434 Q_PROPERTY(Qt::ScreenOrientation invertedPortraitOrientation READ invertedPortraitOrientation NOTIFY changed)
3535 Q_PROPERTY(QString category READ category NOTIFY changed)
36+ Q_PROPERTY(bool supportsMultiColorLed READ supportsMultiColorLed NOTIFY changed)
3637
3738public:
3839 DeviceConfigParser(QObject *parent = nullptr);
@@ -47,6 +48,7 @@ public:
4748 Qt::ScreenOrientation portraitOrientation() const;
4849 Qt::ScreenOrientation invertedPortraitOrientation() const;
4950 QString category() const;
51+ bool supportsMultiColorLed() const;
5052
5153Q_SIGNALS:
5254 void changed();
@@ -58,6 +60,7 @@ private:
5860 QStringList readOrientationsFromConfig(const QString &key) const;
5961 QString readOrientationFromConfig(const QString &key) const;
6062 Qt::ScreenOrientation stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const;
63+ bool readBoolFromConfig(const QString &key, bool defaultValue) const;
6164};
6265
6366#endif
plugins/Utils/easingcurve.h−1
@@ -36,7 +36,6 @@
3636class EasingCurve: public QObject
3737{
3838 Q_OBJECT
39− Q_ENUMS(QEasingCurve::Type)
4039 Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)
4140 Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)
4241 Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
plugins/Utils/expressionfiltermodel.cppnew file+49
@@ -0,0 +1,49 @@
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+#include "expressionfiltermodel.h"
18+
19+ExpressionFilterModel::ExpressionFilterModel(QObject *parent)
20+ : UnitySortFilterProxyModelQML(parent)
21+{
22+}
23+
24+QJSValue ExpressionFilterModel::matchExpression() const
25+{
26+ return m_matchExpression;
27+}
28+
29+void ExpressionFilterModel::setMatchExpression(const QJSValue &value)
30+{
31+ m_matchExpression = value;
32+ invalidateFilter();
33+}
34+
35+bool
36+ExpressionFilterModel::filterAcceptsRow(int sourceRow,
37+ const QModelIndex &sourceParent) const
38+{
39+ if (m_matchExpression.isCallable()) {
40+ QJSValueList args;
41+ args << sourceRow;
42+ QJSValue ret = m_matchExpression.call(args);
43+ if (ret.isBool()) {
44+ return ret.toBool();
45+ }
46+ }
47+
48+ return UnitySortFilterProxyModelQML::filterAcceptsRow(sourceRow, sourceParent);
49+}
plugins/Utils/expressionfiltermodel.hnew file+42
@@ -0,0 +1,42 @@
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+#ifndef EXPRESSIONFILTERMODEL_H
18+#define EXPRESSIONFILTERMODEL_H
19+
20+#include "unitysortfilterproxymodelqml.h"
21+#include <QJSValue>
22+
23+class ExpressionFilterModel : public UnitySortFilterProxyModelQML
24+{
25+ Q_OBJECT
26+ Q_PROPERTY(QJSValue matchExpression READ matchExpression WRITE setMatchExpression NOTIFY matchExpressionChanged)
27+public:
28+ explicit ExpressionFilterModel(QObject *parent = 0);
29+
30+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
31+
32+ QJSValue matchExpression() const;
33+ void setMatchExpression(const QJSValue& value);
34+
35+Q_SIGNALS:
36+ void matchExpressionChanged();
37+
38+private:
39+ mutable QJSValue m_matchExpression;
40+};
41+
42+#endif // EXPRESSIONFILTERMODEL_H
plugins/Utils/globalfunctions.cpp+6−4
@@ -16,11 +16,8 @@
1616
1717#include "globalfunctions.h"
1818
19−#pragma GCC diagnostic push
20−#pragma GCC diagnostic ignored "-pedantic"
21−#include <private/qquickitem_p.h>
22−#pragma GCC diagnostic pop
2319#include <QQmlEngine>
20+#include <private/qquickitem_p.h>
2421
2522GlobalFunctions::GlobalFunctions(QObject *parent)
2623 : QObject(parent)
@@ -54,3 +51,8 @@ QQuickItem *GlobalFunctions::itemAt(QQuickItem* parent, int x, int y, QJSValue m
5451 }
5552 return nullptr;
5653}
54+
55+bool GlobalFunctions::itemUnderMouse(QQuickItem* item)
56+{
57+ return item && item->isUnderMouse();
58+}
plugins/Utils/globalfunctions.h+2
@@ -37,6 +37,8 @@ public:
3737 int x,
3838 int y,
3939 QJSValue matcher);
40+
41+ static Q_INVOKABLE bool itemUnderMouse(QQuickItem* item);
4042};
4143
4244#endif // GLOBALFUNCTIONS_H
plugins/Utils/plugin.cpp+11−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012-2015 Canonical, Ltd.
2+ * Copyright (C) 2012-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
@@ -38,6 +38,11 @@
3838#include "inputeventgenerator.h"
3939#include "deviceconfigparser.h"
4040#include "globalfunctions.h"
41+#include "URLDispatcher.h"
42+#include "appdrawerproxymodel.h"
43+#include "tabfocusfence.h"
44+#include "expressionfiltermodel.h"
45+#include "quicklistproxymodel.h"
4146
4247static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
4348{
@@ -80,4 +85,9 @@ void UtilsPlugin::registerTypes(const char *uri)
8085 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
8186 qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
8287 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
88+ qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
89+ qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
90+ qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
91+ qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");
92+ qmlRegisterType<QuickListProxyModel>(uri, 0, 1, "QuickListProxyModel");
8393}
plugins/Utils/quicklistproxymodel.cppnew file+72
@@ -0,0 +1,72 @@
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+#include "quicklistproxymodel.h"
18+
19+#include <QDebug>
20+
21+QuickListProxyModel::QuickListProxyModel(QObject *parent):
22+ QSortFilterProxyModel(parent)
23+{
24+ connect(this, &QAbstractListModel::rowsInserted, this, &QuickListProxyModel::countChanged);
25+ connect(this, &QAbstractListModel::rowsRemoved, this, &QuickListProxyModel::countChanged);
26+ connect(this, &QAbstractListModel::layoutChanged, this, &QuickListProxyModel::countChanged);
27+}
28+
29+QAbstractItemModel *QuickListProxyModel::source() const
30+{
31+ return m_source;
32+}
33+
34+bool QuickListProxyModel::privateMode() const
35+{
36+ return m_privateMode;
37+}
38+
39+void QuickListProxyModel::setPrivateMode(bool privateMode)
40+{
41+ if (m_privateMode != privateMode) {
42+ m_privateMode = privateMode;
43+ invalidateFilter();
44+ Q_EMIT privateModeChanged();
45+ }
46+}
47+
48+void QuickListProxyModel::setSource(QAbstractItemModel *source)
49+{
50+ if (m_source != source) {
51+ m_source = source;
52+ setSourceModel(m_source);
53+ connect(m_source, &QAbstractItemModel::rowsRemoved, this, &QuickListProxyModel::invalidate);
54+ connect(m_source, &QAbstractItemModel::rowsInserted, this, &QuickListProxyModel::invalidate);
55+ Q_EMIT sourceChanged();
56+ }
57+}
58+
59+int QuickListProxyModel::count() const
60+{
61+ return rowCount();
62+}
63+
64+bool QuickListProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
65+{
66+ Q_UNUSED(source_parent)
67+
68+ if (m_privateMode) {
69+ return !m_source->data(m_source->index(source_row, 0), QuickListModelInterface::RoleIsPrivate).toBool();
70+ }
71+ return true;
72+}
plugins/Utils/quicklistproxymodel.hnew file+52
@@ -0,0 +1,52 @@
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+#include <QSortFilterProxyModel>
18+
19+#include <unity/shell/launcher/QuickListModelInterface.h>
20+
21+using namespace unity::shell::launcher;
22+
23+class QuickListProxyModel: public QSortFilterProxyModel
24+{
25+ Q_OBJECT
26+ Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
27+ Q_PROPERTY(bool privateMode READ privateMode WRITE setPrivateMode NOTIFY privateModeChanged)
28+ Q_PROPERTY(int count READ count NOTIFY countChanged)
29+
30+public:
31+ QuickListProxyModel(QObject* parent = nullptr);
32+
33+ QAbstractItemModel* source() const;
34+ void setSource(QAbstractItemModel* source);
35+
36+ bool privateMode() const;
37+ void setPrivateMode(bool privateMode);
38+
39+ int count() const;
40+
41+protected:
42+ bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
43+
44+Q_SIGNALS:
45+ void sourceChanged();
46+ void privateModeChanged();
47+ void countChanged();
48+
49+private:
50+ QAbstractItemModel* m_source = nullptr;
51+ bool m_privateMode = false;
52+};
plugins/Utils/tabfocusfence.cppnew file+72
@@ -0,0 +1,72 @@
1+/*
2+ * Copyright 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 Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#include "tabfocusfence.h"
18+
19+#include <private/qquickitem_p.h>
20+
21+TabFocusFenceItem::TabFocusFenceItem(QQuickItem *parent) : QQuickItem(parent)
22+{
23+ QQuickItemPrivate *d = QQuickItemPrivate::get(this);
24+ d->isTabFence = true;
25+ setFlag(ItemIsFocusScope);
26+}
27+
28+bool TabFocusFenceItem::focusNext()
29+{
30+ QQuickItem * current = scopedFocusItem();
31+ if (current) {
32+ QQuickItem * next = current->nextItemInFocusChain(true);
33+ if (next) {
34+ next->setFocus(true, Qt::TabFocusReason);
35+ return true;
36+ }
37+ }
38+ return false;
39+}
40+
41+bool TabFocusFenceItem::focusPrev()
42+{
43+ QQuickItem * current = scopedFocusItem();
44+ if (current) {
45+ QQuickItem * prev = current->nextItemInFocusChain(false);
46+ if (prev) {
47+ prev->setFocus(true, Qt::BacktabFocusReason);
48+ return true;
49+ }
50+ }
51+ return false;
52+}
53+
54+void TabFocusFenceItem::keyPressEvent(QKeyEvent *event)
55+{
56+ // Needed so we eat Tab keys when there's only one item inside the fence
57+ if (event->key() == Qt::Key_Tab) {
58+ event->accept();
59+ } else {
60+ QQuickItem::keyPressEvent(event);
61+ }
62+}
63+
64+void TabFocusFenceItem::keyReleaseEvent(QKeyEvent *event)
65+{
66+ // Needed so we eat Tab keys when there's only one item inside the fence
67+ if (event->key() == Qt::Key_Tab) {
68+ event->accept();
69+ } else {
70+ QQuickItem::keyReleaseEvent(event);
71+ }
72+}
plugins/Utils/tabfocusfence.hnew file+38
@@ -0,0 +1,38 @@
1+/*
2+ * Copyright 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 Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#ifndef TABFOCUSFENCE_H
18+#define TABFOCUSFENCE_H
19+
20+#include <QQuickItem>
21+
22+// An item that restricts focus Tab travelling
23+// to its children
24+class TabFocusFenceItem : public QQuickItem
25+{
26+Q_OBJECT
27+
28+public:
29+ TabFocusFenceItem(QQuickItem *parent = nullptr);
30+
31+ Q_INVOKABLE bool focusNext();
32+ Q_INVOKABLE bool focusPrev();
33+
34+ void keyPressEvent(QKeyEvent *event) override;
35+ void keyReleaseEvent(QKeyEvent *event) override;
36+};
37+
38+#endif
plugins/Utils/timezoneFormatter.cpp+1−1
@@ -39,7 +39,7 @@ QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId)
3939 QTimeZone tz(tzId.toByteArray());
4040 if (tz.isValid()) {
4141 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
42− return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
42+ return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm")), tz.abbreviation(now));
4343 }
4444 return QString();
4545}
plugins/Utils/unitysortfilterproxymodelqml.h+5
@@ -38,6 +38,11 @@ public:
3838 Q_INVOKABLE int mapRowToSource(int row);
3939 bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
4040
41+ // Make the QSortFilterProxyModel variants also accessible
42+ using QSortFilterProxyModel::data;
43+ using QSortFilterProxyModel::mapFromSource;
44+ using QSortFilterProxyModel::mapToSource;
45+
4146 /* getters */
4247 int totalCount() const;
4348 bool invertMatch() const;
plugins/Utils/windowstatestorage.cpp+316−121
@@ -1,5 +1,6 @@
11/*
2− * Copyright 2015 Canonical Ltd.
2+ * Copyright 2015-2016 Canonical Ltd.
3+ * Copyright 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 Lesser General Public License as published by
@@ -16,173 +17,367 @@
1617
1718#include "windowstatestorage.h"
1819
19−#include <QtConcurrent>
2020#include <QDebug>
21−#include <QFutureSynchronizer>
21+#include <QDir>
22+#include <QMetaObject>
23+#include <QObject>
2224#include <QSqlQuery>
2325#include <QSqlError>
2426#include <QSqlResult>
27+#include <QStandardPaths>
2528#include <QRect>
2629#include <unity/shell/application/ApplicationInfoInterface.h>
2730
28−QMutex WindowStateStorage::s_mutex;
2931
30−inline QString sanitiseString(QString string) {
31− return string.remove("\"").remove("'").remove("\\");
32−}
33−
34−WindowStateStorage::WindowStateStorage(QObject *parent):
35− QObject(parent)
32+class AsyncQuery: public QObject
3633{
37− QString dbPath = QDir::homePath() + "/.cache/unity8/";
38− m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));
39− QDir dir;
40− dir.mkpath(dbPath);
41− m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");
42− initdb();
43−}
34+ Q_OBJECT
4435
45−WindowStateStorage::~WindowStateStorage()
46−{
47− QFutureSynchronizer<void> futureSync;
48− for (int i = 0; i < m_asyncQueries.count(); ++i) {
49− futureSync.addFuture(m_asyncQueries[i]);
36+public:
37+ AsyncQuery(const QString &dbName):
38+ m_dbName(dbName)
39+ {
5040 }
51− futureSync.waitForFinished();
52− m_db.close();
53−}
5441
55−void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
56−{
57− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
58− .arg(sanitiseString(windowId))
59− .arg((int)state);
42+ ~AsyncQuery()
43+ {
44+ QSqlDatabase::removeDatabase(m_connectionName);
45+ }
6046
61− saveValue(queryString);
62−}
47+ Q_INVOKABLE const QString getDbName()
48+ {
49+ if (!m_ok) {
50+ return "ERROR";
51+ }
52+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
53+ return connection.databaseName();
54+ }
6355
64−WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
65−{
66− const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
67− .arg(sanitiseString(windowId));
56+ Q_INVOKABLE bool initdb()
57+ {
58+ if (m_ok) {
59+ return true;
60+ }
61+ QSqlDatabase connection = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), m_connectionName);
62+ connection.setDatabaseName(m_dbName);
63+ connection.setConnectOptions(QStringLiteral("QSQLITE_BUSY_TIMEOUT=1000"));
64+ if (!connection.open()) {
65+ qWarning() << "AsyncQuery::initdb: Error opening state database. Window positions will not be saved or restored." << m_dbName << connection.lastError().driverText() << connection.lastError().databaseText();
66+ return false;
67+ }
68+ QSqlQuery query(connection);
69+
70+ if (!connection.tables().contains(QStringLiteral("geometry"))) {
71+ QString geometryQuery = QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);");
72+ if (!query.exec(geometryQuery)) {
73+ logSqlError(query);
74+ return false;
75+ }
76+ }
77+
78+ if (!connection.tables().contains(QStringLiteral("state"))) {
79+ QString stateQuery = QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);");
80+ if (!query.exec(stateQuery)) {
81+ logSqlError(query);
82+ return false;
83+ }
84+ }
85+
86+ if (!connection.tables().contains(QStringLiteral("stage"))) {
87+ QString stageQuery = QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);");
88+ if (!query.exec(stageQuery)) {
89+ logSqlError(query);
90+ return false;
91+ }
92+ }
93+ m_ok = true;
94+ return true;
95+ }
96+
97+ Q_INVOKABLE int getState(const QString &windowId) const
98+ {
99+ if (!m_ok) {
100+ return -1;
101+ }
102+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
103+ QSqlQuery query(connection);
104+ query.prepare(m_getStateQuery);
105+ query.bindValue(":windowId", windowId);
106+ query.exec();
107+ if (!query.isActive() || !query.isSelect()) {
108+ logSqlError(query);
109+ return -1;
110+ }
111+ if (!query.first()) {
112+ return -1;
113+ }
114+ bool converted = false;
115+ QVariant resultStr = query.value(0);
116+ int result = resultStr.toInt(&converted);
117+ if (converted) {
118+ return result;
119+ } else {
120+ qWarning() << "getState result expected integer, got " << resultStr;
121+ return -1;
122+ }
123+ }
68124
69− QSqlQuery query = getValue(queryString);
125+ Q_INVOKABLE QRect getGeometry(const QString &windowId) const
126+ {
127+ if (!m_ok) {
128+ return QRect();
129+ }
130+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
131+ QSqlQuery query(connection);
132+ query.prepare(m_getGeometryQuery);
133+ query.bindValue(":windowId", windowId);
134+ query.exec();
135+ if (!query.isActive() || !query.isSelect()) {
136+ logSqlError(query);
137+ return QRect();
138+ }
139+
140+ if (!query.first()) {
141+ return QRect();
142+ }
143+
144+ bool xConverted, yConverted, widthConverted, heightConverted = false;
145+ int x, y, width, height;
146+ QVariant xResultStr = query.value(QStringLiteral("x"));
147+ QVariant yResultStr = query.value(QStringLiteral("y"));
148+ QVariant widthResultStr = query.value(QStringLiteral("width"));
149+ QVariant heightResultStr = query.value(QStringLiteral("height"));
150+ x = xResultStr.toInt(&xConverted);
151+ y = yResultStr.toInt(&yConverted);
152+ width = widthResultStr.toInt(&widthConverted);
153+ height = heightResultStr.toInt(&heightConverted);
154+
155+ if (xConverted && yConverted && widthConverted && heightConverted) {
156+ return QRect(x, y, width, height);
157+ } else {
158+ qWarning() << "getGeometry result expected integers, got x:"
159+ << xResultStr << "y:" << yResultStr << "width" << widthResultStr
160+ << "height:" << heightResultStr;
161+ return QRect();
162+ }
70163
71− if (!query.first()) {
72− return defaultValue;
73164 }
74− return (WindowState)query.value(QStringLiteral("state")).toInt();
75−}
76165
77−void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
78−{
79− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
80− .arg(sanitiseString(windowId))
81− .arg(rect.x())
82− .arg(rect.y())
83− .arg(rect.width())
84− .arg(rect.height());
85−
86− saveValue(queryString);
87−}
166+ Q_INVOKABLE int getStage(const QString &appId) const
167+ {
168+ if (!m_ok) {
169+ return -1;
170+ }
171+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
172+ QSqlQuery query(connection);
173+ query.prepare(m_getStageQuery);
174+ query.bindValue(":appId", appId);
175+ query.exec();
176+ if (!query.isActive() || !query.isSelect()) {
177+ logSqlError(query);
178+ return -1;
179+ }
180+ if (!query.first()) {
181+ return -1;
182+ }
183+ bool converted = false;
184+ QVariant resultStr = query.value(0);
185+ int result = resultStr.toInt(&converted);
186+ if (converted) {
187+ return result;
188+ } else {
189+ qWarning() << "getStage result expected integer, got " << resultStr;
190+ return -1;
191+ }
192+ }
88193
89−void WindowStateStorage::saveStage(const QString &appId, int stage)
90−{
91− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values ('%1', '%2');")
92− .arg(sanitiseString(appId))
93− .arg((int)stage);
194+public Q_SLOTS:
195+
196+ void saveState(const QString &windowId, WindowStateStorage::WindowState state)
197+ {
198+ if (!m_ok) {
199+ return;
200+ }
201+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
202+ QSqlQuery query(connection);
203+ query.prepare(m_saveStateQuery);
204+ query.bindValue(":windowId", windowId);
205+ query.bindValue(":state", (int)state);
206+ if (!query.exec()) {
207+ logSqlError(query);
208+ }
209+ }
94210
95− saveValue(queryString);
96−}
211+ void saveGeometry(const QString &windowId, const QRect &rect)
212+ {
213+ if (!m_ok) {
214+ return;
215+ }
216+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
217+ QSqlQuery query(connection);
218+ query.prepare(m_saveGeometryQuery);
219+ query.bindValue(":windowId", windowId);
220+ query.bindValue(":x", rect.x());
221+ query.bindValue(":y", rect.y());
222+ query.bindValue(":width", rect.width());
223+ query.bindValue(":height", rect.height());
224+ if (!query.exec()) {
225+ logSqlError(query);
226+ }
227+ }
97228
98−int WindowStateStorage::getStage(const QString &appId) const
99−{
100− const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")
101− .arg(sanitiseString(appId));
229+ void saveStage(const QString &appId, int stage)
230+ {
231+ if (!m_ok) {
232+ return;
233+ }
234+ QSqlDatabase connection = QSqlDatabase::database(m_connectionName);
235+ QSqlQuery query(connection);
236+ query.prepare(m_saveStageQuery);
237+ query.bindValue(":appId", appId);
238+ query.bindValue(":stage", stage);
239+ if (!query.exec()) {
240+ logSqlError(query);
241+ }
242+ }
102243
103− QSqlQuery query = getValue(queryString);
244+private:
245+ static const QString m_connectionName;
246+ static const QString m_getStateQuery;
247+ static const QString m_saveStateQuery;
248+ static const QString m_getGeometryQuery;
249+ static const QString m_saveGeometryQuery;
250+ static const QString m_getStageQuery;
251+ static const QString m_saveStageQuery;
252+
253+ static void logSqlError(const QSqlQuery query)
254+ {
255+ qWarning() << "Error executing query" << query.lastQuery()
256+ << "Driver error:" << query.lastError().driverText()
257+ << "Database error:" << query.lastError().databaseText();
258+ }
104259
105− if (!query.first()) {
106− return unity::shell::application::ApplicationInfoInterface::MainStage;
260+ QString m_dbName;
261+ bool m_ok = false;
262+};
263+
264+const QString AsyncQuery::m_connectionName = QStringLiteral("WindowStateStorage");
265+const QString AsyncQuery::m_getStateQuery = QStringLiteral("SELECT state FROM state WHERE windowId = :windowId");
266+const QString AsyncQuery::m_saveStateQuery = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values (:windowId, :state)");
267+const QString AsyncQuery::m_getGeometryQuery = QStringLiteral("SELECT * FROM geometry WHERE windowId = :windowId");
268+const QString AsyncQuery::m_saveGeometryQuery = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values (:windowId, :x, :y, :width, :height)");
269+const QString AsyncQuery::m_getStageQuery = QStringLiteral("SELECT stage FROM stage WHERE appId = :appId");
270+const QString AsyncQuery::m_saveStageQuery = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values (:appId, :stage)");
271+
272+WindowStateStorage::WindowStateStorage(const QString &dbName, QObject *parent):
273+ QObject(parent),
274+ m_thread()
275+{
276+ qRegisterMetaType<WindowStateStorage::WindowState>("WindowStateStorage::WindowState");
277+ QString dbFile;
278+ if (dbName.isEmpty()) {
279+ const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");
280+ QDir dir;
281+ dir.mkpath(dbPath);
282+ dbFile = QString(dbPath) + QStringLiteral("windowstatestorage.sqlite");
283+ } else {
284+ dbFile = dbName;
107285 }
108− return query.value("stage").toInt();
286+ m_asyncQuery = new AsyncQuery(dbFile);
287+ m_asyncQuery->moveToThread(&m_thread);
288+ connect(&m_thread, &QThread::finished, m_asyncQuery, &QObject::deleteLater);
289+ m_thread.start();
290+ // Note that we're relying on initdb being called before any other methods
291+ // on AsyncQuery. Given the current behavior of QueuedConnection (slots
292+ // invoked in the order they are received), this is fine.
293+ QMetaObject::invokeMethod(m_asyncQuery, "initdb",
294+ Qt::QueuedConnection);
295+ connect(this, &WindowStateStorage::saveState, m_asyncQuery, &AsyncQuery::saveState);
296+ connect(this, &WindowStateStorage::saveGeometry, m_asyncQuery, &AsyncQuery::saveGeometry);
297+ connect(this, &WindowStateStorage::saveStage, m_asyncQuery, &AsyncQuery::saveStage);
109298}
110299
111−void WindowStateStorage::executeAsyncQuery(const QString &queryString)
300+WindowStateStorage::~WindowStateStorage()
112301{
113− QMutexLocker l(&s_mutex);
114− QSqlQuery query;
115−
116− bool ok = query.exec(queryString);
117− if (!ok) {
118− qWarning() << "Error executing query" << queryString
119− << "Driver error:" << query.lastError().driverText()
120− << "Database error:" << query.lastError().databaseText();
121− }
302+ m_thread.quit();
303+ m_thread.wait();
122304}
123305
124−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const
306+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
125307{
126− QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
127− .arg(sanitiseString(windowId));
308+ int state;
128309
129− QSqlQuery query = getValue(queryString);
310+ QMetaObject::invokeMethod(m_asyncQuery, "getState", Qt::BlockingQueuedConnection,
311+ Q_RETURN_ARG(int, state),
312+ Q_ARG(const QString&, windowId)
313+ );
130314
131− if (!query.first()) {
315+ if (state == -1) {
132316 return defaultValue;
133317 }
134− return QRect(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(), query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());
318+
319+ return (WindowState)state;
135320}
136321
137−void WindowStateStorage::initdb()
322+int WindowStateStorage::getStage(const QString &appId, int defaultValue) const
138323{
139− m_db.open();
140− if (!m_db.open()) {
141− qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();
142− return;
143− }
324+ int stage;
144325
145− if (!m_db.tables().contains(QStringLiteral("geometry"))) {
146− QSqlQuery query;
147− query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));
148− }
326+ QMetaObject::invokeMethod(m_asyncQuery, "getStage", Qt::BlockingQueuedConnection,
327+ Q_RETURN_ARG(int, stage),
328+ Q_ARG(const QString&, appId)
329+ );
149330
150− if (!m_db.tables().contains(QStringLiteral("state"))) {
151− QSqlQuery query;
152− query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));
331+ if (stage == -1) {
332+ return defaultValue;
153333 }
154334
155− if (!m_db.tables().contains(QStringLiteral("stage"))) {
156− QSqlQuery query;
157− query.exec(QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);"));
158− }
335+ return stage;
159336}
160337
161−void WindowStateStorage::saveValue(const QString &queryString)
338+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
162339{
163− QMutexLocker mutexLocker(&s_mutex);
164−
165− QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
166− m_asyncQueries.append(future);
167−
168− QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
169− futureWatcher->setFuture(future);
170− connect(futureWatcher, &QFutureWatcher<void>::finished,
171− this,
172− [=](){ m_asyncQueries.removeAll(futureWatcher->future());
173− futureWatcher->deleteLater(); });
340+ QRect geometry;
341+ QMetaObject::invokeMethod(m_asyncQuery, "getGeometry", Qt::BlockingQueuedConnection,
342+ Q_RETURN_ARG(QRect, geometry),
343+ Q_ARG(const QString&, windowId)
344+ );
345+ if (geometry.isNull() || !geometry.isValid()) {
346+ return defaultValue;
347+ }
348+ return geometry;
174349}
175350
176−QSqlQuery WindowStateStorage::getValue(const QString &queryString) const
351+const QString WindowStateStorage::getDbName()
177352{
178− QMutexLocker l(&s_mutex);
179− QSqlQuery query;
353+ QString dbName;
354+ QMetaObject::invokeMethod(m_asyncQuery, "getDbName", Qt::BlockingQueuedConnection,
355+ Q_RETURN_ARG(QString, dbName)
356+ );
357+ return QString(dbName);
358+}
180359
181− bool ok = query.exec(queryString);
182− if (!ok) {
183− qWarning() << "Error retrieving database query:" << queryString
184− << "Driver error:" << query.lastError().driverText()
185− << "Database error:" << query.lastError().databaseText();
360+Mir::State WindowStateStorage::toMirState(WindowState state) const
361+{
362+ // assumes a single state (not an OR of several)
363+ switch (state) {
364+ case WindowStateMaximized: return Mir::MaximizedState;
365+ case WindowStateMinimized: return Mir::MinimizedState;
366+ case WindowStateFullscreen: return Mir::FullscreenState;
367+ case WindowStateMaximizedLeft: return Mir::MaximizedLeftState;
368+ case WindowStateMaximizedRight: return Mir::MaximizedRightState;
369+ case WindowStateMaximizedHorizontally: return Mir::HorizMaximizedState;
370+ case WindowStateMaximizedVertically: return Mir::VertMaximizedState;
371+ case WindowStateMaximizedTopLeft: return Mir::MaximizedTopLeftState;
372+ case WindowStateMaximizedTopRight: return Mir::MaximizedTopRightState;
373+ case WindowStateMaximizedBottomLeft: return Mir::MaximizedBottomLeftState;
374+ case WindowStateMaximizedBottomRight: return Mir::MaximizedBottomRightState;
375+
376+ case WindowStateNormal:
377+ case WindowStateRestored:
378+ default:
379+ return Mir::RestoredState;
186380 }
187− return query;
188381}
382+
383+#include "windowstatestorage.moc"
plugins/Utils/windowstatestorage.h+27−20
@@ -1,5 +1,6 @@
11/*
22 * Copyright 2015-2016 Canonical Ltd.
3+ * Copyright 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 Lesser General Public License as published by
@@ -16,13 +17,19 @@
1617
1718#include <QObject>
1819#include <QSqlDatabase>
20+#include <QSqlQuery>
1921#include <QMutex>
2022#include <QFuture>
23+#include <QThread>
24+
25+// unity-api
26+#include <unity/shell/application/Mir.h>
27+
28+class AsyncQuery;
2129
2230class WindowStateStorage: public QObject
2331{
2432 Q_OBJECT
25− Q_ENUMS(WindowState)
2633public:
2734 enum WindowState {
2835 WindowStateNormal = 1 << 0,
@@ -32,36 +39,36 @@ public:
3239 WindowStateMaximizedLeft = 1 << 4,
3340 WindowStateMaximizedRight = 1 << 5,
3441 WindowStateMaximizedHorizontally = 1 << 6,
35− WindowStateMaximizedVertically = 1 << 7
42+ WindowStateMaximizedVertically = 1 << 7,
43+ WindowStateMaximizedTopLeft = 1 << 8,
44+ WindowStateMaximizedTopRight = 1 << 9,
45+ WindowStateMaximizedBottomLeft = 1 << 10,
46+ WindowStateMaximizedBottomRight = 1 << 11,
47+ WindowStateRestored = 1 << 12
3648 };
49+ Q_ENUM(WindowState)
3750 Q_DECLARE_FLAGS(WindowStates, WindowState)
38−#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
3951 Q_FLAG(WindowStates)
40−#endif
4152
42− WindowStateStorage(QObject *parent = 0);
53+ WindowStateStorage(const QString &dbName = QString(), QObject *parent = nullptr);
4354 virtual ~WindowStateStorage();
4455
45− Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
4656 Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;
4757
48− Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);
49− Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;
58+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;
5059
51− Q_INVOKABLE void saveStage(const QString &appId, int stage);
52− Q_INVOKABLE int getStage(const QString &appId) const;
60+ Q_INVOKABLE int getStage(const QString &appId, int defaultValue) const;
5361
54−private:
55− void initdb();
62+ Q_INVOKABLE Mir::State toMirState(WindowState state) const;
5663
57− void saveValue(const QString &queryString);
58− QSqlQuery getValue(const QString &queryString) const;
64+ const QString getDbName();
5965
60− static void executeAsyncQuery(const QString &queryString);
61− static QMutex s_mutex;
66+Q_SIGNALS:
67+ void saveStage(const QString &appId, int stage);
68+ void saveGeometry(const QString &windowId, const QRect &rect);
69+ void saveState(const QString &windowId, WindowStateStorage::WindowState state);
6270
63− // NB: This is accessed from threads. Make sure to mutex it.
64− QSqlDatabase m_db;
65−
66− QList< QFuture<void> > m_asyncQueries;
71+private:
72+ QThread m_thread;
73+ AsyncQuery *m_asyncQuery;
6774};
plugins/WindowManager/AvailableDesktopArea.cppnew file+50
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright (C) 2017 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 "AvailableDesktopArea.h"
18+
19+#include <QGuiApplication>
20+#include <QQuickWindow>
21+#include <qpa/qplatformnativeinterface.h>
22+
23+AvailableDesktopArea::AvailableDesktopArea(QQuickItem *parent)
24+ : QQuickItem(parent)
25+{
26+ connect(this, &QQuickItem::xChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);
27+ connect(this, &QQuickItem::yChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);
28+ connect(this, &QQuickItem::widthChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);
29+ connect(this, &QQuickItem::heightChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);
30+}
31+
32+void AvailableDesktopArea::updatePlatformWindowProperty()
33+{
34+ if (!window()) {
35+ return;
36+ }
37+
38+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
39+
40+ QRect rect(x(), y(), width(), height());
41+
42+ nativeInterface->setWindowProperty(window()->handle(), "availableDesktopArea", QVariant(rect));
43+}
44+
45+void AvailableDesktopArea::itemChange(ItemChange change, const ItemChangeData &)
46+{
47+ if (change == ItemSceneChange) {
48+ updatePlatformWindowProperty();
49+ }
50+}
plugins/Unity/DashCommunicator/dashcommunicator.h → plugins/WindowManager/AvailableDesktopArea.hrenamed+14−21
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2017 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
@@ -14,32 +14,25 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef DASHCOMMUNICATOR_H
18−#define DASHCOMMUNICATOR_H
17+#ifndef AVAILABLEDESKTOPAREA_H
18+#define AVAILABLEDESKTOPAREA_H
1919
20−// Qt
21−#include <QThread>
22−#include <QMutex>
20+#include <QQuickItem>
2321
24−class DashConnection;
22+/**
23+ @brief Used to inform qtmir/miral about the available desktop area of shell
2524
26−class DashCommunicator: public QThread
25+ So that qtmir/miral can take correct window management decisions.
26+ */
27+class AvailableDesktopArea : public QQuickItem
2728{
2829 Q_OBJECT
2930public:
30− explicit DashCommunicator(QObject *parent = 0);
31− ~DashCommunicator();
32−
33−public Q_SLOTS:
34− void setCurrentScope(int index, bool animate, bool isSwipe);
35−
31+ AvailableDesktopArea(QQuickItem *parent = nullptr);
3632protected:
37− void run() override;
38−
39−private:
40− DashConnection *m_dashConnection;
41− bool m_created;
42− QMutex m_mutex;
33+ void itemChange(ItemChange change, const ItemChangeData &value) override;
34+private Q_SLOTS:
35+ void updatePlatformWindowProperty();
4336};
4437
45−#endif
38+#endif // AVAILABLEDESKTOPAREA_H
plugins/WindowManager/CMakeLists.txt+15−2
@@ -1,13 +1,26 @@
11set(WINDOWMANAGER_SRC
2− TopLevelSurfaceList.cpp
2+ AvailableDesktopArea.cpp
3+ TopLevelWindowModel.cpp
4+ Window.cpp
35 WindowManagerPlugin.cpp
6+ WindowMargins.cpp
7+ InputMethodManager.cpp
48 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
59 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
610 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
11+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
12+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
713 )
814
15+add_definitions(-DWINDOWMANAGERQML_LIBRARY)
16+
17+include_directories(
18+ SYSTEM
19+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
20+)
21+
922add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
1023
11−qt5_use_modules(windowmanager-qml Qml Quick Gui)
24+target_link_libraries(windowmanager-qml Qt5::Qml Qt5::Quick Qt5::Gui)
1225
1326add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)
plugins/WindowManager/InputMethodManager.cppnew file+56
@@ -0,0 +1,56 @@
1+/*
2+ * Copyright (C) 2019 UBports Foundation.
3+ * Author(s) Marius Gripsgard <marius@ubports.com>
4+ *
5+ * This program is free software: you can redistribute it and/or modify it under
6+ * the terms of the GNU Lesser General Public License version 3, as published by
7+ * the Free Software Foundation.
8+ *
9+ * This program is distributed in the hope that it will be useful, but WITHOUT
10+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
11+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+ * Lesser General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU Lesser General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ */
17+
18+#include "InputMethodManager.h"
19+#include <QDebug>
20+
21+#include <unity/shell/application/MirSurfaceInterface.h>
22+
23+// local
24+#include "Window.h"
25+
26+Q_LOGGING_CATEGORY(INPUTMETHODMANAGER, "InputMethodManager", QtInfoMsg)
27+#define DEBUG_MSG qCDebug(INPUTMETHODMANAGER).nospace().noquote() << __func__
28+
29+namespace unityapi = unity::shell::application;
30+
31+InputMethodManager *InputMethodManager::instance()
32+{
33+ static InputMethodManager* inputMethod(new InputMethodManager());
34+ return inputMethod;
35+}
36+
37+InputMethodManager::InputMethodManager()
38+{
39+}
40+
41+void InputMethodManager::setWindow(Window* window)
42+{
43+ if (window == m_inputMethodWindow) {
44+ return;
45+ }
46+
47+ DEBUG_MSG << "(" << window << ")";
48+
49+ m_inputMethodWindow = window;
50+ Q_EMIT surfaceChanged(surface());
51+}
52+
53+unityapi::MirSurfaceInterface* InputMethodManager::surface() const
54+{
55+ return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;
56+}
plugins/WindowManager/InputMethodManager.hnew file+55
@@ -0,0 +1,55 @@
1+/*
2+ * Copyright (C) 2019 UBports Foundation.
3+ * Author(s) Marius Gripsgard <marius@ubports.com>
4+ *
5+ * This program is free software: you can redistribute it and/or modify it under
6+ * the terms of the GNU Lesser General Public License version 3, as published by
7+ * the Free Software Foundation.
8+ *
9+ * This program is distributed in the hope that it will be useful, but WITHOUT
10+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
11+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+ * Lesser General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU Lesser General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ */
17+
18+#pragma once
19+
20+#include <QLoggingCategory>
21+#include <QObject>
22+
23+#include "WindowManagerGlobal.h"
24+
25+Q_DECLARE_LOGGING_CATEGORY(INPUTMETHODMANAGER)
26+
27+class Window;
28+
29+namespace unity {
30+ namespace shell {
31+ namespace application {
32+ class MirSurfaceInterface;
33+ }
34+ }
35+}
36+
37+class WINDOWMANAGERQML_EXPORT InputMethodManager : public QObject
38+{
39+ Q_OBJECT
40+ Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
41+
42+public:
43+ InputMethodManager();
44+ static InputMethodManager* instance();
45+
46+ void setWindow(Window* window);
47+
48+Q_SIGNALS:
49+ void surfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);
50+
51+private:
52+ unity::shell::application::MirSurfaceInterface* surface() const;
53+
54+ Window* m_inputMethodWindow{nullptr};
55+};
plugins/WindowManager/TopLevelSurfaceList.cppdeleted−486
@@ -1,486 +0,0 @@
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 "TopLevelSurfaceList.h"
18−
19−// unity-api
20−#include <unity/shell/application/ApplicationInfoInterface.h>
21−#include <unity/shell/application/MirSurfaceInterface.h>
22−#include <unity/shell/application/MirSurfaceListInterface.h>
23−
24−#include <QMetaObject>
25−
26−Q_LOGGING_CATEGORY(UNITY_TOPSURFACELIST, "unity.topsurfacelist", QtDebugMsg)
27−
28−#define DEBUG_MSG qCDebug(UNITY_TOPSURFACELIST).nospace().noquote() << __func__
29−
30−using namespace unity::shell::application;
31−
32−TopLevelSurfaceList::TopLevelSurfaceList(QObject *parent) :
33− QAbstractListModel(parent)
34−{
35− DEBUG_MSG << "()";
36−}
37−
38−TopLevelSurfaceList::~TopLevelSurfaceList()
39−{
40− DEBUG_MSG << "()";
41−}
42−
43−int TopLevelSurfaceList::rowCount(const QModelIndex &parent) const
44−{
45− return !parent.isValid() ? m_surfaceList.size() : 0;
46−}
47−
48−QVariant TopLevelSurfaceList::data(const QModelIndex& index, int role) const
49−{
50− if (index.row() < 0 || index.row() >= m_surfaceList.size())
51− return QVariant();
52−
53− if (role == SurfaceRole) {
54− MirSurfaceInterface *surface = m_surfaceList.at(index.row()).surface;
55− return QVariant::fromValue(surface);
56− } else if (role == ApplicationRole) {
57− return QVariant::fromValue(m_surfaceList.at(index.row()).application);
58− } else if (role == IdRole) {
59− return QVariant::fromValue(m_surfaceList.at(index.row()).id);
60− } else {
61− return QVariant();
62− }
63−}
64−
65−void TopLevelSurfaceList::raise(MirSurfaceInterface *surface)
66−{
67− if (!surface)
68− return;
69−
70− DEBUG_MSG << "(MirSurface[" << (void*)surface << "])";
71−
72− int i = indexOf(surface);
73− if (i != -1) {
74− raiseId(m_surfaceList.at(i).id);
75− }
76−}
77−
78−void TopLevelSurfaceList::appendPlaceholder(ApplicationInfoInterface *application)
79−{
80− DEBUG_MSG << "(" << application->appId() << ")";
81−
82− appendSurfaceHelper(nullptr, application);
83−}
84−
85−void TopLevelSurfaceList::appendSurface(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
86−{
87− Q_ASSERT(surface != nullptr);
88−
89− bool filledPlaceholder = false;
90− for (int i = 0; i < m_surfaceList.count() && !filledPlaceholder; ++i) {
91− ModelEntry &entry = m_surfaceList[i];
92− if (entry.application == application && entry.surface == nullptr) {
93− entry.surface = surface;
94− connectSurface(surface);
95− DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
96− << ", filling out placeholder. after: " << toString();
97− Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
98− filledPlaceholder = true;
99− }
100− }
101−
102− if (!filledPlaceholder) {
103− DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
104− appendSurfaceHelper(surface, application);
105− }
106−}
107−
108−void TopLevelSurfaceList::appendSurfaceHelper(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
109−{
110− if (m_modelState == IdleState) {
111− m_modelState = InsertingState;
112− beginInsertRows(QModelIndex(), m_surfaceList.size() /*first*/, m_surfaceList.size() /*last*/);
113− } else {
114− Q_ASSERT(m_modelState == ResettingState);
115− // No point in signaling anything if we're resetting the whole model
116− }
117−
118− int id = generateId();
119− m_surfaceList.append(ModelEntry(surface, application, id));
120− if (surface) {
121− connectSurface(surface);
122− }
123−
124− if (m_modelState == InsertingState) {
125− endInsertRows();
126− Q_EMIT countChanged();
127− Q_EMIT listChanged();
128− m_modelState = IdleState;
129− }
130−
131− DEBUG_MSG << " after " << toString();
132−}
133−
134−void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
135−{
136− connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool focused){
137− if (focused) {
138− this->raise(surface);
139− }
140− });
141− connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
142− if (!live) {
143− onSurfaceDied(surface);
144− }
145− });
146− connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
147−}
148−
149−void TopLevelSurfaceList::onSurfaceDied(MirSurfaceInterface *surface)
150−{
151− int i = indexOf(surface);
152− if (i == -1) {
153− return;
154− }
155−
156− auto application = m_surfaceList[i].application;
157−
158− // can't be starting if it already has a surface
159− Q_ASSERT(application->state() != ApplicationInfoInterface::Starting);
160−
161− if (application->state() == ApplicationInfoInterface::Running) {
162− m_surfaceList[i].removeOnceSurfaceDestroyed = true;
163− } else {
164− // assume it got killed by the out-of-memory daemon.
165− //
166− // So leave entry in the model and only remove its surface, so shell can display a screenshot
167− // in its place.
168− m_surfaceList[i].removeOnceSurfaceDestroyed = false;
169− }
170−}
171−
172−void TopLevelSurfaceList::onSurfaceDestroyed(MirSurfaceInterface *surface)
173−{
174− int i = indexOf(surface);
175− if (i == -1) {
176− return;
177− }
178−
179− if (m_surfaceList[i].removeOnceSurfaceDestroyed) {
180− removeAt(i);
181− } else {
182− m_surfaceList[i].surface = nullptr;
183− Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
184− DEBUG_MSG << " Removed surface from entry. After: " << toString();
185− }
186−}
187−
188−void TopLevelSurfaceList::removeAt(int index)
189−{
190− if (m_modelState == IdleState) {
191− beginRemoveRows(QModelIndex(), index, index);
192− m_modelState = RemovingState;
193− } else {
194− Q_ASSERT(m_modelState == ResettingState);
195− // No point in signaling anything if we're resetting the whole model
196− }
197−
198− m_surfaceList.removeAt(index);
199−
200− if (m_modelState == RemovingState) {
201− endRemoveRows();
202− Q_EMIT countChanged();
203− Q_EMIT listChanged();
204− m_modelState = IdleState;
205− }
206−
207− DEBUG_MSG << " after " << toString();
208−}
209−
210−int TopLevelSurfaceList::indexOf(MirSurfaceInterface *surface)
211−{
212− for (int i = 0; i < m_surfaceList.count(); ++i) {
213− if (m_surfaceList.at(i).surface == surface) {
214− return i;
215− }
216− }
217− return -1;
218−}
219−
220−void TopLevelSurfaceList::move(int from, int to)
221−{
222− if (from == to) return;
223− DEBUG_MSG << " from=" << from << " to=" << to;
224−
225− if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
226− QModelIndex parent;
227− /* When moving an item down, the destination index needs to be incremented
228− by one, as explained in the documentation:
229− http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
230−
231− Q_ASSERT(m_modelState == IdleState);
232− m_modelState = MovingState;
233−
234− beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
235− m_surfaceList.move(from, to);
236− endMoveRows();
237− Q_EMIT listChanged();
238−
239− m_modelState = IdleState;
240−
241− DEBUG_MSG << " after " << toString();
242− }
243−}
244−
245−MirSurfaceInterface *TopLevelSurfaceList::surfaceAt(int index) const
246−{
247− if (index >=0 && index < m_surfaceList.count()) {
248− return m_surfaceList[index].surface;
249− } else {
250− return nullptr;
251− }
252−}
253−
254−ApplicationInfoInterface *TopLevelSurfaceList::applicationAt(int index) const
255−{
256− if (index >=0 && index < m_surfaceList.count()) {
257− return m_surfaceList[index].application;
258− } else {
259− return nullptr;
260− }
261−}
262−
263−int TopLevelSurfaceList::idAt(int index) const
264−{
265− if (index >=0 && index < m_surfaceList.count()) {
266− return m_surfaceList[index].id;
267− } else {
268− return 0;
269− }
270−}
271−
272−int TopLevelSurfaceList::indexForId(int id) const
273−{
274− for (int i = 0; i < m_surfaceList.count(); ++i) {
275− if (m_surfaceList[i].id == id) {
276− return i;
277− }
278− }
279− return -1;
280−}
281−
282−void TopLevelSurfaceList::doRaiseId(int id)
283−{
284− int fromIndex = indexForId(id);
285− if (fromIndex != -1) {
286− move(fromIndex, 0 /* toIndex */);
287− }
288−}
289−
290−void TopLevelSurfaceList::raiseId(int id)
291−{
292− if (m_modelState == IdleState) {
293− DEBUG_MSG << "(id=" << id << ") - do it now.";
294− doRaiseId(id);
295− } else {
296− DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
297− // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
298− // if we perform yet another model change straight away.
299− //
300− // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
301− // the index is definitely within bounds.
302− QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
303− }
304−}
305−
306−int TopLevelSurfaceList::generateId()
307−{
308− int id = m_nextId;
309− m_nextId = nextFreeId(m_nextId + 1);
310− Q_EMIT nextIdChanged();
311− return id;
312−}
313−
314−int TopLevelSurfaceList::nextFreeId(int candidateId)
315−{
316− if (candidateId > m_maxId) {
317− return nextFreeId(1);
318− } else {
319− if (indexForId(candidateId) == -1) {
320− // it's indeed free
321− return candidateId;
322− } else {
323− return nextFreeId(candidateId + 1);
324− }
325− }
326−}
327−
328−QString TopLevelSurfaceList::toString()
329−{
330− QString str;
331− for (int i = 0; i < m_surfaceList.count(); ++i) {
332− auto item = m_surfaceList.at(i);
333−
334− QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
335− .arg(i)
336− .arg(item.application->appId())
337− .arg((qintptr)item.surface, 0, 16)
338− .arg(item.id);
339−
340− if (i > 0) {
341− str.append(",");
342− }
343− str.append(itemStr);
344− }
345− return str;
346−}
347−
348−void TopLevelSurfaceList::addApplication(ApplicationInfoInterface *application)
349−{
350− DEBUG_MSG << "(" << application->appId() << ")";
351− Q_ASSERT(!m_applications.contains(application));
352− m_applications.append(application);
353−
354− MirSurfaceListInterface *surfaceList = application->surfaceList();
355−
356− if (application->state() != ApplicationInfoInterface::Stopped) {
357− if (surfaceList->count() == 0) {
358− appendPlaceholder(application);
359− } else {
360− for (int i = 0; i < surfaceList->count(); ++i) {
361− appendSurface(surfaceList->get(i), application);
362− }
363− }
364− }
365−
366− connect(surfaceList, &QAbstractItemModel::rowsInserted, this,
367− [this, application, surfaceList](const QModelIndex & /*parent*/, int first, int last)
368− {
369− for (int i = last; i >= first; --i) {
370− this->appendSurface(surfaceList->get(i), application);
371− }
372− });
373−}
374−
375−void TopLevelSurfaceList::removeApplication(ApplicationInfoInterface *application)
376−{
377− DEBUG_MSG << "(" << application->appId() << ")";
378− Q_ASSERT(m_applications.contains(application));
379−
380− MirSurfaceListInterface *surfaceList = application->surfaceList();
381−
382− disconnect(surfaceList, 0, this, 0);
383−
384− Q_ASSERT(m_modelState == IdleState);
385− m_modelState = RemovingState;
386−
387− int i = 0;
388− while (i < m_surfaceList.count()) {
389− if (m_surfaceList.at(i).application == application) {
390− beginRemoveRows(QModelIndex(), i, i);
391− m_surfaceList.removeAt(i);
392− endRemoveRows();
393− Q_EMIT countChanged();
394− Q_EMIT listChanged();
395− } else {
396− ++i;
397− }
398− }
399−
400− m_modelState = IdleState;
401−
402− DEBUG_MSG << " after " << toString();
403−
404− m_applications.removeAll(application);
405−}
406−
407−QAbstractListModel *TopLevelSurfaceList::applicationsModel() const
408−{
409− return m_applicationsModel;
410−}
411−
412−void TopLevelSurfaceList::setApplicationsModel(QAbstractListModel* value)
413−{
414− if (m_applicationsModel == value) {
415− return;
416− }
417−
418− DEBUG_MSG << "(" << value << ")";
419−
420− Q_ASSERT(m_modelState == IdleState);
421− m_modelState = ResettingState;
422−
423− beginResetModel();
424−
425− if (m_applicationsModel) {
426− m_surfaceList.clear();
427− m_applications.clear();
428− disconnect(m_applicationsModel, 0, this, 0);
429− }
430−
431− m_applicationsModel = value;
432−
433− if (m_applicationsModel) {
434− findApplicationRole();
435−
436− connect(m_applicationsModel, &QAbstractItemModel::rowsInserted,
437− this, [this](const QModelIndex &/*parent*/, int first, int last) {
438− for (int i = first; i <= last; ++i) {
439− auto application = getApplicationFromModelAt(i);
440− addApplication(application);
441− }
442− });
443−
444− connect(m_applicationsModel, &QAbstractItemModel::rowsAboutToBeRemoved,
445− this, [this](const QModelIndex &/*parent*/, int first, int last) {
446− for (int i = first; i <= last; ++i) {
447− auto application = getApplicationFromModelAt(i);
448− removeApplication(application);
449− }
450− });
451−
452− for (int i = 0; i < m_applicationsModel->rowCount(); ++i) {
453− auto application = getApplicationFromModelAt(i);
454− addApplication(application);
455− }
456− }
457−
458− endResetModel();
459− m_modelState = IdleState;
460−}
461−
462−ApplicationInfoInterface *TopLevelSurfaceList::getApplicationFromModelAt(int index)
463−{
464− QModelIndex modelIndex = m_applicationsModel->index(index);
465−
466− QVariant variant = m_applicationsModel->data(modelIndex, m_applicationRole);
467−
468− // variant.value<ApplicationInfoInterface*>() returns null for some reason.
469− return static_cast<ApplicationInfoInterface*>(variant.value<QObject*>());
470−}
471−
472−void TopLevelSurfaceList::findApplicationRole()
473−{
474− QHash<int, QByteArray> namesHash = m_applicationsModel->roleNames();
475−
476− m_applicationRole = -1;
477− for (auto i = namesHash.begin(); i != namesHash.end() && m_applicationRole == -1; ++i) {
478− if (i.value() == "application") {
479− m_applicationRole = i.key();
480− }
481− }
482−
483− if (m_applicationRole == -1) {
484− qFatal("TopLevelSurfaceList: applicationsModel must have a \"application\" role.");
485− }
486−}
plugins/WindowManager/TopLevelSurfaceList.hdeleted−223
@@ -1,223 +0,0 @@
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 TOPLEVELSURFACELIST_H
18−#define TOPLEVELSURFACELIST_H
19−
20−#include <QAbstractListModel>
21−#include <QList>
22−#include <QLoggingCategory>
23−
24−Q_DECLARE_LOGGING_CATEGORY(UNITY_TOPSURFACELIST)
25−
26−namespace unity {
27− namespace shell {
28− namespace application {
29− class ApplicationInfoInterface;
30− class MirSurfaceInterface;
31− }
32− }
33−}
34−
35−/**
36− * @brief A model of top-level surfaces
37− *
38− * It's an abstraction of top-level application windows.
39− *
40− * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
41− * still starting up. A shell should then display a splash screen or saved screenshot of the application
42− * until its surface comes up.
43− *
44− * As applications can have multiple surfaces and you can also have entries without surfaces at all,
45− * the only way to unambiguously refer to an entry in this model is through its id.
46− */
47−class TopLevelSurfaceList : public QAbstractListModel
48−{
49−
50− Q_OBJECT
51−
52− /**
53− * @brief A list model of applications.
54− *
55− * It's expected to have a role called "application" which returns a ApplicationInfoInterface
56− */
57− Q_PROPERTY(QAbstractListModel* applicationsModel READ applicationsModel
58− WRITE setApplicationsModel
59− NOTIFY applicationsModelChanged)
60−
61− /**
62− * @brief Number of top-level surfaces in this model
63− *
64− * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
65− */
66− Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
67−
68− /**
69− The id to be used on the next entry created
70− Useful for tests
71− */
72− Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
73−public:
74−
75− /**
76− * @brief The Roles supported by the model
77− *
78− * SurfaceRole - A MirSurfaceInterface. It will be null if the application is still starting up
79− * ApplicationRole - An ApplicationInfoInterface
80− * IdRole - A unique identifier for this entry. Useful to unambiguosly track elements as they move around in the list
81− */
82− enum Roles {
83− SurfaceRole = Qt::UserRole,
84− ApplicationRole = Qt::UserRole + 1,
85− IdRole = Qt::UserRole + 2,
86− };
87−
88− explicit TopLevelSurfaceList(QObject *parent = nullptr);
89− virtual ~TopLevelSurfaceList();
90−
91− // QAbstractItemModel methods
92− int rowCount(const QModelIndex &parent = QModelIndex()) const override;
93− QVariant data(const QModelIndex& index, int role) const override;
94− QHash<int, QByteArray> roleNames() const override {
95− QHash<int, QByteArray> roleNames { {SurfaceRole, "surface"},
96− {ApplicationRole, "application"},
97− {IdRole, "id"} };
98− return roleNames;
99− }
100−
101− int nextId() const { return m_nextId; }
102−
103− QAbstractListModel *applicationsModel() const;
104− void setApplicationsModel(QAbstractListModel*);
105−
106−public Q_SLOTS:
107− /**
108− * @brief Returns the surface at the given index
109− *
110− * It will be a nullptr if the application is still starting up and thus hasn't yet created
111− * and drawn into a surface.
112− */
113− unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
114−
115− /**
116− * @brief Returns the application at the given index
117− */
118− unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
119−
120− /**
121− * @brief Returns the unique id of the element at the given index
122− */
123− int idAt(int index) const;
124−
125− /**
126− * @brief Returns the index where the row with the given id is located
127− *
128− * Returns -1 if there's no row with the given id.
129− */
130− int indexForId(int id) const;
131−
132− /**
133− * @brief Raises the row with the given id to index 0
134− */
135− void raiseId(int id);
136−
137− void doRaiseId(int id);
138−
139−Q_SIGNALS:
140− void countChanged();
141−
142− /**
143− * @brief Emitted when the list changes
144− *
145− * Emitted when model gains an element, loses an element or when elements exchange positions.
146− */
147− void listChanged();
148−
149− void nextIdChanged();
150−
151− void applicationsModelChanged();
152−
153−private:
154− void addApplication(unity::shell::application::ApplicationInfoInterface *application);
155− void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
156−
157− int indexOf(unity::shell::application::MirSurfaceInterface *surface);
158− void raise(unity::shell::application::MirSurfaceInterface *surface);
159− void move(int from, int to);
160− void appendSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
161− unity::shell::application::ApplicationInfoInterface *application);
162− void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
163− int generateId();
164− int nextFreeId(int candidateId);
165− QString toString();
166− void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
167− void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
168− void removeAt(int index);
169− void findApplicationRole();
170−
171− unity::shell::application::ApplicationInfoInterface *getApplicationFromModelAt(int index);
172−
173− /*
174− Placeholder for a future surface from a starting or running application.
175− Enables shell to give immediate feedback to the user by showing, eg,
176− a splash screen.
177−
178− It's a model row containing a null surface and the given application.
179− */
180− void appendPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
181−
182− /*
183− Adds a model row with the given surface and application
184−
185− Alternatively, if a placeholder exists for the given application it's
186− filled with the given surface instead.
187− */
188− void appendSurface(unity::shell::application::MirSurfaceInterface *surface,
189− unity::shell::application::ApplicationInfoInterface *application);
190−
191− struct ModelEntry {
192− ModelEntry(unity::shell::application::MirSurfaceInterface *surface, unity::shell::application::ApplicationInfoInterface *application, int id)
193− : surface(surface), application(application), id(id) {}
194− unity::shell::application::MirSurfaceInterface *surface;
195− unity::shell::application::ApplicationInfoInterface *application;
196− int id;
197− bool removeOnceSurfaceDestroyed{false};
198− };
199−
200− QList<ModelEntry> m_surfaceList;
201− int m_nextId{1};
202− static const int m_maxId{1000000};
203−
204− // applications that are being monitored
205− QList<unity::shell::application::ApplicationInfoInterface *> m_applications;
206−
207− QAbstractListModel* m_applicationsModel{nullptr};
208− int m_applicationRole{-1};
209−
210− enum ModelState {
211− IdleState,
212− InsertingState,
213− RemovingState,
214− MovingState,
215− ResettingState
216− };
217− ModelState m_modelState{IdleState};
218−};
219−
220−Q_DECLARE_METATYPE(TopLevelSurfaceList*)
221−Q_DECLARE_METATYPE(QAbstractListModel*)
222−
223−#endif // TOPLEVELSURFACELIST_H
plugins/WindowManager/TopLevelWindowModel.cppnew file+782
@@ -0,0 +1,782 @@
1+/*
2+ * Copyright (C) 2016-2017 Canonical, Ltd.
3+ * Copyright 2019 UBports Foundation
4+ *
5+ * This program is free software: you can redistribute it and/or modify it under
6+ * the terms of the GNU Lesser General Public License version 3, as published by
7+ * the Free Software Foundation.
8+ *
9+ * This program is distributed in the hope that it will be useful, but WITHOUT
10+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
11+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+ * Lesser General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU Lesser General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ */
17+
18+#include "TopLevelWindowModel.h"
19+
20+// unity-api
21+#include <unity/shell/application/ApplicationInfoInterface.h>
22+#include <unity/shell/application/ApplicationManagerInterface.h>
23+#include <unity/shell/application/MirSurfaceInterface.h>
24+#include <unity/shell/application/MirSurfaceListInterface.h>
25+#include <unity/shell/application/SurfaceManagerInterface.h>
26+
27+// Qt
28+#include <QGuiApplication>
29+#include <QDebug>
30+
31+// local
32+#include "Window.h"
33+#include "InputMethodManager.h"
34+
35+Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)
36+
37+#define DEBUG_MSG qCDebug(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
38+#define INFO_MSG qCInfo(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
39+
40+namespace unityapi = unity::shell::application;
41+
42+TopLevelWindowModel::TopLevelWindowModel()
43+ : m_nullWindow(createNullWindow()),
44+ m_surfaceManagerBusy(false)
45+{
46+ connect(m_nullWindow, &Window::focusedChanged, this, [this] {
47+ Q_EMIT rootFocusChanged();
48+ });
49+}
50+
51+void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)
52+{
53+ if (m_applicationManager == value) {
54+ return;
55+ }
56+
57+ DEBUG_MSG << "(" << value << ")";
58+
59+ Q_ASSERT(m_modelState == IdleState);
60+ m_modelState = ResettingState;
61+
62+ beginResetModel();
63+
64+ if (m_applicationManager) {
65+ m_windowModel.clear();
66+ disconnect(m_applicationManager, 0, this, 0);
67+ }
68+
69+ m_applicationManager = value;
70+
71+ if (m_applicationManager) {
72+ connect(m_applicationManager, &QAbstractItemModel::rowsInserted,
73+ this, [this](const QModelIndex &/*parent*/, int first, int last) {
74+ for (int i = first; i <= last; ++i) {
75+ auto application = m_applicationManager->get(i);
76+ addApplication(application);
77+ }
78+ });
79+
80+ connect(m_applicationManager, &QAbstractItemModel::rowsAboutToBeRemoved,
81+ this, [this](const QModelIndex &/*parent*/, int first, int last) {
82+ for (int i = first; i <= last; ++i) {
83+ auto application = m_applicationManager->get(i);
84+ removeApplication(application);
85+ }
86+ });
87+
88+ for (int i = 0; i < m_applicationManager->rowCount(); ++i) {
89+ auto application = m_applicationManager->get(i);
90+ addApplication(application);
91+ }
92+ }
93+
94+ endResetModel();
95+ m_modelState = IdleState;
96+}
97+
98+void TopLevelWindowModel::setSurfaceManager(unityapi::SurfaceManagerInterface *surfaceManager)
99+{
100+ if (surfaceManager == m_surfaceManager) {
101+ return;
102+ }
103+
104+ DEBUG_MSG << "(" << surfaceManager << ")";
105+
106+ if (m_surfaceManager) {
107+ disconnect(m_surfaceManager, 0, this, 0);
108+ }
109+
110+ m_surfaceManager = surfaceManager;
111+
112+ if (m_surfaceManager) {
113+ connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfaceCreated, this, &TopLevelWindowModel::onSurfaceCreated);
114+ connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfacesRaised, this, &TopLevelWindowModel::onSurfacesRaised);
115+ connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsStarted, this, &TopLevelWindowModel::onModificationsStarted);
116+ connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsEnded, this, &TopLevelWindowModel::onModificationsEnded);
117+ }
118+
119+ Q_EMIT surfaceManagerChanged(m_surfaceManager);
120+}
121+
122+void TopLevelWindowModel::addApplication(unityapi::ApplicationInfoInterface *application)
123+{
124+ DEBUG_MSG << "(" << application->appId() << ")";
125+
126+ if (application->state() != unityapi::ApplicationInfoInterface::Stopped && application->surfaceList()->count() == 0) {
127+ prependPlaceholder(application);
128+ }
129+}
130+
131+void TopLevelWindowModel::removeApplication(unityapi::ApplicationInfoInterface *application)
132+{
133+ DEBUG_MSG << "(" << application->appId() << ")";
134+
135+ Q_ASSERT(m_modelState == IdleState);
136+
137+ int i = 0;
138+ while (i < m_windowModel.count()) {
139+ if (m_windowModel.at(i).application == application) {
140+ deleteAt(i);
141+ } else {
142+ ++i;
143+ }
144+ }
145+}
146+
147+void TopLevelWindowModel::prependPlaceholder(unityapi::ApplicationInfoInterface *application)
148+{
149+ INFO_MSG << "(" << application->appId() << ")";
150+
151+ prependSurfaceHelper(nullptr, application);
152+}
153+
154+void TopLevelWindowModel::prependSurface(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
155+{
156+ Q_ASSERT(surface != nullptr);
157+
158+ connectSurface(surface);
159+
160+ bool filledPlaceholder = false;
161+ for (int i = 0; i < m_windowModel.count() && !filledPlaceholder; ++i) {
162+ ModelEntry &entry = m_windowModel[i];
163+ if (entry.application == application && entry.window->surface() == nullptr) {
164+ entry.window->setSurface(surface);
165+ INFO_MSG << " appId=" << application->appId() << " surface=" << surface
166+ << ", filling out placeholder. after: " << toString();
167+ filledPlaceholder = true;
168+ }
169+ }
170+
171+ if (!filledPlaceholder) {
172+ INFO_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
173+ prependSurfaceHelper(surface, application);
174+ }
175+}
176+
177+void TopLevelWindowModel::prependSurfaceHelper(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
178+{
179+
180+ Window *window = createWindow(surface);
181+
182+ connect(window, &Window::stateChanged, this, [=](Mir::State newState) {
183+ if (newState == Mir::HiddenState) {
184+ // Comply, removing it from our model. Just as if it didn't exist anymore.
185+ removeAt(indexForId(window->id()));
186+ } else {
187+ if (indexForId(window->id()) == -1) {
188+ // was probably hidden before. put it back on the list
189+ auto *application = m_applicationManager->findApplicationWithSurface(window->surface());
190+ Q_ASSERT(application);
191+ prependWindow(window, application);
192+ }
193+ }
194+ });
195+
196+ prependWindow(window, application);
197+
198+ // Activate the newly-prepended window.
199+ window->activate();
200+
201+ INFO_MSG << " after " << toString();
202+}
203+
204+void TopLevelWindowModel::prependWindow(Window *window, unityapi::ApplicationInfoInterface *application)
205+{
206+ if (m_modelState == IdleState) {
207+ m_modelState = InsertingState;
208+ beginInsertRows(QModelIndex(), 0 /*first*/, 0 /*last*/);
209+ } else {
210+ Q_ASSERT(m_modelState == ResettingState);
211+ // No point in signaling anything if we're resetting the whole model
212+ }
213+
214+ m_windowModel.prepend(ModelEntry(window, application));
215+
216+ if (m_modelState == InsertingState) {
217+ endInsertRows();
218+ Q_EMIT countChanged();
219+ Q_EMIT listChanged();
220+ m_modelState = IdleState;
221+ }
222+}
223+
224+void TopLevelWindowModel::connectWindow(Window *window)
225+{
226+ connect(window, &Window::focusRequested, this, [this, window]() {
227+ if (!window->surface()) {
228+ activateEmptyWindow(window);
229+ }
230+ });
231+
232+ connect(window, &Window::focusedChanged, this, [this, window](bool focused) {
233+ if (window->surface()) {
234+ // Condense changes to the focused window
235+ // eg: Do focusedWindow=A to focusedWindow=B instead of
236+ // focusedWindow=A to focusedWindow=null to focusedWindow=B
237+ if (focused) {
238+ Q_ASSERT(m_newlyFocusedWindow == nullptr);
239+ m_focusedWindowChanged = true;
240+ m_newlyFocusedWindow = window;
241+ } else if (m_focusedWindow == window) {
242+ m_focusedWindowChanged = true;
243+ } else {
244+ // don't clear the focused window if you were not there in the first place
245+ // happens when a filled window gets replaced with an empty one (no surface) as the focused window.
246+ }
247+ }
248+ });
249+
250+ connect(window, &Window::closeRequested, this, [this, window]() {
251+ if (!window->surface()) {
252+ // do things ourselves as miral doesn't know about this window
253+ int id = window->id();
254+ int index = indexForId(id);
255+ bool focusOther = false;
256+ Q_ASSERT(index >= 0);
257+ if (window->focused()) {
258+ focusOther = true;
259+ }
260+ m_windowModel[index].application->close();
261+ if (focusOther) {
262+ activateTopMostWindowWithoutId(id);
263+ }
264+ }
265+ });
266+
267+ connect(window, &Window::emptyWindowActivated, this, [this, window]() {
268+ activateEmptyWindow(window);
269+ });
270+
271+ connect(window, &Window::liveChanged, this, [this, window](bool isAlive) {
272+ if (!isAlive && window->state() == Mir::HiddenState) {
273+ // Hidden windows are not in the model. So just delete it right away.
274+ delete window;
275+ }
276+ });
277+}
278+
279+void TopLevelWindowModel::activateEmptyWindow(Window *window)
280+{
281+ Q_ASSERT(!window->surface());
282+ DEBUG_MSG << "(" << window << ")";
283+
284+ // miral doesn't know about empty windows (ie, windows that are not backed up by MirSurfaces)
285+ // So we have to activate them ourselves (instead of asking SurfaceManager to do it for us).
286+
287+ window->setFocused(true);
288+ raiseId(window->id());
289+ Window *previousWindow = m_focusedWindow;
290+ setFocusedWindow(window);
291+ if (previousWindow && previousWindow->surface() && previousWindow->surface()->focused()) {
292+ m_surfaceManager->activate(nullptr);
293+ }
294+}
295+
296+void TopLevelWindowModel::connectSurface(unityapi::MirSurfaceInterface *surface)
297+{
298+ connect(surface, &unityapi::MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
299+ if (!live) {
300+ onSurfaceDied(surface);
301+ }
302+ });
303+ connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
304+}
305+
306+void TopLevelWindowModel::onSurfaceDied(unityapi::MirSurfaceInterface *surface)
307+{
308+ if (surface->type() == Mir::InputMethodType) {
309+ removeInputMethodWindow();
310+ return;
311+ }
312+
313+ int i = indexOf(surface);
314+ if (i == -1) {
315+ return;
316+ }
317+
318+ auto application = m_windowModel[i].application;
319+
320+ DEBUG_MSG << " application->name()=" << application->name()
321+ << " application->state()=" << application->state();
322+
323+ if (application->state() == unityapi::ApplicationInfoInterface::Running
324+ || application->state() == unityapi::ApplicationInfoInterface::Starting) {
325+ m_windowModel[i].removeOnceSurfaceDestroyed = true;
326+ } else {
327+ // assume it got killed by the out-of-memory daemon.
328+ //
329+ // So leave entry in the model and only remove its surface, so shell can display a screenshot
330+ // in its place.
331+ m_windowModel[i].removeOnceSurfaceDestroyed = false;
332+ }
333+}
334+
335+void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surface)
336+{
337+ int i = indexOf(surface);
338+ if (i == -1) {
339+ return;
340+ }
341+
342+ if (m_windowModel[i].removeOnceSurfaceDestroyed) {
343+ deleteAt(i);
344+ } else {
345+ auto window = m_windowModel[i].window;
346+ window->setSurface(nullptr);
347+ window->setFocused(false);
348+ INFO_MSG << " Removed surface from entry. After: " << toString();
349+ }
350+}
351+
352+Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)
353+{
354+ int id = m_nextId.fetchAndAddAcquire(1);
355+ return createWindowWithId(surface, id);
356+}
357+
358+Window *TopLevelWindowModel::createNullWindow()
359+{
360+ return createWindowWithId(nullptr, 0);
361+}
362+
363+Window *TopLevelWindowModel::createWindowWithId(unityapi::MirSurfaceInterface *surface, int id)
364+{
365+ Window *qmlWindow = new Window(id, this);
366+ connectWindow(qmlWindow);
367+ if (surface) {
368+ qmlWindow->setSurface(surface);
369+ }
370+ return qmlWindow;
371+}
372+
373+void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
374+{
375+ DEBUG_MSG << "(" << surface << ")";
376+
377+ if (surface->parentSurface()) {
378+ // Wrap it in a Window so that we keep focusedWindow() up to date.
379+ Window *window = createWindow(surface);
380+ connect(surface, &QObject::destroyed, window, [=](){
381+ window->setSurface(nullptr);
382+ window->deleteLater();
383+ });
384+ } else {
385+ if (surface->type() == Mir::InputMethodType) {
386+ connectSurface(surface);
387+ setInputMethodWindow(createWindow(surface));
388+ } else {
389+ auto *application = m_applicationManager->findApplicationWithSurface(surface);
390+ if (application) {
391+ if (surface->state() == Mir::HiddenState) {
392+ // Ignore it until it's finally shown
393+ connect(surface, &unityapi::MirSurfaceInterface::stateChanged, this, [=](Mir::State newState) {
394+ Q_ASSERT(newState != Mir::HiddenState);
395+ disconnect(surface, &unityapi::MirSurfaceInterface::stateChanged, this, 0);
396+ prependSurface(surface, application);
397+ });
398+ } else {
399+ prependSurface(surface, application);
400+ }
401+ } else {
402+ // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
403+ // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
404+ // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
405+ Window *promptWindow = createWindow(surface);
406+ connect(surface, &QObject::destroyed, promptWindow, [=](){
407+ promptWindow->setSurface(nullptr);
408+ promptWindow->deleteLater();
409+ });
410+ }
411+ }
412+ }
413+}
414+
415+void TopLevelWindowModel::deleteAt(int index)
416+{
417+ auto window = m_windowModel[index].window;
418+
419+ removeAt(index);
420+
421+ window->setSurface(nullptr);
422+
423+ delete window;
424+}
425+
426+void TopLevelWindowModel::removeAt(int index)
427+{
428+ if (m_modelState == IdleState) {
429+ beginRemoveRows(QModelIndex(), index, index);
430+ m_modelState = RemovingState;
431+ } else {
432+ Q_ASSERT(m_modelState == ResettingState);
433+ // No point in signaling anything if we're resetting the whole model
434+ }
435+
436+ auto window = m_windowModel[index].window;
437+
438+ if (!window->surface()) {
439+ window->setFocused(false);
440+ }
441+
442+ m_windowModel.removeAt(index);
443+
444+ if (m_modelState == RemovingState) {
445+ endRemoveRows();
446+ Q_EMIT countChanged();
447+ Q_EMIT listChanged();
448+ m_modelState = IdleState;
449+ }
450+
451+ if (m_focusedWindow == window) {
452+ setFocusedWindow(nullptr);
453+ }
454+
455+ if (m_previousWindow == window) {
456+ m_previousWindow = nullptr;
457+ }
458+
459+ if (m_closingAllApps) {
460+ if (m_windowModel.isEmpty()) {
461+ Q_EMIT closedAllWindows();
462+ }
463+ }
464+
465+ INFO_MSG << " after " << toString() << " apps left " << m_windowModel.count();
466+}
467+
468+void TopLevelWindowModel::setInputMethodWindow(Window *window)
469+{
470+ if (m_inputMethodWindow) {
471+ qWarning("Multiple Input Method Surfaces created, removing the old one!");
472+ delete m_inputMethodWindow;
473+ }
474+ m_inputMethodWindow = window;
475+ Q_EMIT inputMethodSurfaceChanged(m_inputMethodWindow->surface());
476+ InputMethodManager::instance()->setWindow(window);
477+}
478+
479+void TopLevelWindowModel::removeInputMethodWindow()
480+{
481+ if (m_inputMethodWindow) {
482+ delete m_inputMethodWindow;
483+ m_inputMethodWindow = nullptr;
484+ Q_EMIT inputMethodSurfaceChanged(nullptr);
485+ InputMethodManager::instance()->setWindow(nullptr);
486+ }
487+}
488+
489+void TopLevelWindowModel::onSurfacesRaised(const QVector<unityapi::MirSurfaceInterface*> &surfaces)
490+{
491+ DEBUG_MSG << "(" << surfaces << ")";
492+ const int raiseCount = surfaces.size();
493+ for (int i = 0; i < raiseCount; i++) {
494+ int fromIndex = findIndexOf(surfaces[i]);
495+ if (fromIndex != -1) {
496+ move(fromIndex, 0);
497+ }
498+ }
499+}
500+
501+int TopLevelWindowModel::rowCount(const QModelIndex &/*parent*/) const
502+{
503+ return m_windowModel.count();
504+}
505+
506+QVariant TopLevelWindowModel::data(const QModelIndex& index, int role) const
507+{
508+ if (index.row() < 0 || index.row() >= m_windowModel.size())
509+ return QVariant();
510+
511+ if (role == WindowRole) {
512+ Window *window = m_windowModel.at(index.row()).window;
513+ return QVariant::fromValue(window);
514+ } else if (role == ApplicationRole) {
515+ return QVariant::fromValue(m_windowModel.at(index.row()).application);
516+ } else {
517+ return QVariant();
518+ }
519+}
520+
521+int TopLevelWindowModel::findIndexOf(const unityapi::MirSurfaceInterface *surface) const
522+{
523+ for (int i=0; i<m_windowModel.count(); i++) {
524+ if (m_windowModel[i].window->surface() == surface) {
525+ return i;
526+ }
527+ }
528+ return -1;
529+}
530+
531+QString TopLevelWindowModel::toString()
532+{
533+ QString str;
534+ for (int i = 0; i < m_windowModel.count(); ++i) {
535+ auto item = m_windowModel.at(i);
536+
537+ QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
538+ .arg(QString::number(i),
539+ item.application->appId(),
540+ QString::number((qintptr)item.window->surface(), 16),
541+ QString::number(item.window->id()));
542+
543+ if (i > 0) {
544+ str.append(",");
545+ }
546+ str.append(itemStr);
547+ }
548+ return str;
549+}
550+
551+int TopLevelWindowModel::indexOf(unityapi::MirSurfaceInterface *surface)
552+{
553+ for (int i = 0; i < m_windowModel.count(); ++i) {
554+ if (m_windowModel.at(i).window->surface() == surface) {
555+ return i;
556+ }
557+ }
558+ return -1;
559+}
560+
561+int TopLevelWindowModel::indexForId(int id) const
562+{
563+ for (int i = 0; i < m_windowModel.count(); ++i) {
564+ if (m_windowModel[i].window->id() == id) {
565+ return i;
566+ }
567+ }
568+ return -1;
569+}
570+
571+Window *TopLevelWindowModel::windowAt(int index) const
572+{
573+ if (index >=0 && index < m_windowModel.count()) {
574+ return m_windowModel[index].window;
575+ } else {
576+ return nullptr;
577+ }
578+}
579+
580+unityapi::MirSurfaceInterface *TopLevelWindowModel::surfaceAt(int index) const
581+{
582+ if (index >=0 && index < m_windowModel.count()) {
583+ return m_windowModel[index].window->surface();
584+ } else {
585+ return nullptr;
586+ }
587+}
588+
589+unityapi::ApplicationInfoInterface *TopLevelWindowModel::applicationAt(int index) const
590+{
591+ if (index >=0 && index < m_windowModel.count()) {
592+ return m_windowModel[index].application;
593+ } else {
594+ return nullptr;
595+ }
596+}
597+
598+int TopLevelWindowModel::idAt(int index) const
599+{
600+ if (index >=0 && index < m_windowModel.count()) {
601+ return m_windowModel[index].window->id();
602+ } else {
603+ return 0;
604+ }
605+}
606+
607+void TopLevelWindowModel::raiseId(int id)
608+{
609+ if (m_modelState == IdleState) {
610+ DEBUG_MSG << "(id=" << id << ") - do it now.";
611+ doRaiseId(id);
612+ } else {
613+ DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
614+ // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
615+ // if we perform yet another model change straight away.
616+ //
617+ // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
618+ // the index is definitely within bounds.
619+ QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
620+ }
621+}
622+
623+void TopLevelWindowModel::doRaiseId(int id)
624+{
625+ int fromIndex = indexForId(id);
626+ // can't raise something that doesn't exist or that it's already on top
627+ if (fromIndex != -1 && fromIndex != 0) {
628+ auto surface = m_windowModel[fromIndex].window->surface();
629+ if (surface) {
630+ m_surfaceManager->raise(surface);
631+ } else {
632+ // move it ourselves. Since there's no mir::scene::Surface/miral::Window, there's nothing
633+ // miral can do about it.
634+ move(fromIndex, 0);
635+ }
636+ }
637+}
638+
639+void TopLevelWindowModel::setFocusedWindow(Window *window)
640+{
641+ if (window != m_focusedWindow) {
642+ INFO_MSG << "(" << window << ")";
643+
644+ m_previousWindow = m_focusedWindow;
645+
646+ m_focusedWindow = window;
647+ Q_EMIT focusedWindowChanged(m_focusedWindow);
648+
649+ if (m_previousWindow && m_previousWindow->focused() && !m_previousWindow->surface()) {
650+ // do it ourselves. miral doesn't know about this window
651+ m_previousWindow->setFocused(false);
652+ }
653+ }
654+
655+ // Reset
656+ m_pendingActivation = false;
657+}
658+
659+unityapi::MirSurfaceInterface* TopLevelWindowModel::inputMethodSurface() const
660+{
661+ return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;
662+}
663+
664+Window* TopLevelWindowModel::focusedWindow() const
665+{
666+ return m_focusedWindow;
667+}
668+
669+void TopLevelWindowModel::move(int from, int to)
670+{
671+ if (from == to) return;
672+ DEBUG_MSG << " from=" << from << " to=" << to;
673+
674+ if (from >= 0 && from < m_windowModel.size() && to >= 0 && to < m_windowModel.size()) {
675+ QModelIndex parent;
676+ /* When moving an item down, the destination index needs to be incremented
677+ by one, as explained in the documentation:
678+ http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
679+
680+ Q_ASSERT(m_modelState == IdleState);
681+ m_modelState = MovingState;
682+
683+ beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
684+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
685+ const auto &window = m_windowModel.takeAt(from);
686+ m_windowModel.insert(to, window);
687+#else
688+ m_windowModel.move(from, to);
689+#endif
690+ endMoveRows();
691+
692+ Q_EMIT listChanged();
693+ m_modelState = IdleState;
694+
695+ INFO_MSG << " after " << toString();
696+ }
697+}
698+void TopLevelWindowModel::onModificationsStarted()
699+{
700+ m_surfaceManagerBusy = true;
701+}
702+
703+void TopLevelWindowModel::onModificationsEnded()
704+{
705+ if (m_focusedWindowChanged) {
706+ setFocusedWindow(m_newlyFocusedWindow);
707+ }
708+ // reset
709+ m_focusedWindowChanged = false;
710+ m_newlyFocusedWindow = nullptr;
711+ m_surfaceManagerBusy = false;
712+}
713+
714+void TopLevelWindowModel::activateTopMostWindowWithoutId(int forbiddenId)
715+{
716+ DEBUG_MSG << "(" << forbiddenId << ")";
717+
718+ for (int i = 0; i < m_windowModel.count(); ++i) {
719+ Window *window = m_windowModel[i].window;
720+ if (window->id() != forbiddenId) {
721+ window->activate();
722+ break;
723+ }
724+ }
725+}
726+
727+void TopLevelWindowModel::closeAllWindows()
728+{
729+ m_closingAllApps = true;
730+ for (auto win : m_windowModel) {
731+ win.window->close();
732+ }
733+
734+ // This is done after the for loop in the unlikely event that
735+ // an app starts in between this
736+ if (m_windowModel.isEmpty()) {
737+ Q_EMIT closedAllWindows();
738+ }
739+}
740+
741+bool TopLevelWindowModel::rootFocus()
742+{
743+ return !m_nullWindow->focused();
744+}
745+
746+void TopLevelWindowModel::setRootFocus(bool focus)
747+{
748+ INFO_MSG << "(" << focus << "), surfaceManagerBusy is " << m_surfaceManagerBusy;
749+
750+ if (m_surfaceManagerBusy) {
751+ // Something else is probably being focused already, let's not add to
752+ // the noise.
753+ return;
754+ }
755+
756+ if (focus) {
757+ // Give focus back to previous focused window, only if null window is focused.
758+ // If null window is not focused, a different app had taken the focus and we
759+ // should repect that, or if a pendingActivation is going on.
760+ if (m_previousWindow && !m_previousWindow->focused() && !m_pendingActivation &&
761+ m_nullWindow == m_focusedWindow && m_previousWindow != m_nullWindow) {
762+ m_previousWindow->activate();
763+ } else if (!m_pendingActivation) {
764+ // The previous window does not exist any more, focus top window.
765+ activateTopMostWindowWithoutId(-1);
766+ }
767+ } else {
768+ if (!m_nullWindow->focused()) {
769+ m_nullWindow->activate();
770+ }
771+ }
772+}
773+
774+// Pending Activation will block refocus of previous focused window
775+// this is needed since surface activation with miral is async,
776+// and activation of placeholder is sync. This causes a race condition
777+// between placeholder and prev window. This results in prev window
778+// gets focused, as it will always be later than the placeholder.
779+void TopLevelWindowModel::pendingActivation()
780+{
781+ m_pendingActivation = true;
782+}
plugins/WindowManager/TopLevelWindowModel.hnew file+308
@@ -0,0 +1,308 @@
1+/*
2+ * Copyright (C) 2016-2017 Canonical, Ltd.
3+ * Copyright 2019 UBports Foundation
4+ *
5+ * This program is free software: you can redistribute it and/or modify it under
6+ * the terms of the GNU Lesser General Public License version 3, as published by
7+ * the Free Software Foundation.
8+ *
9+ * This program is distributed in the hope that it will be useful, but WITHOUT
10+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
11+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+ * Lesser General Public License for more details.
13+ *
14+ * You should have received a copy of the GNU Lesser General Public License
15+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
16+ */
17+
18+#ifndef TOPLEVELWINDOWMODEL_H
19+#define TOPLEVELWINDOWMODEL_H
20+
21+#include <QAbstractListModel>
22+#include <QAtomicInteger>
23+#include <QLoggingCategory>
24+
25+#include "WindowManagerGlobal.h"
26+
27+Q_DECLARE_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL)
28+
29+class Window;
30+
31+namespace unity {
32+ namespace shell {
33+ namespace application {
34+ class ApplicationInfoInterface;
35+ class ApplicationManagerInterface;
36+ class MirSurfaceInterface;
37+ class SurfaceManagerInterface;
38+ }
39+ }
40+}
41+
42+/**
43+ * @brief A model of top-level surfaces
44+ *
45+ * It's an abstraction of top-level application windows.
46+ *
47+ * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
48+ * still starting up. A shell should then display a splash screen or saved screenshot of the application
49+ * until its surface comes up.
50+ *
51+ * As applications can have multiple surfaces and you can also have entries without surfaces at all,
52+ * the only way to unambiguously refer to an entry in this model is through its id.
53+ */
54+class WINDOWMANAGERQML_EXPORT TopLevelWindowModel : public QAbstractListModel
55+{
56+ Q_OBJECT
57+
58+ /**
59+ * @brief Number of top-level surfaces in this model
60+ *
61+ * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
62+ */
63+ Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
64+
65+ /**
66+ * @brief The input method surface, if any
67+ *
68+ * The surface of a onscreen keyboard (akak "virtual keyboard") would be kept here and not in the model itself.
69+ */
70+ Q_PROPERTY(unity::shell::application::MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
71+
72+ /**
73+ * @brief The currently focused window, if any
74+ */
75+ Q_PROPERTY(Window* focusedWindow READ focusedWindow NOTIFY focusedWindowChanged)
76+
77+ Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager
78+ READ surfaceManager
79+ WRITE setSurfaceManager
80+ NOTIFY surfaceManagerChanged)
81+
82+ Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager
83+ READ applicationManager
84+ WRITE setApplicationManager
85+ NOTIFY applicationManagerChanged)
86+
87+ /**
88+ The id to be used on the next entry created
89+ Useful for tests
90+ */
91+ Q_PROPERTY(int nextId READ nextId)
92+
93+
94+ /**
95+ * @brief Sets whether a user Window or "nothing" should be focused
96+ *
97+ * This implementation of TLWM must have something focused. However, the
98+ * user may wish to have nothing in some cases - for example, when they
99+ * minimize all their windows on the desktop or unfocus the app they're
100+ * using by clicking the background or indicators.
101+ *
102+ * Unsetting rootFocus effectively focuses "nothing" by setting up a Window
103+ * that has no displayable Surfaces and bringing it into focus.
104+ *
105+ * Setting rootFocus attempts to focus the Window which was focused last -
106+ * unless another app is attempting to gain focus (as determined by
107+ * pendingActivation) and that's why we got rootFocus.
108+ *
109+ * If the previously-focused Window was closed before rootFocus was set,
110+ * the next available window will be focused.
111+ */
112+ Q_PROPERTY(bool rootFocus READ rootFocus WRITE setRootFocus NOTIFY rootFocusChanged)
113+
114+public:
115+ /**
116+ * @brief The Roles supported by the model
117+ *
118+ * WindowRole - A Window.
119+ * ApplicationRole - An ApplicationInfoInterface
120+ */
121+ enum Roles {
122+ WindowRole = Qt::UserRole,
123+ ApplicationRole = Qt::UserRole + 1,
124+ };
125+
126+ TopLevelWindowModel();
127+
128+ // From QAbstractItemModel
129+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
130+ QVariant data(const QModelIndex& index, int role) const override;
131+ QHash<int, QByteArray> roleNames() const override {
132+ QHash<int, QByteArray> roleNames { {WindowRole, "window"},
133+ {ApplicationRole, "application"} };
134+ return roleNames;
135+ }
136+
137+ // Own API
138+
139+ unity::shell::application::MirSurfaceInterface* inputMethodSurface() const;
140+ Window* focusedWindow() const;
141+
142+ unity::shell::application::ApplicationManagerInterface *applicationManager() const { return m_applicationManager; }
143+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);
144+
145+ unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }
146+ void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);
147+
148+ int nextId() const { return m_nextId.load(); }
149+
150+public:
151+ /**
152+ * @brief Returns the surface at the given index
153+ *
154+ * It will be a nullptr if the application is still starting up and thus hasn't yet created
155+ * and drawn into a surface.
156+ *
157+ * Same as windowAt(index).surface()
158+ */
159+ Q_INVOKABLE unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
160+
161+ /**
162+ * @brief Returns the window at the given index
163+ *
164+ * Will always be valid
165+ */
166+ Q_INVOKABLE Window *windowAt(int index) const;
167+
168+ /**
169+ * @brief Returns the application at the given index
170+ */
171+ Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
172+
173+ /**
174+ * @brief Returns the unique id of the element at the given index
175+ */
176+ Q_INVOKABLE int idAt(int index) const;
177+
178+ /**
179+ * @brief Returns the index where the row with the given id is located
180+ *
181+ * Returns -1 if there's no row with the given id.
182+ */
183+ Q_INVOKABLE int indexForId(int id) const;
184+
185+ /**
186+ * @brief Raises the row with the given id to the top of the window stack (index == count-1)
187+ */
188+ Q_INVOKABLE void raiseId(int id);
189+
190+ /**
191+ * @brief Closes all windows, emits closedAllWindows when done
192+ */
193+ Q_INVOKABLE void closeAllWindows();
194+
195+ /**
196+ * @brief Sets pending activation flag
197+ */
198+ Q_INVOKABLE void pendingActivation();
199+
200+ void setRootFocus(bool focus);
201+ bool rootFocus();
202+
203+Q_SIGNALS:
204+ void countChanged();
205+ void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);
206+ void focusedWindowChanged(Window *focusedWindow);
207+ void applicationManagerChanged(unity::shell::application::ApplicationManagerInterface*);
208+ void surfaceManagerChanged(unity::shell::application::SurfaceManagerInterface*);
209+
210+ /**
211+ * @brief Emitted when the list changes
212+ *
213+ * Emitted when model gains an element, loses an element or when elements exchange positions.
214+ */
215+ void listChanged();
216+
217+ void closedAllWindows();
218+
219+ void rootFocusChanged();
220+
221+private Q_SLOTS:
222+ void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);
223+ void onSurfacesRaised(const QVector<unity::shell::application::MirSurfaceInterface*> &surfaces);
224+
225+ void onModificationsStarted();
226+ void onModificationsEnded();
227+
228+private:
229+ void doRaiseId(int id);
230+ int generateId();
231+ int nextFreeId(int candidateId, const int latestId);
232+ int nextId(int id) const;
233+ QString toString();
234+ int indexOf(unity::shell::application::MirSurfaceInterface *surface);
235+
236+ void setInputMethodWindow(Window *window);
237+ void setFocusedWindow(Window *window);
238+ void removeInputMethodWindow();
239+ int findIndexOf(const unity::shell::application::MirSurfaceInterface *surface) const;
240+ void deleteAt(int index);
241+ void removeAt(int index);
242+
243+ void addApplication(unity::shell::application::ApplicationInfoInterface *application);
244+ void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
245+
246+ void prependPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
247+ void prependSurface(unity::shell::application::MirSurfaceInterface *surface,
248+ unity::shell::application::ApplicationInfoInterface *application);
249+ void prependSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
250+ unity::shell::application::ApplicationInfoInterface *application);
251+ void prependWindow(Window *window, unity::shell::application::ApplicationInfoInterface *application);
252+
253+ void connectWindow(Window *window);
254+ void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
255+
256+ void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
257+ void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
258+
259+ void move(int from, int to);
260+
261+ void activateEmptyWindow(Window *window);
262+
263+ void activateTopMostWindowWithoutId(int forbiddenId);
264+
265+ Window *createWindow(unity::shell::application::MirSurfaceInterface *surface);
266+ Window *createWindowWithId(unity::shell::application::MirSurfaceInterface *surface, int id);
267+ Window *createNullWindow();
268+
269+ struct ModelEntry {
270+ ModelEntry() {}
271+ ModelEntry(Window *window,
272+ unity::shell::application::ApplicationInfoInterface *application)
273+ : window(window), application(application) {}
274+ Window *window{nullptr};
275+ unity::shell::application::ApplicationInfoInterface *application{nullptr};
276+ bool removeOnceSurfaceDestroyed{false};
277+ };
278+
279+ QVector<ModelEntry> m_windowModel;
280+ Window* m_inputMethodWindow{nullptr};
281+ Window* m_focusedWindow{nullptr};
282+ Window* m_nullWindow;
283+ Window* m_previousWindow{nullptr};
284+ bool m_pendingActivation;
285+
286+ QAtomicInteger<int> m_nextId{1};
287+
288+ unity::shell::application::ApplicationManagerInterface* m_applicationManager{nullptr};
289+ unity::shell::application::SurfaceManagerInterface *m_surfaceManager{nullptr};
290+ bool m_surfaceManagerBusy;
291+
292+ enum ModelState {
293+ IdleState,
294+ InsertingState,
295+ RemovingState,
296+ MovingState,
297+ ResettingState
298+ };
299+ ModelState m_modelState{IdleState};
300+
301+ // Valid between modificationsStarted and modificationsEnded
302+ bool m_focusedWindowChanged{false};
303+ Window *m_newlyFocusedWindow{nullptr};
304+
305+ bool m_closingAllApps{false};
306+};
307+
308+#endif // TOPLEVELWINDOWMODEL_H
plugins/WindowManager/Window.cppnew file+277
@@ -0,0 +1,277 @@
1+/*
2+ * Copyright (C) 2016-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+#include "Window.h"
18+
19+// unity-api
20+#include <unity/shell/application/MirSurfaceInterface.h>
21+
22+#include <QQmlEngine>
23+#include <QTextStream>
24+
25+namespace unityapi = unity::shell::application;
26+
27+Q_LOGGING_CATEGORY(UNITY_WINDOW, "unity.window", QtWarningMsg)
28+
29+#define DEBUG_MSG qCDebug(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__
30+#define WARNING_MSG qCWarning(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__
31+
32+Window::Window(int id, QObject *parent)
33+ : QObject(parent)
34+ , m_id(id)
35+{
36+ DEBUG_MSG << "()";
37+ QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
38+}
39+
40+Window::~Window()
41+{
42+ DEBUG_MSG << "()";
43+}
44+
45+QPoint Window::position() const
46+{
47+ return m_position;
48+}
49+
50+QPoint Window::requestedPosition() const
51+{
52+ return m_requestedPosition;
53+}
54+
55+void Window::setRequestedPosition(const QPoint &value)
56+{
57+ m_positionRequested = true;
58+ if (value != m_requestedPosition) {
59+ m_requestedPosition = value;
60+ Q_EMIT requestedPositionChanged(m_requestedPosition);
61+ if (m_surface) {
62+ m_surface->setRequestedPosition(value);
63+ } else {
64+ // fake-miral: always comply
65+ m_position = m_requestedPosition;
66+ Q_EMIT positionChanged(m_position);
67+ }
68+ }
69+}
70+
71+bool Window::allowClientResize() const
72+{
73+ return m_allowClientResize;
74+}
75+
76+void Window::setAllowClientResize(bool value)
77+{
78+ if (value != m_allowClientResize) {
79+ DEBUG_MSG << "("<<value<<")";
80+ m_allowClientResize = value;
81+ if (m_surface) {
82+ m_surface->setAllowClientResize(value);
83+ }
84+ Q_EMIT allowClientResizeChanged(m_allowClientResize);
85+ }
86+}
87+
88+Mir::State Window::state() const
89+{
90+ return m_state;
91+}
92+
93+bool Window::focused() const
94+{
95+ return m_focused;
96+}
97+
98+bool Window::confinesMousePointer() const
99+{
100+ if (m_surface) {
101+ return m_surface->confinesMousePointer();
102+ } else {
103+ return false;
104+ }
105+}
106+
107+int Window::id() const
108+{
109+ return m_id;
110+}
111+
112+unityapi::MirSurfaceInterface* Window::surface() const
113+{
114+ return m_surface;
115+}
116+
117+void Window::requestState(Mir::State state)
118+{
119+ m_stateRequested = true;
120+ if (m_surface) {
121+ m_surface->requestState(state);
122+ } else if (m_state != state) {
123+ m_state = state;
124+ Q_EMIT stateChanged(m_state);
125+ }
126+}
127+
128+void Window::close()
129+{
130+ if (m_surface) {
131+ m_surface->close();
132+ } else {
133+ Q_EMIT closeRequested();
134+ }
135+}
136+
137+void Window::activate()
138+{
139+ DEBUG_MSG << "()";
140+ if (m_surface) {
141+ m_surface->activate();
142+ } else {
143+ Q_EMIT emptyWindowActivated();
144+ }
145+}
146+
147+void Window::setSurface(unityapi::MirSurfaceInterface *surface)
148+{
149+ DEBUG_MSG << "(" << surface << ")";
150+ if (m_surface) {
151+ disconnect(m_surface, 0, this, 0);
152+ }
153+
154+ m_surface = surface;
155+
156+ if (m_surface) {
157+ connect(surface, &unityapi::MirSurfaceInterface::focusRequested, this, [this]() {
158+ Q_EMIT focusRequested();
159+ });
160+
161+ connect(surface, &unityapi::MirSurfaceInterface::closeRequested, this, &Window::closeRequested);
162+
163+ connect(surface, &unityapi::MirSurfaceInterface::positionChanged, this, [this]() {
164+ updatePosition();
165+ });
166+
167+ connect(surface, &unityapi::MirSurfaceInterface::stateChanged, this, [this]() {
168+ updateState();
169+ });
170+
171+ connect(surface, &unityapi::MirSurfaceInterface::focusedChanged, this, [this]() {
172+ updateFocused();
173+ });
174+
175+ connect(surface, &unityapi::MirSurfaceInterface::allowClientResizeChanged, this, [this]() {
176+ if (m_surface->allowClientResize() != m_allowClientResize) {
177+ m_allowClientResize = m_surface->allowClientResize();
178+ Q_EMIT allowClientResizeChanged(m_allowClientResize);
179+ }
180+ });
181+
182+ connect(surface, &unityapi::MirSurfaceInterface::liveChanged, this, &Window::liveChanged);
183+
184+ connect(surface, &QObject::destroyed, this, [this]() {
185+ setSurface(nullptr);
186+ });
187+
188+ // Surface should never be focused at this point!
189+ if (m_surface->focused()) {
190+ WARNING_MSG << "Inital surface is focused!";
191+ }
192+
193+ // bring it up to speed
194+ if (m_focused) {
195+ m_surface->activate();
196+ }
197+ if (m_positionRequested) {
198+ m_surface->setRequestedPosition(m_requestedPosition);
199+ }
200+ if (m_stateRequested && m_surface->state() == Mir::RestoredState) {
201+ m_surface->requestState(m_state);
202+ }
203+ m_surface->setAllowClientResize(m_allowClientResize);
204+
205+ // and sync with surface
206+ updatePosition();
207+ updateState();
208+ updateFocused();
209+ }
210+
211+ Q_EMIT surfaceChanged(surface);
212+}
213+
214+void Window::updatePosition()
215+{
216+ if (m_surface->position() != m_position) {
217+ m_position = m_surface->position();
218+ Q_EMIT positionChanged(m_position);
219+ }
220+}
221+
222+void Window::updateState()
223+{
224+ if (m_surface->state() != m_state) {
225+ m_state = m_surface->state();
226+ Q_EMIT stateChanged(m_state);
227+ }
228+}
229+
230+void Window::updateFocused()
231+{
232+ if (m_surface->focused() != m_focused) {
233+ m_focused = m_surface->focused();
234+ Q_EMIT focusedChanged(m_focused);
235+ }
236+}
237+
238+void Window::setFocused(bool value)
239+{
240+ if (value != m_focused) {
241+ DEBUG_MSG << "(" << value << ")";
242+ m_focused = value;
243+ Q_EMIT focusedChanged(m_focused);
244+ // when we have a surface we get focus changes from updateFocused() instead
245+ Q_ASSERT(!m_surface);
246+ }
247+}
248+
249+QString Window::toString() const
250+{
251+ QString result;
252+ {
253+ QTextStream stream(&result);
254+ stream << "Window["<<(void*)this<<", id="<<id()<<", ";
255+ if (surface()) {
256+ stream << "MirSurface["<<(void*)surface()<<",\""<<surface()->name()<<"\"]";
257+ } else {
258+ stream << "null";
259+ }
260+ stream << "]";
261+ }
262+ return result;
263+}
264+
265+QDebug operator<<(QDebug dbg, const Window *window)
266+{
267+ QDebugStateSaver saver(dbg);
268+ dbg.nospace();
269+
270+ if (window) {
271+ dbg << qPrintable(window->toString());
272+ } else {
273+ dbg << (void*)(window);
274+ }
275+
276+ return dbg;
277+}
plugins/WindowManager/Window.hnew file+176
@@ -0,0 +1,176 @@
1+/*
2+ * Copyright (C) 2016-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+#ifndef UNITY_WINDOW_H
18+#define UNITY_WINDOW_H
19+
20+#include <QLoggingCategory>
21+#include <QObject>
22+#include <QPoint>
23+
24+// Unity API
25+#include <unity/shell/application/Mir.h>
26+
27+#include "WindowManagerGlobal.h"
28+
29+namespace unity {
30+ namespace shell {
31+ namespace application {
32+ class MirSurfaceInterface;
33+ }
34+ }
35+}
36+
37+Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
38+
39+/**
40+ @brief A slightly higher concept than MirSurface
41+
42+ A Window exists before its MirSurface gets created (for splashscreen purposes)
43+ and might also hang around after the backing surface is gone (In case the application
44+ was killed to free up memory, as it should still remain in the window list since the user
45+ did not explicitly close it).
46+ */
47+class WINDOWMANAGERQML_EXPORT Window : public QObject
48+{
49+ Q_OBJECT
50+
51+ /**
52+ * @brief Position of the current surface buffer, in pixels.
53+ */
54+ Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
55+
56+ /**
57+ * @brief Requested position of the current surface buffer, in pixels.
58+ */
59+ Q_PROPERTY(QPoint requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged)
60+
61+ /**
62+ * @brief State of the surface
63+ */
64+ Q_PROPERTY(Mir::State state READ state NOTIFY stateChanged)
65+
66+ /**
67+ * @brief Whether the surface is focused
68+ *
69+ * It will be true if this surface is MirFocusControllerInterface::focusedSurface
70+ */
71+ Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
72+
73+ /**
74+ * @brief Whether the surface wants to confine the mouse pointer within its boundaries
75+ *
76+ * If true, the surface doesn't want the mouse pointer to leave its boundaries while it's focused.
77+ */
78+ Q_PROPERTY(bool confinesMousePointer READ confinesMousePointer NOTIFY confinesMousePointerChanged)
79+
80+ /**
81+ * @brief A unique identifier for this window.
82+ * Useful for telling windows apart in a list model as they get moved around
83+ */
84+ Q_PROPERTY(int id READ id CONSTANT)
85+
86+ /**
87+ * @brief Surface backing up this window
88+ * It might be null if a surface hasn't been created yet (application is starting up) or if
89+ * the corresponding application has been killed (but can still get restarted to continue from
90+ * where it left)
91+ */
92+ Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
93+
94+ /**
95+ * @brief Whether to comply to resize requests coming from the client side
96+ *
97+ * It's true by default
98+ */
99+ Q_PROPERTY(bool allowClientResize READ allowClientResize WRITE setAllowClientResize NOTIFY allowClientResizeChanged)
100+
101+public:
102+ Window(int id, QObject *parent = nullptr);
103+ virtual ~Window();
104+ QPoint position() const;
105+ QPoint requestedPosition() const;
106+ void setRequestedPosition(const QPoint &);
107+ Mir::State state() const;
108+ bool focused() const;
109+ bool confinesMousePointer() const;
110+ int id() const;
111+ unity::shell::application::MirSurfaceInterface* surface() const;
112+
113+ void setSurface(unity::shell::application::MirSurfaceInterface *surface);
114+ void setFocused(bool value);
115+
116+ bool allowClientResize() const;
117+ void setAllowClientResize(bool);
118+
119+ QString toString() const;
120+
121+public Q_SLOTS:
122+ /**
123+ * @brief Requests a change to the specified state
124+ */
125+ void requestState(Mir::State state);
126+
127+ /**
128+ * @brief Sends a close request
129+ *
130+ */
131+ void close();
132+
133+ /**
134+ * @brief Focuses and raises the window
135+ */
136+ void activate();
137+
138+Q_SIGNALS:
139+ void closeRequested();
140+ void emptyWindowActivated();
141+
142+ void positionChanged(QPoint position);
143+ void requestedPositionChanged(QPoint position);
144+ void stateChanged(Mir::State value);
145+ void focusedChanged(bool value);
146+ void confinesMousePointerChanged(bool value);
147+ void surfaceChanged(unity::shell::application::MirSurfaceInterface *surface);
148+ void allowClientResizeChanged(bool value);
149+ void liveChanged(bool value);
150+
151+ /**
152+ * @brief Emitted when focus for this window is requested by an external party
153+ */
154+ void focusRequested();
155+
156+private:
157+ void updatePosition();
158+ void updateState();
159+ void updateFocused();
160+
161+ QPoint m_position;
162+ QPoint m_requestedPosition;
163+ bool m_positionRequested{false};
164+ bool m_focused{false};
165+ int m_id;
166+ Mir::State m_state{Mir::RestoredState};
167+ bool m_stateRequested{false};
168+ unity::shell::application::MirSurfaceInterface *m_surface{nullptr};
169+
170+ bool m_allowClientResize{true};
171+};
172+
173+QDebug operator<<(QDebug dbg, const Window *window);
174+
175+Q_DECLARE_METATYPE(Window*)
176+#endif // UNITY_WINDOW_H
plugins/WindowManager/WindowManagerGlobal.hnew file+23
@@ -0,0 +1,23 @@
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+#include <QtCore/QtGlobal>
18+
19+#if defined(WINDOWMANAGERQML_LIBRARY)
20+# define WINDOWMANAGERQML_EXPORT Q_DECL_EXPORT
21+#else
22+# define WINDOWMANAGERQML_EXPORT Q_DECL_IMPORT
23+#endif
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/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+321−344
This diff is too big to show here.
po/am.po+585−406
This diff is too big to show here.
po/ar.po+616−523
This diff is too big to show here.
po/ast.po+665−495
This diff is too big to show here.
po/az.po+349−352
This diff is too big to show here.
po/be.po+566−512
This diff is too big to show here.
po/bg.po+299−346
This diff is too big to show here.
po/bn.po+537−494
This diff is too big to show here.
po/br.po+547−418
This diff is too big to show here.
po/bs.po+420−373
This diff is too big to show here.
po/ca.po+726−484
This diff is too big to show here.
po/ca@valencia.po+406−384
This diff is too big to show here.
po/ce.po+272−328
This diff is too big to show here.
po/ckb.po+293−343
This diff is too big to show here.
po/co.po+505−382
This diff is too big to show here.
po/cs.po+658−515
This diff is too big to show here.
po/cy.po+421−373
This diff is too big to show here.
po/da.po+491−446
This diff is too big to show here.
po/de.po+663−474
This diff is too big to show here.
po/el.po+584−474
This diff is too big to show here.
po/en_AU.po+657−449
This diff is too big to show here.
po/en_GB.po+608−442
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+338−356
This diff is too big to show here.
po/es.po+654−466
This diff is too big to show here.
po/et.ponew file+816
This diff is too big to show here.
po/eu.po+427−383
This diff is too big to show here.
po/fa.po+661−449
This diff is too big to show here.
po/fi.po+638−451
This diff is too big to show here.
po/fo.po+371−361
This diff is too big to show here.
po/fr.po+685−494
This diff is too big to show here.
po/ga.po+413−371
This diff is too big to show here.
po/gd.po+627−456
This diff is too big to show here.
po/gl.po+650−460
This diff is too big to show here.
po/gu.ponew file+814
This diff is too big to show here.
po/gv.po+322−352
This diff is too big to show here.
po/he.po+514−498
This diff is too big to show here.
po/hi.po+287−339
This diff is too big to show here.
po/hr.po+606−468
This diff is too big to show here.
po/hu.po+657−473
This diff is too big to show here.
po/hy.po+424−430
This diff is too big to show here.
po/ia.po+613−443
This diff is too big to show here.
po/id.po+392−369
This diff is too big to show here.
po/is.po+374−367
This diff is too big to show here.
po/it.po+647−458
This diff is too big to show here.
po/ja.po+439−415
This diff is too big to show here.
po/kk.ponew file+841
This diff is too big to show here.
po/km.po+408−380
This diff is too big to show here.
po/kn.po+281−339
This diff is too big to show here.
po/ko.po+546−483
This diff is too big to show here.
po/ku.po+353−352
This diff is too big to show here.
po/ky.po+281−339
This diff is too big to show here.
po/lo.po+280−336
This diff is too big to show here.
po/lt.po+556−446
This diff is too big to show here.
po/lv.po+431−386
This diff is too big to show here.
po/ml.po+294−345
This diff is too big to show here.
po/mr.po+295−333
This diff is too big to show here.
po/ms.po+534−412
This diff is too big to show here.
po/my.po+331−344
This diff is too big to show here.
po/nb.po+637−452
This diff is too big to show here.
po/ne.po+277−330
This diff is too big to show here.
po/nl.po+710−512
This diff is too big to show here.
po/nn.po+272−328
This diff is too big to show here.
po/oc.po+613−470
This diff is too big to show here.
po/or.po+272−328
This diff is too big to show here.
po/pa.po+420−379
This diff is too big to show here.
po/pl.po+657−469
This diff is too big to show here.
po/pt.po+650−462
This diff is too big to show here.
po/pt_BR.po+540−481
This diff is too big to show here.
po/ro.po+431−392
This diff is too big to show here.
po/ru.po+657−463
This diff is too big to show here.
po/sc.ponew file+904
This diff is too big to show here.
po/shn.po+273−329
This diff is too big to show here.
po/si.po+299−348
This diff is too big to show here.
po/sk.po+646−458
This diff is too big to show here.
po/sl.po+575−422
This diff is too big to show here.
po/sq.po+388−363
This diff is too big to show here.
po/sr.po+615−448
This diff is too big to show here.
po/sv.po+598−413
This diff is too big to show here.
po/sw.po+395−366
This diff is too big to show here.
po/ta.po+293−344
This diff is too big to show here.
po/te.po+301−343
This diff is too big to show here.
po/th.po+295−350
This diff is too big to show here.
po/tr.po+722−487
This diff is too big to show here.
po/ug.po+509−425
This diff is too big to show here.
po/uk.po+624−453
This diff is too big to show here.
po/unity8.pot+269−326
This diff is too big to show here.
po/update-unity-pot+17
This diff is too big to show here.
po/ur.po+296−349
This diff is too big to show here.
po/uz.po+272−328
This diff is too big to show here.
po/vi.po+272−328
This diff is too big to show here.
po/wo.po+424−380
This diff is too big to show here.
po/xh.po+272−328
This diff is too big to show here.
po/zh_CN.po+631−446
This diff is too big to show here.
po/zh_HK.po+312−346
This diff is too big to show here.
po/zh_TW.po+626−481
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/BaseCarouselDelegate.qmldeleted−42
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+100−31
This diff is too big to show here.
qml/Components/DragHandle.qml+1
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/Flickable.qmlnew file+24
This diff is too big to show here.
qml/Components/FloatingFlickable.qml+4
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+13−47
This diff is too big to show here.
qml/Components/ItemGrabber.qml+1−1
This diff is too big to show here.
qml/Components/KeyboardShortcutsOverlay.qml+19−17
This diff is too big to show here.
qml/Components/KeymapSwitcher.qml+40−3
This diff is too big to show here.
qml/Components/LazyImage.qml+5−1
This diff is too big to show here.
qml/Components/ListItems/Header.qmldeleted−64
This diff is too big to show here.
qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.pngdeleted
Binary file not shown.
qml/Dash/DashApplication.qml → qml/Components/ListView.qmlrenamed+7−11
This diff is too big to show here.
qml/Components/Lockscreen.qml+6−21
This diff is too big to show here.
qml/Components/MediaServices/MediaServices.qmlnew file+386
This diff is too big to show here.
qml/Components/MediaServices/MediaServicesControls.qmlnew file+192
This diff is too big to show here.
qml/Components/MediaServices/MediaServicesHeader.qmlnew file+71
This diff is too big to show here.
qml/Components/MediaServices/VideoPlayer.qmlnew file+155
This diff is too big to show here.
qml/Components/MediaServices/VideoPlayerControls.qmlnew file+158
This diff is too big to show here.
qml/Components/ModeSwitchWarningDialog.qml+8−2
This diff is too big to show here.
qml/Components/NotificationAudio.qml+20−3
This diff is too big to show here.
qml/Components/PanelState/PanelState.qml+6−4
This diff is too big to show here.
qml/Components/PhysicalKeysMapper.qml+4−4
This diff is too big to show here.
qml/Components/ResponsiveGridView.qmldeleted−97
This diff is too big to show here.
qml/Components/ResponsiveVerticalJournal.qmldeleted−81
This diff is too big to show here.
qml/Components/ScrollCalculator.qml+21−2
This diff is too big to show here.
qml/Dash/Previews/PreviewSharing.qml → qml/Components/SharingPicker.qmlrenamed+2−14
This diff is too big to show here.
qml/Components/ShellDialog.qml+27−12
This diff is too big to show here.
qml/Components/Showable.qml+15−12
This diff is too big to show here.
qml/Components/UbuntuShapeForItem.qmldeleted−47
This diff is too big to show here.
qml/Components/VirtualTouchPad.qml+269−1
This diff is too big to show here.
qml/Components/VolumeControl.qml+3−3
This diff is too big to show here.
qml/Components/Wallpaper.qmlnew file+96
This diff is too big to show here.
qml/Components/WallpaperResolver.qml+34−37
This diff is too big to show here.
qml/Components/WindowControlButtons.qml+11−5
This diff is too big to show here.
qml/Components/ZoomableImage.qml+1−1
This diff is too big to show here.
qml/Components/flickableUtils.jsnew file+28
This diff is too big to show here.
qml/Components/graphics/close@20.png
Binary file not shown.
qml/Components/graphics/icon_star_empty@20.png
Binary file not shown.
qml/Components/graphics/icon_star_full@20.png
Binary file not shown.
qml/Components/graphics/icon_star_half@20.png
Binary file not shown.
qml/Components/graphics/icon_star_off@20.png
Binary file not shown.
qml/Components/graphics/icon_star_on@20.png
Binary file not shown.
qml/Components/graphics/non-selected@18.png
Binary file not shown.
qml/Dash/CardCarousel.qmldeleted−74
This diff is too big to show here.
qml/Dash/CardGrid.qmldeleted−84
This diff is too big to show here.
qml/Dash/CardHorizontalList.qmldeleted−66
This diff is too big to show here.
qml/Dash/CardTool.qmldeleted−241
This diff is too big to show here.
qml/Dash/CardVerticalJournal.qmldeleted−85
This diff is too big to show here.
qml/Dash/Dash.qmldeleted−381
This diff is too big to show here.
qml/Dash/DashBackground.qmldeleted−30
This diff is too big to show here.
qml/Dash/DashCategoryBase.qmldeleted−54
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−452
This diff is too big to show here.
qml/Dash/DashRenderer.qmldeleted−66
This diff is too big to show here.
qml/Dash/Filters/FilterExpandableWidget.qmldeleted−96
This diff is too big to show here.
qml/Dash/Filters/FilterOptionSelector.qmldeleted−95
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−89
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−855
This diff is too big to show here.
qml/Dash/PageHeaderExtraPanel.qmldeleted−200
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−117
This diff is too big to show here.
qml/Dash/Previews/PreviewActionCombo.qmldeleted−68
This diff is too big to show here.
qml/Dash/Previews/PreviewActions.qmldeleted−72
This diff is too big to show here.
qml/Dash/Previews/PreviewAudioPlayback.qmldeleted−150
This diff is too big to show here.
qml/Dash/Previews/PreviewComment.qmldeleted−83
This diff is too big to show here.
qml/Dash/Previews/PreviewCommentInput.qmldeleted−73
This diff is too big to show here.
qml/Dash/Previews/PreviewExpandable.qmldeleted−104
This diff is too big to show here.
qml/Dash/Previews/PreviewHeader.qmldeleted−168
This diff is too big to show here.
qml/Dash/Previews/PreviewIconActions.qmldeleted−87
This diff is too big to show here.
qml/Dash/Previews/PreviewImageGallery.qmldeleted−148
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−180
This diff is too big to show here.
qml/Dash/Previews/PreviewRatingSingleDisplay.qmldeleted−70
This diff is too big to show here.
qml/Dash/Previews/PreviewTable.qmldeleted−85
This diff is too big to show here.
qml/Dash/Previews/PreviewTextSummary.qmldeleted−73
This diff is too big to show here.
qml/Dash/Previews/PreviewVideoPlayback.qmldeleted−87
This diff is too big to show here.
qml/Dash/Previews/PreviewWidget.qmldeleted−57
This diff is too big to show here.
qml/Dash/Previews/PreviewWidgetFactory.qmldeleted−92
This diff is too big to show here.
qml/Dash/Previews/PreviewZoomableImage.qmldeleted−102
This diff is too big to show here.
qml/Dash/ScopeListView.qmldeleted−26
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSetting.qmldeleted−46
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSettingBoolean.qmldeleted−63
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSettingList.qmldeleted−50
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSettingString.qmldeleted−89
This diff is too big to show here.
qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qmldeleted−61
This diff is too big to show here.
qml/Dash/ScopeSettingsPage.qmldeleted−72
This diff is too big to show here.
qml/Dash/ScopesList.qmldeleted−122
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−55
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+60−18
This diff is too big to show here.
qml/Components/DelayedLockscreen.qml → qml/Greeter/DelayedLockscreen.qmlrenamed+6−14
This diff is too big to show here.
qml/Dash/Filters/FilterWidget.qml → qml/Greeter/FullLightDMImpl.qmlrenamed+10−11
This diff is too big to show here.
qml/Greeter/Greeter.qml+265−110
This diff is too big to show here.
qml/Greeter/GreeterPrompt.qml+78−93
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+137−130
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+246−54
This diff is too big to show here.
qml/Launcher/LauncherDelegate.qml+10−12
This diff is too big to show here.
qml/Launcher/LauncherPanel.qml+181−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+22−33
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−3
This diff is too big to show here.
qml/Notifications/Notifications.qml+14−25
This diff is too big to show here.
qml/Notifications/ShapedIcon.qml+1
This diff is too big to show here.
qml/Notifications/SwipeToAct.qml+4
This diff is too big to show here.
qml/OrientedShell.qml+36−10
This diff is too big to show here.
qml/Panel/ActiveCallHint.qml+3
This diff is too big to show here.
tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp → qml/Panel/FakePanelMenu.qmlrenamed+8−9
This diff is too big to show here.
qml/Panel/IndicatorPage.qmldeleted−187
This diff is too big to show here.
qml/Panel/IndicatorItem.qml → qml/Panel/Indicators/IndicatorItem.qmlrenamed+16−3
This diff is too big to show here.
qml/Panel/Indicators/MenuItemFactory.qml → qml/Panel/Indicators/IndicatorMenuItemFactory.qmlrenamed+183−92
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/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+379−106
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+81−35
This diff is too big to show here.
qml/Panel/PanelMenuPage.qmlnew file+226
This diff is too big to show here.
qml/Panel/graphics/rectangular_dropshadow@30.png
Binary file not shown.
qml/Rotation/HalfLoopRotationAnimation.qml+1−1
This diff is too big to show here.
qml/Rotation/ImmediateRotationAction.qml+1−1
This diff is too big to show here.
qml/Rotation/NinetyRotationAnimation.qml+1−1
This diff is too big to show here.
qml/Rotation/RotationStates.qml+2−11
This diff is too big to show here.
qml/Rotation/UpdateShellTransformations.qml+4−4
This diff is too big to show here.
qml/ScopeTool.qmldeleted−165
This diff is too big to show here.
qml/Shell.qml+409−262
This diff is too big to show here.
qml/Stages/ApplicationWindow.qml → qml/Stage/ApplicationWindow.qmlrenamed+36−41
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
The content is the same.
qml/Stages/PromptSurfaceAnimations.qml → qml/Stage/PromptSurfaceAnimations.qmlrenamed+2−3
This diff is too big to show here.
qml/Stages/ResizeGrip.qml → qml/Stage/ResizeGrip.qmlrenamed
The content is the same.
qml/Stages/SideStage.qml → qml/Stage/SideStage.qmlrenamed+10−6
This diff is too big to show here.
qml/Stages/Splash.qml → qml/Stage/Splash.qmlrenamed+7−10
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/Stages/SurfaceContainer.qml → qml/Stage/SurfaceContainer.qmlrenamed+5−52
This diff is too big to show here.
qml/Stages/TabletSideStageTouchGesture.qml → qml/Stage/TabletSideStageTouchGesture.qmlrenamed
The content is the same.
qml/Stages/WindowControlsOverlay.qml → qml/Stage/WindowControlsOverlay.qmlrenamed+86−51
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+41−106
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/Stages/graphics/arrows-centre.png → qml/Stage/graphics/arrows-centre.pngrenamed
Binary file not shown.
qml/Stages/graphics/arrows.png → qml/Stage/graphics/arrows.pngrenamed
Binary file not shown.
qml/Stages/graphics/sidestage_drag.svg → qml/Stage/graphics/sidestage_drag.svgrenamed
The content is the same.
qml/Stage/graphics/sidestage_handle@20.pngnew file
Binary file not shown.
qml/Stages/graphics/sidestage_handle@20.sci → qml/Stage/graphics/sidestage_handle@20.scirenamed
The content is the same.
qml/Stages/graphics/sidestage_open.svg → qml/Stage/graphics/sidestage_open.svgrenamed
The content is the same.
qml/Stages/graphics/window-close.svg → qml/Stage/graphics/window-close.svgrenamed
The content is the same.
qml/Stages/AbstractStage.qmldeleted−80
This diff is too big to show here.
qml/Stages/DecoratedWindow.qmldeleted−135
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−729
This diff is too big to show here.
qml/Stages/PhoneStage.qmldeleted−800
This diff is too big to show here.
qml/Stages/SpreadDelegate.qmldeleted−433
This diff is too big to show here.
qml/Stages/SpreadMaths.qmldeleted−164
This diff is too big to show here.
qml/Stages/TabletStage.qmldeleted−1185
This diff is too big to show here.
qml/Stages/TopLevelSurfaceRepeater.qmldeleted−52
This diff is too big to show here.
qml/Stages/TransformedSpreadDelegate.qmldeleted−391
This diff is too big to show here.
qml/Stages/TransformedTabletSpreadDelegate.qmldeleted−437
This diff is too big to show here.
qml/Stages/WindowDecoration.qmldeleted−124
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/Tutorial.qml+1
This diff is too big to show here.
qml/Tutorial/TutorialContent.qml+61−43
This diff is too big to show here.
qml/Tutorial/TutorialLeft.qml+1−1
This diff is too big to show here.
qml/Tutorial/TutorialLeftLong.qml+3−3
This diff is too big to show here.
qml/Tutorial/TutorialRight.qml+2−3
This diff is too big to show here.
qml/Tutorial/TutorialTop.qml+2−2
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+6−1
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+12−12
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+16−6
This diff is too big to show here.
src/Dash/CMakeLists.txtdeleted−29
This diff is too big to show here.
src/Dash/main.cppdeleted−137
This diff is too big to show here.
src/DebuggingController.cppnew file+92
This diff is too big to show here.
src/DebuggingController.hnew file+57
This diff is too big to show here.
src/MouseTouchAdaptor.cpp+28−1
This diff is too big to show here.
src/MouseTouchAdaptor.h+1
This diff is too big to show here.
src/Panel/CMakeLists.txtdeleted−3
This diff is too big to show here.
src/Panel/Indicators/CMakeLists.txtdeleted−1
This diff is too big to show here.
src/SecondaryWindow.cpp+1−1
This diff is too big to show here.
src/ShellApplication.cpp+33−6
This diff is too big to show here.
src/ShellApplication.h+1−3
This diff is too big to show here.
src/ShellView.cpp+22
This diff is too big to show here.
src/libunity8-private/CMakeLists.txt+1−1
This diff is too big to show here.
src/libunity8-private/abstractdbusservicemonitor.h+1−1
This diff is too big to show here.
src/main.cpp+21−4
This diff is too big to show here.
tests/CMakeLists.txt+43−23
This diff is too big to show here.
tests/autopilot/unity8/dash.pydeleted−263
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/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/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.
tests/mocks/Biometryd/MockBiometryd.cppnew file+43
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/Payments/plugin.cpp → tests/mocks/Biometryd/MockIdentifier.cpprenamed+9−9
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.
tests/mocks/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/GSettings.1.0/CMakeLists.txt+1−2
This diff is too big to show here.
tests/mocks/GSettings.1.0/fake_gsettings.cpp+64
This diff is too big to show here.
tests/mocks/GSettings.1.0/fake_gsettings.h+18
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/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.
plugins/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/MeeGo/QOfono/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Powerd/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Powerd/Powerd.h+2−2
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/dbus-enums.h+2−3
This diff is too big to show here.
tests/mocks/QMenuModel/unitymenumodel.cpp+78−13
This diff is too big to show here.
tests/mocks/QMenuModel/unitymenumodel.h+12−1
This diff is too big to show here.
tests/mocks/QtMultimedia/CMakeLists.txt+8−2
This diff is too big to show here.
tests/mocks/QtMultimedia/VideoSurface.qmlnew file+111
This diff is too big to show here.
tests/mocks/QtMultimedia/audio.cppdeleted−132
This diff is too big to show here.
tests/mocks/QtMultimedia/audio.hdeleted−103
This diff is too big to show here.
tests/mocks/QtMultimedia/mediaplayer.cppnew file+319
This diff is too big to show here.
tests/mocks/QtMultimedia/mediaplayer.hnew file+224
This diff is too big to show here.
tests/mocks/QtMultimedia/plugin.cpp+7−3
This diff is too big to show here.
tests/mocks/QtMultimedia/videooutput.cppnew file+127
This diff is too big to show here.
tests/mocks/QtMultimedia/videooutput.hnew file+52
This diff is too big to show here.
tests/mocks/SessionBroadcast/CMakeLists.txtnew file+8
This diff is too big to show here.
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.
tests/mocks/IntegratedLightDM/plugin.h → tests/mocks/SessionBroadcast/plugin.hrenamed+4−4
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/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−95
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/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/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/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/Update/CMakeLists.txtnew file+1
This diff is too big to show here.
tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qmlnew file+30
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/Unity/Application/ApplicationInfo.cpp+62−36
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationInfo.h+8−13
This diff is too big to show here.
tests/mocks/Unity/Application/ApplicationManager.cpp+122−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+146−80
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurface.h+57−27
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceItem.cpp+72−17
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceItem.h+3−2
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceListModel.cpp+17−40
This diff is too big to show here.
tests/mocks/Unity/Application/MirSurfaceListModel.h+7−15
This diff is too big to show here.
tests/mocks/Unity/Application/SurfaceManager.cpp+186−31
This diff is too big to show here.
tests/mocks/Unity/Application/SurfaceManager.h+32−10
This diff is too big to show here.
tests/mocks/Unity/Application/UbuntuKeyboardInfo.cppdeleted−58
This diff is too big to show here.
tests/mocks/Unity/Application/UbuntuKeyboardInfo.hdeleted−57
This diff is too big to show here.
tests/mocks/Unity/Application/VirtualKeyboard.cpp+27−5
This diff is too big to show here.
tests/mocks/Unity/Application/VirtualKeyboard.h+4−1
This diff is too big to show here.
tests/mocks/Unity/Application/plugin.cpp+6−35
This diff is too big to show here.
tests/mocks/Unity/Application/resources/Kate.qmlnew file+49
This diff is too big to show here.
tests/mocks/Unity/Application/resources/KateDialog.qmlnew file+48
This diff is too big to show here.
qml/Stages/ShimStage.qml → tests/mocks/Unity/Application/resources/KateMenu.qmlrenamed+17−19
This diff is too big to show here.
tests/mocks/Unity/Application/resources/MirSurfaceItem.qml+2−5
This diff is too big to show here.
tests/mocks/Unity/Application/resources/VirtualKeyboard.qml+1−6
This diff is too big to show here.
tests/mocks/Unity/Application/resources/screenshots/browser@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/camera@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/dialer@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/facebook@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/gallery@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/map@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/music@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/twitter@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png
Binary file not shown.
tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png
Binary file not shown.
tests/mocks/Unity/Application/resources/surfaces.qrc+3
This diff is too big to show here.
tests/mocks/Unity/Application/resources/vkb_portrait.png
Binary file not shown.
tests/mocks/Unity/ApplicationMenu/CMakeLists.txtnew file+18
This diff is too big to show here.
tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cppnew file+47
This diff is too big to show here.
tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.hnew file+41
This diff is too big to show here.
tests/mocks/Unity/ApplicationMenu/plugin.cppnew file+42
This diff is too big to show here.
plugins/Ubuntu/SystemImage/plugin.h → tests/mocks/Unity/ApplicationMenu/plugin.hrenamed+6−5
This diff is too big to show here.
tests/mocks/Unity/ApplicationMenu/qmldirnew file+3
This diff is too big to show here.
tests/mocks/Unity/CMakeLists.txt+2−63
This diff is too big to show here.
tests/mocks/Unity/Connectivity/CMakeLists.txt+1−1
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/CMakeLists.txtdeleted−18
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/dashcommunicator.cppdeleted−42
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/dashcommunicator.hdeleted−39
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cppdeleted−46
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.hdeleted−41
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/plugin.cppdeleted−31
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/plugin.hdeleted−34
This diff is too big to show here.
tests/mocks/Unity/DashCommunicator/qmldirdeleted−3
This diff is too big to show here.
tests/mocks/Unity/Indicators/CMakeLists.txt+5−1
This diff is too big to show here.
tests/mocks/Unity/Indicators/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/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/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+27−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherItem.h+9
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+4−1
This diff is too big to show here.
tests/mocks/Unity/Launcher/MockLauncherModel.h+1−1
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/Platform/CMakeLists.txtnew file+1
This diff is too big to show here.
qml/Components/ListItems/ThinDivider.qml → tests/mocks/Unity/Platform/MockPlatform.qmlrenamed+7−9
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/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/fake_categories.cppdeleted−161
This diff is too big to show here.
tests/mocks/Unity/fake_categories.hdeleted−54
This diff is too big to show here.
tests/mocks/Unity/fake_expandablefilterwidget.cppdeleted−53
This diff is too big to show here.
tests/mocks/Unity/fake_expandablefilterwidget.hdeleted−48
This diff is too big to show here.
tests/mocks/Unity/fake_filters.cppdeleted−136
This diff is too big to show here.
tests/mocks/Unity/fake_navigation.cppdeleted−123
This diff is too big to show here.
tests/mocks/Unity/fake_navigation.hdeleted−61
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectorfilter.cppdeleted−70
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectorfilter.hdeleted−54
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectoroptions.cppdeleted−90
This diff is too big to show here.
tests/mocks/Unity/fake_optionselectoroptions.hdeleted−49
This diff is too big to show here.
tests/mocks/Unity/fake_previewmodel.cppdeleted−95
This diff is too big to show here.
tests/mocks/Unity/fake_previewmodel.hdeleted−58
This diff is too big to show here.
tests/mocks/Unity/fake_previewwidgetmodel.cppdeleted−89
This diff is too big to show here.
tests/mocks/Unity/fake_previewwidgetmodel.hdeleted−47
This diff is too big to show here.
tests/mocks/Unity/fake_rangeinputfilter.cppdeleted−167
This diff is too big to show here.
tests/mocks/Unity/fake_rangeinputfilter.hdeleted−79
This diff is too big to show here.
tests/mocks/Unity/fake_resultsmodel.cppdeleted−92
This diff is too big to show here.
tests/mocks/Unity/fake_resultsmodel.hdeleted−52
This diff is too big to show here.
tests/mocks/Unity/fake_scope.cppdeleted−367
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−280
This diff is too big to show here.
tests/mocks/Unity/fake_scopes.hdeleted−83
This diff is too big to show here.
tests/mocks/Unity/fake_scopesoverview.cppdeleted−340
This diff is too big to show here.
tests/mocks/Unity/fake_scopesoverview.hdeleted−117
This diff is too big to show here.
tests/mocks/Unity/fake_settingsmodel.cppdeleted−95
This diff is too big to show here.
tests/mocks/Unity/fake_settingsmodel.hdeleted−54
This diff is too big to show here.
tests/mocks/Unity/fake_unity_plugin.cppdeleted−62
This diff is too big to show here.
tests/mocks/Unity/fake_valuesliderfilter.cppdeleted−84
This diff is too big to show here.
tests/mocks/Unity/fake_valuesliderfilter.hdeleted−55
This diff is too big to show here.
tests/mocks/Unity/fake_valueslidervalues.cppdeleted−51
This diff is too big to show here.
tests/mocks/Unity/qmldirdeleted−3
This diff is too big to show here.
tests/mocks/Utils/CMakeLists.txt+18−4
This diff is too big to show here.
tests/mocks/Utils/URLDispatcher.cppnew file+38
This diff is too big to show here.
tests/mocks/Utils/URLDispatcher.hnew file+47
This diff is too big to show here.
tests/mocks/Utils/constants.cpp+2−1
This diff is too big to show here.
tests/mocks/Utils/constants.h+5−5
This diff is too big to show here.
tests/mocks/Utils/plugin.cpp+11−1
This diff is too big to show here.
tests/mocks/Utils/windowstatestorage.cpp+27−4
This diff is too big to show here.
tests/mocks/Utils/windowstatestorage.h+15−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/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
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+38−13
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+4−3
This diff is too big to show here.
tests/plugins/Cursor/tst_Cursor.qml+8−1
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−84
This diff is too big to show here.
tests/plugins/Dash/cardcreator/1.res.cardcreatordeleted−82
This diff is too big to show here.
tests/plugins/Dash/cardcreator/1.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/10.resdeleted−130
This diff is too big to show here.
tests/plugins/Dash/cardcreator/10.res.cardcreatordeleted−127
This diff is too big to show here.
tests/plugins/Dash/cardcreator/10.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.resdeleted−178
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.res.cardcreatordeleted−173
This diff is too big to show here.
tests/plugins/Dash/cardcreator/11.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.resdeleted−110
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.res.cardcreatordeleted−108
This diff is too big to show here.
tests/plugins/Dash/cardcreator/12.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/2.resdeleted−129
This diff is too big to show here.
tests/plugins/Dash/cardcreator/2.res.cardcreatordeleted−126
This diff is too big to show here.
tests/plugins/Dash/cardcreator/2.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/3.resdeleted−94
This diff is too big to show here.
tests/plugins/Dash/cardcreator/3.res.cardcreatordeleted−91
This diff is too big to show here.
tests/plugins/Dash/cardcreator/3.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/4.resdeleted−110
This diff is too big to show here.
tests/plugins/Dash/cardcreator/4.res.cardcreatordeleted−107
This diff is too big to show here.
tests/plugins/Dash/cardcreator/4.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/5.resdeleted−106
This diff is too big to show here.
tests/plugins/Dash/cardcreator/5.res.cardcreatordeleted−104
This diff is too big to show here.
tests/plugins/Dash/cardcreator/5.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/6.resdeleted−126
This diff is too big to show here.
tests/plugins/Dash/cardcreator/6.res.cardcreatordeleted−124
This diff is too big to show here.
tests/plugins/Dash/cardcreator/6.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/7.resdeleted−142
This diff is too big to show here.
tests/plugins/Dash/cardcreator/7.res.cardcreatordeleted−139
This diff is too big to show here.
tests/plugins/Dash/cardcreator/7.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/8.resdeleted−108
This diff is too big to show here.
tests/plugins/Dash/cardcreator/8.res.cardcreatordeleted−105
This diff is too big to show here.
tests/plugins/Dash/cardcreator/8.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.resdeleted−119
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.res.cardcreatordeleted−117
This diff is too big to show here.
tests/plugins/Dash/cardcreator/9.tstdeleted−4
This diff is too big to show here.
tests/plugins/Dash/cardcreatortest.cppdeleted−121
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−2213
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertest.cppdeleted−2009
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−119
This diff is too big to show here.
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qmldeleted−76
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−140
This diff is too big to show here.
tests/plugins/Dash/tst_ScopeStyle.qmldeleted−188
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltest.cppdeleted−502
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltest.qmldeleted−45
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltry.cppdeleted−89
This diff is too big to show here.
tests/plugins/Dash/verticaljournaltry.qmldeleted−121
This diff is too big to show here.
tests/plugins/GlobalShortcut/CMakeLists.txt+12−7
This diff is too big to show here.
tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp+3−2
This diff is too big to show here.
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+5−23
This diff is too big to show here.
tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+4−1
This diff is too big to show here.
tests/plugins/IntegratedLightDM/CMakeLists.txtdeleted−93
This diff is too big to show here.
tests/plugins/IntegratedLightDM/usersmodel.cppdeleted−84
This diff is too big to show here.
tests/plugins/LightDM/CMakeLists.txtnew file+1
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+157
This diff is too big to show here.
tests/plugins/IntegratedLightDM/dbus.cpp → tests/plugins/LightDM/IntegratedLightDM/dbus.cpprenamed+22−12
This diff is too big to show here.
tests/plugins/IntegratedLightDM/greeter.qml → tests/plugins/LightDM/IntegratedLightDM/greeter.qmlrenamed+2−7
This diff is too big to show here.
tests/plugins/IntegratedLightDM/integrated.cpp → tests/plugins/LightDM/IntegratedLightDM/integrated.cpprenamed
The content is the same.
tests/plugins/IntegratedLightDM/pam.cpp → tests/plugins/LightDM/IntegratedLightDM/pam.cpprenamed
The content is the same.
tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cppnew file+175
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cppnew file+134
This diff is too big to show here.
tests/plugins/LightDM/IntegratedLightDM/usersmodel.cppnew file+168
This diff is too big to show here.
tests/plugins/SessionBroadcast/BroadcastServer.cppnew file+33
This diff is too big to show here.
tests/plugins/SessionBroadcast/BroadcastServer.hnew file+40
This diff is too big to show here.
tests/plugins/SessionBroadcast/CMakeLists.txtnew file+51
This diff is too big to show here.
tests/plugins/SessionBroadcast/interfaces.xmlnew file+18
This diff is too big to show here.
tests/plugins/SessionBroadcast/server.cppnew file+37
This diff is too big to show here.
tests/plugins/SessionBroadcast/sessionbroadcasttest.cppnew file+111
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+16−8
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/tst_AxisVelocityCalculator.cpp+1−1
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+1−1
This diff is too big to show here.
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml+1−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/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+148−30
This diff is too big to show here.
tests/plugins/Unity/Launcher/no-icon.desktopdeleted−2
This diff is too big to show here.
tests/plugins/Unity/Launcher/ualwrapper.cppnew file+58
This diff is too big to show here.
tests/plugins/Unity/Launcher/ualwrapper.hnew file+55
This diff is too big to show here.
tests/plugins/Unity/Launcher/xdgwatcher.cppnew file+45
This diff is too big to show here.
tests/mocks/IntegratedLightDM/MockGreeter.h → tests/plugins/Unity/Launcher/xdgwatcher.hrenamed+18−16
This diff is too big to show here.
tests/plugins/Unity/Platform/CMakeLists.txtnew file+30
This diff is too big to show here.
tests/plugins/Unity/Platform/platformtest.cppnew file+142
This diff is too big to show here.
tests/plugins/Unity/Session/CMakeLists.txt+48−2
This diff is too big to show here.
tests/plugins/Unity/Session/LightDMServer.cppnew file+29
This diff is too big to show here.
tests/plugins/Unity/Session/LightDMServer.hnew file+38
This diff is too big to show here.
tests/plugins/Unity/Session/LogindServer.cppnew file+43
This diff is too big to show here.
tests/plugins/Unity/Session/LogindServer.hnew file+48
This diff is too big to show here.
tests/plugins/Unity/Session/interfaces.xmlnew file+29
This diff is too big to show here.
tests/plugins/Unity/Session/preload.cnew file+43
This diff is too big to show here.
tests/plugins/Unity/Session/server.cppnew file+50
This diff is too big to show here.
tests/plugins/Unity/Session/sessionbackendtest.cpp+142−9
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+107−10
This diff is too big to show here.
tests/plugins/Utils/WindowStateStorageTest.cppnew file+121
This diff is too big to show here.
tests/plugins/WindowManager/CMakeLists.txtnew file+36
This diff is too big to show here.
tests/plugins/WindowManager/UnityApplicationMocks.hnew file+211
This diff is too big to show here.
tests/plugins/WindowManager/tst_TopLevelWindowModel.cppnew file+193
This diff is too big to show here.
tests/plugins/Wizard/CMakeLists.txt+8−2
This diff is too big to show here.
tests/plugins/Wizard/tst_pagelist.cpp+30−1
This diff is too big to show here.
tests/qmltests/ApplicationMenuDataLoader.qmlnew file+99
This diff is too big to show here.
tests/qmltests/ApplicationMenus/tst_MenuBar.qmlnew file+437
This diff is too big to show here.
tests/qmltests/ApplicationMenus/tst_MenuPopup.qmlnew file+361
This diff is too big to show here.
tests/qmltests/CMakeLists.txt+45−68
This diff is too big to show here.
tests/qmltests/Components/CMakeLists.txt+31−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+25−6
This diff is too big to show here.
tests/qmltests/Components/tst_DraggingArea.qml+6−6
This diff is too big to show here.
tests/qmltests/Components/tst_EdgeDragEvaluator.cpp+6−4
This diff is too big to show here.
tests/qmltests/Components/tst_LazyImage/portrait.png
Binary file not shown.
tests/qmltests/Components/tst_LazyImage/square.png
Binary file not shown.
tests/qmltests/Components/tst_LazyImage/wide.png
Binary file not shown.
tests/qmltests/Components/tst_Lockscreen.qml+14−32
This diff is too big to show here.
tests/qmltests/Components/tst_MediaServices.qmlnew file+231
This diff is too big to show here.
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+7−6
This diff is too big to show here.
tests/qmltests/Components/tst_Rating.qml+1−1
This diff is too big to show here.
tests/qmltests/Components/tst_ResponsiveGridView.qmldeleted−157
This diff is too big to show here.
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qmldeleted−183
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml → tests/qmltests/Components/tst_SharingPicker.qmlrenamed+11−11
This diff is too big to show here.
tests/qmltests/Components/tst_Showable.qml+13
This diff is too big to show here.
tests/qmltests/Components/tst_VirtualTouchPad.qml+55−1
This diff is too big to show here.
tests/qmltests/Components/tst_Wallpaper.qmlnew file+118
This diff is too big to show here.
tests/qmltests/Components/tst_WallpaperResolver.qml+115−43
This diff is too big to show here.
tests/qmltests/Components/tst_ZoomableImage.qml+2−2
This diff is too big to show here.
tests/qmltests/Dash/CardHelpers.jsdeleted−115
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qmldeleted−99
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qmldeleted−96
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterRangeInput.qmldeleted−247
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterValueSlider.qmldeleted−101
This diff is too big to show here.
tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qmldeleted−59
This diff is too big to show here.
tests/qmltests/Dash/Previews/MockPreviewWidget.qmldeleted−27
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_Preview.qmldeleted−134
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewActions.qmldeleted−231
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qmldeleted−184
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewComment.qmldeleted−84
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qmldeleted−85
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qmldeleted−358
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewHeader.qmldeleted−187
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewIconActions.qmldeleted−136
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qmldeleted−147
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewMediaToolbar.qmldeleted−69
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewPayments.qmldeleted−203
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewProgress.qmldeleted−87
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qmldeleted−123
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qmldeleted−94
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qmldeleted−84
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qmldeleted−214
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewTable.qmldeleted−126
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qmldeleted−87
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qmldeleted−61
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qmldeleted−103
This diff is too big to show here.
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmldeleted−133
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qmldeleted−62
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qmldeleted−84
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qmldeleted−98
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qmldeleted−88
This diff is too big to show here.
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qmldeleted−65
This diff is too big to show here.
tests/qmltests/Dash/artwork/avatar@12.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/background.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/checkers.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/emblem.pngdeleted
Binary file not shown.
tests/qmltests/Dash/artwork/music-player-design.pngdeleted
Binary file not shown.
tests/qmltests/Dash/tst_Card.qmldeleted−692
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−698
This diff is too big to show here.
tests/qmltests/Dash/tst_DashContent.qmldeleted−688
This diff is too big to show here.
tests/qmltests/Dash/tst_DashPageHeader.qmldeleted−316
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−692
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+277−151
This diff is too big to show here.
tests/qmltests/Greeter/tst_GreeterView.qmlnew file+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.qmldeleted−533
This diff is too big to show here.
tests/qmltests/Greeter/tst_WideView.qmldeleted−530
This diff is too big to show here.
tests/qmltests/Launcher/tst_Drawer.qmlnew file+520
This diff is too big to show here.
tests/qmltests/Launcher/tst_Launcher.qml+418−77
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+106−50
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/tst_IndicatorItem.qml → tests/qmltests/Panel/Indicators/tst_IndicatorItem.qmlrenamed+5−4
This diff is too big to show here.
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml → tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qmlrenamed+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/IndicatorTest.qml → tests/qmltests/Panel/PanelTest.qmlrenamed−5
This diff is too big to show here.
tests/qmltests/Panel/PanelUI.qmlnew file+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_IndicatorsBar.qml → tests/qmltests/Panel/tst_PanelBar.qmlrenamed+25−34
This diff is too big to show here.
tests/qmltests/Panel/tst_IndicatorItemRow.qml → tests/qmltests/Panel/tst_PanelItemRow.qmlrenamed+41−12
This diff is too big to show here.
tests/qmltests/Panel/tst_IndicatorsMenu.qml → tests/qmltests/Panel/tst_PanelMenu.qmlrenamed+137−34
This diff is too big to show here.
tests/qmltests/Panel/tst_IndicatorPage.qml → tests/qmltests/Panel/tst_PanelMenuPage.qmlrenamed+53−49
This diff is too big to show here.
tests/qmltests/Panel/tst_PanelSmallScreen.qmlnew file+133
This diff is too big to show here.
tests/qmltests/Stages/ApplicationCheckBox.qml → tests/qmltests/Stage/ApplicationCheckBox.qmlrenamed+8−8
This diff is too big to show here.
tests/qmltests/Stages/SizeHintField.qml → tests/qmltests/Stage/SizeHintField.qmlrenamed
The content is the same.
tests/qmltests/Stages/SurfaceManagerControls.qml → tests/qmltests/Stage/SurfaceManagerControls.qmlrenamed
The content is the same.
tests/qmltests/Stages/SurfaceManagerField.qml → tests/qmltests/Stage/SurfaceManagerField.qmlrenamed
The content is the same.
tests/qmltests/Stages/tst_ApplicationWindow.qml → tests/qmltests/Stage/tst_ApplicationWindow.qmlrenamed+16−33
This diff is too big to show here.
tests/qmltests/Stage/tst_DecoratedWindow.qmlnew file+267
This diff is too big to show here.
tests/qmltests/Stage/tst_DesktopStage.qmlnew file+1085
This diff is too big to show here.
tests/qmltests/Stages/tst_PhoneStage.qml → tests/qmltests/Stage/tst_PhoneStage.qmlrenamed+239−285
This diff is too big to show here.
tests/qmltests/Stage/tst_QMLTopLevelWindowModel.qmlnew file+191
This diff is too big to show here.
tests/qmltests/Stages/tst_Splash.qml → tests/qmltests/Stage/tst_Splash.qmlrenamed+16−2
This diff is too big to show here.
tests/qmltests/Stages/tst_SurfaceContainer.qml → tests/qmltests/Stage/tst_SurfaceContainer.qmlrenamed+15−10
This diff is too big to show here.
tests/qmltests/Stages/tst_TabletStage.qml → tests/qmltests/Stage/tst_TabletStage.qmlrenamed+315−309
This diff is too big to show here.
tests/qmltests/Stage/tst_WindowDecoration.qmlnew file+244
This diff is too big to show here.
tests/qmltests/Stages/tst_WindowResizeArea.qml → tests/qmltests/Stage/tst_WindowResizeArea.qmlrenamed+73−115
This diff is too big to show here.
tests/qmltests/Stages/tst_DesktopStage.qmldeleted−681
This diff is too big to show here.
tests/qmltests/Stages/tst_SpreadDelegate.qmldeleted−320
This diff is too big to show here.
tests/qmltests/Tutorial/tst_Tutorial.qml+207−186
This diff is too big to show here.
tests/qmltests/UnityLogo.png
Binary file not shown.
tests/qmltests/Wizard/tst_Wizard.qml+138−135
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+500−489
This diff is too big to show here.
tests/qmltests/tst_Shell.qml+1735−833
This diff is too big to show here.
tests/qmltests/tst_ShellWithPin.qml+167−231
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−3
This diff is too big to show here.
tests/utils/modules/Unity/Test/CMakeLists.txt+11−6
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/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+12−22
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+16−5
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.