481dd71...xenial · unity8

git.iko.soy/unity8

1110 files changed+77940−94873

since splitsnapshots

unifiedsplit

.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

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

.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+32−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,22 +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=20)

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)

6583pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

66−

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

6785pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

86+pkg_check_modules(QTDBUSTEST REQUIRED

87+ libqtdbustest-1

88+ libqtdbusmock-1

89+ )

6890

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

7092find_path(UBUNTUGESTUREPRIV

@@ -126,8 +148,6 @@ include(autopilot)

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

127149

128150set(SHELL_APP unity8)

129−set(DASH_APP unity8-dash)

130−set(SCOPE_TOOL unity-scope-tool)

131151set(INDICATORS_CLIENT_APP indicators-client)

132152set(GREETER_APP unity8-greeter)

133153set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

@@ -138,8 +158,6 @@ include_directories(

138158 ${APPLICATION_API_INCLUDE_DIRS}

139159)

140160

141−set(ARTIFACTS_DIR "" CACHE PATH "Store test artifacts in this directory.")

142−

143161# Quiet logger

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

145163if(NOT QUIET_LOGGER)

CODING+24

@@ -162,3 +162,27 @@ $ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name

162162or run them all with

163163

164164$ 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

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

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

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

9+## Where to report issues

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

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

11#!/bin/sh

3+#

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

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/CMakeLists.txt+1−9

@@ -1,13 +1,11 @@

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)

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

76# install desktop files

87install(FILES

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

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

119 ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop

1210 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1311 )

@@ -22,14 +20,8 @@ install(FILES

2220 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d

2321 )

2422

25−# install dash icon

26−install(FILES

27− ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png

28− DESTINATION ${SHELL_APP_DIR}/Dash/

29− )

30−

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

3224

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

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

3527install(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

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−

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

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.

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-wrapper+22−11

@@ -1,8 +1,7 @@

11#!/bin/sh

22# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-

33#

5−# Author: Michael Terry <michael.terry@canonical.com>

65#

76# This program is free software: you can redistribute it and/or modify it under

87# the terms of the GNU General Public License as published by the Free Software

@@ -42,15 +41,20 @@ set_greeter_var()

4241SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket

4342rm -f $SUB_SOCKET # clear socket in case we were hard shut down

4443

44+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"

45+

4546# If touch session script (which sets up grid units and mir variables) is available, use it

4647TOUCH_WRAPPER=

47−if [ -x /usr/bin/ubuntu-touch-session ]; then

48− TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session

48+if which ubuntu-touch-session >/dev/null; then

49+ TOUCH_WRAPPER=ubuntu-touch-session

4950fi

5051

51−# Pretend that we're in an ubuntu-touch session, so that indicator-network

52−# will start.

53−export DESKTOP_SESSION=ubuntu-touch

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

5458

5559# We disable ofono using pulse. It causes problems with racing with the user's

5660# pulse. We need to come up with a better long-term fix for this, because we

@@ -62,13 +66,20 @@ set_greeter_var PA_DISABLED 1

6266# creates for them and don't want to start all the services that a normal

6367# session would. So it's inconvenient to live within an upstart session.

6468# But... we still want to use Upstart for some services. So launch here.

65−MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &

69+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event &

6670INIT_PID=$!

6771while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done

68−export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)

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

6980

7081# Start any pre-greeter tasks if needed (like wizard)

71−/sbin/initctl emit unity8-greeter-starting

82+initctl emit unity8-greeter-starting

7283

7384# Define language here for phone if available. When phone user switches their

7485# language, they expect that to affect the greeter too. But the user doesn't

@@ -92,7 +103,7 @@ if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then

92103fi

93104

94105# And finally actually start the greeter

95−exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

106+exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

96107CMD_PID=$!

97108wait $CMD_PID

98109CMD_PID=

data/unity8.conf+39−29

@@ -2,37 +2,51 @@ description "Unity Shell v8"

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

44emits indicator-services-start

5+emits indicator-services-end

67start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus

78stop on desktop-end

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,30 +77,23 @@ 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

6689

6790post-start script

68− # If no MIR_SOCKET was defined on launch, we try to set one here

69− if [ -z "$(initctl get-env --global UNITY_MIR_SOCKET)" ]; then

70− if [ -S "$XDG_RUNTIME_DIR/mir_socket" ]; then

71− mir_socket=$XDG_RUNTIME_DIR/mir_socket

72− elif [ -S "/tmp/mir_socket" ]; then

73− mir_socket=/tmp/mir_socket

74− fi

75−

76− if [ -n "$mir_socket" ]; then

77− initctl set-env --global MIR_SOCKET="$mir_socket"

78− fi

79− fi

80−

8191 initctl emit --no-wait indicator-services-start

8292end script

8393

8494post-stop script

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

86− initctl unset-env --global UNITY_MIR_SOCKET

8796 initctl unset-env --global MIR_SERVER_PROMPT_FILE

8897 initctl emit application-end

98+ initctl emit indicator-services-end

8999end script

debian/changelog+694−26

@@ -1,3 +1,672 @@

1+unity8 (8.20+ubports) xenial; urgency=medium

3+ * Replace dependency on ubuntu-wallpapers with ubports-wallpapers

5+ -- Dalton Durst <dalton@ubports.com> Fri, 5 Oct 2018 13:28:20 -0500

7+unity8 (8.17+ubports3) xenial; urgency=medium

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+

1670unity8 (8.14+16.10.20160811.1-0ubuntu1) yakkety; urgency=medium

2671

3672 [ Albert Astals Cid ]

@@ -143,12 +812,6 @@ unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium

143812

144813 -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 05 Jul 2016 10:00:57 +0000

145814

146−unity8 (8.12+16.10.20160627.5-0ubuntu1local~1468240753) UNRELEASED; urgency=medium

147−

148− * ''

149−

150− -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 11 Jul 2016 14:39:14 +0200

151−

152815unity8 (8.12+16.10.20160627.5-0ubuntu1) yakkety; urgency=medium

153816

154817 [ Albert Astals Cid ]

@@ -561,7 +1224,7 @@ unity8 (8.12+16.04.20160330-0ubuntu1) xenial; urgency=medium

5611224unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium

5621225

5631226 [ Michael Terry ]

564− *

1227+ *

5651228 * Fix setting OSK layout in OOBE wizard

5661229 * Stop the left edge tutorial from being shown when the bottom edge

5671230 tutorial wants to be shown after receiving a call.

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

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

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

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

3276−

3939+

32773940 [ Michael Zanetti ]

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

32793942 * Add right-edge spread animation for tablet

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

35474210

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

35494212

3550− * debian/control:

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

4213+ * debian/control:

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

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

35534216 on amd64 and i386

35544217

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

66507313 [ Michał Sawicz ]

66517314 * Fix icons in ApplicationsFilterGrid.qml.

66527315 * Support flipped image in run_on_device.

6653−

7316+

66547317 [ Michael Zanetti ]

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

66567319 * Reworked Launcher folding.

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

67357398

67367399 [ Michael Terry ]

67377400 * Make greeter look like the desktop one

6738−

7401+

67397402 [ Gerry Boland ]

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

67417404 * Applied a workaround to reduce flickering when launching apps

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

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

67527415

67537416 [ Sergio Schvezov ]

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

67557418 the launcher (LP: #1178262).

67567419

67577420 [ Daniel d'Andrada ]

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

67937456 [ Mathieu Trudel-Lapierre ]

67947457 * debian/control:

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

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

67977460 * debian/copyright: fix syntax.

67987461

67997462 [ Michał Sawicz ]

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

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

68047467

68057468 [ Daniel d'Andrada ]

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

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

68077470 single-finger drag gestures.

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

68097472

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

72407903

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

72427905

7243− * fix launching of notepad

7906+ * fix launching of notepad

72447907

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

72467909

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

72537916

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

72557918

7256− * launch real notepad app

7919+ * launch real notepad app

72577920 * fix launching of mock apps

72587921

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

72607923

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

72627925

7263− * integrate ubuntu-browser instead of snowshoe

7926+ * integrate ubuntu-browser instead of snowshoe

72647927

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

72667929

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

73448007

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

73468009

7347− * New release with fullscreen launcher fixes

8010+ * New release with fullscreen launcher fixes

73488011

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

73508013

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

73568019

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

73588021

7359− * enable multi-threaded render for apps

8022+ * enable multi-threaded render for apps

73608023

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

73628025

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

73648027

73658028 [ Bill Filler ]

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

7367− and twitter

8030+ and twitter

73688031

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

73708033

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

73768039

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

73788041

7379− * fix to launch new gallery with correct args

8042+ * fix to launch new gallery with correct args

73808043

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

73828045

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

74388101

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

74408103

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

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

74428105

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

74448107

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

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

74678130 via dbus-luanch to properly setup session bus

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

7469− processes

8132+ processes

74708133

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

74728135

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

74748137

7475− * added additional Android env vars to upstart script

8138+ * added additional Android env vars to upstart script

74768139

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

74788141

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

74808143

7481− * added support to launch telephony-app

8144+ * added support to launch telephony-app

74828145

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

74848147

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

75058168 * Initial release

75068169

75078170 -- 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+219−182

@@ -2,234 +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 arm 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− libgnome-desktop-3-dev,

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− libgsettings-qt-dev,

26− libhardware-dev,

27− liblightdm-qt5-3-dev,

28− libpam0g-dev,

29− libpay2-dev,

30− libpulse-dev,

31− libqmenumodel-dev (>= 0.2.9),

32− libqt5svg5-dev,

33− libqt5xmlpatterns5-dev,

34− libsystemsettings-dev,

35− libubuntugestures5-dev (>= 1.3.2030),

36− libubuntugestures5-private-dev (>= 1.3.2030),

37− libudev-dev,

38− libunity-api-dev (>= 7.117),

39− libusermetricsoutput1-dev,

40−# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop

41− libx11-dev[!arm64 !armhf],

42− libxcb1-dev[!arm64 !armhf],

43− libxi-dev[!arm64 !armhf],

44−# End of X11 libs

45− pkg-config,

46− python3-all:any,

47− python3-setuptools,

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

49− qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),

50− qml-module-qtquick-layouts,

51− qml-module-qtquick-xmllistmodel,

52− qml-module-qtquick2,

53− qml-module-qtsysteminfo,

54− qml-module-qttest,

55− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

56− qml-module-ubuntu-web,

57− qt5-default,

58− qtbase5-dev (>= 5.4),

59− qtbase5-dev-tools,

60− qtbase5-private-dev (>= 5.4),

61− qtdeclarative5-dev (>= 5.4),

62− qtdeclarative5-dev-tools,

63− qtdeclarative5-private-dev (>= 5.4),

64− qtdeclarative5-ubuntu-content1,

65− qtdeclarative5-ubuntu-settings-components (>= 0.7),

66− 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,

6776Standards-Version: 3.9.4

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

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

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

71−# and sync up the code again.

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

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

7479XS-Testsuite: autopkgtest

7580X-Ubuntu-Use-Langpack: yes

7681

7782Package: indicators-client

7883Architecture: any

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

80− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

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

82− ${misc:Depends},

83− ${shlibs:Depends},

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

8490Description: Indicators client test application

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

8692

8793Package: unity8-greeter

8894Architecture: any

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

90− unity-system-compositor,

91− ${misc:Depends},

92− ${shlibs:Depends}

93−Recommends: lightdm

94−Provides: lightdm-greeter

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,

95104Description: The Unity8 Greeter

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

97106

98−Package: unity-scope-tool

99−Architecture: any

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

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

102− ${misc:Depends},

103− ${shlibs:Depends},

104−# We do call pkg-config libunity-scopes from the code

105− pkg-config,

106− libunity-scopes-dev,

107−Description: Development tool for Unity scopes

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

109− on Unity8.

110−

111107Package: unity8

112108Architecture: any

113−Provides: indicator-renderer,

114−Depends: dmz-cursor-theme,

115− gsettings-desktop-schemas,

116− libcap2-bin,

117− libglib2.0-bin,

118− qmenumodel-qml (>= 0.2.9),

119− qml-module-biometryd,

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

121− qml-module-qtquick-xmllistmodel,

122− qml-module-qtsysteminfo,

123− qml-module-ubuntu-web,

124− qtdeclarative5-qtmir-plugin (>= 0.4.8),

125− qtdeclarative5-ubuntu-telephony0.1,

126− qtdeclarative5-ubuntu-web-plugin,

127− ubuntu-system-settings (>= 0.4),

128− unity-launcher-impl-7,

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

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

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

132− ${misc:Depends},

133− ${shlibs:Depends},

134−Recommends: indicator-keyboard,

135− indicator-session,

136− unity-scope-click,

137− unity-scope-mediascanner2,

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

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

140− unity8-greeter (<< 7.89),

141− ubuntu-keyboard (<< 0.100),

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

143− unity8-greeter (<< 7.89),

144−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,

145148Description: Unity 8 shell

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

147150

148151Package: unity8-common

149152Architecture: all

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

151− qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

152− qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

153− qtdeclarative5-ubuntu-settings-components (>= 0.7),

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

155− ubuntu-thumbnailer-impl-0,

156− unity-application-impl-20,

157− unity-notifications-impl-3,

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

159− unity-scopes-impl-12,

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

161− ${misc:Depends},

162−Breaks: unity8 (<< 7.86),

163−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),

164170Description: Unity 8 shell (common files)

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

166172 .

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

168− unity8 and unity-scope-tool.

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

169174

170175Package: unity8-autopilot

171176Architecture: all

172−Depends: autopilot-qt5 (>= 1.4),

173− gir1.2-glib-2.0,

174− gir1.2-notify-0.7,

175− libqt5test5,

176− libqt5widgets5,

177− ofono-phonesim,

178− python3-autopilot,

179− python3-evdev,

180− python3-fixtures,

181− python3-gi,

182− qttestability-autopilot (>= 1.4),

183− ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

184− unity-scope-click,

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

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

187− url-dispatcher-tools,

188− xvfb,

189− ${misc:Depends},

190− ${python3:Depends},

191− ${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},

192196Description: Test package for Unity 8 shell

193197 Autopilot tests for the unity8 package

194198

195−Package: unity8-fake-env

199+Package: unity8-tests

196200Architecture: any

197201Multi-Arch: same

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

199−Depends: ${misc:Depends},

200− ${shlibs:Depends},

201−Provides: unity-application-impl,

202− unity-application-impl-20,

203−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)

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

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

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

207227

208228Package: unity8-private

209229Architecture: any

210230Multi-Arch: same

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

212−Depends: accountsservice-ubuntu-schemas (>= 0.0.7),

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

214− libhardware2,

215− pay-service,

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

217− qtdeclarative5-gsettings1.0,

218− qml-module-qtmultimedia,

219− ${misc:Depends},

220− ${shlibs:Depends},

221−Provides: unity-launcher-impl,

222− 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,

223245Description: Unity 8 private libs

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

225247 .

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

227249 only used by the shell.

228250

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+

229265Package: unity8-doc

230266Section: doc

231267Architecture: all

232268Multi-Arch: foreign

233−Depends: ${misc:Depends},

269+Depends:

270+ ${misc:Depends},

234271Description: Documentation for Unity8

235272 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-3.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

@@ -1 +0,0 @@

1−1.0

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,

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

34# log all commands and abort on error

45set -xe

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)

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.install+1−1

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

1−data/unity8-greeter-wrapper usr/bin/

21data/unity8-greeter-init.conf usr/share/upstart/sessions/

2+data/unity8-greeter-wrapper usr/bin/

33data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/

44usr/share/lightdm/greeters/unity8-greeter.desktop

55usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf

debian/unity8-private.install+1−2

@@ -1,7 +1,6 @@

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

76usr/lib/*/unity8/qml/LightDM

@@ -9,9 +8,9 @@ usr/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+7−10

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

1916usr/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/*

3− *

4− * Authors:

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

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+1−30

@@ -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,7 +32,7 @@

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

3938#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")

@@ -93,8 +92,6 @@ AccountsService::AccountsService(QObject* parent, const QString &user)

9392 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));

9493 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));

9594 registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));

96− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));

97− registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));

9895 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));

9996 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));

10097 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));

@@ -216,32 +213,6 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons

216213 return (PasswordDisplayHint)value.toInt();

217214}

218215

219−bool AccountsService::hereEnabled() const

220−{

221− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED);

222− return value.toBool();

223−}

224−

225−void AccountsService::setHereEnabled(bool enabled)

226−{

227− setProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, enabled);

228−}

229−

230−QString AccountsService::hereLicensePath() const

231−{

232− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);

233− QString hereLicensePath = value.toString();

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

235− hereLicensePath = QStringLiteral("");

236− return hereLicensePath;

237−}

238−

239−bool AccountsService::hereLicensePathValid() const

240−{

241− auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);

242− return !value.toString().isNull();

243−}

244−

245216QString AccountsService::realName() const

246217{

247218 auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);

plugins/AccountsService/AccountsService.h+1−17

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

@@ -67,16 +66,6 @@ class AccountsService: public QObject

6766 READ failedFingerprintLogins

6867 WRITE setFailedFingerprintLogins

6968 NOTIFY failedFingerprintLoginsChanged)

70− Q_PROPERTY(bool hereEnabled

71− READ hereEnabled

72− WRITE setHereEnabled

73− NOTIFY hereEnabledChanged)

74− Q_PROPERTY(QString hereLicensePath

75− READ hereLicensePath

76− NOTIFY hereLicensePathChanged)

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

78− READ hereLicensePathValid

79− NOTIFY hereLicensePathChanged)

8069 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)

8170 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)

8271 Q_PROPERTY(QStringList keymaps READ keymaps WRITE setKeymaps NOTIFY keymapsChanged)

@@ -86,6 +75,7 @@ public:

8675 Keyboard,

8776 Numeric,

8877 };

78+ Q_ENUM(PasswordDisplayHint)

8979

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

9181 ~AccountsService() = default;

@@ -106,10 +96,6 @@ public:

10696 void setFailedLogins(uint failedLogins);

10797 uint failedFingerprintLogins() const;

10898 void setFailedFingerprintLogins(uint failedFingerprintLogins);

109− bool hereEnabled() const;

110− void setHereEnabled(bool enabled);

111− QString hereLicensePath() const;

112− bool hereLicensePathValid() const;

11399 QString realName() const;

114100 void setRealName(const QString &realName);

115101 QString email() const;

@@ -129,8 +115,6 @@ Q_SIGNALS:

129115 void passwordDisplayHintChanged();

130116 void failedLoginsChanged();

131117 void failedFingerprintLoginsChanged();

132− void hereEnabledChanged();

133− void hereLicensePathChanged();

134118 void realNameChanged();

135119 void emailChanged();

136120 void keymapsChanged();

plugins/AccountsService/CMakeLists.txt+1−2

@@ -7,9 +7,8 @@ add_library(AccountsService-qml MODULE

77 plugin.cpp

88 )

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

@@ -9,11 +9,17 @@

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

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

1111

12+

1213

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

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

1516 </property>

1617

18+

19+ <property name="DemoEdges2" type="b" access="readwrite">

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

21+ </property>

22+

1723

1824 <property name="DemoEdgesCompleted" type="as" access="readwrite">

1925 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>

plugins/CMakeLists.txt+1−2

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

1−include(QmlPlugins)

1+find_package(QmlPlugins)

33# Set up and install a plugin for unity8.

44#

@@ -17,7 +17,6 @@ add_subdirectory(GlobalShortcut)

1717add_subdirectory(Greeter)

1818add_subdirectory(LightDM)

1919add_subdirectory(Lights)

20−add_subdirectory(Dash)

2120add_subdirectory(Powerd)

2221add_subdirectory(ScreenshotDirectory)

2322add_subdirectory(SessionBroadcast)

plugins/Cursor/CMakeLists.txt+2−3

@@ -26,8 +26,7 @@ add_library(Cursor-qml SHARED

2626target_link_libraries(Cursor-qml

2727 xcursorloader-static

2828 ${QT5PLATFORM_SUPPORT_LDFLAGS}

29+ Qt5::Qml Qt5::Quick Qt5::Svg

2930)

3031

31−qt5_use_modules(Cursor-qml Qml Quick DBus Network Gui Sql Concurrent Svg)

32−

33−add_unity8_plugin(Cursor 1.0 Cursor TARGETS Cursor-qml)

32+add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)

plugins/Cursor/CursorImageInfo.cpp+1−2

@@ -108,8 +108,7 @@ int CursorImageInfo::frameDuration() const

108108QUrl CursorImageInfo::imageSource() const

109109{

110110 auto urlString = QString("image://cursor/%1/%2/%3")

111− .arg(m_themeName)

112− .arg(m_cursorName)

111+ .arg(m_themeName, m_cursorName)

113112 .arg(m_cursorHeight);

114113

115114 return QUrl(urlString);

plugins/Cursor/CursorImageProvider.cpp+2

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

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() - 1), buttons);

57− newX = parentItem()->width() - 1;

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

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

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

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

14−

15−include_directories(

16− SYSTEM

17− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

18− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

19− ${Qt5V8_PRIVATE_INCLUDE_DIR}

20−)

21−

22−remove_definitions(-DQT_NO_KEYWORDS)

23−

24−set(QMLPLUGIN_SRC

25− plugin.cpp

26− listviewwithpageheader.cpp

27− abstractdashview.cpp

28− verticaljournal.cpp

29− horizontaljournal.cpp

30− organicgrid.cpp

31− )

32−

33−add_library(Dash-qml MODULE

34− ${QMLPLUGIN_SRC}

35− )

36−

37−target_link_libraries(Dash-qml

38− ${Qt5Gui_LIBRARIES}

39− ${Qt5Quick_LIBRARIES}

40− )

41−

42−qt5_use_modules(Dash-qml Qml Quick Concurrent)

43−

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

45−

46−install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)

47−file(COPY graphics/music_progress_bg.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/graphics/)

plugins/Dash/CardAttributes.qmldeleted−71

@@ -1,71 +0,0 @@

1−/*

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

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

@@ -1,996 +0,0 @@

1−/*

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 artShapeLoader

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 = 'Loader { \n\

87− id: artShapeLoader; \n\

88− height: root.fixedArtShapeSize.height; \n\

89− width: root.fixedArtShapeSize.width; \n\

90− anchors { %1 } \n\

91− objectName: "artShapeLoader"; \n\

92− readonly property string cardArt: cardData && cardData["art"] || %8; \n\

93− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\

94− active: cardArt != ""; \n\

95− asynchronous: %5; \n\

96− visible: status === Loader.Ready; \n\

97− sourceComponent: Item { \n\

98− id: artShape; \n\

99− objectName: "artShape"; \n\

100− visible: image.status === Image.Ready; \n\

101− readonly property alias image: artImage; \n\

102− %6 \n\

103− width: root.fixedArtShapeSize.width; \n\

104− height: root.fixedArtShapeSize.height; \n\

105− CroppedImageMinimumSourceSize { \n\

106− id: artImage; \n\

107− objectName: "artImage"; \n\

108− source: artShapeLoader.cardArt; \n\

109− asynchronous: %5; \n\

110− visible: %4; \n\

111− width: %2; \n\

112− height: %3; \n\

113− %7 \n\

114− } \n\

115− } \n\

116− }\n';

117−

118−// %1 is used as anchors of artShapeLoader

119−// %2 is used as image width

120−// %3 is used as image height

121−// %4 is whether the image should be visible

122−// %5 is whether the loader should be asynchronous or not

123−// %6 is the shape code we want to use

124−// %7 is injected as code to artImage

125−// %8 is used as image fallback

126−var kArtShapeHolderCodeCardToolCard = 'Loader { \n\

127− id: artShapeLoader; \n\

128− anchors { %1 } \n\

129− objectName: "artShapeLoader"; \n\

130− readonly property string cardArt: cardData && cardData["art"] || %8; \n\

131− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\

132− active: cardArt != ""; \n\

133− asynchronous: %5; \n\

134− visible: status === Loader.Ready; \n\

135− sourceComponent: Item { \n\

136− id: artShape; \n\

137− objectName: "artShape"; \n\

138− visible: image.status === Image.Ready; \n\

139− readonly property alias image: artImage; \n\

140− %6 \n\

141− width: image.status !== Image.Ready ? 0 : image.width; \n\

142− height: image.status !== Image.Ready ? 0 : image.height; \n\

143− CroppedImageMinimumSourceSize { \n\

144− id: artImage; \n\

145− objectName: "artImage"; \n\

146− source: artShapeLoader.cardArt; \n\

147− asynchronous: %5; \n\

148− visible: %4; \n\

149− width: %2; \n\

150− height: %3; \n\

151− %7 \n\

152− } \n\

153− } \n\

154− }\n';

155−

156−// %1 is anchors.fill

157−// %2 is width

158−// %3 is height

159−// %4 is whether the icon should be asynchronous or not

160−var kAudioButtonCode = 'AbstractButton { \n\

161− id: audioButton; \n\

162− anchors.fill: %1; \n\

163− width: %2; \n\

164− height: %3; \n\

165− readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\

166− UbuntuShape { \n\

167− anchors.fill: parent; \n\

168− visible: parent.pressed; \n\

169− radius: "medium"; \n\

170− } \n\

171− Rectangle { \n\

172− color: Qt.rgba(0, 0, 0, 0.5); \n\

173− anchors.centerIn: parent; \n\

174− width: parent.width * 0.5; \n\

175− height: width; \n\

176− radius: width / 2; \n\

177− } \n\

178− Icon { \n\

179− anchors.centerIn: parent; \n\

180− width: parent.width * 0.3; \n\

181− height: width; \n\

182− opacity: 0.9; \n\

183− name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\

184− color: "white"; \n\

185− asynchronous: %4; \n\

186− } \n\

187− onClicked: { \n\

188− if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\

189− if (DashAudioPlayer.playing) { \n\

190− DashAudioPlayer.pause(); \n\

191− } else { \n\

192− DashAudioPlayer.play(); \n\

193− } \n\

194− } else { \n\

195− var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\

196− DashAudioPlayer.playSource(source, playlist); \n\

197− } \n\

198− } \n\

199− onPressAndHold: { \n\

200− root.pressAndHold(); \n\

201− } \n\

202− }';

203−

204−// %1 is whether the loader should be asynchronous or not

205−// %2 is the header height code

206−var kOverlayLoaderCode = 'Loader { \n\

207− id: overlayLoader; \n\

208− readonly property real overlayHeight: %2 + units.gu(2); \n\

209− anchors.fill: artShapeLoader; \n\

210− active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\

211− asynchronous: %1; \n\

212− visible: showHeader && status === Loader.Ready; \n\

213− sourceComponent: UbuntuShapeOverlay { \n\

214− id: overlay; \n\

215− property real luminance: Style.luminance(overlayColor); \n\

216− aspect: UbuntuShape.Flat; \n\

217− radius: "medium"; \n\

218− overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\

219− overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\

220− } \n\

221− }\n';

222−

223−// multiple row version of HeaderRowCode

224−function kHeaderRowCodeGenerator() {

225− var kHeaderRowCodeTemplate = 'Row { \n\

226− id: row; \n\

227− objectName: "outerRow"; \n\

228− property real margins: units.gu(1); \n\

229− spacing: margins; \n\

230− %2\

231− anchors { %1 } \n\

232− anchors.right: parent.right; \n\

233− anchors.margins: margins; \n\

234− anchors.rightMargin: 0; \n\

235− data: [ \n\

236− %3 \n\

237− ] \n\

238− }\n';

239− var args = Array.prototype.slice.call(arguments);

240− var isCardTool = args.shift();

241− var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";

242− var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));

243− return code;

244−}

245−

246−// multiple item version of kHeaderContainerCode

247−function kHeaderContainerCodeGenerator() {

248− var headerContainerCodeTemplate = 'Item { \n\

249− id: headerTitleContainer; \n\

250− anchors { %1 } \n\

251− width: parent.width - x; \n\

252− implicitHeight: %2; \n\

253− data: [ \n\

254− %3 \n\

255− ]\n\

256− }\n';

257− var args = Array.prototype.slice.call(arguments);

258− var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));

259− return code;

260−}

261−

262−// %1 is used as anchors of mascotShapeLoader

263−// %2 is whether the loader should be asynchronous or not

264−var kMascotShapeLoaderCode = 'Loader { \n\

265− id: mascotShapeLoader; \n\

266− objectName: "mascotShapeLoader"; \n\

267− asynchronous: %2; \n\

268− active: mascotImage.status === Image.Ready; \n\

269− visible: showHeader && active && status === Loader.Ready; \n\

270− width: units.gu(6); \n\

271− height: units.gu(5.625); \n\

272− sourceComponent: UbuntuShape { image: mascotImage } \n\

273− anchors { %1 } \n\

274− }\n';

275−

276−// %1 is used as anchors of mascotImage

277−// %2 is used as visible of mascotImage

278−// %3 is injected as code to mascotImage

279−// %4 is used as fallback image

280−var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\

281− id: mascotImage; \n\

282− objectName: "mascotImage"; \n\

283− anchors { %1 } \n\

284− source: cardData && cardData["mascot"] || %4; \n\

285− width: units.gu(6); \n\

286− height: units.gu(5.625); \n\

287− horizontalAlignment: Image.AlignHCenter; \n\

288− verticalAlignment: Image.AlignVCenter; \n\

289− visible: %2; \n\

290− %3 \n\

291− }\n';

292−

293−// %1 is used as anchors of titleLabel

294−// %2 is used as color of titleLabel

295−// %3 is used as extra condition for visible of titleLabel

296−// %4 is used as title width

297−// %5 is used as horizontal alignment

298−var kTitleLabelCode = 'Label { \n\

299− id: titleLabel; \n\

300− objectName: "titleLabel"; \n\

301− anchors { %1 } \n\

302− elide: Text.ElideRight; \n\

303− fontSize: "small"; \n\

304− wrapMode: Text.Wrap; \n\

305− maximumLineCount: 2; \n\

306− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

307− color: %2; \n\

308− visible: showHeader %3; \n\

309− width: %4; \n\

310− text: root.title; \n\

311− font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\

312− horizontalAlignment: %5; \n\

313− }\n';

314−

315−// %1 is used as extra anchors of emblemIcon

316−// %2 is used as color of emblemIcon

317−// FIXME The width code is a

318−// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293

319−var kEmblemIconCode = 'Icon { \n\

320− id: emblemIcon; \n\

321− objectName: "emblemIcon"; \n\

322− anchors { \n\

323− bottom: titleLabel.baseline; \n\

324− right: parent.right; \n\

325− %1 \n\

326− } \n\

327− source: cardData && cardData["emblem"] || ""; \n\

328− color: %2; \n\

329− height: source != "" ? titleLabel.font.pixelSize : 0; \n\

330− width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\

331− }\n';

332−

333−// %1 is used as anchors of touchdown effect

334−var kTouchdownCode = 'UbuntuShape { \n\

335− id: touchdown; \n\

336− objectName: "touchdown"; \n\

337− anchors { %1 } \n\

338− visible: root.pressed; \n\

339− radius: "medium"; \n\

340− borderSource: "radius_pressed.sci" \n\

341− }\n';

342−

343−// %1 is used as anchors of subtitleLabel

344−// %2 is used as color of subtitleLabel

345−var kSubtitleLabelCode = 'Label { \n\

346− id: subtitleLabel; \n\

347− objectName: "subtitleLabel"; \n\

348− anchors { %1 } \n\

349− anchors.topMargin: units.dp(2); \n\

350− elide: Text.ElideRight; \n\

351− maximumLineCount: 1; \n\

352− fontSize: "x-small"; \n\

353− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

354− color: %2; \n\

355− visible: titleLabel.visible && titleLabel.text; \n\

356− text: cardData && cardData["subtitle"] || ""; \n\

357− font.weight: Font.Light; \n\

358− }\n';

359−

360−// %1 is used as anchors of attributesRow

361−// %2 is used as color of attributesRow

362−var kAttributesRowCode = 'CardAttributes { \n\

363− id: attributesRow; \n\

364− objectName: "attributesRow"; \n\

365− anchors { %1 } \n\

366− color: %2; \n\

367− fontScale: root.fontScale; \n\

368− model: cardData && cardData["attributes"]; \n\

369− }\n';

370−

371−// %1 is used as anchors of socialActionsRow

372−// %2 is used as color of socialActionsRow

373−var kSocialActionsRowCode = 'CardSocialActions { \n\

374− id: socialActionsRow; \n\

375− objectName: "socialActionsRow"; \n\

376− anchors { %1 } \n\

377− color: %2; \n\

378− model: cardData && cardData["socialActions"]; \n\

379− onClicked: root.action(actionId); \n\

380− }\n';

381−

382−// %1 is used as top anchor of summary

383−// %2 is used as topMargin anchor of summary

384−// %3 is used as color of summary

385−var kSummaryLabelCode = 'Label { \n\

386− id: summary; \n\

387− objectName: "summaryLabel"; \n\

388− anchors { \n\

389− top: %1; \n\

390− left: parent.left; \n\

391− right: parent.right; \n\

392− margins: units.gu(1); \n\

393− topMargin: %2; \n\

394− } \n\

395− wrapMode: Text.Wrap; \n\

396− maximumLineCount: 5; \n\

397− elide: Text.ElideRight; \n\

398− text: cardData && cardData["summary"] || ""; \n\

399− height: text ? implicitHeight : 0; \n\

400− fontSize: "small"; \n\

401− color: %3; \n\

402− }\n';

403−

404−// %1 is used as bottom anchor of audio progress bar

405−// %2 is used as left anchor of audio progress bar

406−// %3 is used as text color

407−var kAudioProgressBarCode = 'CardAudioProgress { \n\

408− id: audioProgressBar; \n\

409− duration: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["duration"]) || 0; \n\

410− source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\

411− anchors { \n\

412− bottom: %1; \n\

413− left: %2; \n\

414− right: parent.right; \n\

415− margins: units.gu(1); \n\

416− } \n\

417− color: %3; \n\

418− }';

419−

420−function sanitizeColor(colorString) {

421− if (colorString !== undefined) {

422− if (colorString.match(/^[#a-z0-9]*$/i) === null) {

423− // This is not the perfect regexp for color

424− // but what we're trying to do here is just protect

425− // against injection so it's ok

426− return "";

427− }

428− }

429− return colorString;

430−}

431−

432−function cardString(template, components, isCardTool, artShapeStyle, categoryLayout) {

433− var code;

434−

435− var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";

436−

437− code = 'AbstractButton { \n\

438− id: root; \n\

439− property var cardData; \n\

440− property string backgroundShapeStyle: "inset"; \n\

441− property real fontScale: 1.0; \n\

442− property var scopeStyle: null; \n\

443− readonly property string title: cardData && cardData["title"] || ""; \n\

444− property bool showHeader: true; \n\

445− implicitWidth: childrenRect.width; \n\

446− enabled: %1; \n\

447− \n'.arg(templateInteractive);

448−

449− if (!isCardTool) {

450− code += "property int fixedHeaderHeight: -1; \n\

451− property size fixedArtShapeSize: Qt.size(-1, -1); \n";

452− }

453−

454− var hasArt = components["art"] && components["art"]["field"] || false;

455− var hasSummary = components["summary"] || false;

456− var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;

457− var artAndSummary = hasArt && hasSummary && !isConciergeMode;

458− var isHorizontal = template["card-layout"] === "horizontal";

459− var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||

460− (hasSummary && (template["card-background"] || components["background"]));

461− var hasTitle = components["title"] || false;

462− var hasMascot = components["mascot"] || false;

463− var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;

464− var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);

465− var hasSubtitle = hasTitle && components["subtitle"] || false;

466− var hasHeaderRow = hasMascot && hasTitle;

467− var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;

468− var hasSocialActions = hasTitle && components["social-actions"] || false;

469− var isAudio = template["quick-preview-type"] === "audio";

470− var asynchronous = isCardTool ? "false" : "true";

471−

472− code += 'signal action(var actionId);\n';

473− if (isAudio) {

474− // For now we only support audio cards with [optional] art, title, subtitle

475− // in horizontal mode

476− // Anything else makes it behave not like an audio card

477− if (hasSummary) isAudio = false;

478− if (!isHorizontal) isAudio = false;

479− if (hasMascot) isAudio = false;

480− if (hasEmblem) isAudio = false;

481− if (headerAsOverlay) isAudio = false;

482− if (hasAttributes) isAudio = false;

483− }

484−

485− if (hasBackground) {

486− var templateCardBackground;

487− if (template && typeof template["card-background"] === "string") {

488− templateCardBackground = 'decodeURI("' + encodeURI(template["card-background"]) + '")';

489− } else {

490− templateCardBackground = '""';

491− }

492−

493− var backgroundElements0;

494− var backgroundElements1;

495− if (template && typeof template["card-background"] === "object" && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {

496− var element0 = sanitizeColor(template["card-background"]["elements"][0]);

497− var element1 = sanitizeColor(template["card-background"]["elements"][1]);

498− if (element0 !== undefined) {

499− backgroundElements0 = '"%1"'.arg(element0);

500− }

501− if (element1 !== undefined) {

502− backgroundElements1 = '"%1"'.arg(element1);

503− }

504− }

505− code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);

506− }

507−

508− if (hasArt) {

509− code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';

510−

511− var artShapeAspect;

512− if (isCardTool) {

513− var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;

514− if (isNaN(artShapeAspect)) {

515− artShapeAspect = 1;

516− }

517− } else {

518− artShapeAspect = "(root.fixedArtShapeSize.width / root.fixedArtShapeSize.height)";

519− }

520−

521− var widthCode, heightCode;

522− var artAnchors;

523− if (isHorizontal) {

524− artAnchors = 'left: parent.left';

525− if (hasMascot || hasTitle) {

526− widthCode = 'height * ' + artShapeAspect;

527− heightCode = 'headerHeight + 2 * units.gu(1)';

528− } else {

529− // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?

530− // So we define a "random" height of the image height + 2 gu for the margins

531− widthCode = 'height * ' + artShapeAspect

532− heightCode = 'units.gu(7.625)';

533− }

534− } else {

535− artAnchors = 'horizontalCenter: parent.horizontalCenter;';

536− widthCode = 'root.width'

537− heightCode = 'width / ' + artShapeAspect;

538− }

539−

540− var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";

541− fallback = encodeURI(fallback);

542− var fallbackStatusCode = "";

543− var fallbackURICode = '""';

544− if (fallback !== "") {

545− // fallbackStatusCode has %8 in it because we want to substitute it for fallbackURICode

546− // which in kArtShapeHolderCode is %8

547− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';

548− fallbackURICode = 'decodeURI("%1")'.arg(fallback);

549− }

550− var artShapeHolderShapeCode;

551− if (!isConciergeMode) {

552− if (artShapeStyle === "icon") {

553− artShapeHolderShapeCode = kArtProportionalShapeCode;

554− } else {

555− var artShapeHolderShapeAspect;

556− switch (artShapeStyle) {

557− case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;

558− case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;

559− default:

560− case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;

561− }

562− artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(artShapeHolderShapeAspect);

563− }

564− } else {

565− artShapeHolderShapeCode = "";

566− }

567− var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;

568− code += artShapeHolderCode.arg(artAnchors)

569− .arg(widthCode)

570− .arg(heightCode)

571− .arg(isConciergeMode ? "true" : "false")

572− .arg(asynchronous)

573− .arg(artShapeHolderShapeCode)

574− .arg(fallbackStatusCode)

575− .arg(fallbackURICode);

576− } else {

577− code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'

578− }

579−

580− if (headerAsOverlay) {

581− var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";

582− code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);

583− }

584−

585− var headerVerticalAnchors;

586− if (headerAsOverlay) {

587− headerVerticalAnchors = 'bottom: artShapeLoader.bottom; \n\

588− bottomMargin: units.gu(1);\n';

589− } else {

590− if (hasArt) {

591− if (isHorizontal) {

592− headerVerticalAnchors = 'top: artShapeLoader.top; \n\

593− topMargin: units.gu(1);\n';

594− } else {

595− headerVerticalAnchors = 'top: artShapeLoader.bottom; \n\

596− topMargin: units.gu(1);\n';

597− }

598− } else {

599− headerVerticalAnchors = 'top: parent.top; \n\

600− topMargin: units.gu(1);\n';

601− }

602− }

603−

604− var headerLeftAnchor;

605− var headerLeftAnchorHasMargin = false;

606− if (isHorizontal && hasArt) {

607− headerLeftAnchor = 'left: artShapeLoader.right; \n\

608− leftMargin: units.gu(1);\n';

609− headerLeftAnchorHasMargin = true;

610− } else if (isHorizontal && isAudio) {

611− headerLeftAnchor = 'left: audioButton.right; \n\

612− leftMargin: units.gu(1);\n';

613− headerLeftAnchorHasMargin = true;

614− } else {

615− headerLeftAnchor = 'left: parent.left;\n';

616− }

617−

618− var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary && !isAudio;

619−

620− if (hasHeaderRow) {

621− code += 'readonly property int headerHeight: row.height;\n'

622− } else if (hasMascot) {

623− code += 'readonly property int headerHeight: mascotImage.height;\n'

624− } else if (hasAttributes) {

625− if (hasTitle && hasSubtitle) {

626− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + attributesRow.height + attributesRow.anchors.topMargin;\n'

627− } else if (hasTitle) {

628− code += 'readonly property int headerHeight: titleLabel.height + attributesRow.height + attributesRow.anchors.topMargin;\n'

629− } else {

630− code += 'readonly property int headerHeight: attributesRow.height;\n'

631− }

632− } else if (isAudio) {

633− if (hasSubtitle) {

634− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'

635− } else if (hasTitle) {

636− code += 'readonly property int headerHeight: titleLabel.height + audioProgressBar.height + audioProgressBar.anchors.topMargin;\n'

637− } else {

638− code += 'readonly property int headerHeight: audioProgressBar.height;\n'

639− }

640− } else if (hasSubtitle) {

641− code += 'readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;\n'

642− } else if (hasTitle) {

643− code += 'readonly property int headerHeight: titleLabel.height;\n'

644− } else {

645− code += 'readonly property int headerHeight: 0;\n'

646− }

647−

648− var mascotShapeCode = '';

649− var mascotCode = '';

650− if (hasMascot) {

651− var useMascotShape = !hasBackground && !headerAsOverlay;

652− var mascotAnchors = '';

653− if (!hasHeaderRow) {

654− mascotAnchors += headerLeftAnchor;

655− mascotAnchors += headerVerticalAnchors;

656− if (!headerLeftAnchorHasMargin) {

657− mascotAnchors += 'leftMargin: units.gu(1);\n'

658− }

659− } else {

660− mascotAnchors = 'verticalCenter: parent.verticalCenter;'

661− }

662−

663− if (useMascotShape) {

664− mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);

665− }

666−

667− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';

668− var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";

669− fallback = encodeURI(fallback);

670− var fallbackStatusCode = "";

671− var fallbackURICode = '""';

672− if (fallback !== "") {

673− // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode

674− // which in kMascotImageCode is %4

675− fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %4;';

676− fallbackURICode = 'decodeURI("%1")'.arg(fallback);

677− }

678− mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackStatusCode).arg(fallbackURICode);

679− }

680−

681− 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")';

682−

683− var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

684− var titleSubtitleCode = '';

685− if (hasTitle) {

686− var titleColor;

687− if (headerAsOverlay) {

688− titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';

689− } else if (hasSummary) {

690− titleColor = 'summary.color';

691− } else if (hasBackground) {

692− titleColor = summaryColorWithBackground;

693− } else {

694− titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

695− }

696−

697− var titleAnchors;

698− var subtitleAnchors;

699− var attributesAnchors;

700− var titleContainerAnchors;

701− var titleRightAnchor;

702− var titleWidth = "undefined";

703−

704− var extraRightAnchor = '';

705− var extraLeftAnchor = '';

706− if (!touchdownOnArtShape) {

707− extraRightAnchor = 'rightMargin: units.gu(1); \n';

708− extraLeftAnchor = 'leftMargin: units.gu(1); \n';

709− } else if (headerAsOverlay && !hasEmblem) {

710− extraRightAnchor = 'rightMargin: units.gu(1); \n';

711− }

712−

713− if (hasMascot) {

714− titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';

715− } else {

716− titleContainerAnchors = 'right: parent.right; ';

717− titleContainerAnchors += headerLeftAnchor;

718− titleContainerAnchors += headerVerticalAnchors;

719− if (!headerLeftAnchorHasMargin) {

720− titleContainerAnchors += extraLeftAnchor;

721− }

722− }

723− if (hasEmblem) {

724− titleRightAnchor = 'right: emblemIcon.left; \n\

725− rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';

726− } else {

727− titleRightAnchor = 'right: parent.right; \n'

728− titleRightAnchor += extraRightAnchor;

729− }

730−

731− if (hasTitleContainer) {

732− // Using headerTitleContainer

733− titleAnchors = titleRightAnchor;

734− titleAnchors += 'left: parent.left; \n\

735− top: parent.top;';

736− subtitleAnchors = 'right: parent.right; \n\

737− left: parent.left; \n';

738− subtitleAnchors += extraRightAnchor;

739− if (hasSubtitle) {

740− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';

741− subtitleAnchors += 'top: titleLabel.bottom;\n';

742− } else {

743− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';

744− }

745− } else if (hasMascot) {

746− // Using row without titleContainer

747− titleAnchors = 'verticalCenter: parent.verticalCenter;\n';

748− titleWidth = "parent.width - x";

749− } else {

750− if (headerAsOverlay) {

751− // Using anchors to the overlay

752− titleAnchors = titleRightAnchor;

753− titleAnchors += 'left: parent.left; \n\

754− leftMargin: units.gu(1); \n\

755− top: overlayLoader.top; \n\

756− topMargin: units.gu(1) + overlayLoader.height - overlayLoader.overlayHeight; \n';

757− } else {

758− // Using anchors to the mascot/parent

759− titleAnchors = titleRightAnchor;

760− titleAnchors += headerLeftAnchor;

761− titleAnchors += headerVerticalAnchors;

762− if (!headerLeftAnchorHasMargin) {

763− titleAnchors += extraLeftAnchor;

764− }

765− }

766− subtitleAnchors = 'left: titleLabel.left; \n\

767− leftMargin: titleLabel.leftMargin; \n';

768− subtitleAnchors += extraRightAnchor;

769− if (hasEmblem) {

770− // using container

771− subtitleAnchors += 'right: parent.right; \n';

772− } else {

773− subtitleAnchors += 'right: titleLabel.right; \n';

774− }

775−

776− if (hasSubtitle) {

777− attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';

778− subtitleAnchors += 'top: titleLabel.bottom;\n';

779− } else {

780− attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';

781− }

782− }

783−

784− var titleAlignment = "Text.AlignHCenter";

785− if (template["card-layout"] === "horizontal"

786− || typeof components["title"] !== "object"

787− || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";

788− var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];

789− for (var key in keys) {

790− key = keys[key];

791− try {

792− if (typeof components[key] === "string"

793− || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";

794− } catch (e) {

795− continue;

796− }

797− }

798−

799− // code for different elements

800− var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');

801− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);

802− var subtitleCode;

803− var attributesCode;

804−

805− // code for the title container

806− var containerCode = [];

807− var containerHeight = 'titleLabel.height';

808− containerCode.push(titleCode);

809− if (hasSubtitle) {

810− subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);

811− containerCode.push(subtitleCode);

812− containerHeight += ' + subtitleLabel.height';

813− }

814− if (hasEmblem) {

815− containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));

816− }

817− if (hasAttributes) {

818− attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);

819− containerCode.push(attributesCode);

820− containerHeight += ' + attributesRow.height';

821− }

822−

823− if (hasTitleContainer) {

824− // use container

825− titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);

826− } else {

827− // no container

828− titleSubtitleCode = titleCode;

829− if (hasSubtitle) {

830− titleSubtitleCode += subtitleCode;

831− }

832− if (hasAttributes) {

833− titleSubtitleCode += attributesCode;

834− }

835− }

836− }

837−

838− if (hasHeaderRow) {

839− var rowCode = [mascotCode, titleSubtitleCode];

840− if (mascotShapeCode != '') {

841− rowCode.unshift(mascotShapeCode);

842− }

843− code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)

844− } else {

845− code += mascotShapeCode + mascotCode + titleSubtitleCode;

846− }

847−

848− if (isAudio) {

849− var audioProgressBarLeftAnchor = 'audioButton.right';

850− var audioProgressBarBottomAnchor = 'audioButton.bottom';

851− var audioProgressBarTextColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

852−

853− code += kAudioProgressBarCode.arg(audioProgressBarBottomAnchor)

854− .arg(audioProgressBarLeftAnchor)

855− .arg(audioProgressBarTextColor);

856−

857− var audioButtonAnchorsFill;

858− var audioButtonWidth;

859− var audioButtonHeight;

860− if (hasArt) {

861− audioButtonAnchorsFill = 'artShapeLoader';

862− audioButtonWidth = 'undefined';

863− audioButtonHeight = 'undefined';

864− } else {

865− audioButtonAnchorsFill = 'undefined';

866− audioButtonWidth = 'height';

867− audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'

868− : 'root.fixedHeaderHeight + 2 * units.gu(1)';

869− }

870− code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);

871− }

872−

873− if (hasSummary) {

874− var summaryTopAnchor;

875− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

876− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

877− else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';

878− else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';

879− else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';

880− else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';

881− else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';

882− else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';

883− else if (hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

884− else summaryTopAnchor = 'parent.top';

885−

886− var summaryColor;

887− if (hasBackground) {

888− summaryColor = summaryColorWithBackground;

889− } else {

890− summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

891− }

892−

893− var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');

894−

895− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);

896− }

897−

898− if (hasSocialActions) {

899− var socialAnchors;

900− var socialTopAnchor;

901−

902− if (hasSummary) socialTopAnchor = 'summary.bottom;';

903− else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

904− else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

905− else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';

906− else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';

907− else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';

908− else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';

909− else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';

910− else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';

911− else if (hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

912− else socialTopAnchor = 'parent.top';

913−

914− socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'

915−

916− var socialColor;

917− if (hasBackground) {

918− socialColor = summaryColorWithBackground;

919− } else {

920− socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

921− }

922−

923− code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);

924− }

925−

926− if (artShapeStyle != "shadow" && artShapeStyle != "icon") {

927− var touchdownAnchors;

928− if (hasBackground) {

929− touchdownAnchors = 'fill: backgroundLoader';

930− } else if (touchdownOnArtShape) {

931− touchdownAnchors = 'fill: artShapeLoader';

932− } else {

933− touchdownAnchors = 'fill: root'

934− }

935− code += kTouchdownCode.arg(touchdownAnchors);

936− }

937−

938− if (isCardTool || categoryLayout !== "grid") {

939− var implicitHeight = 'implicitHeight: ';

940− if (hasSocialActions) {

941− implicitHeight += 'socialActionsRow.y + socialActionsRow.height + units.gu(1);\n';

942− } else if (hasSummary) {

943− implicitHeight += 'summary.y + summary.height + units.gu(1);\n';

944− } else if (isAudio) {

945− implicitHeight += 'audioButton.height;\n';

946− } else if (headerAsOverlay) {

947− implicitHeight += 'artShapeLoader.height;\n';

948− } else if (hasHeaderRow) {

949− implicitHeight += 'row.y + row.height + units.gu(1);\n';

950− } else if (hasMascot) {

951− implicitHeight += 'mascotImage.y + mascotImage.height;\n';

952− } else if (hasTitleContainer) {

953− implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';

954− } else if (hasAttributes) {

955− implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';

956− } else if (hasSubtitle) {

957− implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';

958− } else if (hasTitle) {

959− implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';

960− } else if (hasArt) {

961− implicitHeight += 'artShapeLoader.height;\n';

962− } else {

963− implicitHeight = '';

964− }

965− } else {

966− implicitHeight = '';

967− }

968−

969− // Close the AbstractButton

970− code += implicitHeight + '}\n';

971−

972− return code;

973−}

974−

975−function createCardComponent(parent, template, components, isCardTool, artShapeStyle, categoryLayout, identifier) {

976− var imports = 'import QtQuick 2.4; \n\

977− import Ubuntu.Components 1.3; \n\

978− import Ubuntu.Settings.Components 0.1; \n\

979− import Dash 0.1;\n\

980− import Utils 0.1;\n';

981− var card = cardString(template, components, isCardTool, artShapeStyle, categoryLayout);

982− var code = imports + 'Component {\n' + card + '}\n';

983−

984− try {

985− return Qt.createQmlObject(code, parent, identifier);

986− } catch (e) {

987− console.error("ERROR: Invalid component created.");

988− console.error("Template:");

989− console.error(JSON.stringify(template));

990− console.error("Components:");

991− console.error(JSON.stringify(components));

992− console.error("Code:");

993− console.error(code);

994− throw e;

995− }

996−}

plugins/Dash/CardCreatorCache.qmldeleted−40

@@ -1,40 +0,0 @@

1−/*

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, categoryLayout) {

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 + categoryLayout;

33− var component = cache[allString];

34− if (component === undefined) {

35− component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, categoryLayout, allString);

36− cache[allString] = component;

37− }

38− return component;

39− }

40−}

plugins/Dash/CardSocialActions.qmldeleted−94

@@ -1,94 +0,0 @@

1−/*

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

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

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

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

@@ -1,359 +0,0 @@

1−/*

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−#include <private/qquickitem_p.h>

20−

21−AbstractDashView::AbstractDashView()

22− : m_delegateModel(nullptr)

23− , m_asyncRequestedIndex(-1)

24− , m_columnSpacing(0)

25− , m_rowSpacing(0)

26− , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4

27− , m_displayMarginBeginning(0)

28− , m_displayMarginEnd(0)

29− , m_needsRelayout(false)

30− , m_delegateValidated(false)

31− , m_implicitHeightDirty(false)

32−{

33− connect(this, &AbstractDashView::widthChanged, this, &AbstractDashView::relayout);

34− connect(this, &AbstractDashView::heightChanged, this, &AbstractDashView::onHeightChanged);

35−}

36−

37−QAbstractItemModel *AbstractDashView::model() const

38−{

39− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;

40−}

41−

42−void AbstractDashView::setModel(QAbstractItemModel *model)

43−{

44− if (model != this->model()) {

45− if (!m_delegateModel) {

46− createDelegateModel();

47− } else {

48− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);

49− }

50− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

51− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &AbstractDashView::onModelUpdated);

52−

53− cleanupExistingItems();

54−

55− Q_EMIT modelChanged();

56− polish();

57− }

58−}

59−

60−QQmlComponent *AbstractDashView::delegate() const

61−{

62− return m_delegateModel ? m_delegateModel->delegate() : nullptr;

63−}

64−

65−void AbstractDashView::setDelegate(QQmlComponent *delegate)

66−{

67− if (delegate != this->delegate()) {

68− if (!m_delegateModel) {

69− createDelegateModel();

70− }

71−

72− cleanupExistingItems();

73−

74− m_delegateModel->setDelegate(delegate);

75−

76− Q_EMIT delegateChanged();

77− m_delegateValidated = false;

78− polish();

79− }

80−}

81−

82−qreal AbstractDashView::columnSpacing() const

83−{

84− return m_columnSpacing;

85−}

86−

87−void AbstractDashView::setColumnSpacing(qreal columnSpacing)

88−{

89− if (columnSpacing != m_columnSpacing) {

90− m_columnSpacing = columnSpacing;

91− Q_EMIT columnSpacingChanged();

92−

93− if (isComponentComplete()) {

94− relayout();

95− }

96− }

97−}

98−

99−qreal AbstractDashView::rowSpacing() const

100−{

101− return m_rowSpacing;

102−}

103−

104−void AbstractDashView::setRowSpacing(qreal rowSpacing)

105−{

106− if (rowSpacing != m_rowSpacing) {

107− m_rowSpacing = rowSpacing;

108− Q_EMIT rowSpacingChanged();

109−

110− if (isComponentComplete()) {

111− relayout();

112− }

113− }

114−}

115−

116−int AbstractDashView::cacheBuffer() const

117−{

118− return m_buffer;

119−}

120−

121−void AbstractDashView::setCacheBuffer(int buffer)

122−{

123− if (buffer < 0) {

124− qmlInfo(this) << "Cannot set a negative cache buffer";

125− return;

126− }

127−

128− if (m_buffer != buffer) {

129− m_buffer = buffer;

130− if (isComponentComplete()) {

131− polish();

132− }

133− emit cacheBufferChanged();

134− }

135−}

136−

137−qreal AbstractDashView::displayMarginBeginning() const

138−{

139− return m_displayMarginBeginning;

140−}

141−

142−void AbstractDashView::setDisplayMarginBeginning(qreal begin)

143−{

144− if (m_displayMarginBeginning == begin)

145− return;

146− m_displayMarginBeginning = begin;

147− if (isComponentComplete()) {

148− polish();

149− }

150− emit displayMarginBeginningChanged();

151−}

152−

153−qreal AbstractDashView::displayMarginEnd() const

154−{

155− return m_displayMarginEnd;

156−}

157−

158−void AbstractDashView::setDisplayMarginEnd(qreal end)

159−{

160− if (m_displayMarginEnd == end)

161− return;

162− m_displayMarginEnd = end;

163− if (isComponentComplete()) {

164− polish();

165− }

166− emit displayMarginEndChanged();

167−}

168−

169−void AbstractDashView::createDelegateModel()

170−{

171− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

172− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &AbstractDashView::itemCreated);

173− if (isComponentComplete())

174− m_delegateModel->componentComplete();

175−}

176−

177−void AbstractDashView::refill()

178−{

179− if (!isComponentComplete() || height() < 0) {

180− return;

181− }

182−

183− const qreal from = -m_displayMarginBeginning;

184− const qreal to = height() + m_displayMarginEnd;

185− const qreal bufferFrom = from - m_buffer;

186− const qreal bufferTo = to + m_buffer;

187−

188− bool added = addVisibleItems(from, to, false);

189− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

190− added |= addVisibleItems(bufferFrom, bufferTo, true);

191−

192− if (added || removed) {

193− m_implicitHeightDirty = true;

194− polish();

195− }

196−}

197−

198−bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)

199−{

200− if (fillToY <= fillFromY)

201− return false;

202−

203− if (!delegate())

204− return false;

205−

206− if (m_delegateModel->count() == 0)

207− return false;

208−

209− int modelIndex;

210− qreal yPos;

211− findBottomModelIndexToAdd(&modelIndex, &yPos);

212− bool changed = false;

213− while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {

214− if (!createItem(modelIndex, asynchronous))

215− break;

216−

217− changed = true;

218− findBottomModelIndexToAdd(&modelIndex, &yPos);

219− }

220−

221− findTopModelIndexToAdd(&modelIndex, &yPos);

222− while (modelIndex >= 0 && yPos > fillFromY) {

223− if (!createItem(modelIndex, asynchronous))

224− break;

225−

226− changed = true;

227− findTopModelIndexToAdd(&modelIndex, &yPos);

228− }

229−

230− return changed;

231−}

232−

233−QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

234−{

235− if (asynchronous && m_asyncRequestedIndex != -1)

236− return nullptr;

237−

238− m_asyncRequestedIndex = -1;

239− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

240− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

241− if (!item) {

242− if (object) {

243− m_delegateModel->release(object);

244− if (!m_delegateValidated) {

245− m_delegateValidated = true;

246− QObject* delegateObj = delegate();

247− qmlInfo(delegateObj ? delegateObj : this) << "Delegate must be of Item type";

248− }

249− } else {

250− m_asyncRequestedIndex = modelIndex;

251− }

252− return nullptr;

253− } else {

254− QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

255− addItemToView(modelIndex, item);

256− return item;

257− }

258−}

259−

260−void AbstractDashView::releaseItem(QQuickItem *item)

261−{

262− QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

263− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

264− if (flags & QQmlDelegateModel::Destroyed) {

265− item->setParentItem(nullptr);

266− }

267−}

268−

269−void AbstractDashView::setImplicitHeightDirty()

270−{

271− m_implicitHeightDirty = true;

272−}

273−

274−void AbstractDashView::itemCreated(int modelIndex, QObject *object)

275−{

276− QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

277− if (!item) {

278− qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

279− return;

280− }

281− item->setParentItem(this);

282−

283− // We only need to call createItem if we are here because of an asynchronous generation

284− // otherwise we are in this slot because createItem is creating the item sync

285− // and thus we don't need to call createItem again, nor need to set m_implicitHeightDirty

286− // and call polish because the sync createItem was called from addVisibleItems that

287− // is called from refill that will already do those if an item was added

288− if (modelIndex == m_asyncRequestedIndex) {

289− createItem(modelIndex, false);

290− m_implicitHeightDirty = true;

291− polish();

292− }

293−}

294−

295−void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

296−{

297− if (reset) {

298− cleanupExistingItems();

299− } else {

300− processModelRemoves(changeSet.removes());

301−

302− // The current AbstractDashViews do not support insertions that are not at the end

303− // so reset if that happens

304− Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {

305− if (insert.index < m_delegateModel->count() - 1) {

306− cleanupExistingItems();

307− break;

308− }

309− }

310− }

311− polish();

312−}

313−

314−

315−void AbstractDashView::relayout()

316−{

317− m_needsRelayout = true;

318− polish();

319−}

320−

321−void AbstractDashView::onHeightChanged()

322−{

323− polish();

324−}

325−

326−void AbstractDashView::updatePolish()

327−{

328− if (!model())

329− return;

330−

331− if (m_needsRelayout) {

332− doRelayout();

333− m_needsRelayout = false;

334− m_implicitHeightDirty = true;

335− }

336−

337− refill();

338−

339− const qreal from = -m_displayMarginBeginning;

340− const qreal to = height() + m_displayMarginEnd;

341− updateItemCulling(from, to);

342−

343− if (m_implicitHeightDirty) {

344− calculateImplicitHeight();

345− m_implicitHeightDirty = false;

346− }

347−}

348−

349−void AbstractDashView::componentComplete()

350−{

351− if (m_delegateModel)

352− m_delegateModel->componentComplete();

353−

354− QQuickItem::componentComplete();

355−

356− m_needsRelayout = true;

357−

358− polish();

359−}

plugins/Dash/abstractdashview.hdeleted−128

@@ -1,128 +0,0 @@

1−/*

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−

25−#include <private/qqmldelegatemodel_p.h>

26−#include <private/qquickitemchangelistener_p.h>

27−#include <qqmlinfo.h>

28−

29−class AbstractDashView : public QQuickItem, public QQuickItemChangeListener

30−{

31− Q_OBJECT

32−

33− Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)

34− Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

35− Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)

36− Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)

37− Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

38− Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning

39− WRITE setDisplayMarginBeginning

40− NOTIFY displayMarginBeginningChanged)

41− Q_PROPERTY(qreal displayMarginEnd READ displayMarginEnd

42− WRITE setDisplayMarginEnd

43− NOTIFY displayMarginEndChanged)

44−

45−friend class VerticalJournalTest;

46−friend class HorizontalJournalTest;

47−friend class OrganicGridTest;

48−

49−public:

50− AbstractDashView();

51−

52− QAbstractItemModel *model() const;

53− void setModel(QAbstractItemModel *model);

54−

55− QQmlComponent *delegate() const;

56− void setDelegate(QQmlComponent *delegate);

57−

58− qreal columnSpacing() const;

59− void setColumnSpacing(qreal columnSpacing);

60−

61− qreal rowSpacing() const;

62− void setRowSpacing(qreal rowSpacing);

63−

64− int cacheBuffer() const;

65− void setCacheBuffer(int);

66−

67− qreal displayMarginBeginning() const;

68− void setDisplayMarginBeginning(qreal);

69−

70− qreal displayMarginEnd() const;

71− void setDisplayMarginEnd(qreal);

72−

73−Q_SIGNALS:

74− void modelChanged();

75− void delegateChanged();

76− void columnSpacingChanged();

77− void rowSpacingChanged();

78− void cacheBufferChanged();

79− void displayMarginBeginningChanged();

80− void displayMarginEndChanged();

81−

82−protected Q_SLOTS:

83− void relayout();

84−

85−protected:

86− void updatePolish() override;

87− void componentComplete() override;

88−

89− void releaseItem(QQuickItem *item);

90− void setImplicitHeightDirty();

91−

92−private Q_SLOTS:

93− void itemCreated(int modelIndex, QObject *object);

94− void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

95− void onHeightChanged();

96−

97−private:

98− void createDelegateModel();

99− void refill();

100− bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);

101− QQuickItem *createItem(int modelIndex, bool asynchronous);

102−

103− virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

104− virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

105− virtual void addItemToView(int modelIndex, QQuickItem *item) = 0;

106− virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;

107− virtual void cleanupExistingItems() = 0;

108− virtual void doRelayout() = 0;

109− virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

110− virtual void calculateImplicitHeight() = 0;

111− virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;

112−

113− QQmlDelegateModel *m_delegateModel;

114−

115− // Index we are waiting because we requested it asynchronously

116− int m_asyncRequestedIndex;

117−

118− int m_columnSpacing;

119− int m_rowSpacing;

120− int m_buffer;

121− qreal m_displayMarginBeginning;

122− qreal m_displayMarginEnd;

123− bool m_needsRelayout;

124− bool m_delegateValidated;

125− bool m_implicitHeightDirty;

126−};

127−

128−#endif

plugins/Dash/graphics/music_progress_bg.pngdeleted

Binary file not shown.

plugins/Dash/horizontaljournal.cppdeleted−239

@@ -1,239 +0,0 @@

1−/*

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−#include <qqmlinfo.h>

30−#include <private/qqmldelegatemodel_p.h>

31−#include <private/qquickitem_p.h>

32−

33−HorizontalJournal::HorizontalJournal()

34− : m_firstVisibleIndex(-1)

35− , m_rowHeight(0)

36−{

37−}

38−

39−qreal HorizontalJournal::rowHeight() const

40−{

41− return m_rowHeight;

42−}

43−

44−void HorizontalJournal::setRowHeight(qreal rowHeight)

45−{

46− if (rowHeight != m_rowHeight) {

47− m_rowHeight = rowHeight;

48− Q_EMIT rowHeightChanged();

49−

50− if (isComponentComplete()) {

51− Q_FOREACH(QQuickItem *item, m_visibleItems) {

52− item->setHeight(rowHeight);

53− }

54− relayout();

55− }

56− }

57−}

58−

59−void HorizontalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

60−{

61− if (m_visibleItems.isEmpty()) {

62− *modelIndex = 0;

63− *yPos = 0;

64− } else {

65− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();

66− if (m_lastInRowIndexPosition.contains(*modelIndex - 1)) {

67− *yPos = m_visibleItems.last()->y() + m_rowHeight + rowSpacing();

68− } else {

69− *yPos = m_visibleItems.last()->y();

70− }

71− }

72−}

73−

74−void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

75−{

76− if (m_visibleItems.isEmpty()) {

77− *modelIndex = -1;

78− *yPos = INT_MIN;

79− } else {

80− *modelIndex = m_firstVisibleIndex - 1;

81− if (m_lastInRowIndexPosition.contains(*modelIndex)) {

82− *yPos = m_visibleItems.first()->y() - rowSpacing() - m_rowHeight;

83− } else {

84− *yPos = m_visibleItems.first()->y();

85− }

86− }

87−}

88−

89−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

90−{

91− bool changed = false;

92−

93− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {

94− releaseItem(m_visibleItems.takeFirst());

95− changed = true;

96− m_firstVisibleIndex++;

97− }

98−

99− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {

100− releaseItem(m_visibleItems.takeLast());

101− changed = true;

102− m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());

103− }

104−

105− if (m_visibleItems.isEmpty()) {

106− m_firstVisibleIndex = -1;

107− }

108−

109− return changed;

110−}

111−

112−void HorizontalJournal::addItemToView(int modelIndex, QQuickItem *item)

113−{

114− if (item->height() != m_rowHeight) {

115− qWarning() << "Item" << modelIndex << "height is not the one that the rowHeight mandates, resetting it";

116− item->setHeight(m_rowHeight);

117− }

118−

119− if (m_visibleItems.isEmpty()) {

120− Q_ASSERT(modelIndex == 0);

121− item->setY(0);

122− item->setX(0);

123− m_visibleItems << item;

124− m_firstVisibleIndex = 0;

125− } else {

126− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count()

127− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {

128− QQuickItem *lastItem = m_visibleItems.last();

129− if (lastItem->x() + lastItem->width() + columnSpacing() + item->width() <= width()) {

130− // Fits in the row

131− item->setY(lastItem->y());

132− item->setX(lastItem->x() + lastItem->width() + columnSpacing());

133− } else {

134− // Starts a new row

135− item->setY(lastItem->y() + m_rowHeight + rowSpacing());

136− item->setX(0);

137− m_lastInRowIndexPosition[modelIndex - 1] = lastItem->x();

138− }

139− m_visibleItems << item;

140− } else if (modelIndex == m_firstVisibleIndex - 1) {

141− QQuickItem *firstItem = m_visibleItems.first();

142− if (m_lastInRowIndexPosition.contains(modelIndex)) {

143− // It is the last item of its row, so start a new one since we're going back

144− item->setY(firstItem->y() - rowSpacing() - m_rowHeight);

145− item->setX(m_lastInRowIndexPosition[modelIndex]);

146− } else {

147− item->setY(firstItem->y());

148− item->setX(firstItem->x() - columnSpacing() - item->width());

149− }

150− m_firstVisibleIndex = modelIndex;

151− m_visibleItems.prepend(item);

152− } else {

153− qWarning() << "HorizontalJournal::addItemToView - Got unexpected modelIndex"

154− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

155− }

156− }

157−}

158−

159−void HorizontalJournal::cleanupExistingItems()

160−{

161− // Cleanup the existing items

162− Q_FOREACH(QQuickItem *item, m_visibleItems)

163− releaseItem(item);

164− m_visibleItems.clear();

165− m_lastInRowIndexPosition.clear();

166− m_firstVisibleIndex = -1;

167− setImplicitHeightDirty();

168−}

169−

170−void HorizontalJournal::calculateImplicitHeight()

171−{

172− if (m_firstVisibleIndex >= 0) {

173− const int nIndexes = m_firstVisibleIndex + m_visibleItems.count();

174− const double bottomMostY = m_visibleItems.last()->y() + m_rowHeight;

175− const double averageHeight = bottomMostY / nIndexes;

176− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - nIndexes));

177− } else {

178− setImplicitHeight(0);

179− }

180−}

181−

182−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

183−{

184− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

185− for (int i = remove.count - 1; i >= 0; --i) {

186− const int indexToRemove = remove.index + i;

187− // We only support removing from the end so

188− // any of the last items of a column has to be indexToRemove

189− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

190− if (indexToRemove == lastIndex) {

191− releaseItem(m_visibleItems.takeLast());

192− m_lastInRowIndexPosition.remove(indexToRemove);

193− } else {

194− if (indexToRemove < lastIndex) {

195− qDebug() << "HorizontalJournal only supports removal from the end of the model, resetting instead";

196− cleanupExistingItems();

197− break;

198− } else {

199− setImplicitHeightDirty();

200− }

201− }

202− }

203− }

204− if (m_visibleItems.isEmpty()) {

205− m_firstVisibleIndex = -1;

206− }

207−}

208−

209−

210−void HorizontalJournal::doRelayout()

211−{

212− // If m_firstVisibleIndex is not 0 we need to drop all the delegates

213− // since we can't consistently relayout without the first item being there

214−

215− if (m_firstVisibleIndex == 0) {

216− int i = 0;

217− const QList<QQuickItem*> allItems = m_visibleItems;

218− m_visibleItems.clear();

219− m_lastInRowIndexPosition.clear();

220− Q_FOREACH(QQuickItem *item, allItems) {

221− addItemToView(i, item);

222− ++i;

223− }

224− } else {

225− Q_FOREACH(QQuickItem *item, m_visibleItems) {

226− releaseItem(item);

227− }

228− m_visibleItems.clear();

229− m_lastInRowIndexPosition.clear();

230− m_firstVisibleIndex = -1;

231− }

232−}

233−

234−void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

235−{

236− Q_FOREACH(QQuickItem *item, m_visibleItems) {

237− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);

238− }

239−}

plugins/Dash/horizontaljournal.hdeleted−63

@@ -1,63 +0,0 @@

1−/*

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

@@ -1,1401 +0,0 @@

1−/*

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−#include <private/qqmlcontext_p.h>

99−#include <private/qqmldelegatemodel_p.h>

100−#include <private/qqmlglobal_p.h>

101−#include <private/qquickitem_p.h>

102−#include <private/qquickanimation_p.h>

103−// #include <private/qquickrectangle_p.h>

104−

105−qreal ListViewWithPageHeader::ListItem::height() const

106−{

107− return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);

108−}

109−

110−qreal ListViewWithPageHeader::ListItem::y() const

111−{

112− return m_item->y() - (m_sectionItem ? m_sectionItem->height() : 0);

113−}

114−

115−void ListViewWithPageHeader::ListItem::setY(qreal newY)

116−{

117− if (m_sectionItem) {

118− m_sectionItem->setY(newY);

119− m_item->setY(newY + m_sectionItem->height());

120− } else {

121− m_item->setY(newY);

122− }

123−}

124−

125−bool ListViewWithPageHeader::ListItem::culled() const

126−{

127− return QQuickItemPrivate::get(m_item)->culled;

128−}

129−

130−void ListViewWithPageHeader::ListItem::setCulled(bool culled)

131−{

132− QQuickItemPrivate::get(m_item)->setCulled(culled);

133− if (m_sectionItem)

134− QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);

135−}

136−

137−void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)

138−{

139− m_sectionItem = sectionItem;

140−}

141−

142−ListViewWithPageHeader::ListViewWithPageHeader()

143− : m_delegateModel(nullptr)

144− , m_asyncRequestedIndex(-1)

145− , m_delegateValidated(false)

146− , m_firstVisibleIndex(-1)

147− , m_minYExtent(0)

148− , m_contentHeightDirty(false)

149− , m_headerItem(nullptr)

150− , m_previousContentY(0)

151− , m_headerItemShownHeight(0)

152− , m_sectionDelegate(nullptr)

153− , m_topSectionItem(nullptr)

154− , m_forceNoClip(false)

155− , m_inLayout(false)

156− , m_inContentHeightKeepHeaderShown(false)

157− , m_cacheBuffer(0)

158−{

159− m_clipItem = new QQuickItem(contentItem());

160−// m_clipItem = new QQuickRectangle(contentItem());

161−// ((QQuickRectangle*)m_clipItem)->setColor(Qt::gray);

162−

163− m_contentYAnimation = new QQuickNumberAnimation(this);

164− m_contentYAnimation->setEasing(QEasingCurve::OutQuad);

165− m_contentYAnimation->setProperty(QStringLiteral("contentY"));

166− m_contentYAnimation->setDuration(200);

167− m_contentYAnimation->setTargetObject(this);

168−

169− connect(contentItem(), &QQuickItem::widthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);

170− connect(this, &ListViewWithPageHeader::contentHeightChanged, this, &ListViewWithPageHeader::onContentHeightChanged);

171− connect(this, &ListViewWithPageHeader::heightChanged, this, &ListViewWithPageHeader::onHeightChanged);

172− connect(m_contentYAnimation, &QQuickNumberAnimation::runningChanged, this, &ListViewWithPageHeader::contentYAnimationRunningChanged);

173−

174− setFlickableDirection(VerticalFlick);

175−}

176−

177−ListViewWithPageHeader::~ListViewWithPageHeader()

178−{

179−}

180−

181−QAbstractItemModel *ListViewWithPageHeader::model() const

182−{

183− return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;

184−}

185−

186−void ListViewWithPageHeader::setModel(QAbstractItemModel *model)

187−{

188− if (model != this->model()) {

189− if (!m_delegateModel) {

190− createDelegateModel();

191− } else {

192− disconnect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);

193− }

194− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

195− connect(m_delegateModel, &QQmlDelegateModel::modelUpdated, this, &ListViewWithPageHeader::onModelUpdated);

196− Q_EMIT modelChanged();

197− polish();

198− // TODO?

199−// Q_EMIT contentHeightChanged();

200−// Q_EMIT contentYChanged();

201− }

202−}

203−

204−QQmlComponent *ListViewWithPageHeader::delegate() const

205−{

206− return m_delegateModel ? m_delegateModel->delegate() : nullptr;

207−}

208−

209−void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)

210−{

211− if (delegate != this->delegate()) {

212− if (!m_delegateModel) {

213− createDelegateModel();

214− }

215−

216− // Cleanup the existing items

217− Q_FOREACH(ListItem *item, m_visibleItems)

218− releaseItem(item);

219− m_visibleItems.clear();

220− initializeValuesForEmptyList();

221−

222− m_delegateModel->setDelegate(delegate);

223−

224− Q_EMIT delegateChanged();

225− m_delegateValidated = false;

226− m_contentHeightDirty = true;

227− polish();

228− }

229−}

230−

231−void ListViewWithPageHeader::initializeValuesForEmptyList()

232−{

233− m_firstVisibleIndex = -1;

234− adjustMinYExtent();

235− setContentY(0);

236− m_clipItem->setY(0);

237− if (m_topSectionItem) {

238− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

239− }

240−}

241−

242−QQuickItem *ListViewWithPageHeader::header() const

243−{

244− return m_headerItem;

245−}

246−

247−void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)

248−{

249− if (m_headerItem != headerItem) {

250− qreal oldHeaderHeight = 0;

251− qreal oldHeaderY = 0;

252− if (m_headerItem) {

253− oldHeaderHeight = m_headerItem->height();

254− oldHeaderY = m_headerItem->y();

255− m_headerItem->setParentItem(nullptr);

256− QQuickItemPrivate::get(m_headerItem)->removeItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);

257− }

258− m_headerItem = headerItem;

259− if (m_headerItem) {

260− m_headerItem->setParentItem(contentItem());

261− m_headerItem->setZ(1);

262− m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();

263− QQuickItemPrivate::get(m_headerItem)->addItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);

264− }

265− qreal newHeaderHeight = m_headerItem ? m_headerItem->height() : 0;

266− if (!m_visibleItems.isEmpty() && newHeaderHeight != oldHeaderHeight) {

267− headerHeightChanged(newHeaderHeight, oldHeaderHeight, oldHeaderY);

268− polish();

269− m_contentHeightDirty = true;

270− }

271− Q_EMIT headerChanged();

272− }

273−}

274−

275−QQmlComponent *ListViewWithPageHeader::sectionDelegate() const

276−{

277− return m_sectionDelegate;

278−}

279−

280−void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

281−{

282− if (delegate != m_sectionDelegate) {

283− // TODO clean existing sections

284−

285− m_sectionDelegate = delegate;

286−

287− m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);

288− if (m_topSectionItem) {

289− m_topSectionItem->setZ(3);

290− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

291− connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);

292− }

293−

294− // TODO create sections for existing items

295−

296− Q_EMIT sectionDelegateChanged();

297− Q_EMIT stickyHeaderHeightChanged();

298− }

299−}

300−

301−QString ListViewWithPageHeader::sectionProperty() const

302−{

303− return m_sectionProperty;

304−}

305−

306−void ListViewWithPageHeader::setSectionProperty(const QString &property)

307−{

308− if (property != m_sectionProperty) {

309− m_sectionProperty = property;

310−

311− updateWatchedRoles();

312−

313− // TODO recreate sections

314−

315− Q_EMIT sectionPropertyChanged();

316− }

317−}

318−

319−bool ListViewWithPageHeader::forceNoClip() const

320−{

321− return m_forceNoClip;

322−}

323−

324−void ListViewWithPageHeader::setForceNoClip(bool noClip)

325−{

326− if (noClip != m_forceNoClip) {

327− m_forceNoClip = noClip;

328− updateClipItem();

329− Q_EMIT forceNoClipChanged();

330− }

331−}

332−

333−int ListViewWithPageHeader::stickyHeaderHeight() const

334−{

335− return m_topSectionItem ? m_topSectionItem->height() : 0;

336−}

337−

338−qreal ListViewWithPageHeader::headerItemShownHeight() const

339−{

340− return m_headerItemShownHeight;

341−}

342−

343−int ListViewWithPageHeader::cacheBuffer() const

344−{

345− return m_cacheBuffer;

346−}

347−

348−void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)

349−{

350− if (cacheBuffer < 0) {

351− qmlInfo(this) << "Cannot set a negative cache buffer";

352− return;

353− }

354−

355− if (cacheBuffer != m_cacheBuffer) {

356− m_cacheBuffer = cacheBuffer;

357− Q_EMIT cacheBufferChanged();

358− polish();

359− }

360−}

361−

362−void ListViewWithPageHeader::positionAtBeginning()

363−{

364− if (m_delegateModel->count() <= 0)

365− return;

366−

367− qreal headerHeight = (m_headerItem ? m_headerItem->height() : 0);

368− if (m_firstVisibleIndex != 0) {

369− // TODO This could be optimized by trying to reuse the interesection

370− // of items that may end up intersecting between the existing

371− // m_visibleItems and the items we are creating in the next loop

372− Q_FOREACH(ListItem *item, m_visibleItems)

373− releaseItem(item);

374− m_visibleItems.clear();

375− m_firstVisibleIndex = -1;

376−

377− // Create the item 0, it will be already correctly positioned at createItem()

378− m_clipItem->setY(0);

379− ListItem *item = createItem(0, false);

380− // Create the subsequent items

381− int modelIndex = 1;

382− qreal pos = item->y() + item->height();

383− const qreal bufferTo = height() + m_cacheBuffer;

384− while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {

385− if (!(item = createItem(modelIndex, false)))

386− break;

387− pos += item->height();

388− ++modelIndex;

389− }

390−

391− m_previousContentY = m_visibleItems.first()->y() - headerHeight;

392− }

393− setContentY(m_visibleItems.first()->y() + m_clipItem->y() - headerHeight);

394− if (m_headerItem) {

395− // TODO This should not be needed and the code that adjust the m_headerItem position

396− // in viewportMoved() should be enough but in some cases we have not found a way to reproduce

397− // yet the code of viewportMoved() fails so here we make sure that at least if we are calling

398− // positionAtBeginning the header item will be correctly positioned

399− m_headerItem->setY(-m_minYExtent);

400− }

401−}

402−

403−static inline bool uFuzzyCompare(qreal r1, qreal r2)

404−{

405− return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));

406−}

407−

408−void ListViewWithPageHeader::showHeader()

409−{

410− if (!m_headerItem)

411− return;

412−

413− const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);

414− if (!uFuzzyCompare(to, contentY())) {

415− const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();

416− if (headerShownByItsOwn && m_headerItemShownHeight == 0) {

417− // We are not clipping since we are just at the top of the viewport

418− // but because of the showHeader animation we will need to, so

419− // enable the clipping without logically moving the items

420− m_headerItemShownHeight = m_headerItem->y() + m_headerItem->height() - contentY();

421− if (!m_visibleItems.isEmpty()) {

422− updateClipItem();

423− ListItem *firstItem = m_visibleItems.first();

424− firstItem->setY(firstItem->y() - m_headerItemShownHeight);

425− layout();

426− }

427− Q_EMIT headerItemShownHeightChanged();

428− }

429− m_contentYAnimation->setTo(to);

430− contentYAnimationType = ContentYAnimationShowHeader;

431− m_contentYAnimation->start();

432− }

433−}

434−

435−int ListViewWithPageHeader::firstCreatedIndex() const

436−{

437− return m_firstVisibleIndex;

438−}

439−

440−int ListViewWithPageHeader::createdItemCount() const

441−{

442− return m_visibleItems.count();

443−}

444−

445−QQuickItem *ListViewWithPageHeader::item(int modelIndex) const

446−{

447− ListItem *item = itemAtIndex(modelIndex);

448− if (item)

449− return item->m_item;

450− else

451− return nullptr;

452−}

453−

454−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex)

455−{

456− ListItem *listItem = itemAtIndex(modelIndex);

457− if (listItem) {

458− return maximizeVisibleArea(listItem, listItem->height());

459− }

460−

461− return false;

462−}

463−

464−bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)

465−{

466− if (itemHeight < 0)

467− return false;

468−

469− ListItem *listItem = itemAtIndex(modelIndex);

470− if (listItem) {

471− return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));

472− }

473−

474− return false;

475−}

476−

477−bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listItemHeight)

478−{

479− if (listItem) {

480− layout();

481− const auto listItemY = m_clipItem->y() + listItem->y();

482− if (listItemY > contentY() && listItemY + listItemHeight > contentY() + height()) {

483− // we can scroll the list up to show more stuff

484− const auto to = qMin(listItemY, listItemY + listItemHeight - height());

485− m_contentYAnimation->setTo(to);

486− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

487− m_contentYAnimation->start();

488− } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||

489− (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))

490− {

491− // we can scroll the list down to show more stuff

492− auto realVisibleListItemY = listItemY;

493− if (m_topSectionItem) {

494− // If we are showing the top section sticky item and this item doesn't have a section

495− // item we have to make sure to scroll it a bit more so that it is not underlapping

496− // the top section sticky item

497− bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;

498− if (topSectionShown && !listItem->sectionItem()) {

499− realVisibleListItemY -= m_topSectionItem->height();

500− }

501− }

502− const auto to = qMax(realVisibleListItemY, listItemY + listItemHeight - height());

503− m_contentYAnimation->setTo(to);

504− contentYAnimationType = ContentYAnimationMaximizeVisibleArea;

505− m_contentYAnimation->start();

506− }

507− return true;

508− }

509− return false;

510−}

511−

512−qreal ListViewWithPageHeader::minYExtent() const

513−{

514−// qDebug() << "ListViewWithPageHeader::minYExtent" << m_minYExtent;

515− return m_minYExtent;

516−}

517−

518−qreal ListViewWithPageHeader::maxYExtent() const

519−{

520− return height() - contentHeight();

521−}

522−

523−void ListViewWithPageHeader::componentComplete()

524−{

525− if (m_delegateModel)

526− m_delegateModel->componentComplete();

527−

528− QQuickFlickable::componentComplete();

529−

530− polish();

531−}

532−

533−void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

534−{

535− // Check we are not being taken down and don't paint anything

536− // TODO Check if we still need this in 5.2

537− // For reproduction just inifnite loop testDash or testDashContent

538− if (!QQmlEngine::contextForObject(this)->parentContext())

539− return;

540−

541− QQuickFlickable::viewportMoved(orient);

542−// qDebug() << "ListViewWithPageHeader::viewportMoved" << contentY();

543− const qreal diff = m_previousContentY - contentY();

544− adjustHeader(diff);

545− m_previousContentY = contentY();

546− layout();

547− polish();

548−}

549−

550−void ListViewWithPageHeader::adjustHeader(qreal diff)

551−{

552− const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

553− if (m_headerItem) {

554− const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

555− if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {

556− m_headerItem->setHeight(m_headerItem->implicitHeight());

557− // We are going down (but it's not because of the rebound at the end)

558− // (but the header was not shown by it's own position)

559− // or the header is partially shown and we are not doing a maximizeVisibleArea either

560− const bool scrolledUp = m_previousContentY > contentY();

561− const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());

562− const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();

563− const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

564−

565− if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {

566− m_headerItemShownHeight = 0;

567− m_headerItem->setY(-m_minYExtent);

568− } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

569− if (maximizeVisibleAreaRunning && diff > 0) {

570− // If we are maximizing and the header was shown, make sure we hide it

571− m_headerItemShownHeight -= diff;

572− } else {

573− m_headerItemShownHeight += diff;

574− }

575− if (uFuzzyCompare(contentY(), -m_minYExtent)) {

576− m_headerItemShownHeight = 0;

577− } else {

578− m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

579− }

580− if (m_headerItemShownHeight > 0) {

581− if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {

582− m_headerItem->setY(contentY());

583− m_headerItemShownHeight = m_headerItem->height();

584− } else {

585− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

586− }

587− } else {

588− m_headerItem->setY(-m_minYExtent);

589− }

590− }

591− Q_EMIT headerItemShownHeightChanged();

592− } else {

593− // Stick the header item to the top when dragging down

594− m_headerItem->setY(contentY());

595− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

596− }

597− // We will be changing the clip item, need to accomadate for it

598− // otherwise we move the firstItem down/up twice (unless the

599− // show header animation is running, where we want to keep the viewport stable)

600− if (!showHeaderAnimationRunning) {

601− diff += oldHeaderItemShownHeight - m_headerItemShownHeight;

602− } else {

603− diff = -diff;

604− }

605− }

606− if (!m_visibleItems.isEmpty()) {

607− updateClipItem();

608− ListItem *firstItem = m_visibleItems.first();

609− firstItem->setY(firstItem->y() + diff);

610− if (showHeaderAnimationRunning) {

611− adjustMinYExtent();

612− }

613− }

614−}

615−

616−void ListViewWithPageHeader::createDelegateModel()

617−{

618− m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

619− connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &ListViewWithPageHeader::itemCreated);

620− if (isComponentComplete())

621− m_delegateModel->componentComplete();

622− updateWatchedRoles();

623−}

624−

625−void ListViewWithPageHeader::refill()

626−{

627− if (m_inLayout) {

628− return;

629− }

630− if (!isComponentComplete()) {

631− return;

632− }

633−

634− const qreal from = contentY();

635− const qreal to = from + height();

636− const qreal bufferFrom = from - m_cacheBuffer;

637− const qreal bufferTo = to + m_cacheBuffer;

638−

639− bool added = addVisibleItems(from, to, false);

640− bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

641− added |= addVisibleItems(bufferFrom, bufferTo, true);

642−

643− if (added || removed) {

644− m_contentHeightDirty = true;

645− }

646−}

647−

648−bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

649−{

650− if (!delegate())

651− return false;

652−

653− if (m_delegateModel->count() == 0)

654− return false;

655−

656− ListItem *item;

657−// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;

658−

659− int modelIndex = 0;

660− qreal pos = 0;

661− if (!m_visibleItems.isEmpty()) {

662− modelIndex = m_firstVisibleIndex + m_visibleItems.count();

663− item = m_visibleItems.last();

664− pos = item->y() + item->height() + m_clipItem->y();

665− }

666− bool changed = false;

667−// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;

668− while (modelIndex < m_delegateModel->count() && pos <= fillTo) {

669−// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;

670− if (!(item = createItem(modelIndex, asynchronous)))

671− break;

672− pos += item->height();

673− ++modelIndex;

674− changed = true;

675− }

676−

677− modelIndex = 0;

678− pos = 0;

679− if (!m_visibleItems.isEmpty()) {

680− modelIndex = m_firstVisibleIndex - 1;

681− item = m_visibleItems.first();

682− pos = item->y() + m_clipItem->y();

683− }

684− while (modelIndex >= 0 && pos > fillFrom) {

685−// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;

686− if (!(item = createItem(modelIndex, asynchronous)))

687− break;

688− pos -= item->height();

689− --modelIndex;

690− changed = true;

691− }

692−

693− return changed;

694−}

695−

696−void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

697−{

698− QQuickItem *item = listItem->m_item;

699− QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

700− if (flags & QQmlDelegateModel::Destroyed) {

701− item->setParentItem(nullptr);

702− }

703− if (listItem->sectionItem()) {

704− listItem->sectionItem()->deleteLater();

705− }

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 &sectionText, 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− if (m_headerItem) {

1338− const bool cullHeader = m_headerItem->y() + m_headerItem->height() < contentY();

1339− QQuickItemPrivate::get(m_headerItem)->setCulled(cullHeader);

1340− }

1341− m_inLayout = false;

1342−}

1343−

1344−void ListViewWithPageHeader::updatePolish()

1345−{

1346− // Check we are not being taken down and don't paint anything

1347− // TODO Check if we still need this in 5.2

1348− // For reproduction just inifnite loop testDash or testDashContent

1349− if (!QQmlEngine::contextForObject(this)->parentContext())

1350− return;

1351−

1352− Q_FOREACH(ListItem *item, m_itemsToRelease)

1353− reallyReleaseItem(item);

1354− m_itemsToRelease.clear();

1355−

1356− if (!model())

1357− return;

1358−

1359− layout();

1360−

1361− refill();

1362−

1363− if (m_contentHeightDirty) {

1364− qreal contentHeight;

1365− if (m_visibleItems.isEmpty()) {

1366− contentHeight = m_headerItem ? m_headerItem->height() : 0;

1367− } else {

1368− const int modelCount = model()->rowCount();

1369− const int visibleItems = m_visibleItems.count();

1370− const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;

1371− qreal nonCreatedHeight = 0;

1372− if (lastValidIndex != modelCount - 1) {

1373− const int visibleItems = m_visibleItems.count();

1374− qreal visibleItemsHeight = 0;

1375− Q_FOREACH(ListItem *item, m_visibleItems) {

1376− visibleItemsHeight += item->height();

1377− }

1378− const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);

1379− nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;

1380− }

1381− ListItem *item = m_visibleItems.last();

1382− contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();

1383− if (m_firstVisibleIndex != 0) {

1384− // Make sure that if we are shrinking we tell the view we still fit

1385− m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));

1386− }

1387− }

1388−

1389− m_contentHeightDirty = false;

1390− adjustMinYExtent();

1391− if (contentHeight + m_minYExtent < height()) {

1392− // need this since in the previous call to adjustMinYExtent contentHeight is not set yet

1393− m_minYExtent = 0;

1394− }

1395− m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1396− setContentHeight(contentHeight);

1397− m_inContentHeightKeepHeaderShown = false;

1398− }

1399−}

1400−

1401−#include "moc_listviewwithpageheader.cpp"

plugins/Dash/listviewwithpageheader.hdeleted−218

@@ -1,218 +0,0 @@

1−/*

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 &sectionText, 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−259

@@ -1,259 +0,0 @@

1−/*

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−#include <math.h>

20−

21−#include <private/qquickitem_p.h>

22−

23−OrganicGrid::OrganicGrid()

24− : m_firstVisibleIndex(-1)

25− , m_numberOfModulesPerRow(-1)

26−{

27−}

28−

29−QSizeF OrganicGrid::smallDelegateSize() const

30−{

31− return m_smallDelegateSize;

32−}

33−

34−void OrganicGrid::setSmallDelegateSize(const QSizeF size)

35−{

36− if (m_smallDelegateSize != size) {

37− m_smallDelegateSize = size;

38− Q_EMIT smallDelegateSizeChanged();

39−

40− if (isComponentComplete()) {

41− relayout();

42− }

43− }

44−}

45−

46−QSizeF OrganicGrid::bigDelegateSize() const

47−{

48− return m_bigDelegateSize;

49−}

50−

51−void OrganicGrid::setBigDelegateSize(const QSizeF size)

52−{

53− if (m_bigDelegateSize != size) {

54− m_bigDelegateSize = size;

55− Q_EMIT bigDelegateSizeChanged();

56−

57− if (isComponentComplete()) {

58− relayout();

59− }

60− }

61−}

62−

63−QPointF OrganicGrid::positionForIndex(int modelIndex) const

64−{

65− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();

66− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();

67− const int itemsPerRow = m_numberOfModulesPerRow * 6;

68− const int rowIndex = floor(modelIndex / itemsPerRow);

69− const int columnIndex = floor((modelIndex - rowIndex * itemsPerRow) / 6);

70−

71− qreal yPos = (moduleHeight + rowSpacing()) * rowIndex;

72− const int moduleIndex = modelIndex % 6;

73− if (moduleIndex == 2) {

74− yPos += m_smallDelegateSize.height() + rowSpacing();

75− } else if (moduleIndex == 3 || moduleIndex == 5) {

76− yPos += m_bigDelegateSize.height() + rowSpacing();

77− }

78−

79− qreal xPos = (moduleWidth + columnSpacing()) * columnIndex;

80− if (moduleIndex == 1) {

81− xPos += m_smallDelegateSize.width() + columnSpacing();

82− } else if (moduleIndex == 3) {

83− xPos += m_bigDelegateSize.width() + columnSpacing();

84− } else if (moduleIndex == 4) {

85− xPos += (m_smallDelegateSize.width() + columnSpacing()) * 2;

86− } else if (moduleIndex == 5) {

87− xPos += m_bigDelegateSize.width() + m_smallDelegateSize.width() + columnSpacing() * 2;

88− }

89−

90− return QPointF(xPos, yPos);

91−}

92−

93−QSizeF OrganicGrid::sizeForIndex(int modelIndex) const

94−{

95− const int moduleIndex = modelIndex % 6;

96− if (moduleIndex == 0 || moduleIndex == 1 || moduleIndex == 3 || moduleIndex == 5) {

97− return m_smallDelegateSize;

98− } else {

99− return m_bigDelegateSize;

100− }

101−}

102−

103−void OrganicGrid::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

104−{

105− if (m_visibleItems.isEmpty()) {

106− *modelIndex = 0;

107− *yPos = 0;

108− } else {

109− *modelIndex = m_firstVisibleIndex + m_visibleItems.count();

110− // We create stuff in a 6-module basis, so always return back

111− // the y position of the first item

112− const int firstModuleIndex = ((*modelIndex) / 6) * 6;

113− *yPos = positionForIndex(firstModuleIndex).y();

114− }

115−}

116−

117−void OrganicGrid::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

118−{

119− if (m_visibleItems.isEmpty()) {

120− *modelIndex = 0;

121− *yPos = 0;

122− } else {

123− *modelIndex = m_firstVisibleIndex - 1;

124− // We create stuff in a 6-module basis, so always return back

125− // the y position of the last item bottom

126− const int lastModuleIndex = ((*modelIndex) / 6) * 6 + 5;

127− *yPos = positionForIndex(lastModuleIndex).y();

128− *yPos += sizeForIndex(lastModuleIndex).height();

129− }

130−}

131−

132−void OrganicGrid::addItemToView(int modelIndex, QQuickItem *item)

133−{

134− // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count() or the first

135− if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {

136− m_visibleItems << item;

137− } else if (modelIndex == m_firstVisibleIndex - 1) {

138− m_firstVisibleIndex = modelIndex;

139− m_visibleItems.prepend(item);

140− } else if (modelIndex == 0) {

141− m_firstVisibleIndex = 0;

142− m_visibleItems << item;

143− } else {

144− qWarning() << "OrganicGrid::addItemToView - Got unexpected modelIndex"

145− << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

146− return;

147− }

148−

149− const QPointF pos = positionForIndex(modelIndex);

150− item->setPosition(pos);

151−

152− item->setSize(sizeForIndex(modelIndex));

153−}

154−

155−bool OrganicGrid::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

156−{

157− bool changed = false;

158−

159− // As adding, we also remove in a 6-module basis

160− int lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;

161− bool removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;

162− while (removeIndex && !m_visibleItems.isEmpty()) {

163− releaseItem(m_visibleItems.takeFirst());

164− changed = true;

165− m_firstVisibleIndex++;

166−

167− lastModuleIndex = (m_firstVisibleIndex / 6) * 6 + 5;

168− removeIndex = positionForIndex(lastModuleIndex).y() + sizeForIndex(lastModuleIndex).height() < bufferFromY;

169− }

170−

171− int firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;

172− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;

173− while (removeIndex && !m_visibleItems.isEmpty()) {

174− releaseItem(m_visibleItems.takeLast());

175− changed = true;

176−

177− firstModuleIndex = ((m_firstVisibleIndex + m_visibleItems.count() - 1) / 6) * 6;

178− removeIndex = positionForIndex(firstModuleIndex).y() > bufferToY;

179− }

180−

181− if (m_visibleItems.isEmpty()) {

182− m_firstVisibleIndex = -1;

183− }

184−

185− return changed;

186−}

187−

188−void OrganicGrid::cleanupExistingItems()

189−{

190− Q_FOREACH(QQuickItem *item, m_visibleItems)

191− releaseItem(item);

192− m_visibleItems.clear();

193− m_firstVisibleIndex = -1;

194− setImplicitHeightDirty();

195−}

196−

197−void OrganicGrid::doRelayout()

198−{

199− const qreal moduleWidth = m_smallDelegateSize.width() * 2 + columnSpacing() * 2 + m_bigDelegateSize.width();

200− m_numberOfModulesPerRow = floor((width() + columnSpacing()) / (moduleWidth + columnSpacing()));

201− m_numberOfModulesPerRow = qMax(1, m_numberOfModulesPerRow);

202−

203− int i = m_firstVisibleIndex;

204− const QList<QQuickItem*> allItems = m_visibleItems;

205− m_visibleItems.clear();

206− Q_FOREACH(QQuickItem *item, allItems) {

207− addItemToView(i, item);

208− ++i;

209− }

210−}

211−

212−void OrganicGrid::updateItemCulling(qreal visibleFromY, qreal visibleToY)

213−{

214− Q_FOREACH(QQuickItem *item, m_visibleItems) {

215− QQuickItemPrivate::get(item)->setCulled(item->y() + item->height() <= visibleFromY || item->y() >= visibleToY);

216− }

217−}

218−

219−void OrganicGrid::calculateImplicitHeight()

220−{

221− const qreal moduleHeight = m_smallDelegateSize.height() + rowSpacing() + m_bigDelegateSize.height();

222− const int itemCount = !model() ? 0 : model()->rowCount();

223− const int itemsPerRow = m_numberOfModulesPerRow * 6;

224− const int fullRows = floor(itemCount / itemsPerRow);

225− const qreal fullRowsHeight = fullRows == 0 ? 0 : fullRows * moduleHeight + rowSpacing() * (fullRows - 1);

226−

227− const int remainingItems = itemCount - fullRows * itemsPerRow;

228− if (remainingItems == 0) {

229− setImplicitHeight(fullRowsHeight);

230− } else if (remainingItems <= 2) {

231− setImplicitHeight(fullRowsHeight + m_smallDelegateSize.height() + rowSpacing());

232− } else {

233− setImplicitHeight(fullRowsHeight + rowSpacing() + moduleHeight);

234− }

235−}

236−

237−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

238−{

239− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

240− for (int i = remove.count - 1; i >= 0; --i) {

241− const int indexToRemove = remove.index + i;

242− // We only support removing from the end

243− const int lastIndex = m_firstVisibleIndex + m_visibleItems.count() - 1;

244− if (indexToRemove == lastIndex) {

245− releaseItem(m_visibleItems.takeLast());

246− } else {

247− if (indexToRemove < lastIndex) {

248− qDebug() << "OrganicGrid only supports removal from the end of the model, resetting instead";

249− cleanupExistingItems();

250− break;

251− }

252− }

253− }

254− }

255− if (m_visibleItems.isEmpty()) {

256− m_firstVisibleIndex = -1;

257− }

258− setImplicitHeightDirty();

259−}

plugins/Dash/organicgrid.hdeleted−91

@@ -1,91 +0,0 @@

1−/*

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

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

@@ -1,280 +0,0 @@

1−/*

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−#include <math.h>

31−

32−#include <private/qquickitem_p.h>

33−

34−VerticalJournal::VerticalJournal()

35− : m_columnWidth(0)

36−{

37−}

38−

39−qreal VerticalJournal::columnWidth() const

40−{

41− return m_columnWidth;

42−}

43−

44−void VerticalJournal::setColumnWidth(qreal columnWidth)

45−{

46− if (columnWidth != m_columnWidth) {

47− m_columnWidth = columnWidth;

48− Q_EMIT columnWidthChanged();

49−

50− if (isComponentComplete()) {

51− Q_FOREACH(const auto &column, m_columnVisibleItems) {

52− Q_FOREACH(const ViewItem item, column) {

53− item.m_item->setWidth(columnWidth);

54− }

55− }

56− relayout();

57− }

58− }

59−}

60−

61−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)

62−{

63− *modelIndex = 0;

64− *yPos = std::numeric_limits<qreal>::max();

65−

66− Q_FOREACH(const auto &column, m_columnVisibleItems) {

67− if (!column.isEmpty()) {

68− const ViewItem &item = column.last();

69− *yPos = qMin(*yPos, item.y() + item.height() + rowSpacing());

70− *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);

71− } else {

72− *yPos = 0;

73− }

74− }

75−}

76−

77−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

78−{

79− *modelIndex = 0;

80− *yPos = std::numeric_limits<qreal>::lowest();

81− int columnToAddTo = -1;

82−

83− // Find the topmost free column

84− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

85− const auto &column = m_columnVisibleItems[i];

86− if (!column.isEmpty()) {

87− const ViewItem &item = column.first();

88− const auto itemTopPos = item.y() - rowSpacing();

89− if (itemTopPos > *yPos) {

90− *yPos = itemTopPos;

91− *modelIndex = item.m_modelIndex - 1;

92− columnToAddTo = i;

93− }

94− }

95− }

96−

97− if (*modelIndex > 0) {

98− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

99− while (*modelIndex > 0 && m_indexColumnMap[*modelIndex] != columnToAddTo) {

100− // We found out that we have to add to columnToAddTo

101− // and thought that we had to add *modelIndex, but history tells

102− // it is not correct, so find up from *modelIndex until we found the index

103− // that has to end up in columnToAddTo

104− *modelIndex = *modelIndex - 1;

105− Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

106− }

107− }

108−}

109−

110−bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

111−{

112− bool changed = false;

113−

114− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

115− QList<ViewItem> &column = m_columnVisibleItems[i];

116− while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {

117− releaseItem(column.takeFirst().m_item);

118− changed = true;

119− }

120−

121− while (!column.isEmpty() && column.last().y() > bufferToY) {

122− releaseItem(column.takeLast().m_item);

123− changed = true;

124− }

125− }

126−

127− return changed;

128−}

129−

130−void VerticalJournal::addItemToView(int modelIndex, QQuickItem *item)

131−{

132− if (item->width() != m_columnWidth) {

133− qWarning() << "Item" << modelIndex << "width is not the one that the columnWidth mandates, resetting it";

134− item->setWidth(m_columnWidth);

135− }

136−

137− // Check if we add it to the bottom of existing column items

138− const QList<ViewItem> &firstColumn = m_columnVisibleItems[0];

139− qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : -rowSpacing();

140− int columnToAddTo = 0;

141− for (int i = 1; i < m_columnVisibleItems.count(); ++i) {

142− const QList<ViewItem> &column = m_columnVisibleItems[i];

143− const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : -rowSpacing();

144− if (iY < columnToAddY) {

145− columnToAddTo = i;

146− columnToAddY = iY;

147− }

148− }

149−

150− const QList<ViewItem> &columnToAdd = m_columnVisibleItems[columnToAddTo];

151− if (columnToAdd.isEmpty() || columnToAdd.last().m_modelIndex < modelIndex) {

152− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));

153− item->setY(columnToAddY + rowSpacing());

154−

155− m_columnVisibleItems[columnToAddTo] << ViewItem(item, modelIndex);

156− m_indexColumnMap[modelIndex] = columnToAddTo;

157− } else {

158− Q_ASSERT(m_indexColumnMap.contains(modelIndex));

159− columnToAddTo = m_indexColumnMap[modelIndex];

160− columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();

161−

162− item->setX(columnToAddTo * (m_columnWidth + columnSpacing()));

163− item->setY(columnToAddY - rowSpacing() - item->height());

164−

165− m_columnVisibleItems[columnToAddTo].prepend(ViewItem(item, modelIndex));

166− }

167−}

168−

169−void VerticalJournal::cleanupExistingItems()

170−{

171− // Cleanup the existing items

172− for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

173− QList<ViewItem> &column = m_columnVisibleItems[i];

174− Q_FOREACH(const ViewItem item, column)

175− releaseItem(item.m_item);

176− column.clear();

177− }

178− m_indexColumnMap.clear();

179− setImplicitHeightDirty();

180−}

181−

182−void VerticalJournal::calculateImplicitHeight()

183−{

184− int lastModelIndex = -1;

185− qreal bottomMostY = 0;

186− Q_FOREACH(const auto &column, m_columnVisibleItems) {

187− if (!column.isEmpty()) {

188− const ViewItem &item = column.last();

189− lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);

190− bottomMostY = qMax(bottomMostY, item.y() + item.height());

191− }

192− }

193− if (lastModelIndex >= 0) {

194− const double averageHeight = bottomMostY / (lastModelIndex + 1);

195− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));

196− } else {

197− setImplicitHeight(0);

198− }

199−}

200−

201−void VerticalJournal::doRelayout()

202−{

203− QList<ViewItem> allItems;

204− Q_FOREACH(const auto &column, m_columnVisibleItems)

205− allItems << column;

206−

207− qSort(allItems);

208−

209− const int nColumns = qMax(1., floor((double)(width() + columnSpacing()) / (m_columnWidth + columnSpacing())));

210− m_columnVisibleItems.resize(nColumns);

211− m_indexColumnMap.clear();

212− for (int i = 0; i < nColumns; ++i)

213− m_columnVisibleItems[i].clear();

214−

215− // If the first of allItems doesn't contain index 0 we need to drop them

216− // all since we can't consistently relayout without the first item being there

217−

218− if (!allItems.isEmpty()) {

219− if (allItems.first().m_modelIndex == 0) {

220− Q_FOREACH(const ViewItem item, allItems)

221− addItemToView(item.m_modelIndex, item.m_item);

222− } else {

223− Q_FOREACH(const ViewItem item, allItems)

224− releaseItem(item.m_item);

225− }

226− }

227−}

228−

229−void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

230−{

231− Q_FOREACH(const auto &column, m_columnVisibleItems) {

232− Q_FOREACH(const ViewItem item, column) {

233− const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;

234− QQuickItemPrivate::get(item.m_item)->setCulled(cull);

235− }

236− }

237−}

238−

239−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

240−{

241− Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

242− for (int i = remove.count - 1; i >= 0; --i) {

243− const int indexToRemove = remove.index + i;

244− // Since we only support removing from the end, indexToRemove

245− // must refer to the last item of one of the columns or

246− // be bigger than them (because it's not in the viewport and

247− // thus we have not created a delegate for it)

248− bool found = false;

249− int lastCreatedIndex = INT_MIN;

250− for (int i = 0; !found && i < m_columnVisibleItems.count(); ++i) {

251− QList<ViewItem> &column = m_columnVisibleItems[i];

252− if (!column.isEmpty()) {

253− const int lastColumnIndex = column.last().m_modelIndex;

254− if (lastColumnIndex == indexToRemove) {

255− releaseItem(column.takeLast().m_item);

256− found = true;

257− }

258− lastCreatedIndex = qMax(lastCreatedIndex, lastColumnIndex);

259− }

260− }

261− if (!found) {

262− if (indexToRemove < lastCreatedIndex) {

263− qDebug() << "VerticalJournal only supports removal from the end of the model, resetting instead";

264− cleanupExistingItems();

265− break;

266− } else {

267− setImplicitHeightDirty();

268− }

269− }

270− }

271− }

272−}

273−

274−void VerticalJournal::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)

275−{

276− const qreal heightDiff = newGeometry.height() - oldGeometry.height();

277− if (heightDiff != 0) {

278− relayout();

279− }

280−}

plugins/Dash/verticaljournal.hdeleted−103

@@ -1,103 +0,0 @@

1−/*

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−protected:

69− void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;

70−

71−Q_SIGNALS:

72− void columnWidthChanged();

73−

74−private:

75− class ViewItem

76− {

77− public:

78− ViewItem(QQuickItem *item, int modelIndex) : m_item(item), m_modelIndex(modelIndex) {}

79− qreal x() const { return m_item->x(); }

80− qreal y() const { return m_item->y(); }

81− qreal height() const { return m_item->height(); }

82− bool operator<(const ViewItem v) const { return m_modelIndex < v.m_modelIndex; }

83−

84− QQuickItem *m_item;

85− int m_modelIndex;

86− };

87−

88− void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

89− void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

90− bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

91− void addItemToView(int modelIndex, QQuickItem *item) override;

92− void cleanupExistingItems() override;

93− void calculateImplicitHeight() override;

94− void doRelayout() override;

95− void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

96− void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

97−

98− QVector<QList<ViewItem>> m_columnVisibleItems;

99− QHash<int, int> m_indexColumnMap;

100− int m_columnWidth;

101−};

102−

103−#endif

plugins/GlobalShortcut/CMakeLists.txt+1−1

@@ -5,6 +5,6 @@ set(globalshortcutplugin_SRCS

66add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})

8−qt5_use_modules(GlobalShortcut-qml Quick Gui)

8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)

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)

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/LightDM/CMakeLists.txt+1−1

@@ -7,7 +7,6 @@ include_directories(

77 ${CMAKE_CURRENT_SOURCE_DIR}

88 ${CMAKE_CURRENT_BINARY_DIR}

99 ${CMAKE_SOURCE_DIR}/plugins/Utils

10− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM

1110 ${libunity8-private_SOURCE_DIR}

1211 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

1312)

@@ -18,6 +17,7 @@ set(QMLPLUGIN_SRC

1817 DBusGreeterList.cpp

1918 Greeter.cpp

2019 plugin.cpp

20+ PromptsModel.cpp

2121 SessionsModel.cpp

2222 UsersModel.cpp

2323 )

plugins/LightDM/DBusGreeterList.cpp+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/LightDM/DBusGreeterList.h+1−1

@@ -47,7 +47,7 @@ Q_SIGNALS:

4747 void entryIsLockedChanged();

4848

4949private Q_SLOTS:

50− void authenticationUserChangedHandler(const QString &user);

50+ void authenticationUserChangedHandler();

5151 void promptlessChangedHandler();

5252

5353private:

plugins/LightDM/FullLightDM/CMakeLists.txt+6−2

@@ -6,10 +6,14 @@ add_definitions(-DFULL_LIGHTDM)

77include_directories(

88 ../

9− ${LIBLIGHTDM_INCLUDE_DIRS}

109 ${CMAKE_CURRENT_BINARY_DIR}

1110 )

1211

12+include_directories(

13+ SYSTEM

14+ ${LIBLIGHTDM_INCLUDE_DIRS}

15+ )

16+

1317foreach(source_file ${QMLPLUGIN_SRC})

1418 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

1519endforeach()

@@ -22,7 +26,7 @@ target_link_libraries(FullLightDM-qml

2226 unity8-private

2327 ${LIBLIGHTDM_LDFLAGS}

2428 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

29+ Qt5::DBus Qt5::Gui Qt5::Qml

2530 )

2631

27−qt5_use_modules(FullLightDM-qml DBus Gui Qml)

2832add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

plugins/LightDM/Greeter.cpp+144−14

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

11/*

33 *

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

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

@@ -17,12 +17,16 @@

1717

1818#include "Greeter.h"

1919#include "GreeterPrivate.h"

20+#include <QCoreApplication>

2021#include <libintl.h>

2122

23+static Greeter *singleton = nullptr;

24+

2225GreeterPrivate::GreeterPrivate(Greeter* parent)

2326 : m_greeter(new QLightDM::Greeter(parent)),

2427 m_active(false),

25− wasPrompted(false),

28+ responded(false),

29+ everResponded(false),

2630 promptless(false),

2731 q_ptr(parent)

2832{

@@ -41,9 +45,32 @@ Greeter::Greeter(QObject* parent)

4145 connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,

4246 this, &Greeter::authenticationCompleteFilter);

4347

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+

4452 d->m_greeter->connectSync();

4553}

4654

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+

4774bool Greeter::isActive() const

4875{

4976 Q_D(const Greeter);

@@ -68,7 +95,16 @@ bool Greeter::isAuthenticated() const

6895QString Greeter::authenticationUser() const

6996{

7097 Q_D(const Greeter);

71− return d->m_greeter->authenticationUser();

98+ return d->cachedAuthUser;

99+}

100+

101+void Greeter::checkAuthenticationUser()

102+{

103+ Q_D(Greeter);

104+ if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {

105+ d->cachedAuthUser = d->m_greeter->authenticationUser();

106+ Q_EMIT authenticationUserChanged();

107+ }

72108}

73109

74110QString Greeter::defaultSessionHint() const

@@ -86,26 +122,65 @@ bool Greeter::promptless() const

86122QString Greeter::selectUser() const

87123{

88124 Q_D(const Greeter);

89− return d->m_greeter->selectUserHint();

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

90148}

91149

92150void Greeter::authenticate(const QString &username)

93151{

94152 Q_D(Greeter);

95− d->wasPrompted = false;

153+ d->prompts.clear();

154+ d->responded = false;

155+ d->everResponded = false;

96156 if (d->promptless) {

97157 d->promptless = false;

98158 Q_EMIT promptlessChanged();

99159 }

100160

101− d->m_greeter->authenticate(username);

161+ if (authenticationUser() == username) {

162+ d->prompts = d->leftovers;

163+ }

164+ d->leftovers.clear();

165+

166+ if (username == QStringLiteral("*guest")) {

167+ d->m_greeter->authenticateAsGuest();

168+ } else if (username == QStringLiteral("*other")) {

169+ d->m_greeter->authenticate(nullptr);

170+ } else {

171+ d->m_greeter->authenticate(username);

172+ }

173+

174+ Q_EMIT authenticationStarted();

102175 Q_EMIT isAuthenticatedChanged();

103− Q_EMIT authenticationUserChanged(username);

176+ checkAuthenticationUser();

104177}

105178

106179void Greeter::respond(const QString &response)

107180{

108181 Q_D(Greeter);

182+ d->responded = true;

183+ d->everResponded = true;

109184 d->m_greeter->respond(response);

110185}

111186

@@ -118,32 +193,87 @@ bool Greeter::startSessionSync(const QString &session)

118193void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)

119194{

120195 Q_D(Greeter);

121− d->wasPrompted = true;

196+

197+ checkAuthenticationUser(); // may have changed in liblightdm

122198

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

124205

125206 // Strip prompt of any colons at the end

126− QString trimmedText = text.trimmed();

127207 if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {

128208 trimmedText.chop(1);

129209 }

130210

131− Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);

211+ if (trimmedText == "login") {

212+ // 'login' is provided untranslated by LightDM when asking for a manual

213+ // login username.

214+ trimmedText = gettext("Username");

215+ }

216+

217+ if (d->responded) {

218+ d->prompts.clear();

219+ d->responded = false;

220+ }

221+

222+ d->prompts.append(trimmedText, isSecret ? PromptsModel::Secret : PromptsModel::Question);

132223}

133224

134225void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)

135226{

136− Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);

227+ Q_D(Greeter);

228+

229+ checkAuthenticationUser(); // may have changed in liblightdm

230+

231+ bool isError = type == QLightDM::Greeter::MessageTypeError;

232+

233+ if (d->responded) {

234+ d->prompts.clear();

235+ d->responded = false;

236+ }

237+ d->prompts.append(text, isError? PromptsModel::Error : PromptsModel::Message);

137238}

138239

139240void Greeter::authenticationCompleteFilter()

140241{

141242 Q_D(Greeter);

142− if (!d->wasPrompted) {

243+

244+ Q_EMIT isAuthenticatedChanged();

245+

246+ bool automatic = !d->everResponded;

247+ bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;

248+

249+ if (isAuthenticated() && automatic) {

143250 d->promptless = true;

144251 Q_EMIT promptlessChanged();

145252 }

146253

147− Q_EMIT isAuthenticatedChanged();

148− Q_EMIT authenticationComplete();

254+ if (!isAuthenticated()) {

255+ if (pamHasLeftoverMessages) {

256+ d->leftovers = d->prompts; // Prefer PAM's messages

257+ } else if (automatic) {

258+ d->leftovers.append(gettext("Failed to authenticate"), PromptsModel::Error);

259+ } else {

260+ d->leftovers.append(gettext("Invalid password, please try again"), PromptsModel::Error);

261+ }

262+ } else if (pamHasLeftoverMessages) {

263+ automatic = true; // treat this successful login as automatic, so user sees message

264+ d->leftovers = d->prompts;

265+ }

266+

267+ if (automatic) {

268+ d->prompts = d->leftovers; // OK, we'll just use these now

269+ d->leftovers.clear();

270+ d->prompts.append(isAuthenticated() ? gettext("Log In") : gettext("Retry"),

271+ PromptsModel::Button);

272+ }

273+

274+ if (isAuthenticated()) {

275+ Q_EMIT loginSuccess(automatic);

276+ } else {

277+ Q_EMIT loginError(automatic);

278+ }

149279}

plugins/LightDM/Greeter.h+17−10

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

11/*

33 *

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

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

@@ -21,13 +21,13 @@

2121 such edits in the future, and by inserting ourselves here, we have more

2222 control. */

2323

24−#ifndef UNITY_GREETER_H

25−#define UNITY_GREETER_H

24+#pragma once

2625

2726#include <QLightDM/Greeter>

2827#include <QtCore/QObject>

2928

3029class GreeterPrivate;

30+class PromptsModel;

3131

3232class Greeter : public QObject

3333{

@@ -41,7 +41,8 @@ class Greeter : public QObject

4141 Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

4242

4343public:

44− explicit Greeter(QObject* parent=0);

44+ static Greeter *instance();

45+ virtual ~Greeter();

4546

4647 bool isActive() const;

4748 bool isAuthenticated() const;

@@ -49,6 +50,11 @@ public:

4950 QString defaultSessionHint() const;

5051 bool promptless() const;

5152 QString selectUser() const;

53+ bool hasGuestAccount() const;

54+ bool showManualLoginHint() const;

55+ bool hideUsersHint() const;

56+

57+ PromptsModel *promptsModel();

5258

5359public Q_SLOTS:

5460 void authenticate(const QString &username=QString());

@@ -57,21 +63,23 @@ public Q_SLOTS:

5763 void setIsActive(bool isActive);

5864

5965Q_SIGNALS:

60− void showMessage(const QString &text, bool isError);

61− void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);

62− void authenticationComplete();

63− void authenticationUserChanged(const QString &user);

66+ void authenticationUserChanged();

6467 void isActiveChanged();

6568 void isAuthenticatedChanged();

6669 void promptlessChanged();

6770 void showGreeter();

6871 void hideGreeter();

72+ void loginError(bool automatic);

73+ void loginSuccess(bool automatic);

74+ void authenticationStarted(); // useful for testing

6975

7076 // This signal is emitted by external agents like indicators, and the UI

7177 // should switch to this user if possible.

7278 void requestAuthenticationUser(const QString &user);

7379

7480protected:

81+ explicit Greeter(QObject* parent=0);

82+

7583 GreeterPrivate * const d_ptr;

7684

7785 Q_DECLARE_PRIVATE(Greeter)

@@ -80,6 +88,5 @@ private Q_SLOTS:

8088 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);

8189 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);

8290 void authenticationCompleteFilter();

91+ void checkAuthenticationUser();

8392};

84−

85−#endif

plugins/LightDM/GreeterPrivate.h+13−7

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

11/*

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.txt+1−1

@@ -25,9 +25,9 @@ target_link_libraries(IntegratedLightDM-qml

2525 integratedLightDM

2626 unity8-private

2727 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28+ Qt5::DBus Qt5::Gui Qt5::Qml

2829 )

2930

30−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)

3131add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)

3232

3333add_subdirectory(liblightdm)

plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt+3−4

@@ -26,22 +26,21 @@ target_link_libraries(integratedLightDM

2626 ${GLIB_LIBRARIES}

2727 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

2828 -lpam

29+ Qt5::Concurrent Qt5::DBus Qt5::Gui

2930)

3031target_link_libraries(integratedLightDMSession

3132 ${GLIB_LIBRARIES}

3233 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

3334 -lpam

35+ Qt5::Concurrent Qt5::DBus Qt5::Gui

3436)

3537target_link_libraries(MockLightDM-demo-shared

3638 ${GLIB_LIBRARIES}

3739 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

3840 -lpam

41+ Qt5::Concurrent Qt5::DBus Qt5::Gui

3942)

4043

41−qt5_use_modules(integratedLightDM Concurrent DBus Gui)

42−qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)

43−qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)

44−

4544set_target_properties(integratedLightDM PROPERTIES

4645 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")

4746set_target_properties(integratedLightDMSession PROPERTIES

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp+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/LightDM/IntegratedLightDM/liblightdm/Greeter.h+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/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp+27−22

@@ -206,6 +206,28 @@ public Q_SLOTS:

206206 }

207207 }

208208

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+

209231Q_SIGNALS:

210232 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);

211233 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

@@ -247,28 +269,6 @@ private Q_SLOTS:

247269 }

248270

249271private:

250− void cancelPam()

251− {

252− if (pamHandle != nullptr) {

253− QFuture<int> pamFuture = futureWatcher.future();

254− pam_handle *handle = pamHandle;

255− pamHandle = nullptr; // to disable normal finishPam() handling

256− pamFuture.cancel();

257−

258− // Note the empty loop, we just want to clear the futures queue.

259− // Any further prompts from the pam thread will be immediately

260− // responded to/dismissed in handlePrompt().

261− while (respond(QString()));

262−

263− // Now let signal/slot handling happen so the thread can finish

264− while (!pamFuture.isFinished()) {

265− QCoreApplication::processEvents();

266− }

267−

268− pam_end(handle, PAM_CONV_ERR);

269− }

270− }

271−

272272 Greeter *greeter;

273273 GreeterPrivate *greeterPrivate;

274274 pam_handle* pamHandle;

@@ -299,6 +299,11 @@ void GreeterPrivate::handleRespond(const QString &response)

299299 m_impl->respond(response);

300300}

301301

302+void GreeterPrivate::cancelAuthentication()

303+{

304+ m_impl->cancelPam();

305+}

306+

302307}

303308

304309#include "GreeterPrivate.moc"

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h+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.cpp−1

@@ -38,7 +38,6 @@ SessionsModel::SessionsModel(QObject* parent) :

3838 QAbstractListModel(parent),

3939 d_ptr(new SessionsModelPrivate(this))

4040{

41− Q_D(SessionsModel);

4241 m_roleNames = QAbstractListModel::roleNames();

4342 m_roleNames[KeyRole] = "key";

4443 m_roleNames[TypeRole] = "type";

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h+2−2

@@ -35,8 +35,6 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

3535 {

3636 Q_OBJECT

3737

38− Q_ENUMS(SessionModelRoles SessionType)

39−

4038 public:

4139

4240 enum SessionModelRoles {

@@ -46,11 +44,13 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

4644 IdRole = KeyRole, /** Deprecated */

4745 TypeRole

4846 };

47+ Q_ENUM(SessionModelRoles)

4948

5049 enum SessionType {

5150 LocalSessions,

5251 RemoteSessions

5352 };

53+ Q_ENUM(SessionType)

5454

5555 explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/

5656 explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h+1−2

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

@@ -53,6 +51,7 @@ public:

5351 BackgroundPathRole,

5452 UidRole

5553 };

54+ Q_ENUM(UserModelRoles)

5655

5756 int rowCount(const QModelIndex &parent) const override;

5857 QVariant data(const QModelIndex &index, int role) const override;

plugins/LightDM/PromptsModel.cppnew file+97

@@ -0,0 +1,97 @@

1+/*

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+/*

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.cpp+31−18

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

11/*

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

@@ -47,15 +47,15 @@ void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories

4747 Q_EMIT iconSearchDirectoriesChanged();

4848}

4949

50−QUrl SessionsModel::iconUrl(const QString sessionName) const

50+QUrl SessionsModel::iconUrl(const QString sessionKey) const

5151{

5252 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)

5353 {

5454 // This is an established icon naming convention

5555 QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

56− "/custom_" + sessionName + "_badge.png";

56+ "/custom_" + sessionKey + "_badge.png";

5757 QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

58− "/" + sessionName + "_badge.png";

58+ "/" + sessionKey + "_badge.png";

5959

6060 QFile customIconFile(customIconUrl);

6161 QFile iconFile(iconUrl);

@@ -63,29 +63,35 @@ QUrl SessionsModel::iconUrl(const QString sessionName) const

6363 return QUrl(customIconUrl);

6464 } else if (iconFile.exists()) {

6565 return QUrl(iconUrl);

66− } else{

66+ } else {

6767 // Search the legacy way

6868 QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";

69− if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {

69+ bool iconFound = false;

70+ if (sessionKey == "ubuntu" || sessionKey == "ubuntu-2d") {

7071 path += "ubuntu_badge.png";

72+ iconFound = true;

7173 } else if(

72− sessionName == "gnome-classic" ||

73− sessionName == "gnome-flashback-compiz" ||

74− sessionName == "gnome-flashback-metacity" ||

75− sessionName == "gnome-shell" ||

76− sessionName == "gnome-wayland" ||

77− sessionName == "gnome"

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"

7880 ){

7981 path += "gnome_badge.png";

80− } else if (sessionName == "plasma") {

82+ iconFound = true;

83+ } else if (sessionKey == "plasma") {

8184 path += "kde_badge.png";

82− } else if (sessionName == "xterm") {

85+ iconFound = true;

86+ } else if (sessionKey == "xterm") {

8387 path += "recovery_console_badge.png";

84− } else if (sessionName == "remote-login") {

88+ iconFound = true;

89+ } else if (sessionKey == "remote-login") {

8590 path += "remote_login_help.png";

91+ iconFound = true;

8692 }

8793

88− if (QFile(path).exists()) {

94+ if (QFile(path).exists() && iconFound) {

8995 return path;

9096 }

9197 }

@@ -99,7 +105,7 @@ QVariant SessionsModel::data(const QModelIndex& index, int role) const

99105{

100106 switch (role) {

101107 case SessionsModel::IconRole:

102− return iconUrl(m_model->data(index, Qt::DisplayRole).toString());

108+ return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());

103109 default:

104110 return m_model->data(index, role);

105111 }

@@ -113,8 +119,15 @@ SessionsModel::SessionsModel(QObject* parent)

113119 m_roleNames = m_model->roleNames();

114120 m_roleNames[IconRole] = "icon_url";

115121

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+

116130 setModel(m_model);

117− setSourceModel(m_model);

118131 setSortCaseSensitivity(Qt::CaseInsensitive);

119132 setSortLocaleAware(true);

120133 setSortRole(Qt::DisplayRole);

plugins/LightDM/SessionsModel.h+5−7

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

11/*

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,8 +15,7 @@

1515 *

1616 */

1717

18−#ifndef UNITY_SESSIONSMODEL_H

19−#define UNITY_SESSIONSMODEL_H

18+#pragma once

2019

2120#include <unitysortfilterproxymodelqml.h>

2221#include <QLightDM/SessionsModel>

@@ -28,10 +27,9 @@ class SessionsModel : public UnitySortFilterProxyModelQML

2827{

2928 Q_OBJECT

3029

31− Q_ENUMS(SessionModelRoles)

32−

3330 Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories

3431 WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)

32+

3533Q_SIGNALS:

3634 void iconSearchDirectoriesChanged();

3735

@@ -45,6 +43,7 @@ public:

4543 TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,

4644 IconRole

4745 };

46+ Q_ENUM(SessionModelRoles)

4847

4948 explicit SessionsModel(QObject* parent=nullptr);

5049

@@ -55,6 +54,7 @@ public:

5554 Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;

5655

5756 void setIconSearchDirectories(const QList<QUrl> searchDirectories);

57+

5858private:

5959 QLightDM::SessionsModel* m_model;

6060 QHash<int, QByteArray> m_roleNames;

@@ -64,5 +64,3 @@ private:

6464 QUrl("/usr/share/unity-greeter/")};

6565

6666};

67−

68−#endif // UNITY_SESSIONSMODEL_H

plugins/LightDM/UsersModel.cpp+176−9

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

11/*

33 *

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

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

@@ -12,20 +12,22 @@

1212 *

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

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

15− *

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

1715 */

1816

17+#include "Greeter.h"

1918#include "UsersModel.h"

19+#include <QIdentityProxyModel>

2020#include <QLightDM/UsersModel>

21−#include <QtCore/QSortFilterProxyModel>

21+

22+#include <libintl.h>

2223

2324// First, we define an internal class that wraps LightDM's UsersModel. This

2425// class will modify some of the data coming from LightDM. For example, we

25−// modify any empty Real Names into just normal Names.

26+// modify any empty Real Names into just normal Names. We also add optional

27+// rows, depending on configuration.

2628// (We can't modify the data directly in UsersModel below because it won't sort

2729// using the modified data.)

28−class MangleModel : public QSortFilterProxyModel

30+class MangleModel : public QIdentityProxyModel

2931{

3032 Q_OBJECT

3133

@@ -33,29 +35,177 @@ public:

3335 explicit MangleModel(QObject* parent=0);

3436

3537 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

38+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

39+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

40+

41+private:

42+ struct CustomRow {

43+ QString name;

44+ QString realName;

45+ };

46+

47+ int sourceRowCount() const;

48+

49+ void updateGuestRow();

50+ void updateManualRow();

51+ void updateCustomRows();

52+

53+ void addCustomRow(const CustomRow &newRow);

54+ void removeCustomRow(const QString &rowName);

55+

56+ QList<CustomRow> m_customRows;

57+ bool m_updatingCustomRows;

3658};

3759

3860MangleModel::MangleModel(QObject* parent)

39− : QSortFilterProxyModel(parent)

61+ : QIdentityProxyModel(parent)

62+ , m_updatingCustomRows(false)

4063{

4164 setSourceModel(new QLightDM::UsersModel(this));

65+

66+ updateCustomRows();

67+

68+ // Would be nice if there were a rowCountChanged signal in the base class.

69+ // We redo all custom rows on any row count change, because (A) some of

70+ // custom rows (manual login) use row count information and (B) when

71+ // testing, we use a modelReset signal as a way to indicate that a custom

72+ // row has been toggled off or on.

73+ connect(this, &QIdentityProxyModel::modelReset,

74+ this, &MangleModel::updateCustomRows);

75+ connect(this, &QIdentityProxyModel::rowsInserted,

76+ this, &MangleModel::updateCustomRows);

77+ connect(this, &QIdentityProxyModel::rowsRemoved,

78+ this, &MangleModel::updateCustomRows);

4279}

4380

4481QVariant MangleModel::data(const QModelIndex &index, int role) const

4582{

46− QVariant variantData = QSortFilterProxyModel::data(index, role);

83+ QVariant variantData;

84+

85+ if (index.row() >= rowCount())

86+ return QVariant();

87+

88+ bool isCustomRow = index.row() >= sourceRowCount();

89+ if (isCustomRow && index.column() == 0) {

90+ int customIndex = index.row() - sourceRowCount();

91+ if (role == QLightDM::UsersModel::NameRole) {

92+ variantData = m_customRows[customIndex].name;

93+ } else if (role == QLightDM::UsersModel::RealNameRole) {

94+ variantData = m_customRows[customIndex].realName;

95+ } else if (role == QLightDM::UsersModel::LoggedInRole) {

96+ variantData = false;

97+ } else if (role == QLightDM::UsersModel::SessionRole) {

98+ variantData = Greeter::instance()->defaultSessionHint();

99+ }

100+ } else {

101+ variantData = QIdentityProxyModel::data(index, role);

102+ }

47103

48104 // If user's real name is empty, switch to unix name

49105 if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {

50− variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

106+ variantData = data(index, QLightDM::UsersModel::NameRole);

51107 } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {

52108 const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";

53109 variantData = stringData;

54110 }

55111

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+

56117 return variantData;

57118}

58119

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+

59209// **** Now we continue with actual UsersModel class ****

60210

61211UsersModel::UsersModel(QObject* parent)

@@ -68,4 +218,21 @@ UsersModel::UsersModel(QObject* parent)

68218 sort(0);

69219}

70220

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+

71238#include "UsersModel.moc"

plugins/LightDM/UsersModel.h+6−8

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

11/*

33 *

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

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

@@ -12,19 +12,16 @@

1212 *

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

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

15− *

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

1715 */

1816

1917/* This class is a really tiny filter around QLightDM::UsersModel. There are

2018 some operations that we want to edit a bit for the benefit of Qml.

2119 Specifically, we want to sort users according to realName. */

2220

23−#ifndef UNITY_USERSMODEL_H

24−#define UNITY_USERSMODEL_H

21+#pragma once

2522

2623#include <unitysortfilterproxymodelqml.h>

27−#include <QtCore/QObject>

24+#include <QObject>

2825

2926class UsersModel : public UnitySortFilterProxyModelQML

3027{

@@ -32,6 +29,7 @@ class UsersModel : public UnitySortFilterProxyModelQML

3229

3330public:

3431 explicit UsersModel(QObject* parent=0);

35−};

3632

37−#endif

33+protected:

34+ bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

35+};

plugins/LightDM/plugin.cpp+13−5

@@ -19,6 +19,7 @@

1919#include "DBusGreeter.h"

2020#include "DBusGreeterList.h"

2121#include "Greeter.h"

22+#include "PromptsModel.h"

2223#include "SessionsModel.h"

2324#include "UsersModel.h"

2425#include <libusermetricsoutput/ColorTheme.h>

@@ -32,16 +33,24 @@

3233

3334static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

3435{

35− Q_UNUSED(engine)

3636 Q_UNUSED(scriptEngine)

3737

38− Greeter *greeter = new Greeter();

38+ Greeter *greeter = Greeter::instance();

3939 new DBusGreeter(greeter, QStringLiteral("/"));

4040 new DBusGreeterList(greeter, QStringLiteral("/list"));

4141

42+ engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);

43+

4244 return greeter;

4345}

4446

47+static QObject *prompts_provider(QQmlEngine *engine, QJSEngine *)

48+{

49+ auto model = Greeter::instance()->promptsModel();

50+ engine->setObjectOwnership(model, QQmlEngine::CppOwnership);

51+ return model;

52+}

53+

4554static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

4655{

4756 Q_UNUSED(engine)

@@ -78,11 +87,10 @@ void PLUGIN_CLASSNAME::registerTypes(const char *uri)

7887 #error No library defined in LightDM plugin

7988#endif

8089

81− qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

82− qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

90+ qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);

8391

8492 qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

85− qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

93+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

8694

8795 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

8896 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

plugins/Lights/CMakeLists.txt+8−2

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

11pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

45include_directories(

56 SYSTEM

@@ -9,9 +10,14 @@ include_directories(

910add_library(Lights-qml MODULE

1011 plugin.cpp

1112 Lights.cpp

13+ LegacyLights.cpp

14+ HfdLights.cpp

1215 )

1316

14−qt5_use_modules(Lights-qml Qml Gui)

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

1622

1723add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

plugins/Lights/HfdLights.cppnew file+62

@@ -0,0 +1,62 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ * Author: Florian Leeber <florian@ubports.com>

17+ */

18+

19+#include "HfdLights.h"

20+#include <QtCore/QDebug>

21+#include <QDBusArgument>

22+#include <QDBusConnection>

23+#include <iostream>

24+

25+#define HFD_SERVICE_NAME "com.lomiri.hfd"

26+#define HFD_SERVICE_PATH "/com/lomiri/hfd"

27+#define HFD_SERVICE_INTERFACE "com.lomiri.hfd.Leds"

28+

29+HfdLights::HfdLights(QObject* parent)

30+ : Lights(parent)

31+{

32+ m_hfdInterface = new QDBusInterface(

33+ QStringLiteral(HFD_SERVICE_NAME),

34+ QStringLiteral(HFD_SERVICE_PATH),

35+ QStringLiteral(HFD_SERVICE_INTERFACE),

36+ QDBusConnection::systemBus(),

37+ this

38+ );

39+}

40+

41+bool HfdLights::init()

42+{

43+ // hfd does not need any initalization to be used

44+ return true;

45+}

46+

47+void HfdLights::turnOn()

48+{

49+ m_hfdInterface->call(QStringLiteral("setState"), 0);

50+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)m_color.rgba());

51+ m_hfdInterface->call(QStringLiteral("setOnMs"), m_onMs);

52+ m_hfdInterface->call(QStringLiteral("setOffMs"), m_offMs);

53+ m_hfdInterface->call(QStringLiteral("setState"), 1);

54+}

55+

56+void HfdLights::turnOff()

57+{

58+ m_hfdInterface->call(QStringLiteral("setState"), 0);

59+ m_hfdInterface->call(QStringLiteral("setColor"), (quint32)0);

60+ m_hfdInterface->call(QStringLiteral("setOnMs"), 0);

61+ m_hfdInterface->call(QStringLiteral("setOffMs"), 0);

62+}

plugins/Unity/DashCommunicator/plugin.h → plugins/Lights/HfdLights.hrenamed+17−9

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

11/*

33 *

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

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

@@ -13,22 +13,30 @@

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

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

1515 *

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

16+ * Author: Florian Leeber <florian@ubports.com>

1717 */

1818

19−#ifndef DASHCOMMUNICATOR_PLUGIN_H

20−#define DASHCOMMUNICATOR_PLUGIN_H

19+#ifndef UNITY_HFDLIGHTS_H

20+#define UNITY_HFDLIGHTS_H

2121

22−#include <QtQml/QQmlEngine>

23−#include <QtQml/QQmlExtensionPlugin>

22+#include <QtCore/QObject>

23+#include <QDBusInterface>

24+#include "Lights.h"

2425

25−class DashCommunicatorPlugin : public QQmlExtensionPlugin

26+class HfdLights: public Lights

2627{

2728 Q_OBJECT

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

2929

3030public:

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

31+ explicit HfdLights(QObject *parent = 0);

32+

33+protected:

34+ bool init() override;

35+ void turnOff() override;

36+ void turnOn() override;

37+

38+private:

39+ QDBusInterface* m_hfdInterface;

3240};

3341

3442#endif

plugins/Lights/LegacyLights.cppnew file+91

@@ -0,0 +1,91 @@

1+/*

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

tests/mocks/Unity/DashCommunicator/plugin.h → plugins/Lights/LegacyLights.hrenamed+19−8

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

11/*

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

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)

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 )

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

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

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)

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

@@ -11,6 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES

1111

1212add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})

1313

14−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)

15−

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

1620add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+2−1

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

11/*

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

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 *

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

44 *

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

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/CMakeLists.txt+2−4

@@ -16,10 +16,8 @@ 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})

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/TouchGate.cpp+3

@@ -61,6 +61,9 @@ void TouchGate::touchEvent(QTouchEvent *event)

6161 const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];

6262

6363 if (touchPoint.state() == Qt::TouchPointPressed) {

64+// FIXME: This assert triggers frequently in make trySomething. We have verified

65+// that it's a bug in the mouse to touch conversion of the test environment

66+// and not in the actual product. Still, it probably should be cleaned up eventually.

6467// Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));

6568 m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;

6669 m_touchInfoMap[touchPoint.id()].ended = false;

plugins/Ubuntu/Gestures/TouchGestureArea.cpp+6−5

@@ -328,6 +328,12 @@ void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)

328328 }

329329 }

330330 }

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

331337}

332338

333339void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)

@@ -735,7 +741,6 @@ void TouchGestureArea::resyncCachedTouchPoints()

735741 bool added = false;

736742 bool ended = false;

737743 bool moved = false;

738− bool wantsDrag = false;

739744

740745 // list of deletes

741746 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);

@@ -765,10 +770,6 @@ void TouchGestureArea::resyncCachedTouchPoints()

765770 }

766771 }

767772

768− if (wantsDrag && !dragging()) {

769− setDragging(true);

770− }

771−

772773 if (ended) {

773774 if (m_cachedTouchPoints.isEmpty()) {

774775 if (!dragging()) Q_EMIT clicked();

plugins/Ubuntu/Gestures/TouchGestureArea.h+3−3

@@ -76,7 +76,7 @@ public:

7676 return *this;

7777 }

7878

79− bool operator=(const GestureTouchPoint& rhs) const {

79+ bool operator==(const GestureTouchPoint& rhs) const {

8080 if (&rhs == this) return true;

8181 return m_id == rhs.m_id &&

8282 m_pressed == rhs.m_pressed &&

@@ -84,7 +84,7 @@ public:

8484 m_y == rhs.m_y &&

8585 m_dragging == rhs.m_dragging;

8686 }

87− bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }

87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }

8888

8989 void setPos(const QPointF &pos);

9090

@@ -114,7 +114,6 @@ private:

114114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem

115115{

116116 Q_OBJECT

117− Q_ENUMS(Status)

118117

119118 Q_PROPERTY(int status READ status NOTIFY statusChanged)

120119 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)

@@ -137,6 +136,7 @@ public:

137136 Recognized,

138137 Rejected

139138 };

139+ Q_ENUM(Status)

140140 TouchGestureArea(QQuickItem* parent = nullptr);

141141 ~TouchGestureArea();

142142

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

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 &currency)

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

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

@@ -1,15 +0,0 @@

1−include_directories(

2− ${GLIB_INCLUDE_DIRS}

3−)

4−

5−set(SYSTEMIMAGE_SOURCES

6− plugin.cpp

7− SystemImage.cpp

8−)

9−

10−add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

11−

12−qt5_use_modules(SystemImage Qml DBus Core)

13−target_link_libraries(SystemImage ${GLIB_LIBRARIES})

14−

15−add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

plugins/Ubuntu/SystemImage/SystemImage.cppdeleted−155

@@ -1,155 +0,0 @@

1−/*

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

18−#include <QDBusPendingCall>

19−#include <QDBusReply>

20−#include <QDebug>

21−

22−#include <glib.h>

23−

24−#include "SystemImage.h"

25−

26−#define SYSTEMIMAGE_SERVICE QStringLiteral("com.canonical.SystemImage")

27−#define SYSTEMIMAGE_PATH QStringLiteral("/Service")

28−#define SYSTEMIMAGE_IFACE QStringLiteral("com.canonical.SystemImage")

29−

30−Q_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN, "unity8.systemimage", QtWarningMsg)

31−

32−#define DEBUG_MSG qCDebug(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO

33−#define WARNING_MSG qCWarning(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO

34−

35−SystemImage::SystemImage(QObject *parent)

36− : QObject(parent)

37−{

38− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateAvailableStatus"),

39− this, SLOT(onUpdateAvailableStatus(bool,bool,QString,int,QString,QString)));

40− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateDownloaded"),

41− this, SLOT(onUpdateDownloaded()));

42− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateFailed"),

43− this, SLOT(onUpdateFailed(int,QString)));

44− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),

45− this, SLOT(onUpdateApplied(bool)));

46− QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Rebooting"),

47− this, SLOT(onRebooting(bool)));

48−}

49−

50−void SystemImage::checkForUpdate()

51−{

52− DEBUG_MSG << "Checking for update";

53− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

54− QStringLiteral("CheckForUpdate"));

55− QDBusConnection::systemBus().asyncCall(msg);

56−}

57−

58−void SystemImage::applyUpdate()

59−{

60− DEBUG_MSG << "Applying update";

61− setUpdateApplying(true);

62−

63− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

64− QStringLiteral("ApplyUpdate"));

65− QDBusConnection::systemBus().asyncCall(msg);

66−}

67−

68−void SystemImage::factoryReset()

69−{

70− const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

71− QStringLiteral("FactoryReset"));

72− QDBusConnection::systemBus().asyncCall(msg);

73−}

74−

75−void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, const QString &available_version, int update_size,

76− const QString &last_update_date, const QString &error_reason)

77−{

78− DEBUG_MSG << "A new update is " << (is_available ? "" : "NOT") << "available";

79−

80− if (is_available == m_updateAvailable) {

81− return;

82− }

83−

84− m_updateAvailable = is_available;

85− m_downloading = downloading;

86− m_availableVersion = available_version;

87− m_updateSize = formatSize(update_size);

88− m_lastUpdateDate = last_update_date;

89− m_errorReason = error_reason;

90− Q_EMIT updateAvailableStatus();

91−

92− DEBUG_MSG << "Downloading: " << downloading << ", version: " << available_version << ", last update: " << last_update_date <<

93− ", size: " << m_updateSize;

94−}

95−

96−void SystemImage::onUpdateDownloaded()

97−{

98− DEBUG_MSG << "Update downloaded";

99−

100− m_downloaded = true;

101− Q_EMIT updateDownloadedChanged();

102−}

103−

104−void SystemImage::onUpdateFailed(int /*consecutive_failure_count*/, const QString &last_reason)

105−{

106− WARNING_MSG << "System Update failed: " << last_reason;

107− setUpdateApplying(false);

108−}

109−

110−void SystemImage::onUpdateApplied(bool applied)

111−{

112− DEBUG_MSG << "System Update applied with status: " << applied;

113− setUpdateApplying(false);

114− if (applied) {

115− resetUpdateStatus();

116− Q_EMIT updateAvailableStatus();

117− }

118−}

119−

120−void SystemImage::onRebooting(bool status)

121−{

122− setUpdateApplying(false);

123− DEBUG_MSG << "Rebooting: " << status;

124−}

125−

126−void SystemImage::setUpdateApplying(bool status)

127−{

128− if (status != m_updateApplying) {

129− m_updateApplying = status;

130− Q_EMIT updateApplyingChanged();

131− }

132−}

133−

134−void SystemImage::resetUpdateStatus()

135−{

136− m_updateAvailable = false;

137− m_updateApplying = false;

138− m_downloading = false;

139− m_downloaded = false;

140− m_availableVersion.clear();

141− m_updateSize.clear();

142− m_lastUpdateDate.clear();

143− m_errorReason.clear();

144−}

145−

146−QString SystemImage::formatSize(quint64 size) const

147−{

148− guint64 g_size = size;

149−

150− gchar * formatted_size = g_format_size(g_size);

151− QString q_formatted_size = QString::fromLocal8Bit(formatted_size);

152− g_free(formatted_size);

153−

154− return q_formatted_size;

155−}

plugins/Ubuntu/SystemImage/SystemImage.hdeleted−84

@@ -1,84 +0,0 @@

1−/*

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 SYSTEMIMAGE_H

18−#define SYSTEMIMAGE_H

19−

20−#include <QObject>

21−#include <QLoggingCategory>

22−

23−Q_DECLARE_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN)

24−

25−class SystemImage : public QObject

26−{

27− Q_OBJECT

28− Q_DISABLE_COPY(SystemImage)

29−

30− Q_PROPERTY(bool updateAvailable READ updateAvailable NOTIFY updateAvailableStatus)

31− Q_PROPERTY(bool updateDownloading READ updateDownloading NOTIFY updateAvailableStatus)

32− Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY updateAvailableStatus)

33− Q_PROPERTY(QString updateSize READ updateSize NOTIFY updateAvailableStatus)

34− Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)

35− Q_PROPERTY(bool updateDownloaded READ updateDownloaded NOTIFY updateDownloadedChanged)

36−

37−public:

38− explicit SystemImage(QObject *parent = nullptr);

39− ~SystemImage() = default;

40−

41− bool updateAvailable() const { return m_updateAvailable; }

42− bool updateDownloading() const { return m_downloading; }

43− QString availableVersion() const { return m_availableVersion; }

44− QString updateSize() const { return m_updateSize; }

45− bool updateApplying() const { return m_updateApplying; }

46− bool updateDownloaded() const { return m_downloaded; }

47−

48−public Q_SLOTS:

49− Q_INVOKABLE void checkForUpdate();

50− Q_INVOKABLE void applyUpdate();

51− Q_INVOKABLE void factoryReset();

52−

53−private Q_SLOTS:

54− void onUpdateAvailableStatus(bool is_available, bool updateDownloading, const QString &available_version,

55− int update_size, const QString &last_update_date, const QString &error_reason);

56− void onUpdateDownloaded();

57− void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);

58− void onUpdateApplied(bool applied);

59− void onRebooting(bool status);

60−

61−Q_SIGNALS:

62− void updateAvailableStatus();

63− void updateDownloadedChanged();

64− void updateApplyingChanged();

65−

66−private Q_SLOTS:

67− void setUpdateApplying(bool status);

68−

69−private:

70− void resetUpdateStatus();

71− QString formatSize(quint64 size) const;

72−

73−private:

74− bool m_updateAvailable = false;

75− bool m_updateApplying = false;

76− bool m_downloading = false;

77− bool m_downloaded = false;

78− QString m_availableVersion;

79− QString m_updateSize;

80− QString m_lastUpdateDate;

81− QString m_errorReason;

82−};

83−

84−#endif // SYSTEMIMAGE_H

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)

3+include_directories(

4+ ${CMAKE_CURRENT_SOURCE_DIR}

5+ ${CMAKE_CURRENT_BINARY_DIR}

6+)

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+/*

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+/*

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

6+ An interface to register menus that are associated with a window in an application. The

7+ main interface is documented here: @ref com::ubuntu::MenuRegistrar.

9+ The actual menus are transported using the gmenumodel protocol

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+/*

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/Dash/plugin.h → plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hrenamed+12−11

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

11/*

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 DASH_PLUGIN_H

19−#define DASH_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 DashPlugin : 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

34+#endif // DBUSAPPLICATIONMENUREGISTRY_H

plugins/Unity/ApplicationMenu/plugin.cppnew file+42

@@ -0,0 +1,42 @@

1+/*

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

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

66add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})

8−qt5_use_modules(Connectivity Qml DBus Core)

8+target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)

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

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

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

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

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

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

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

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/plugin.cppdeleted−32

@@ -1,32 +0,0 @@

1−/*

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− *

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

17− */

18−

19−#include "plugin.h"

20−#include "dashcommunicator.h"

21−#include "dashcommunicatorservice.h"

22−

23−#include <QDBusConnection>

24−#include <QtQml/qqml.h>

25−

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

27−{

28− // @uri Unity.DashCommunicator

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

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

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

32−}

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+4−2

@@ -11,6 +11,9 @@ include_directories(

1111include_directories(

1212 SYSTEM

1313 ${GLIB_INCLUDE_DIRS}

14+)

15+include_directories(

16+ SYSTEM

1417 ${GIO_INCLUDE_DIRS}

1518 ${QMENUMODEL_INCLUDE_DIRS}

1619)

@@ -41,8 +44,7 @@ target_link_libraries(IndicatorsQml

4144 ${GLIB_LIBRARIES}

4245 ${GIO_LIBRARIES}

4346 ${QMENUMODEL_LDFLAGS}

47+ Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus

4448)

4549

46−qt5_use_modules(IndicatorsQml Core Qml Quick DBus)

47−

4850add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)

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+1−4

@@ -282,13 +282,10 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

282282 // convergence:

283283 // 1) enable session indicator

284284 // 2) enable keyboard indicator

285− // 3) on a PC, switch the battery/power indicator to desktop mode,

286− // can't control brightness for now and phone-on-desktop broken (FIXME)

287285 //

288286 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

289287 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

290− || new_indicator->identifier() == QStringLiteral("indicator-keyboard")

291− || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {

288+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {

292289 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));

293290 } else {

294291 new_indicator->setProfile(m_profile);

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)

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+/*

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+/*

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

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

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+72−45

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

11/*

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

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

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+/*

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/Ubuntu/SystemImage/plugin.h → plugins/Unity/Launcher/ualwrapper.hrenamed+16−11

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

11/*

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

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

1515 */

1616

17−#ifndef SYSTEMIMAGE_PLUGIN_H

18−#define SYSTEMIMAGE_PLUGIN_H

17+#include <QObject>

1918

20−#include <QQmlExtensionPlugin>

21−

22−class BackendPlugin : public QQmlExtensionPlugin

19+class UalWrapper: public QObject

2320{

2421 Q_OBJECT

25− Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)

26−

2722public:

28− void registerTypes(const char *uri) override;

29−};

23+ struct AppInfo {

24+ QString appId;

25+ bool valid = false;

26+ QString name;

27+ QString icon;

28+ QStringList keywords;

29+ uint popularity = 0;

30+ };

3031

31−#endif // SYSTEMIMAGE_PLUGIN_H

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+/*

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+/*

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

77add_library(Platform-qml SHARED ${platformplugin_SRCS})

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+1−1

@@ -18,8 +18,8 @@ add_library(UnitySession-qml MODULE

1818 ${QMLSESSIONPLUGIN_SRC}

1919 )

2020

21−qt5_use_modules(UnitySession-qml DBus Qml)

2221target_link_libraries(UnitySession-qml

22+ Qt5::DBus Qt5::Qml

2323 unity8-private

2424 ${GIO_LDFLAGS}

2525 ${GLIB_LIBRARIES}

plugins/Unity/Session/dbusunitysessionservice.cpp+75−4

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

@@ -211,6 +212,23 @@ public:

211212 QDBusConnection::SM_BUSNAME().asyncCall(msg);

212213 }

213214

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;

230+ }

231+

214232private Q_SLOTS:

215233 void onPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)

216234 {

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

@@ -335,8 +359,10 @@ void DBusUnitySessionService::PromptLock()

335359 // Prompt as in quick. No locking animation needed. Usually used by

336360 // indicator-session in combination with a switch to greeter or other

337361 // user session.

338− Q_EMIT LockRequested();

339− Q_EMIT lockRequested();

362+ if (CanLock()) {

363+ Q_EMIT LockRequested();

364+ Q_EMIT lockRequested();

365+ }

340366}

341367

342368void DBusUnitySessionService::Lock()

@@ -468,11 +494,56 @@ void performAsyncUnityCall(const QString &method)

468494

469495

470496DBusGnomeSessionManagerWrapper::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()

471542 : UnityDBusObject(QStringLiteral("/org/gnome/SessionManager/EndSessionDialog"), QStringLiteral("com.canonical.Unity"))

472543{

473544}

474545

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

476547{

477548 Q_UNUSED(arg_1);

478549 Q_UNUSED(max_wait);

plugins/Unity/Session/dbusunitysessionservice.h+18−4

@@ -270,17 +270,31 @@ private:

270270class DBusGnomeSessionManagerWrapper : public UnityDBusObject

271271{

272272 Q_OBJECT

273− Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")

273+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager")

274274

275275public:

276276 DBusGnomeSessionManagerWrapper();

277277 ~DBusGnomeSessionManagerWrapper() = default;

278278

279279public Q_SLOTS:

280− 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+};

281286

282−private:

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

284298};

285299

286300class 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+11−4

@@ -7,7 +7,6 @@ include_directories(

77 SYSTEM

88 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

99 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

10− ${GIO_INCLUDE_DIRS}

1110)

1211

1312set(QMLPLUGIN_SRC

@@ -15,6 +14,10 @@ set(QMLPLUGIN_SRC

1514 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

1615 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

1716 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

1821 constants.cpp

1922 WindowInputMonitor.cpp

2023 inputwatcher.cpp

@@ -29,6 +32,10 @@ set(QMLPLUGIN_SRC

2932 inputeventgenerator.cpp

3033 deviceconfigparser.cpp

3134 globalfunctions.cpp

35+ URLDispatcher.cpp

36+ tabfocusfence.cpp

37+ expressionfiltermodel.cpp

38+ quicklistproxymodel.cpp

3239 plugin.cpp

3340 )

3441

@@ -36,7 +43,9 @@ add_library(Utils-qml SHARED

3643 ${QMLPLUGIN_SRC}

3744 )

3845

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

4049

4150# Because this is an internal support library, we want

4251# to expose all symbols in it. Consider changing this

@@ -44,6 +53,4 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})

4453# files directly in targets.

4554set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

4655

47−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)

48−

4956add_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+/*

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+/*

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+/*

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 &currentWord, 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+/*

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

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

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

@@ -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+/*

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+/*

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

@@ -51,3 +51,8 @@ QQuickItem *GlobalFunctions::itemAt(QQuickItem* parent, int x, int y, QJSValue m

5151 }

5252 return nullptr;

5353}

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

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+/*

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+/*

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+/*

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+/*

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/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−123

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

11/*

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,175 +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(QLatin1Char('\"'))

32− .remove(QLatin1Char('\''))

33− .remove(QLatin1Char('\\'));

34−}

35−

36−WindowStateStorage::WindowStateStorage(QObject *parent):

37− QObject(parent)

32+class AsyncQuery: public QObject

3833{

39− QString dbPath = QDir::homePath() + "/.cache/unity8/";

40− m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));

41− QDir dir;

42− dir.mkpath(dbPath);

43− m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");

44− initdb();

45−}

34+ Q_OBJECT

4635

47−WindowStateStorage::~WindowStateStorage()

48−{

49− QFutureSynchronizer<void> futureSync;

50− for (int i = 0; i < m_asyncQueries.count(); ++i) {

51− futureSync.addFuture(m_asyncQueries[i]);

36+public:

37+ AsyncQuery(const QString &dbName):

38+ m_dbName(dbName)

39+ {

5240 }

53− futureSync.waitForFinished();

54− m_db.close();

55−}

5641

57−void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)

58−{

59− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")

60− .arg(sanitiseString(windowId))

61− .arg((int)state);

42+ ~AsyncQuery()

43+ {

44+ QSqlDatabase::removeDatabase(m_connectionName);

45+ }

6246

63− saveValue(queryString);

64−}

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

6555

66−WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

67−{

68− const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")

69− .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+ }

7096

71− QSqlQuery query = getValue(queryString);

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

124+

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

72163

73− if (!query.first()) {

74− return defaultValue;

75164 }

76− return (WindowState)query.value(QStringLiteral("state")).toInt();

77−}

78165

79−void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)

80−{

81− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

82− .arg(sanitiseString(windowId))

83− .arg(rect.x())

84− .arg(rect.y())

85− .arg(rect.width())

86− .arg(rect.height());

87−

88− saveValue(queryString);

89−}

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

90193

91−void WindowStateStorage::saveStage(const QString &appId, int stage)

92−{

93− const QString queryString = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values ('%1', '%2');")

94− .arg(sanitiseString(appId))

95− .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+ }

96210

97− saveValue(queryString);

98−}

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

99228

100−int WindowStateStorage::getStage(const QString &appId, int defaultValue) const

101−{

102− const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")

103− .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+ }

104243

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

106259

107− if (!query.first()) {

108− return defaultValue;

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;

109285 }

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

111298}

112299

113−void WindowStateStorage::executeAsyncQuery(const QString &queryString)

300+WindowStateStorage::~WindowStateStorage()

114301{

115− QMutexLocker l(&s_mutex);

116− QSqlQuery query;

117−

118− bool ok = query.exec(queryString);

119− if (!ok) {

120− qWarning() << "Error executing query" << queryString

121− << "Driver error:" << query.lastError().driverText()

122− << "Database error:" << query.lastError().databaseText();

123− }

302+ m_thread.quit();

303+ m_thread.wait();

124304}

125305

126−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const

306+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

127307{

128− QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

129− .arg(sanitiseString(windowId));

308+ int state;

130309

131− 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+ );

132314

133− if (!query.first()) {

315+ if (state == -1) {

134316 return defaultValue;

135317 }

136− 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;

137320}

138321

139−void WindowStateStorage::initdb()

322+int WindowStateStorage::getStage(const QString &appId, int defaultValue) const

140323{

141− m_db.open();

142− if (!m_db.open()) {

143− qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();

144− return;

145− }

324+ int stage;

146325

147− if (!m_db.tables().contains(QStringLiteral("geometry"))) {

148− QSqlQuery query;

149− query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));

150− }

326+ QMetaObject::invokeMethod(m_asyncQuery, "getStage", Qt::BlockingQueuedConnection,

327+ Q_RETURN_ARG(int, stage),

328+ Q_ARG(const QString&, appId)

329+ );

151330

152− if (!m_db.tables().contains(QStringLiteral("state"))) {

153− QSqlQuery query;

154− query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));

331+ if (stage == -1) {

332+ return defaultValue;

155333 }

156334

157− if (!m_db.tables().contains(QStringLiteral("stage"))) {

158− QSqlQuery query;

159− query.exec(QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);"));

160− }

335+ return stage;

161336}

162337

163−void WindowStateStorage::saveValue(const QString &queryString)

338+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

164339{

165− QMutexLocker mutexLocker(&s_mutex);

166−

167− QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

168− m_asyncQueries.append(future);

169−

170− QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

171− futureWatcher->setFuture(future);

172− connect(futureWatcher, &QFutureWatcher<void>::finished,

173− this,

174− [=](){ m_asyncQueries.removeAll(futureWatcher->future());

175− 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;

176349}

177350

178−QSqlQuery WindowStateStorage::getValue(const QString &queryString) const

351+const QString WindowStateStorage::getDbName()

179352{

180− QMutexLocker l(&s_mutex);

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

182359

183− bool ok = query.exec(queryString);

184− if (!ok) {

185− qWarning() << "Error retrieving database query:" << queryString

186− << "Driver error:" << query.lastError().driverText()

187− << "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;

188380 }

189− return query;

190381}

382+

383+#include "windowstatestorage.moc"

plugins/Utils/windowstatestorage.h+26−19

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

11/*

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

5260 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+/*

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

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+14−2

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

711 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

12+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h

813 )

914

15+add_definitions(-DWINDOWMANAGERQML_LIBRARY)

16+

17+include_directories(

18+ SYSTEM

19+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

20+)

21+

1022add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})

1123

12−qt5_use_modules(windowmanager-qml Qml Quick Gui)

24+target_link_libraries(windowmanager-qml Qt5::Qml Qt5::Quick Qt5::Gui)

1325

1426add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)

plugins/WindowManager/InputMethodManager.cppnew file+56

@@ -0,0 +1,56 @@

1+/*

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+/*

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

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

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+/*

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+/*

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+/*

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+/*

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

tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel → plugins/WindowManager/WindowManagerGlobal.hrenamed+8−2

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

11/*

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,4 +14,10 @@

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

1515 */

1616

17−#include "../liblightdm/SessionsModel.h"

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

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

11/*

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

@@ -16,13 +16,29 @@

1616

1717#include "WindowManagerPlugin.h"

1818

19−#include "TopLevelSurfaceList.h"

19+#include "AvailableDesktopArea.h"

20+#include "TopLevelWindowModel.h"

21+#include "Window.h"

22+#include "WindowMargins.h"

23+#include "InputMethodManager.h"

2024

2125#include <QtQml>

2226

27+QObject *inputMethodManager(QQmlEngine *engine, QJSEngine *scriptEngine)

28+{

29+ Q_UNUSED(engine)

30+ Q_UNUSED(scriptEngine)

31+ return InputMethodManager::instance();

32+}

33+

2334void WindowManagerPlugin::registerTypes(const char *uri)

2435{

25− qmlRegisterType<TopLevelSurfaceList>(uri, 0, 1, "TopLevelSurfaceList");

36+ qmlRegisterType<AvailableDesktopArea>(uri, 1, 0, "AvailableDesktopArea");

37+ qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");

38+ qmlRegisterType<WindowMargins>(uri, 1, 0, "WindowMargins");

39+ qmlRegisterSingletonType<InputMethodManager>(uri, 1, 0, "InputMethodManager", inputMethodManager);

40+

41+ qRegisterMetaType<Window*>("Window*");

2642

2743 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

2844}

plugins/WindowManager/WindowMargins.cppnew file+74

@@ -0,0 +1,74 @@

1+/*

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 "WindowMargins.h"

18+

19+#include <QGuiApplication>

20+#include <QQuickWindow>

21+#include <qpa/qplatformnativeinterface.h>

22+

23+void WindowMargins::setNormal(QRectF value)

24+{

25+ if (m_normal == value) {

26+ return;

27+ }

28+

29+ m_normal = value;

30+

31+ if (window()) {

32+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

33+ nativeInterface->setWindowProperty(window()->handle(), "normalWindowMargins", QVariant(m_normal.toRect()));

34+ }

35+

36+ Q_EMIT normalChanged();

37+}

38+

39+QRectF WindowMargins::normal() const

40+{

41+ return m_normal;

42+}

43+

44+void WindowMargins::setDialog(QRectF value)

45+{

46+ if (m_dialog == value) {

47+ return;

48+ }

49+

50+ m_dialog = value;

51+

52+ if (window()) {

53+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

54+ nativeInterface->setWindowProperty(window()->handle(), "dialogWindowMargins", QVariant(m_dialog.toRect()));

55+ }

56+

57+ Q_EMIT dialogChanged();

58+}

59+

60+QRectF WindowMargins::dialog() const

61+{

62+ return m_dialog;

63+}

64+

65+void WindowMargins::itemChange(ItemChange change, const ItemChangeData &data)

66+{

67+ if (change == ItemSceneChange && data.window != nullptr) {

68+ QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

69+ if (!m_normal.isNull()) {

70+ nativeInterface->setWindowProperty(data.window->handle(), "normalWindowMargins", QVariant(m_normal.toRect()));

71+ nativeInterface->setWindowProperty(data.window->handle(), "dialogWindowMargins", QVariant(m_dialog.toRect()));

72+ }

73+ }

74+}

plugins/WindowManager/WindowMargins.hnew file+59

@@ -0,0 +1,59 @@

1+/*

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 WINDOWMARGINS_H

18+#define WINDOWMARGINS_H

19+

20+#include <QQuickItem>

21+#include <QRectF>

22+

23+/*

24+ * Specifies window margins for different Mir window types

25+ *

26+ * Used to inform MirAL so that it can take window management decisions that match

27+ * the visuals drawn by Unity.

28+ */

29+class WindowMargins : public QQuickItem

30+{

31+ Q_OBJECT

32+

33+ // Margins for windows of normal type

34+ Q_PROPERTY(QRectF normal READ normal WRITE setNormal NOTIFY normalChanged)

35+

36+ // Margins for windows of dialog type

37+ Q_PROPERTY(QRectF dialog READ dialog WRITE setDialog NOTIFY dialogChanged)

38+

39+ // TODO: Add margins for other window types as needed

40+

41+public:

42+ QRectF normal() const;

43+ void setNormal(QRectF value);

44+

45+ QRectF dialog() const;

46+ void setDialog(QRectF value);

47+

48+protected:

49+ void itemChange(ItemChange change, const ItemChangeData &value) override;

50+

51+Q_SIGNALS:

52+ void normalChanged();

53+ void dialogChanged();

54+private:

55+ QRectF m_normal;

56+ QRectF m_dialog;

57+};

58+

59+#endif // WINDOWMARGINS_H

plugins/Wizard/CMakeLists.txt+5−2

@@ -10,10 +10,13 @@ add_library(Wizard-qml MODULE

1010 timezonemodel.cpp

1111 Status.cpp

1212 keyboardLayoutsModel.cpp

13+ Changelog.cpp

1314)

1415

15−qt5_use_modules(Wizard-qml DBus Qml)

16−target_link_libraries(Wizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})

16+target_link_libraries(Wizard-qml

17+ Qt5::DBus Qt5::Qml

18+ ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS}

19+)

1720add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)

1821

1922set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")

plugins/Wizard/Changelog.cppnew file+58

@@ -0,0 +1,58 @@

1+/*

3+ * Written by: Marius Gripsgard <marius@ubports.com>

4+ *

5+ * This program is free software: you can redistribute it and/or modify it

6+ * under the terms of the GNU General Public License version 3, as published

7+ * by the Free Software Foundation.

8+ *

9+ * This program is distributed in the hope that it will be useful, but

10+ * WITHOUT ANY WARRANTY; without even the implied warranties of

11+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

12+ * PURPOSE. See the GNU General Public License for more details.

13+ *

14+ * You should have received a copy of the GNU General Public License along

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

16+ */

17+

18+#include "Changelog.h"

19+

20+#include <QDir>

21+#include <QFile>

22+#include <QTextStream>

23+

24+Changelog::Changelog()

25+ : QObject()

26+{

27+ readChangelog();

28+ if(QFile::exists(changelogPath()))

29+ m_fsWatcher.addPath(changelogPath());

30+ connect(&m_fsWatcher, &QFileSystemWatcher::fileChanged, this, &Changelog::watcherFileChanged);

31+}

32+

33+QString Changelog::changelogPath()

34+{

35+ return "/usr/share/ubports/changelogs/current";

36+}

37+

38+QString Changelog::text() const

39+{

40+ return m_text;

41+}

42+

43+void Changelog::readChangelog()

44+{

45+ if(!QFile::exists(changelogPath()))

46+ return;

47+ QFile f(changelogPath());

48+ if (!f.open(QFile::ReadOnly | QFile::Text)) return;

49+ QTextStream in(&f);

50+ m_text = in.readAll();

51+ Q_EMIT textChanged();

52+}

53+

54+void Changelog::watcherFileChanged()

55+{

56+ readChangelog();

57+ m_fsWatcher.removePath(changelogPath());

58+}

plugins/Wizard/Changelog.hnew file+52

@@ -0,0 +1,52 @@

1+/*

3+ * Written by: Marius Gripsgard <marius@ubports.com>

4+ *

5+ * This program is free software: you can redistribute it and/or modify it

6+ * under the terms of the GNU General Public License version 3, as published

7+ * by the Free Software Foundation.

8+ *

9+ * This program is distributed in the hope that it will be useful, but

10+ * WITHOUT ANY WARRANTY; without even the implied warranties of

11+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR

12+ * PURPOSE. See the GNU General Public License for more details.

13+ *

14+ * You should have received a copy of the GNU General Public License along

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

16+ */

17+

18+#ifndef WIZARD_CHANGELOG_H

19+#define WIZARD_CHANGELOG_H

20+

21+#include <QFileSystemWatcher>

22+#include <QObject>

23+#include <QString>

24+

25+class Changelog : public QObject

26+{

27+ Q_OBJECT

28+ Q_PROPERTY(QString text READ text NOTIFY textChanged)

29+

30+public:

31+ Changelog();

32+ ~Changelog() = default;

33+

34+ QString text() const;

35+

36+Q_SIGNALS:

37+ void textChanged();

38+

39+private Q_SLOTS:

40+ void watcherFileChanged();

41+

42+private:

43+ Q_DISABLE_COPY(Changelog)

44+

45+ static QString changelogPath();

46+ void readChangelog();

47+

48+ QFileSystemWatcher m_fsWatcher;

49+ QString m_text;

50+};

51+

52+#endif

plugins/Wizard/System.cpp+69−7

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

11/*

34 *

45 * This program is free software: you can redistribute it and/or modify it

@@ -46,29 +47,93 @@ QString System::wizardEnabledPath()

4647 return QDir::home().filePath(QStringLiteral(".config/ubuntu-system-settings/wizard-has-run"));

4748}

4849

50+QString System::currentFrameworkPath()

51+{

52+ QFileInfo f("/usr/share/click/frameworks/current");

53+ return f.canonicalFilePath();

54+}

55+

56+/*

57+wizardEnabled and isUpdate logic

58+

59+if wizard-has-run does NOT exist == is new install

60+if wizard-has-run exists but does NOT match current framework == is update

61+if wizard-has-run exists but does match current framework == show no wizard

62+*/

63+

64+bool System::wizardPathExists() {

65+ return QFile::exists(wizardEnabledPath());

66+}

67+

4968bool System::wizardEnabled() const

5069{

51− return !QFile::exists(wizardEnabledPath());

70+ if (!wizardPathExists()) {

71+ return true;

72+ }

73+ return isUpdate();

74+}

75+

76+QString System::readCurrentFramework()

77+{

78+ QFile f(currentFrameworkPath());

79+ if (!f.open(QFile::ReadOnly | QFile::Text)) return "";

80+ QTextStream in(&f);

81+ return in.readAll();

82+}

83+

84+QString System::readWizardEnabled()

85+{

86+ QFile f(wizardEnabledPath());

87+ if (!f.open(QFile::ReadOnly | QFile::Text)) return "";

88+ QTextStream in(&f);

89+ return in.readAll();

90+}

91+

92+QString System::version() const

93+{

94+ return readCurrentFramework();

95+}

96+

97+bool System::isUpdate() const

98+{

99+ if (!wizardPathExists()) {

100+ return false;

101+ }

102+

103+ return readCurrentFramework() != readWizardEnabled();

52104}

53105

54106void System::setWizardEnabled(bool enabled)

55107{

56− if (wizardEnabled() == enabled)

108+ if (wizardEnabled() == enabled && !isUpdate())

57109 return;

58110

59111 if (enabled) {

60112 QFile::remove(wizardEnabledPath());

61113 } else {

62114 QDir(wizardEnabledPath()).mkpath(QStringLiteral(".."));

63− QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);

115+ if (QFile::exists(wizardEnabledPath())) {

116+ QFile::remove(wizardEnabledPath());

117+ }

118+ // For special cases check if wizardEnabledPath is a folder

119+ if (QDir(wizardEnabledPath()).exists()) {

120+ QDir(wizardEnabledPath()).removeRecursively();

121+ }

122+ if (!QFile::copy(currentFrameworkPath(), wizardEnabledPath())) {

123+ // Make en empty file if framework does not exist

124+ QFile f(wizardEnabledPath());

125+ f.open(QFile::WriteOnly);

126+ }

64127 m_fsWatcher.addPath(wizardEnabledPath());

65128 Q_EMIT wizardEnabledChanged();

129+ Q_EMIT isUpdateChanged();

66130 }

67131}

68132

69133void System::watcherFileChanged()

70134{

71135 Q_EMIT wizardEnabledChanged();

136+ Q_EMIT isUpdateChanged();

72137 m_fsWatcher.removePath(wizardEnabledPath());

73138}

74139

@@ -103,13 +168,10 @@ void System::updateSessionLocale(const QString &locale)

103168

104169 // Restart bits of the session to pick up new language.

105170 QProcess::startDetached(QStringLiteral("sh -c \"initctl emit indicator-services-end; \

106− initctl stop scope-registry; \

107− initctl stop smart-scopes-proxy; \

108171 initctl emit --no-wait indicator-services-start; \

109172 initctl restart --no-wait ubuntu-location-service-trust-stored; \

110173 initctl restart --no-wait maliit-server; \

111− initctl restart --no-wait indicator-messages; \

112− initctl restart --no-wait unity8-dash\""));

174+ initctl restart --no-wait indicator-messages"));

113175}

114176

115177void System::skipUntilFinishedPage()

plugins/Wizard/System.h+17

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

11/*

34 *

45 * This program is free software: you can redistribute it and/or modify it

@@ -18,6 +19,7 @@

1819#define WIZARD_SYSTEM_H

1920

2021#include <QFileSystemWatcher>

22+#include <QVersionNumber>

2123#include <QObject>

2224#include <QString>

2325

@@ -25,12 +27,21 @@ class System : public QObject

2527{

2628 Q_OBJECT

2729 Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)

30+ Q_PROPERTY(QString version READ version NOTIFY versionChanged)

31+ Q_PROPERTY(bool isUpdate READ isUpdate NOTIFY isUpdateChanged)

2832

2933public:

3034 System();

3135 ~System() = default;

3236

37+ /**

38+ * Checks whether the wizard is enabled for first-run or otherwise.

39+ */

3340 bool wizardEnabled() const;

41+

42+ QString version() const;

43+ bool isUpdate() const;

44+

3445 void setWizardEnabled(bool enabled);

3546

3647public Q_SLOTS:

@@ -42,6 +53,8 @@ public Q_SLOTS:

4253

4354Q_SIGNALS:

4455 void wizardEnabledChanged();

56+ void versionChanged();

57+ void isUpdateChanged();

4558

4659private Q_SLOTS:

4760 void watcherFileChanged();

@@ -50,7 +63,11 @@ private:

5063 Q_DISABLE_COPY(System)

5164

5265 static QString wizardEnabledPath();

66+ static QString currentFrameworkPath();

5367 static void setSessionVariable(const QString &variable, const QString &value);

68+ static QString readCurrentFramework();

69+ static QString readWizardEnabled();

70+ static bool wizardPathExists();

5471

5572 QFileSystemWatcher m_fsWatcher;

5673};

plugins/Wizard/Utils/CMakeLists.txt+1−1

@@ -20,7 +20,7 @@ add_library(WizardUtils-qml SHARED

2020# files directly in targets.

2121set_target_properties(WizardUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

2222

23−qt5_use_modules(WizardUtils-qml DBus Qml Quick)

23+target_link_libraries(WizardUtils-qml Qt5::DBus Qt5::Qml Qt5::Quick)

2424

2525set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/Utils)

2626install(FILES qmldir DESTINATION ${PLUG_DIR})

plugins/Wizard/plugin.cpp+2

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

2020#include "timezonemodel.h"

2121#include "LocalePlugin.h"

2222#include "Status.h"

23+#include "Changelog.h"

2324#include "keyboardLayoutsModel.h"

2425

2526#include <QtQml/qqml.h>

@@ -30,6 +31,7 @@ void WizardPlugin::registerTypes(const char *uri)

3031 qmlRegisterType<PageList>(uri, 0, 1, "PageList");

3132 qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });

3233 qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });

34+ qmlRegisterSingletonType<Changelog>(uri, 0, 1, "Changelog", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Changelog; });

3335 qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");

3436 qmlRegisterType<KeyboardLayoutsModel>(uri, 0, 1, "KeyboardLayoutsModel");

3537 qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");

plugins/Wizard/test.shdeleted−18

@@ -1,18 +0,0 @@

1−#!/bin/sh

2−

3−TOPDIR=$(readlink -e "$(dirname ${0})/..")

4−

5−LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)

6−if [ -n ${LOCAL_PRIVATE_DIR} ]; then

7− echo "Testing against locally built version"

8− export UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/debian/tmp/usr/share"

9− export UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES="${LOCAL_PRIVATE_DIR}"

10− export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}

11− export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}

12−else

13− echo "Testing against system version"

14−fi

15−

16−export QML2_IMPORT_PATH=${TOPDIR}/tests/mocks:${QML2_IMPORT_PATH}

17−

18−exec system-settings-wizard

po/aa.po+286−378

@@ -6,123 +6,138 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2016-08-11 06:28+0000\n"

11−"PO-Revision-Date: 2016-02-12 10:18+0000\n"

12−"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"

13−"Language-Team: Afar <aa@li.org>\n"

9+"Report-Msgid-Bugs-To: \n"

10+"POT-Creation-Date: 2021-01-29 11:42-0600\n"

11+"PO-Revision-Date: 2021-03-08 10:42+0000\n"

12+"Last-Translator: TigranKhachatryan0 <tigrank2008@gmail.com>\n"

13+"Language-Team: Afar <https://translate.ubports.com/projects/ubports/lomiri/"

14+"aa/>\n"

15+"Language: aa\n"

1416"MIME-Version: 1.0\n"

1517"Content-Type: text/plain; charset=UTF-8\n"

1618"Content-Transfer-Encoding: 8bit\n"

1719"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2016-08-17 05:51+0000\n"

19−"X-Generator: Launchpad (build 18169)\n"

20+"X-Generator: Weblate 3.11.3\n"

21+"X-Launchpad-Export-Date: 2016-11-23 06:34+0000\n"

2022

21−#: plugins/LightDM/Greeter.cpp:123

23+#: plugins/LightDM/Greeter.cpp:199

2224msgid "Password: "

23−msgstr "Cuumita "

25+msgstr ""

2426

25−#: plugins/Unity/Launcher/launcheritem.cpp:49

26−#: plugins/Unity/Launcher/launcheritem.cpp:108

27−msgid "Pin shortcut"

27+#: plugins/LightDM/Greeter.cpp:214

28+msgid "Username"

2829msgstr ""

2930

30−#: plugins/Unity/Launcher/launcheritem.cpp:54

31−msgid "Quit"

32−msgstr "Kat"

31+#: plugins/LightDM/Greeter.cpp:258

32+msgid "Failed to authenticate"

33+msgstr ""

3334

34−#: plugins/Unity/Launcher/launcheritem.cpp:108

35−msgid "Unpin shortcut"

35+#: plugins/LightDM/Greeter.cpp:260

36+msgid "Invalid password, please try again"

3637msgstr ""

3738

38−#: qml/Components/DelayedLockscreen.qml:50

39−msgid "Device Locked"

39+#: plugins/LightDM/Greeter.cpp:270

40+msgid "Log In"

4041msgstr ""

4142

42−#: qml/Components/DelayedLockscreen.qml:65

43−msgid "You have been locked out due to too many failed passphrase attempts."

43+#: plugins/LightDM/Greeter.cpp:270

44+msgid "Retry"

45+msgstr "Qagis"

46+

47+#: plugins/LightDM/UsersModel.cpp:157

48+msgid "Login"

4449msgstr ""

4550

46−#: qml/Components/DelayedLockscreen.qml:66

47−msgid "You have been locked out due to too many failed passcode attempts."

51+#: plugins/LightDM/UsersModel.cpp:165

52+msgid "Guest Session"

4853msgstr ""

4954

50−#: qml/Components/DelayedLockscreen.qml:75

51−#, qt-format

52−msgid "Please wait %1 minute and then try again…"

53−msgid_plural "Please wait %1 minutes and then try again…"

54−msgstr[0] "Maganak %1 minit qambaalaay, kaadu gabbat"

55−msgstr[1] "Maganak %1 minit qambaalaay, kaadu gabbat"

55+#: plugins/Unity/Launcher/launcheritem.cpp:48

56+#: plugins/Unity/Launcher/launcheritem.cpp:122

57+msgid "Pin shortcut"

58+msgstr ""

59+

60+#: plugins/Unity/Launcher/launcheritem.cpp:54

61+msgid "Quit"

62+msgstr "Kat"

63+

64+#: plugins/Unity/Launcher/launcheritem.cpp:122

65+msgid "Unpin shortcut"

66+msgstr ""

5667

57−#: qml/Components/Dialogs.qml:149

68+#: qml/Components/Dialogs.qml:176

5869msgctxt "Title: Lock/Log out dialog"

5970msgid "Log out"

6071msgstr "Eweq"

6172

62−#: qml/Components/Dialogs.qml:150

73+#: qml/Components/Dialogs.qml:177

6374msgid "Are you sure you want to log out?"

6475msgstr ""

6576

66−#: qml/Components/Dialogs.qml:152

77+#: qml/Components/Dialogs.qml:180

6778msgctxt "Button: Lock the system"

6879msgid "Lock"

6980msgstr "Koflis"

7081

71−#: qml/Components/Dialogs.qml:159

82+#: qml/Components/Dialogs.qml:191

7283msgctxt "Button: Log out from the system"

7384msgid "Log Out"

7485msgstr "Eweq"

7586

76−#: qml/Components/Dialogs.qml:166 qml/Components/Dialogs.qml:222

77−#: qml/Dash/DashPageHeader.qml:322 qml/Wizard/Pages/passcode-confirm.qml:32

87+#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284

88+#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32

7889#: qml/Wizard/Pages/passcode-set.qml:32

7990msgid "Cancel"

8091msgstr "Bayis"

8192

82−#: qml/Components/Dialogs.qml:178

93+#: qml/Components/Dialogs.qml:211

8394msgctxt "Title: Reboot dialog"

8495msgid "Reboot"

8596msgstr "Wadir-ugus"

8697

87−#: qml/Components/Dialogs.qml:179

98+#: qml/Components/Dialogs.qml:212

8899msgid "Are you sure you want to reboot?"

89100msgstr "Wadir-ugussuh digga maay litoo?"

90101

91−#: qml/Components/Dialogs.qml:181

102+#: qml/Components/Dialogs.qml:215

92103msgid "No"

93104msgstr "Maleey"

94105

95−#: qml/Components/Dialogs.qml:187

106+#: qml/Components/Dialogs.qml:223

96107msgid "Yes"

97108msgstr "Yeey"

98109

99−#: qml/Components/Dialogs.qml:202

110+#: qml/Components/Dialogs.qml:243

100111msgctxt "Title: Power off/Restart dialog"

101112msgid "Power"

102113msgstr "Cayla"

103114

104−#: qml/Components/Dialogs.qml:203

115+#: qml/Components/Dialogs.qml:244

105116msgid ""

106117"Are you sure you would like\n"

107118"to power off?"

108119msgstr "Timmi haytuh digga maay litoo?"

109120

110−#: qml/Components/Dialogs.qml:205

121+#: qml/Components/Dialogs.qml:248

111122msgctxt "Button: Power off the system"

112123msgid "Power off"

113124msgstr "Timmi hayis"

114125

115−#: qml/Components/Dialogs.qml:214

126+#: qml/Components/Dialogs.qml:263

116127msgctxt "Button: Restart the system"

117128msgid "Restart"

118129msgstr "Wadir-qimbis"

119130

131+#: qml/Components/Dialogs.qml:276

132+msgid "Screenshot"

133+msgstr ""

134+

120135#: qml/Components/KeyboardShortcutsOverlay.qml:41

121136msgid "Keyboard Shortcuts"

122137msgstr ""

123138

124139#: qml/Components/KeyboardShortcutsOverlay.qml:55

125−msgid "Unity 8"

140+msgid "Lomiri"

126141msgstr ""

127142

128143#: qml/Components/KeyboardShortcutsOverlay.qml:62

@@ -138,7 +153,7 @@ msgid "Alt + PrtScr"

138153msgstr ""

139154

140155#: qml/Components/KeyboardShortcutsOverlay.qml:80

141−msgid "Takes a screenshot of a window."

156+msgid "Takes a screenshot of the current window."

142157msgstr ""

143158

144159#: qml/Components/KeyboardShortcutsOverlay.qml:88

@@ -157,135 +172,139 @@ msgstr ""

157172msgid "Switches to previous keyboard layout."

158173msgstr ""

159174

160−#: qml/Components/KeyboardShortcutsOverlay.qml:118

161−msgid "Launcher"

175+#: qml/Components/KeyboardShortcutsOverlay.qml:114

176+msgid "Ctrl + Alt + T"

162177msgstr ""

163178

164−#: qml/Components/KeyboardShortcutsOverlay.qml:125

165−msgid "Super (Hold)"

179+#: qml/Components/KeyboardShortcutsOverlay.qml:119

180+msgid "Starts the Terminal application."

166181msgstr ""

167182

168−#: qml/Components/KeyboardShortcutsOverlay.qml:130

169−msgid "Opens the launcher, displays shortcuts."

183+#: qml/Components/KeyboardShortcutsOverlay.qml:131

184+msgid "Launcher"

170185msgstr ""

171186

172187#: qml/Components/KeyboardShortcutsOverlay.qml:138

173−msgid "Alt + F1"

188+msgid "Super (Hold)"

174189msgstr ""

175190

176191#: qml/Components/KeyboardShortcutsOverlay.qml:143

177−msgid "Opens launcher keyboard navigation mode."

192+msgid "Opens the launcher, displays shortcuts."

178193msgstr ""

179194

180195#: qml/Components/KeyboardShortcutsOverlay.qml:151

181−msgid "Super + Tab"

196+msgid "Alt + F1"

182197msgstr ""

183198

184199#: qml/Components/KeyboardShortcutsOverlay.qml:156

185−msgid "Switches applications via the launcher."

200+msgid "Opens launcher keyboard navigation mode."

186201msgstr ""

187202

188203#: qml/Components/KeyboardShortcutsOverlay.qml:164

189−msgid "Super + 0 to 9"

204+msgid "Super + Tab"

190205msgstr ""

191206

192207#: qml/Components/KeyboardShortcutsOverlay.qml:169

193−msgid "Same as clicking on a launcher icon."

208+msgid "Switches applications via the launcher."

194209msgstr ""

195210

196−#: qml/Components/KeyboardShortcutsOverlay.qml:181

197−msgid "Scopes"

211+#: qml/Components/KeyboardShortcutsOverlay.qml:177

212+msgid "Super + 1 to 0"

213+msgstr ""

214+

215+#: qml/Components/KeyboardShortcutsOverlay.qml:182

216+msgid "Same as clicking on a launcher icon."

198217msgstr ""

199218

200−#: qml/Components/KeyboardShortcutsOverlay.qml:188

201−msgid "Super (Tap)"

219+#: qml/Components/KeyboardShortcutsOverlay.qml:190

220+msgid "Super + A"

202221msgstr ""

203222

204−#: qml/Components/KeyboardShortcutsOverlay.qml:193

205−msgid "Opens the Scopes home."

223+#: qml/Components/KeyboardShortcutsOverlay.qml:195

224+msgid "Opens the Application Drawer."

206225msgstr ""

207226

208−#: qml/Components/KeyboardShortcutsOverlay.qml:209

227+#: qml/Components/KeyboardShortcutsOverlay.qml:235

209228msgid "Switching"

210229msgstr ""

211230

212−#: qml/Components/KeyboardShortcutsOverlay.qml:216

231+#: qml/Components/KeyboardShortcutsOverlay.qml:242

213232msgid "Alt + Tab"

214233msgstr ""

215234

216−#: qml/Components/KeyboardShortcutsOverlay.qml:221

235+#: qml/Components/KeyboardShortcutsOverlay.qml:247

217236msgid "Switches between applications."

218237msgstr ""

219238

220−#: qml/Components/KeyboardShortcutsOverlay.qml:229

239+#: qml/Components/KeyboardShortcutsOverlay.qml:255

221240msgid "Super + W"

222241msgstr ""

223242

224−#: qml/Components/KeyboardShortcutsOverlay.qml:234

243+#: qml/Components/KeyboardShortcutsOverlay.qml:260

225244msgid "Opens the desktop spread."

226245msgstr ""

227246

228−#: qml/Components/KeyboardShortcutsOverlay.qml:242

247+#: qml/Components/KeyboardShortcutsOverlay.qml:268

229248msgid "Cursor Left or Right"

230249msgstr ""

231250

232−#: qml/Components/KeyboardShortcutsOverlay.qml:247

251+#: qml/Components/KeyboardShortcutsOverlay.qml:273

233252msgid "Moves the focus."

234253msgstr ""

235254

236−#: qml/Components/KeyboardShortcutsOverlay.qml:259

255+#: qml/Components/KeyboardShortcutsOverlay.qml:285

237256msgid "Windows"

238257msgstr ""

239258

240−#: qml/Components/KeyboardShortcutsOverlay.qml:266

259+#: qml/Components/KeyboardShortcutsOverlay.qml:292

241260msgid "Ctrl + Super + D"

242261msgstr ""

243262

244−#: qml/Components/KeyboardShortcutsOverlay.qml:271

263+#: qml/Components/KeyboardShortcutsOverlay.qml:297

245264msgid "Minimizes all windows."

246265msgstr ""

247266

248−#: qml/Components/KeyboardShortcutsOverlay.qml:279

267+#: qml/Components/KeyboardShortcutsOverlay.qml:305

249268msgid "Ctrl + Super + Up"

250269msgstr ""

251270

252−#: qml/Components/KeyboardShortcutsOverlay.qml:284

271+#: qml/Components/KeyboardShortcutsOverlay.qml:310

253272msgid "Maximizes the current window."

254273msgstr ""

255274

256−#: qml/Components/KeyboardShortcutsOverlay.qml:292

275+#: qml/Components/KeyboardShortcutsOverlay.qml:318

257276msgid "Ctrl + Super + Down"

258277msgstr ""

259278

260−#: qml/Components/KeyboardShortcutsOverlay.qml:297

279+#: qml/Components/KeyboardShortcutsOverlay.qml:323

261280msgid "Minimizes or restores the current window."

262281msgstr ""

263282

264−#: qml/Components/KeyboardShortcutsOverlay.qml:305

283+#: qml/Components/KeyboardShortcutsOverlay.qml:331

265284msgid "Ctrl + Super + Left or Right"

266285msgstr ""

267286

268−#: qml/Components/KeyboardShortcutsOverlay.qml:310

287+#: qml/Components/KeyboardShortcutsOverlay.qml:336

269288msgid "Semi-maximizes the current window."

270289msgstr ""

271290

272−#: qml/Components/KeyboardShortcutsOverlay.qml:318

291+#: qml/Components/KeyboardShortcutsOverlay.qml:344

273292msgid "Alt + F4"

274293msgstr ""

275294

276−#: qml/Components/KeyboardShortcutsOverlay.qml:323

295+#: qml/Components/KeyboardShortcutsOverlay.qml:349

277296msgid "Closes the current window."

278297msgstr ""

279298

280−#: qml/Components/Lockscreen.qml:239

299+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:235

281300msgid "Return to Call"

282301msgstr "Seecol gacis"

283302

284−#: qml/Components/Lockscreen.qml:239

303+#: qml/Components/Lockscreen.qml:212

285304msgid "Emergency Call"

286305msgstr ""

287306

288−#: qml/Components/Lockscreen.qml:271

307+#: qml/Components/Lockscreen.qml:245

289308msgid "OK"

290309msgstr "Hayya"

291310

@@ -299,29 +318,29 @@ msgstr ""

299318msgid "%1:%2"

300319msgstr ""

301320

302−#: qml/Components/ModeSwitchWarningDialog.qml:32

321+#: qml/Components/ModeSwitchWarningDialog.qml:33

303322msgid "Apps may have unsaved data:"

304323msgstr ""

305324

306−#: qml/Components/ModeSwitchWarningDialog.qml:57

325+#: qml/Components/ModeSwitchWarningDialog.qml:60

307326msgctxt ""

308327"Re-dock means connect the device again to an external screen/mouse/keyboard"

309328msgid "Re-dock, save your work and close these apps to continue."

310329msgstr ""

311330

312−#: qml/Components/ModeSwitchWarningDialog.qml:63

331+#: qml/Components/ModeSwitchWarningDialog.qml:67

313332msgid "Or force close now (unsaved data will be lost)."

314333msgstr ""

315334

316−#: qml/Components/ModeSwitchWarningDialog.qml:75

335+#: qml/Components/ModeSwitchWarningDialog.qml:80

317336msgid "OK, I will reconnect"

318337msgstr ""

319338

320−#: qml/Components/ModeSwitchWarningDialog.qml:76

339+#: qml/Components/ModeSwitchWarningDialog.qml:81

321340msgid "Reconnect now!"

322341msgstr ""

323342

324−#: qml/Components/ModeSwitchWarningDialog.qml:88

343+#: qml/Components/ModeSwitchWarningDialog.qml:94

325344msgid "Close all"

326345msgstr "Inkih alif"

327346

@@ -329,186 +348,96 @@ msgstr "Inkih alif"

329348msgid "Preview Share Item"

330349msgstr ""

331350

332−#: qml/Dash/DashPageHeader.qml:360

333−msgctxt "Button: Open the Ubuntu Store"

334−msgid "Store"

335−msgstr ""

336−

337−#: qml/Dash/DashPageHeader.qml:367

338−msgctxt "Button: Start a search in the current dash scope"

339−msgid "Search"

340−msgstr "Goranto"

341−

342−#: qml/Dash/DashPageHeader.qml:377

343−msgctxt "Button: Show the current dash scope settings"

344−msgid "Settings"

345−msgstr "Massosu"

346−

347−#: qml/Dash/DashPageHeader.qml:384

348−msgid "Remove from Favorites"

349−msgstr ""

350−

351−#: qml/Dash/DashPageHeader.qml:384

352−msgid "Add to Favorites"

353−msgstr ""

354−

355−#: qml/Dash/FiltersPopover.qml:60

356−msgid "Refine your results"

357−msgstr ""

358−

359−#: qml/Dash/FiltersPopover.qml:69

360−msgid "Reset"

361−msgstr ""

362−

363−#: qml/Dash/GenericScopeView.qml:585 qml/Dash/GenericScopeView.qml:780

364−msgid "Show less"

365−msgstr ""

366−

367−#: qml/Dash/GenericScopeView.qml:585

368−msgid "Show all"

369−msgstr ""

370−

371−#: qml/Dash/GenericScopeView.qml:642

372−msgctxt "Label: Hint for dash search line edit"

373−msgid "Search"

374−msgstr "Goranto"

375−

376−#: qml/Dash/PageHeaderExtraPanel.qml:56

377−msgid "Recent Searches"

378−msgstr ""

379−

380−#: qml/Dash/PageHeaderExtraPanel.qml:67

381−msgid "Clear All"

382−msgstr ""

383−

384−#: qml/Dash/Previews/PreviewActionCombo.qml:35

385−msgid "More..."

386−msgstr ""

387−

388−#: qml/Dash/Previews/PreviewActionCombo.qml:35

389−msgid "Less..."

390−msgstr ""

391−

392−#: qml/Dash/Previews/PreviewCommentInput.qml:68

393−#: qml/Dash/Previews/PreviewRatingInput.qml:175

394−msgid "Send"

395−msgstr "Rub"

396−

397−#: qml/Dash/Previews/PreviewRatingInput.qml:82

398−msgid "Rate this"

399−msgstr ""

400−

401−#: qml/Dash/Previews/PreviewRatingInput.qml:157

402−msgid "Add a review"

403−msgstr ""

404−

405−#: qml/Dash/PullToRefreshScopeStyle.qml:55

406−msgid "Pull to refresh…"

407−msgstr ""

408−

409−#: qml/Dash/PullToRefreshScopeStyle.qml:60

410−msgid "Release to refresh…"

351+#: qml/Components/VirtualTouchPad.qml:317

352+msgid ""

353+"Your device is now connected to an external display. Use this screen as a "

354+"touch pad to interact with the pointer."

411355msgstr ""

412356

413−#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

414−msgid "Enable location data"

357+#: qml/Components/VirtualTouchPad.qml:327

358+msgid "Tap left button to click."

415359msgstr ""

416360

417−#: qml/Dash/ScopesList.qml:55

418−msgid "Manage"

361+#: qml/Components/VirtualTouchPad.qml:339

362+msgid "Tap right button to right click."

419363msgstr ""

420364

421−#: qml/Dash/ScopesList.qml:102

422−msgid "Home"

423−msgstr "Dabqi"

424−

425−#: qml/Dash/ScopesList.qml:103

426−msgid "Also installed"

365+#: qml/Components/VirtualTouchPad.qml:351

366+msgid "Swipe with two fingers to scroll."

427367msgstr ""

428368

429−#: qml/DisabledScreenNotice.qml:109

430−msgid ""

431−"Your device is now connected to an external display. Use this screen as a "

432−"touch pad to interact with the pointer."

369+#: qml/Components/VirtualTouchPad.qml:396

370+msgid "Find more settings in the system settings."

433371msgstr ""

434372

435373#: qml/Greeter/CoverPage.qml:127

436374msgid "Unlock"

437375msgstr ""

438376

439−#: qml/Greeter/Greeter.qml:561

440−msgid "Try again"

377+#: qml/Greeter/DelayedLockscreen.qml:43

378+msgid "Device Locked"

441379msgstr ""

442380

443−#: qml/Greeter/LoginList.qml:63

444−msgid "Passphrase"

381+#: qml/Greeter/DelayedLockscreen.qml:58

382+msgid "You have been locked out due to too many failed passphrase attempts."

445383msgstr ""

446384

447−#: qml/Greeter/LoginList.qml:64

448−msgid "Passcode"

385+#: qml/Greeter/DelayedLockscreen.qml:59

386+msgid "You have been locked out due to too many failed passcode attempts."

449387msgstr ""

450388

451−#: qml/Greeter/LoginList.qml:87

452−msgid "Retry"

453−msgstr "Qagis"

389+#: qml/Greeter/DelayedLockscreen.qml:68

390+#, qt-format

391+msgid "Please wait %1 minute and then try again…"

392+msgid_plural "Please wait %1 minutes and then try again…"

393+msgstr[0] "Maganak %1 minit qambaalaay, kaadu gabbat"

394+msgstr[1] "Maganak %1 minit qambaalaay, kaadu gabbat"

454395

455−#: qml/Greeter/LoginList.qml:88

456−msgid "Log In"

396+#: qml/Greeter/Greeter.qml:550

397+msgid "Try again"

457398msgstr ""

458399

459−#: qml/Greeter/NarrowView.qml:55

460−msgid "Sorry, incorrect passphrase."

461−msgstr ""

400+#: qml/Greeter/Greeter.qml:551

401+#, fuzzy

402+#| msgid "Enter passphrase"

403+msgid "Enter passphrase to unlock"

404+msgstr "Tatur-maxco culus"

462405

463−#: qml/Greeter/NarrowView.qml:56

464−msgid "Sorry, incorrect passcode."

465−msgstr ""

406+#: qml/Greeter/Greeter.qml:552

407+#, fuzzy

408+#| msgid "Enter passcode"

409+msgid "Enter passcode to unlock"

410+msgstr "Tatur-mudenta culus"

466411

467−#: qml/Greeter/NarrowView.qml:57

468−msgid "This will be your last attempt."

412+#: qml/Greeter/NarrowView.qml:235

413+msgid "Emergency"

469414msgstr ""

470415

471−#: qml/Greeter/NarrowView.qml:59

472−msgid ""

473−"If passphrase is entered incorrectly, your phone will conduct a factory "

474−"reset and all personal data will be deleted."

416+#: qml/Greeter/PromptList.qml:126

417+msgid "Passphrase"

475418msgstr ""

476419

477−#: qml/Greeter/NarrowView.qml:60

478−msgid ""

479−"If passcode is entered incorrectly, your phone will conduct a factory reset "

480−"and all personal data will be deleted."

420+#: qml/Greeter/PromptList.qml:126

421+msgid "Passcode"

481422msgstr ""

482423

483−#: qml/Greeter/NarrowView.qml:129

484−#, qt-format

485−msgid "Enter %1"

486−msgstr "%1 culus"

487−

488−#: qml/Greeter/NarrowView.qml:130

489−msgid "Enter passphrase"

490−msgstr "Tatur-maxco culus"

491−

492−#: qml/Greeter/NarrowView.qml:131

493−msgid "Enter passcode"

494−msgstr "Tatur-mudenta culus"

495−

496−#: qml/Greeter/NarrowView.qml:135

497−#, qt-format

498−msgid "Sorry, incorrect %1"

424+#: qml/Greeter/SessionsList.qml:124

425+msgid "Select desktop environment"

499426msgstr ""

500427

501−#: qml/Greeter/NarrowView.qml:136

502−msgid "Sorry, incorrect passphrase"

503−msgstr ""

428+#: qml/Launcher/Drawer.qml:250

429+#, fuzzy

430+#| msgctxt "Button: Start a search in the current dash scope"

431+#| msgid "Search"

432+msgid "Search…"

433+msgstr "Goranto"

504434

505−#: qml/Greeter/NarrowView.qml:137

506−msgctxt "passphrase"

507−msgid "Please re-enter"

435+#: qml/Launcher/PullToRefreshScopeStyle.qml:56

436+msgid "Pull to refresh…"

508437msgstr ""

509438

510−#: qml/Greeter/NarrowView.qml:138

511−msgid "Sorry, incorrect passcode"

439+#: qml/Launcher/PullToRefreshScopeStyle.qml:61

440+msgid "Release to refresh…"

512441msgstr ""

513442

514443#: qml/Notifications/NotificationMenuItemFactory.qml:124

@@ -523,62 +452,62 @@ msgstr ""

523452msgid "Conference"

524453msgstr "Koboxu"

525454

526−#: qml/Panel/Indicators/MenuItemFactory.qml:762

455+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:869

527456msgid "Nothing is playing"

528457msgstr ""

529458

530−#: qml/Panel/Indicators/MenuItemFactory.qml:891

459+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:997

531460#, qt-format

532461msgid "%1 hour"

533462msgid_plural "%1 hours"

534463msgstr[0] "%1 saaqata"

535464msgstr[1] "%1 saaqata"

536465

537−#: qml/Panel/Indicators/MenuItemFactory.qml:895

466+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1001

538467#, qt-format

539468msgid "%1 minute"

540469msgid_plural "%1 minutes"

541470msgstr[0] "%1 miniti"

542471msgstr[1] "%1 miniti"

543472

544−#: qml/Panel/Indicators/MenuItemFactory.qml:900

473+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1006

545474#, qt-format

546475msgid "%1 second"

547476msgid_plural "%1 seconds"

548477msgstr[0] "%1 nammayye"

549478msgstr[1] "%1 nammayye"

550479

551−#: qml/Panel/Indicators/MenuItemFactory.qml:903

480+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1009

552481msgid "0 seconds"

553482msgstr "0 nammayye"

554483

555484#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

556−#: qml/Panel/Indicators/MenuItemFactory.qml:905

485+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1011

557486#, qt-format

558487msgid "%1 remaining"

559488msgstr "%1 raaqe"

560489

561−#: qml/Panel/Indicators/MenuItemFactory.qml:911

490+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1017

562491msgid "In queue…"

563492msgstr ""

564493

565−#: qml/Panel/Indicators/MenuItemFactory.qml:915

494+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1021

566495msgid "Downloading"

567496msgstr "Qulluumah"

568497

569−#: qml/Panel/Indicators/MenuItemFactory.qml:917

498+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1023

570499msgid "Paused, tap to resume"

571500msgstr ""

572501

573−#: qml/Panel/Indicators/MenuItemFactory.qml:919

502+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1025

574503msgid "Canceled"

575504msgstr "Bayteh"

576505

577−#: qml/Panel/Indicators/MenuItemFactory.qml:921

506+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1027

578507msgid "Finished"

579508msgstr "Duudumteh"

580509

581−#: qml/Panel/Indicators/MenuItemFactory.qml:923

510+#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1029

582511msgid "Failed, tap to retry"

583512msgstr ""

584513

@@ -598,23 +527,34 @@ msgctxt "Button: Call back on phone"

598527msgid "Call back"

599528msgstr ""

600529

601−#: qml/Stages/SideStage.qml:76

530+#: qml/Panel/PanelMenuPage.qml:92

531+#, fuzzy

532+#| msgctxt "Button: Go back one page in the Wizard"

533+#| msgid "Back"

534+msgid "Back"

535+msgstr "Derre"

536+

537+#: qml/Stage/SideStage.qml:76

602538msgid "Drag using 3 fingers any application from one window to the other"

603539msgstr ""

604540

541+#: qml/Stage/Stage.qml:671

542+msgid "No running apps"

543+msgstr ""

544+

605545#: qml/Tutorial/TutorialLeftLong.qml:49

606−msgid "Long swipe from the left edge to open the Today scope"

546+msgid "Long swipe from the left edge to open the Application Drawer"

607547msgstr ""

608548

609549#: qml/Tutorial/TutorialLeft.qml:47

610550msgid "Short swipe from the left edge to open the launcher"

611551msgstr ""

612552

613−#: qml/Tutorial/TutorialRight.qml:55

553+#: qml/Tutorial/TutorialRight.qml:54

614554msgid "Push your mouse against the right edge to view your open apps"

615555msgstr ""

616556

617−#: qml/Tutorial/TutorialRight.qml:56

557+#: qml/Tutorial/TutorialRight.qml:55

618558msgid "Swipe from the right edge to view your open apps"

619559msgstr ""

620560

@@ -622,96 +562,80 @@ msgstr ""

622562msgid "Swipe from the top edge to access notifications and quick settings"

623563msgstr ""

624564

625−#: qml/Wizard/Page.qml:54

565+#: qml/Wizard/Page.qml:59

626566msgctxt "Button: Go back one page in the Wizard"

627567msgid "Back"

628568msgstr "Derre"

629569

630−#: qml/Wizard/Pages/10-welcome.qml:27

570+#: qml/Wizard/Pages/10-welcome.qml:29

631571msgid "Language"

632572msgstr ""

633573

634−#: qml/Wizard/Pages/10-welcome.qml:172 qml/Wizard/Pages/20-keyboard.qml:151

635−#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/40-location.qml:271

636−#: qml/Wizard/Pages/50-timezone.qml:270 qml/Wizard/Pages/60-account.qml:65

637−#: qml/Wizard/Pages/70-passwd-type.qml:144

638−#: qml/Wizard/Pages/75-report-check.qml:84

639−#: qml/Wizard/Pages/passcode-desktop.qml:141

640−#: qml/Wizard/Pages/password-set.qml:141

574+#: qml/Wizard/Pages/10-welcome.qml:176

575+#: qml/Wizard/Pages/10-welcome-update.qml:126

576+#: qml/Wizard/Pages/11-changelog.qml:74 qml/Wizard/Pages/20-keyboard.qml:152

577+#: qml/Wizard/Pages/30-wifi.qml:214 qml/Wizard/Pages/50-timezone.qml:272

578+#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/70-passwd-type.qml:146

579+#: qml/Wizard/Pages/passcode-desktop.qml:154

580+#: qml/Wizard/Pages/password-set.qml:153

641581msgid "Next"

642582msgstr ""

643583

644−#: qml/Wizard/Pages/20-keyboard.qml:30

584+#: qml/Wizard/Pages/10-welcome-update.qml:91

585+msgid "Welcome to "

586+msgstr ""

587+

588+#: qml/Wizard/Pages/10-welcome-update.qml:106

589+msgid "We will make sure your device is ready to use "

590+msgstr ""

591+

592+#: qml/Wizard/Pages/11-changelog.qml:28

593+msgid "What's new"

594+msgstr ""

595+

596+#: qml/Wizard/Pages/11-changelog.qml:74

597+msgid "Loading..."

598+msgstr ""

599+

600+#: qml/Wizard/Pages/20-keyboard.qml:31

645601msgid "Select Keyboard"

646602msgstr ""

647603

648−#: qml/Wizard/Pages/20-keyboard.qml:70

604+#: qml/Wizard/Pages/20-keyboard.qml:71

649605msgid "Keyboard language"

650606msgstr ""

651607

652−#: qml/Wizard/Pages/20-keyboard.qml:92

608+#: qml/Wizard/Pages/20-keyboard.qml:93

653609msgid "Keyboard layout"

654610msgstr ""

655611

656−#: qml/Wizard/Pages/20-keyboard.qml:151 qml/Wizard/Pages/30-wifi.qml:206

657−#: qml/Wizard/Pages/60-account.qml:65

658−#: qml/Wizard/Pages/77-system-update.qml:152 qml/Wizard/Pages/sim.qml:101

612+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:214

613+#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/79-system-update.qml:144

614+#: qml/Wizard/Pages/sim.qml:101

659615msgid "Skip"

660616msgstr "Kaqit"

661617

662−#: qml/Wizard/Pages/30-wifi.qml:30

618+#: qml/Wizard/Pages/30-wifi.qml:31

663619msgid "Connect to Wi‑Fi"

664620msgstr ""

665621

666−#: qml/Wizard/Pages/30-wifi.qml:131

622+#: qml/Wizard/Pages/30-wifi.qml:139

667623msgid "Connected"

668624msgstr ""

669625

670−#: qml/Wizard/Pages/30-wifi.qml:164

626+#: qml/Wizard/Pages/30-wifi.qml:172

671627msgid "Available Wi-Fi networks"

672628msgstr ""

673629

674−#: qml/Wizard/Pages/30-wifi.qml:165

630+#: qml/Wizard/Pages/30-wifi.qml:173

675631msgid "No available Wi-Fi networks"

676632msgstr ""

677633

678−#: qml/Wizard/Pages/40-location.qml:27

679−msgid "Location Services"

680−msgstr ""

681−

682−#: qml/Wizard/Pages/40-location.qml:83

683−msgid ""

684−"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

685−"(recommended)"

686−msgstr ""

687−

688−#: qml/Wizard/Pages/40-location.qml:105

689−#, qt-format

690−msgid "By selecting this option you agree to the Nokia HERE %1."

691−msgstr ""

692−

693−#: qml/Wizard/Pages/40-location.qml:106

694−msgctxt "part of: Nokia HERE terms and conditions"

695−msgid "terms and conditions"

696−msgstr ""

697−

698−#: qml/Wizard/Pages/40-location.qml:160

699−msgid "GPS only"

700−msgstr ""

701−

702−#: qml/Wizard/Pages/40-location.qml:214

703−msgid "Don't use my location"

704−msgstr ""

705−

706−#: qml/Wizard/Pages/40-location.qml:260

707−msgid "You can change it later in System Settings."

708−msgstr ""

709−

710−#: qml/Wizard/Pages/50-timezone.qml:29

634+#: qml/Wizard/Pages/50-timezone.qml:30

711635msgid "Time Zone"

712636msgstr ""

713637

714−#: qml/Wizard/Pages/50-timezone.qml:181

638+#: qml/Wizard/Pages/50-timezone.qml:183

715639msgid "Enter your city"

716640msgstr ""

717641

@@ -719,118 +643,80 @@ msgstr ""

719643msgid "Personalize Your Device"

720644msgstr ""

721645

722−#: qml/Wizard/Pages/60-account.qml:48

646+#: qml/Wizard/Pages/60-account.qml:54

723647msgid "Preferred Name"

724648msgstr ""

725649

726−#: qml/Wizard/Pages/70-passwd-type.qml:39

650+#: qml/Wizard/Pages/70-passwd-type.qml:40

727651msgid "Lock Screen"

728652msgstr ""

729653

730−#: qml/Wizard/Pages/70-passwd-type.qml:101

654+#: qml/Wizard/Pages/70-passwd-type.qml:103

731655msgctxt "Label: Type of security method"

732656msgid "Create new password"

733657msgstr ""

734658

735−#: qml/Wizard/Pages/70-passwd-type.qml:103

659+#: qml/Wizard/Pages/70-passwd-type.qml:105

736660msgctxt "Label: Type of security method"

737661msgid "Create passcode (numbers only)"

738662msgstr ""

739663

740−#: qml/Wizard/Pages/70-passwd-type.qml:105

664+#: qml/Wizard/Pages/70-passwd-type.qml:107

741665msgctxt "Label: Type of security method"

742666msgid "No lock code"

743667msgstr ""

744668

745−#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

746−msgid "Privacy Policy"

747−msgstr ""

748−

749−#: qml/Wizard/Pages/75-report-check.qml:26

750−msgid "Help Us Improve"

751−msgstr ""

752−

753−#: qml/Wizard/Pages/75-report-check.qml:59

754−msgid "Improve system performance by sending us crashes and error reports."

755−msgstr ""

756−

757−#: qml/Wizard/Pages/75-report-check.qml:60

758−msgid "Privacy policy"

759−msgstr ""

760−

761−#: qml/Wizard/Pages/77-system-update.qml:28

669+#: qml/Wizard/Pages/79-system-update.qml:28

762670msgid "Update Device"

763671msgstr ""

764672

765−#: qml/Wizard/Pages/77-system-update.qml:55

673+#: qml/Wizard/Pages/79-system-update.qml:55

766674msgid ""

767675"There is a system update available and ready to install. Afterwards, the "

768676"device will automatically restart."

769677msgstr ""

770678

771−#: qml/Wizard/Pages/77-system-update.qml:76

679+#: qml/Wizard/Pages/79-system-update.qml:76

772680msgctxt "string identifying name of the update"

773−msgid "Ubuntu system"

681+msgid "Ubuntu Touch system"

774682msgstr ""

775683

776−#: qml/Wizard/Pages/77-system-update.qml:83

684+#: qml/Wizard/Pages/79-system-update.qml:83

777685#, qt-format

778686msgctxt "version of the system update"

779687msgid "Version %1"

780688msgstr ""

781689

782−#: qml/Wizard/Pages/77-system-update.qml:102

690+#: qml/Wizard/Pages/79-system-update.qml:95

783691msgid "This could take a few minutes..."

784692msgstr ""

785693

786−#: qml/Wizard/Pages/77-system-update.qml:116

694+#: qml/Wizard/Pages/79-system-update.qml:109

787695msgid "Install and restart now"

788696msgstr ""

789697

790−#: qml/Wizard/Pages/80-finished.qml:89

791−msgid "Welcome to Ubuntu"

698+#: qml/Wizard/Pages/80-finished.qml:91

699+msgid "Welcome Back"

792700msgstr ""

793701

794−#: qml/Wizard/Pages/80-finished.qml:104

795−msgid "You are ready to use your device now"

796−msgstr ""

797−

798−#: qml/Wizard/Pages/80-finished.qml:124

799−msgid "Get Started"

800−msgstr ""

801−

802−#: qml/Wizard/Pages/here-terms.qml:25

803−msgid "Terms & Conditions"

804−msgstr ""

805−

806−#: qml/Wizard/Pages/here-terms.qml:69

807−msgid "Your device uses positioning technologies provided by HERE."

808−msgstr ""

809−

810−#: qml/Wizard/Pages/here-terms.qml:81

811−msgid ""

812−"To provide you with positioning services and to improve their quality, HERE "

813−"collects information about nearby cell towers and Wi-Fi hotspots around your "

814−"current location whenever your position is being found."

702+#: qml/Wizard/Pages/80-finished.qml:91

703+msgid "Welcome to Ubuntu"

815704msgstr ""

816705

817−#: qml/Wizard/Pages/here-terms.qml:93

818−msgid ""

819−"The information collected is used to analyze the service and to improve the "

820−"use of service, but not to identify you personally."

706+#: qml/Wizard/Pages/80-finished.qml:106

707+msgid "You are ready to use your device now"

821708msgstr ""

822709

823−#: qml/Wizard/Pages/here-terms.qml:106

824−#, qt-format

825−msgid "By continuing, you agree to the HERE platform %1 and %2."

826−msgstr ""

710+#: qml/Wizard/Pages/80-finished.qml:126

711+msgid "Continue"

712+msgstr "Tatur"

827713

828−#: qml/Wizard/Pages/here-terms.qml:107

829−msgid "Service Terms"

714+#: qml/Wizard/Pages/80-finished.qml:126

715+msgid "Get Started"

830716msgstr ""

831717

832718#: qml/Wizard/Pages/passcode-confirm.qml:43

833−#: qml/Wizard/Pages/passcode-desktop.qml:96

719+#: qml/Wizard/Pages/passcode-desktop.qml:104

834720msgid "Confirm passcode"

835721msgstr ""

836722

@@ -843,28 +729,28 @@ msgctxt "Enter the passcode again"

843729msgid "Please re-enter."

844730msgstr ""

845731

846−#: qml/Wizard/Pages/passcode-desktop.qml:30

732+#: qml/Wizard/Pages/passcode-desktop.qml:31

847733msgid "Lock Screen Passcode"

848734msgstr ""

849735

850−#: qml/Wizard/Pages/passcode-desktop.qml:60

736+#: qml/Wizard/Pages/passcode-desktop.qml:68

851737msgid "Enter 4 numbers to setup your passcode"

852738msgstr ""

853739

854−#: qml/Wizard/Pages/passcode-desktop.qml:76

740+#: qml/Wizard/Pages/passcode-desktop.qml:84

855741#: qml/Wizard/Pages/passcode-set.qml:54

856742msgid "Choose passcode"

857743msgstr ""

858744

859−#: qml/Wizard/Pages/passcode-desktop.qml:126

745+#: qml/Wizard/Pages/passcode-desktop.qml:139

860746msgid "Passcode too short"

861747msgstr ""

862748

863−#: qml/Wizard/Pages/passcode-desktop.qml:128

749+#: qml/Wizard/Pages/passcode-desktop.qml:141

864750msgid "Passcodes match"

865751msgstr ""

866752

867−#: qml/Wizard/Pages/passcode-desktop.qml:130

753+#: qml/Wizard/Pages/passcode-desktop.qml:143

868754msgid "Passcodes do not match"

869755msgstr ""

870756

@@ -872,19 +758,19 @@ msgstr ""

872758msgid "Passcode must be 4 characters long"

873759msgstr ""

874760

875−#: qml/Wizard/Pages/password-set.qml:30

761+#: qml/Wizard/Pages/password-set.qml:31

876762msgid "Lock Screen Password"

877763msgstr ""

878764

879−#: qml/Wizard/Pages/password-set.qml:61

765+#: qml/Wizard/Pages/password-set.qml:68

880766msgid "Enter at least 8 characters"

881767msgstr ""

882768

883−#: qml/Wizard/Pages/password-set.qml:73

769+#: qml/Wizard/Pages/password-set.qml:80

884770msgid "Choose password"

885771msgstr ""

886772

887−#: qml/Wizard/Pages/password-set.qml:103

773+#: qml/Wizard/Pages/password-set.qml:110

888774msgid "Confirm password"

889775msgstr ""

890776

@@ -940,6 +826,28 @@ msgstr ""

940826msgid "Very weak password"

941827msgstr ""

942828

829+#~ msgctxt "Button: Show the current dash scope settings"

830+#~ msgid "Settings"

831+#~ msgstr "Massosu"

832+

833+#~ msgctxt "Label: Hint for dash search line edit"

834+#~ msgid "Search"

835+#~ msgstr "Goranto"

836+

837+#~ msgid "Send"

838+#~ msgstr "Rub"

839+

840+#~ msgid "Home"

841+#~ msgstr "Dabqi"

842+

843+#, fuzzy

844+#~ msgid "Download"

845+#~ msgstr "Qulluumah"

846+

847+#, fuzzy

848+#~ msgid "Downloaded"

849+#~ msgstr "Qulluumah"

850+

943851#~ msgctxt "Title: Reboot/Shut down dialog"

944852#~ msgid "Shut down"

945853#~ msgstr "Bargus"

@@ -955,6 +863,9 @@ msgstr ""

955863#~ msgid "Reboot"

956864#~ msgstr "Wadir-ugus"

957865

866+#~ msgid "Enter %1"

867+#~ msgstr "%1 culus"

868+

958869#~ msgctxt "Label: Type of security method"

959870#~ msgid "Swipe"

960871#~ msgstr "Uysuttuc"

@@ -967,6 +878,3 @@ msgstr ""

967878

968879#~ msgid "Let’s get started."

969880#~ msgstr "Hayya qimbisnay."

970−

971−#~ msgid "Continue"

972−#~ msgstr "Tatur"

po/am.po+542−432

This diff is too big to show here.

po/ar.po+578−554

This diff is too big to show here.

po/ast.po+625−524

This diff is too big to show here.

po/az.po+315−387

This diff is too big to show here.

po/be.po+532−547

This diff is too big to show here.

po/bg.po+267−383

This diff is too big to show here.

po/bn.po+502−528

This diff is too big to show here.

po/br.po+504−444

This diff is too big to show here.

po/bs.po+382−404

This diff is too big to show here.

po/ca.po+614−490

This diff is too big to show here.

po/ca@valencia.po+370−417

This diff is too big to show here.

po/ce.po+241−366

This diff is too big to show here.

po/ckb.po+261−380

This diff is too big to show here.

po/co.po+454−400

This diff is too big to show here.

po/cs.po+622−548

This diff is too big to show here.

po/cy.po+383−404

This diff is too big to show here.

po/da.po+455−479

This diff is too big to show here.

po/de.po+588−470

This diff is too big to show here.

po/el.po+543−502

This diff is too big to show here.

po/en_AU.po+616−477

This diff is too big to show here.

po/en_GB.po+560−463

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+307−394

This diff is too big to show here.

po/es.po+589−472

This diff is too big to show here.

po/et.ponew file+816

This diff is too big to show here.

po/eu.po+389−414

This diff is too big to show here.

po/fa.po+594−452

This diff is too big to show here.

po/fi.po+560−442

This diff is too big to show here.

po/fo.po+328−387

This diff is too big to show here.

po/fr.po+614−495

This diff is too big to show here.

po/ga.po+374−401

This diff is too big to show here.

po/gd.po+585−483

This diff is too big to show here.

po/gl.po+572−453

This diff is too big to show here.

po/gu.ponew file+814

This diff is too big to show here.

po/gv.po+290−389

This diff is too big to show here.

po/he.po+479−532

This diff is too big to show here.

po/hi.po+255−376

This diff is too big to show here.

po/hr.po+566−497

This diff is too big to show here.

po/hu.po+574−462

This diff is too big to show here.

po/hy.po+393−468

This diff is too big to show here.

po/ia.po+523−426

This diff is too big to show here.

po/id.po+358−404

This diff is too big to show here.

po/is.po+340−402

This diff is too big to show here.

po/it.po+607−487

This diff is too big to show here.

po/ja.po+406−451

This diff is too big to show here.

po/kk.ponew file+841

This diff is too big to show here.

po/km.po+366−407

This diff is too big to show here.

po/kn.po+249−376

This diff is too big to show here.

po/ko.po+510−516

This diff is too big to show here.

po/ku.po+319−387

This diff is too big to show here.

po/ky.po+249−376

This diff is too big to show here.

po/lo.po+248−373

This diff is too big to show here.

po/lt.po+523−482

This diff is too big to show here.

po/lv.po+393−417

This diff is too big to show here.

po/ml.po+262−382

This diff is too big to show here.

po/mr.po+264−371

This diff is too big to show here.

po/ms.po+484−431

This diff is too big to show here.

po/my.po+298−380

This diff is too big to show here.

po/nb.po+564−448

This diff is too big to show here.

po/ne.po+245−367

This diff is too big to show here.

po/nl.po+674−545

This diff is too big to show here.

po/nn.po+241−366

This diff is too big to show here.

po/oc.po+575−501

This diff is too big to show here.

po/or.po+241−366

This diff is too big to show here.

po/pa.po+384−412

This diff is too big to show here.

po/pl.po+601−482

This diff is too big to show here.

po/pt.po+583−466

This diff is too big to show here.

po/pt_BR.po+501−511

This diff is too big to show here.

po/ro.po+393−423

This diff is too big to show here.

po/ru.po+616−491

This diff is too big to show here.

po/sc.ponew file+904

This diff is too big to show here.

po/shn.po+242−367

This diff is too big to show here.

po/si.po+267−385

This diff is too big to show here.

po/sk.po+575−456

This diff is too big to show here.

po/sl.po+530−446

This diff is too big to show here.

po/sq.po+345−389

This diff is too big to show here.

po/sr.po+573−475

This diff is too big to show here.

po/sv.po+558−442

This diff is too big to show here.

po/sw.po+357−397

This diff is too big to show here.

po/ta.po+261−381

This diff is too big to show here.

po/te.po+269−380

This diff is too big to show here.

po/th.po+264−388

This diff is too big to show here.

po/tr.po+686−520

This diff is too big to show here.

po/ug.po+435−420

This diff is too big to show here.

po/uk.po+582−480

This diff is too big to show here.

po/unity8.pot+238−364

This diff is too big to show here.

po/update-unity-pot+17

This diff is too big to show here.

po/ur.po+265−387

This diff is too big to show here.

po/uz.po+241−366

This diff is too big to show here.

po/vi.po+241−366

This diff is too big to show here.

po/wo.po+388−413

This diff is too big to show here.

po/xh.po+241−366

This diff is too big to show here.

po/zh_CN.po+552−436

This diff is too big to show here.

po/zh_HK.po+280−383

This diff is too big to show here.

po/zh_TW.po+564−488

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenuItemFactory.qmlnew file+135

This diff is too big to show here.

qml/Components/Circle.qml → qml/ApplicationMenus/ApplicationMenusLimits.qmlrenamed+7−5

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+1−1

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+93−27

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

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

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+7−5

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+19−8

This diff is too big to show here.

qml/Components/LazyImage.qml+2

This diff is too big to show here.

qml/Components/ListItems/Header.qmldeleted−64

This diff is too big to show here.

qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.pngdeleted

Binary file not shown.

qml/Components/ListItems/ThinDivider.qml → qml/Components/ListView.qmlrenamed+8−11

This diff is too big to show here.

qml/Components/Lockscreen.qml+6−29

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/PassphraseLockscreen.qml−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/PinLockscreen.qml−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/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+9−5

This diff is too big to show here.

qml/Components/ZoomableImage.qml+1−1

This diff is too big to show here.

qml/Dash/Filters/FilterWidget.qml → qml/Components/flickableUtils.jsrenamed+10−14

This diff is too big to show here.

qml/Dash/CardCarousel.qmldeleted−74

This diff is too big to show here.

qml/Dash/CardGrid.qmldeleted−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−242

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

This diff is too big to show here.

qml/Dash/DashPageHeader.qmldeleted−479

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

This diff is too big to show here.

qml/Dash/Filters/FilterOptionSelector.qmldeleted−97

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

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

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

This diff is too big to show here.

qml/Dash/Previews/PreviewInlineVideo.qmldeleted−65

This diff is too big to show here.

qml/Dash/Previews/PreviewMediaToolbar.qmldeleted−57

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

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

This diff is too big to show here.

qml/Dash/Previews/PreviewWidgetFactory.qmldeleted−102

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qmldeleted−103

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

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+38−17

This diff is too big to show here.

qml/Components/DelayedLockscreen.qml → qml/Greeter/DelayedLockscreen.qmlrenamed+6−15

This diff is too big to show here.

qml/Greeter/FullLightDMImpl.qml+3

This diff is too big to show here.

qml/Greeter/Greeter.qml+111−74

This diff is too big to show here.

qml/Greeter/GreeterPrompt.qml+70−140

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+3−1

This diff is too big to show here.

qml/Greeter/LightDMService.qml+6−4

This diff is too big to show here.

qml/Dash/DashApplication.qml → qml/Greeter/LoginAreaContainer.qmlrenamed+16−17

This diff is too big to show here.

qml/Greeter/LoginList.qml+127−133

This diff is too big to show here.

qml/Greeter/NarrowView.qmldeleted−201

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

This diff is too big to show here.

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/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+245−55

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+177−44

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/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/Notifications/Notification.qml+14−6

This diff is too big to show here.

qml/Notifications/NotificationButton.qml+2−1

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qml−1

This diff is too big to show here.

qml/Notifications/Notifications.qml+5−1

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+26−7

This diff is too big to show here.

qml/Panel/ActiveCallHint.qml+3

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter → qml/Panel/FakePanelMenu.qmlrenamed+11−2

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+182−156

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+1−1

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsList.qml+19−24

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

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml → qml/Panel/PanelMenu.qmlrenamed+80−36

This diff is too big to show here.

qml/Panel/PanelMenuPage.qmlnew file+226

This diff is too big to show here.

qml/Rotation/RotationStates.qml+2−11

This diff is too big to show here.

qml/ScopeTool.qmldeleted−165

This diff is too big to show here.

qml/Shell.qml+356−118

This diff is too big to show here.

qml/Stage/AbstractStage.qmldeleted−90

This diff is too big to show here.

qml/Stage/ApplicationWindow.qml+19−33

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.qml+153−37

This diff is too big to show here.

qml/Stage/DesktopSpread.qmldeleted−576

This diff is too big to show here.

qml/Stage/DesktopSpreadDelegate.qmldeleted−162

This diff is too big to show here.

qml/Stage/FakeMaximizeDelegate.qmlnew file+233

This diff is too big to show here.

qml/Stage/MoveHandler.qmlnew file+201

This diff is too big to show here.

qml/Stage/PhoneStage.qmldeleted−806

This diff is too big to show here.

qml/Stage/PromptSurfaceAnimations.qml+2−3

This diff is too big to show here.

qml/Stage/SideStage.qml+10−6

This diff is too big to show here.

qml/Stage/Splash.qml+7−10

This diff is too big to show here.

qml/Stage/Spread/BezierCurve.qml+16

This diff is too big to show here.

qml/Stage/Spread/KeySpline.js+3−2

This diff is too big to show here.

qml/Stage/Spread/MathUtils.js+16

This diff is too big to show here.

qml/Stage/Spread/OpacityMask.qml+16

This diff is too big to show here.

qml/Stage/Spread/Spread.qml+35−26

This diff is too big to show here.

qml/Stage/Spread/SpreadDelegateInputArea.qml+26−101

This diff is too big to show here.

qml/Stage/Spread/SpreadMaths.qml+1−1

This diff is too big to show here.

qml/Stage/Spread/StagedRightEdgeMaths.qml+44−17

This diff is too big to show here.

qml/Stage/Spread/WindowedRightEdgeMaths.qml+35−4

This diff is too big to show here.

qml/Stage/Spread/cubic-bezier.js+15

This diff is too big to show here.

qml/Stage/SpreadDelegate.qmldeleted−424

This diff is too big to show here.

qml/Stage/Stage.qml+1016−458

This diff is too big to show here.

qml/Stage/StageMaths.qml+34−11

This diff is too big to show here.

qml/Stage/StagedFullscreenPolicy.qml+7−13

This diff is too big to show here.

qml/Stage/SurfaceContainer.qml−54

This diff is too big to show here.

qml/Stage/TabletStage.qmldeleted−1199

This diff is too big to show here.

qml/Stage/TopLevelSurfaceRepeater.qmldeleted−61

This diff is too big to show here.

qml/Stage/TransformedSpreadDelegate.qmldeleted−391

This diff is too big to show here.

qml/Stage/TransformedTabletSpreadDelegate.qmldeleted−437

This diff is too big to show here.

qml/Stage/WindowControlsOverlay.qml+86−51

This diff is too big to show here.

qml/Stage/WindowDecoration.qml+87−55

This diff is too big to show here.

qml/Stage/WindowInfoItem.qml+29−2

This diff is too big to show here.

qml/Stage/WindowResizeArea.qml+15−82

This diff is too big to show here.

qml/Stage/WindowStateSaver.qmlnew file+64

This diff is too big to show here.

qml/Stage/WindowedFullscreenPolicy.qml+4−12

This diff is too big to show here.

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/Wizard/Components/InputMethod.qml+9−9

This diff is too big to show here.

qml/Wizard/Page.qml+15

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

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.qml+1

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qml+14−10

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/77-system-update.qml → qml/Wizard/Pages/79-system-update.qmlrenamed+4−12

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/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+15−5

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/Wizard.qml+5−2

This diff is too big to show here.

qml/Wizard/WizardItemSelector.qml+1

This diff is too big to show here.

qml/Stage/graphics/dropshadow2gu@30.png → qml/graphics/dropshadow2gu@30.pngrenamed

Binary file not shown.

qml/Stage/graphics/dropshadow2gu@30.sci → qml/graphics/dropshadow2gu@30.scirenamed

The content is the same.

qml/graphics/phone_background.jpgdeleted

Binary file not shown.

qml/graphics/tablet_background.jpgdeleted

Binary file not shown.

src/ApplicationArguments.h+5

This diff is too big to show here.

src/CMakeLists.txt+15−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−138

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/ShellApplication.cpp+23−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+20−3

This diff is too big to show here.

tests/CMakeLists.txt+37−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/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/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+17−38

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+5−25

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.txt+1−1

This diff is too big to show here.

tests/mocks/Biometryd/MockOperation.h−1

This diff is too big to show here.

tests/mocks/CMakeLists.txt+17−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/LightDM/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txtdeleted−51

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cppdeleted−51

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.hdeleted−42

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cppdeleted−37

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.hdeleted−34

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cppdeleted−39

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModeldeleted−17

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtdeleted−20

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cppdeleted−206

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cppdeleted−123

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/plugin.cppdeleted−79

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/LightDMController/CMakeLists.txtnew file+14

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/plugin.cpp → tests/mocks/LightDMController/plugin.cpprenamed+14−10

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/plugin.h → tests/mocks/LightDMController/plugin.hrenamed+4−6

This diff is too big to show here.

tests/mocks/LightDMController/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Lights/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Lights/Lights.h+1−1

This diff is too big to show here.

tests/mocks/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+1−1

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.cpp+3−2

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.h+7−6

This diff is too big to show here.

tests/mocks/QtMultimedia/videooutput.h+1−1

This diff is too big to show here.

tests/mocks/SessionBroadcast/CMakeLists.txtnew file+8

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/plugin.cpp → tests/mocks/SessionBroadcast/SessionBroadcast.cpprenamed+12−12

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h → tests/mocks/SessionBroadcast/SessionBroadcast.hrenamed+13−11

This diff is too big to show here.

plugins/Ubuntu/SystemImage/plugin.cpp → tests/mocks/SessionBroadcast/plugin.cpprenamed+10−7

This diff is too big to show here.

tests/mocks/LightDM/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/MockSystemImage.cppdeleted−50

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/MockSystemImage.hdeleted−56

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.

plugins/Ubuntu/Payments/plugin.cpp → tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qmlrenamed+11−9

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp+27

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h+22

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+61−27

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+8−9

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+114−64

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

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+127−82

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.h+49−27

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+24−9

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.h+1−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/VirtualKeyboard.cpp+14−11

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.cpp+6−27

This diff is too big to show here.

tests/mocks/Unity/Application/resources/Kate.qmlnew file+49

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateDialog.qmlnew file+48

This diff is too big to show here.

tests/plugins/Dash/cardcreatortest.qml → tests/mocks/Unity/Application/resources/KateMenu.qmlrenamed+20−8

This diff is too big to show here.

tests/mocks/Unity/Application/resources/surfaces.qrc+3

This diff is too big to show here.

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/Payments/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/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+61−18

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/Platform/CMakeLists.txtnew file+1

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingNumber.qml → tests/mocks/Unity/Platform/MockPlatform.qmlrenamed+7−3

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

This diff is too big to show here.

tests/mocks/Unity/fake_scope.hdeleted−128

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_unity_plugin.hdeleted−34

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+13−3

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/plugin.cpp → tests/mocks/Utils/URLDispatcher.cpprenamed+17−7

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+25−2

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.h+14−6

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txt+2−2

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cpp+19−4

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.h+11−1

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cpp+2

This diff is too big to show here.

tests/mocks/liblightdm/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h → tests/mocks/liblightdm/GreeterPrivate.hrenamed

The content is the same.

tests/mocks/liblightdm/MockController.cppnew file+192

This diff is too big to show here.

tests/mocks/liblightdm/MockController.hnew file+106

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.cppnew file+316

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h → tests/mocks/liblightdm/MockGreeter.hrenamed+10−25

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp → tests/mocks/liblightdm/MockSessionsModel.cpprenamed+41−22

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h → tests/mocks/liblightdm/MockSessionsModel.hrenamed+11−19

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.cppnew file+220

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h → tests/mocks/liblightdm/MockUsersModel.hrenamed+9−18

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp → tests/mocks/liblightdm/SessionsModelPrivate.cpprenamed+27−17

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h → tests/mocks/liblightdm/SessionsModelPrivate.hrenamed+5−1

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/liblightdm/UsersModelPrivate.cpprenamed+36−22

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h → tests/mocks/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

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/plugins/AccountsService/CMakeLists.txt+8−2

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+3−2

This diff is too big to show here.

tests/plugins/Dash/CMakeLists.txtdeleted−79

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.resdeleted−81

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.res.cardcreatordeleted−77

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

This diff is too big to show here.

tests/plugins/Dash/cardcreator/11.res.cardcreatordeleted−168

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

This diff is too big to show here.

tests/plugins/Dash/cardcreator/12.res.cardcreatordeleted−103

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

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res.cardcreatordeleted−86

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

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res.cardcreatordeleted−99

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/horizontaljournaltest.cppdeleted−487

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

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadersectiontest.cppdeleted−2210

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cppdeleted−2006

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

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

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/LightDM/IntegratedLightDM/CMakeLists.txt+58−17

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/dbus.cpp+22−12

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/greeter.qml+2−7

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cppnew file+175

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+51−13

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp+101−17

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+12−6

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+12−2

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+14−3

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+131−32

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/plugins/Unity/Launcher/xdgwatcher.hnew file+39

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+21−3

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.cpp+10

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.h+5

This diff is too big to show here.

tests/plugins/Unity/Session/interfaces.xml+12

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/sessionbackendtest.cpp+130−11

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/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+42−68

This diff is too big to show here.

tests/qmltests/Components/CMakeLists.txt+26−7

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+23−4

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+4−2

This diff is too big to show here.

tests/qmltests/Components/tst_Lockscreen.qml+13−50

This diff is too big to show here.

tests/qmltests/Components/tst_MediaServices.qml+5−4

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+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/Components/tst_SharingPicker.qml+3−3

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_PreviewInlineVideo.qmldeleted−114

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

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qmldeleted−87

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

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

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

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qmldeleted−731

This diff is too big to show here.

tests/qmltests/Dash/tst_DashPageHeader.qmldeleted−357

This diff is too big to show here.

tests/qmltests/Dash/tst_DashShell.qmldeleted−145

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qmldeleted−699

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml+87−140

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_WideView.qmldeleted−610

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+371−72

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+100−27

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+12−6

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+15−8

This diff is too big to show here.

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+3−3

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+24−33

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorItemRow.qml → tests/qmltests/Panel/tst_PanelItemRow.qmlrenamed+38−34

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorsMenu.qml → tests/qmltests/Panel/tst_PanelMenu.qmlrenamed+108−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/Stage/ApplicationCheckBox.qml+8−8

This diff is too big to show here.

tests/qmltests/Stage/tst_ApplicationWindow.qml+16−33

This diff is too big to show here.

tests/qmltests/Stage/tst_DecoratedWindow.qml+75−148

This diff is too big to show here.

tests/qmltests/Stage/tst_DesktopStage.qml+461−194

This diff is too big to show here.

tests/qmltests/Stage/tst_PhoneStage.qml+239−285

This diff is too big to show here.

tests/qmltests/Stage/tst_QMLTopLevelWindowModel.qmlnew file+191

This diff is too big to show here.

tests/qmltests/Stage/tst_Splash.qml+16−2

This diff is too big to show here.

tests/qmltests/Stage/tst_SpreadDelegate.qmldeleted−423

This diff is too big to show here.

tests/qmltests/Stage/tst_SurfaceContainer.qml+15−10

This diff is too big to show here.

tests/qmltests/Stage/tst_TabletStage.qml+233−357

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/Stage/tst_WindowResizeArea.qml+63−107

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+205−184

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+100−142

This diff is too big to show here.

tests/qmltests/tst_DisabledScreenNotice.qml+23−9

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml+442−465

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+1580−751

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+161−227

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+5−5

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.qmlnew file+64

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1

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+1−1

This diff is too big to show here.

tools/CMakeLists.txt+2−12

This diff is too big to show here.

src/Panel/Indicators/client/CMakeLists.txt → tools/indicatorsclient/CMakeLists.txtrenamed+1−1

This diff is too big to show here.

src/Panel/Indicators/client/indicatorsclient.cpp → tools/indicatorsclient/indicatorsclient.cpprenamed+10−8

This diff is too big to show here.

src/Panel/Indicators/client/indicatorsclient.h → tools/indicatorsclient/indicatorsclient.hrenamed−2

This diff is too big to show here.

src/Panel/Indicators/client/main.cpp → tools/indicatorsclient/main.cpprenamed

The content is the same.

tools/menutool/CMakeLists.txtnew file+5

This diff is too big to show here.

tools/menutool/READMEnew file+11

This diff is too big to show here.

tools/menutool/menutool.cppnew file+62

This diff is too big to show here.

tools/menutool/menutool.qmlnew file+118

This diff is too big to show here.

tools/registry-tracker.cppdeleted−146

This diff is too big to show here.

tools/registry-tracker.hdeleted−49

This diff is too big to show here.

tools/scopetool.cppdeleted−116

This diff is too big to show here.

tools/unlock-device+16

This diff is too big to show here.