git.iko.soy/unity8

on fa68d4d help sign in

fromc73a8d3

swap

to0 ahead, 1381 behind

compare

.bazaar/Makefilenew file+6

@@ -0,0 +1,6 @@

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.pynew file+51

@@ -0,0 +1,51 @@

1+#!/usr/bin/python

2+# Copyright 2013, 2014 Canonical Ltd.

3+#

4+# This program is free software; you can redistribute it and/or modify

5+# it under the terms of the GNU Lesser General Public License as published by

6+# the Free Software Foundation; version 3.

7+#

8+# This program is distributed in the hope that it will be useful,

9+# but WITHOUT ANY WARRANTY; without even the implied warranty of

10+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+# GNU Lesser General Public License for more details.

12+#

13+# You should have received a copy of the GNU Lesser General Public License

14+# along with this program. If not, see <http://www.gnu.org/licenses/>.

15+

16+import os

17+import subprocess

18+from bzrlib import branch

19+from bzrlib.urlutils import local_path_from_url

20+

21+

22+def execute_makecheck(

23+ local_branch, master_branch, old_revision_number, old_revision_id,

24+ future_revision_number, future_revision_id, tree_delta, future_tree):

25+ if not master_branch.basis_tree().has_filename("qml/Shell.qml"):

26+ return

27+

28+ os.chdir(local_path_from_url(master_branch.base))

29+

30+ print "Executing 'make -C builddir test'.."

31+ os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"

32+ if (subprocess.call("make -C builddir test", shell=True) != 0):

33+

34+ print("\n\n*** Warning ***\n\n"

35+ "Basic tests failed. This commit will not pass continuous "

36+ "integration.")

37+

38+ branch = local_branch or master_branch

39+ revision = branch.repository.get_revision(future_revision_id)

40+ msg_file = open('message.txt', 'w')

41+ msg_file.write(revision.message)

42+ msg_file.close()

43+

44+ print("\n\nSaved commit message to $SRC_DIR/message.txt.")

45+ print("You can uncommit this revision, fix the tests and reuse your "

46+ "message running:\n\nbzr commit -F message.txt\n\n")

47+ elif os.path.isfile("message.txt"):

48+ os.remove("message.txt")

49+

50+branch.Branch.hooks.install_named_hook(

51+ 'pre_commit', execute_makecheck, 'make check pre-commit')

.bzr-builddeb/default.confnew file+2

@@ -0,0 +1,2 @@

1+[BUILDDEB]

2+split = True

.bzrignorenew file+7

@@ -0,0 +1,7 @@

1+# default build dir

2+/builddir

3+# QtCreator project files

4+/*.user

5+# Eclipse project files

6+.settings

7+message.txt

.gitignore−7

@@ -2,15 +2,8 @@

22/builddir

33# QtCreator project files

44/*.user

5−*.qmlc

6−*.jsc

75# Eclipse project files

86/.project

97/.cproject

108/.settings

119/.pydevproject

12−# KDevelop project Files

13−/.kdev4/

14−/build/

15−/*.kdev4

16−.clickable/

CMakeLists.txt+11−18

@@ -62,31 +62,22 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2

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

6363

6464include(FindPkgConfig)

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)

65+find_package(Qt5Core 5.4 REQUIRED)

66+find_package(Qt5Qml 5.4 REQUIRED)

67+find_package(Qt5Quick 5.4 REQUIRED)

68+find_package(Qt5Gui 5.4 REQUIRED)

69+find_package(Qt5DBus 5.4 REQUIRED)

70+find_package(Qt5Concurrent 5.4 REQUIRED)

71+find_package(Qt5Sql 5.4 REQUIRED)

72+

73+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)

7874pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

7975pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

8076pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

81−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)

8277pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

8378pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

8479pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)

8580pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

86−pkg_check_modules(QTDBUSTEST REQUIRED

87− libqtdbustest-1

88− libqtdbusmock-1

89− )

9081

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

9283find_path(UBUNTUGESTUREPRIV

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

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

149140

150141set(SHELL_APP unity8)

142+set(DASH_APP unity8-dash)

143+set(SCOPE_TOOL unity-scope-tool)

151144set(INDICATORS_CLIENT_APP indicators-client)

152145set(GREETER_APP unity8-greeter)

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

CODING−24

@@ -162,27 +162,3 @@ $ 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.

Jenkinsfiledeleted−2

@@ -1,2 +0,0 @@

1−@Library('ubports-build-tools') _

2−buildAndProvideDebianPackage()

README.mddeleted−31

@@ -1,31 +0,0 @@

1−# Lomiri

2−

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

4−

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

6−

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

8−

9−## Where to report issues

10−

11−Issues related to the version of Lomiri that currently runs on Ubuntu Touch devices may still be reported on this repository. We will move these reports to the GitLab repository as part of our final migration.

12−

13−## Developing Lomiri on Ubuntu Touch

14−

15−This repository contains the code for Lomiri currently running on Ubuntu Touch. If you would like to modify this version of Lomiri, follow the steps below. If you would like to modify Lomiri in another operating system, check out our new repository: https://gitlab.com/ubports/core/lomiri

16−

17−Lomiri can be built and its test suite run using [`clickable`](https://clickable-ut.dev). This is a convenient method to try out most graphical changes to Lomiri without an annoying redeployment process. If you wish to test your changes on your device or make changes that are more difficult to test without real hardware, check out [Making changes and testing locally on the UBports documentation](https://docs.ubports.com/en/latest/systemdev/testing-locally.html). If not, read on.

18−

19−Before you start, [install Clickable](https://clickable-ut.dev/en/latest/install.html).

20−

21−Now, clone this repository to your computer: `git clone https://github.com/ubports/unity8.git`

22−

23−Move into this directory: `cd unity8`

24−

25−Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:

26−

27−* `clickable ide qtcreator` will open QtCreator with this repository open as a project. You can edit and build the project this way, but running the tests will be a bit difficult.

28−* `clickable build --libs --verbose` will build Lomiri in the same environment as it would receive in Ubuntu Touch.

29−* `clickable test --libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...

30−* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make tryShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow trying out some Lomiri components in a mock environment. You can use this to try out your changes to Lomiri as you develop.

31−* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make xvfbtestShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow running a single TestCase. You can remove the `xvfb` part of the make target to run the test case graphically, which might help you see what is causing the test to fail.

build.sh−16

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

11#!/bin/sh

22

3−#

4−# Copyright (C) 2017 Canonical Ltd

5−#

6−# This program is free software: you can redistribute it and/or modify

7−# it under the terms of the GNU General Public License version 3 as

8−# published by the Free Software Foundation.

9−#

10−# This program is distributed in the hope that it will be useful,

11−# but WITHOUT ANY WARRANTY; without even the implied warranty of

12−# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13−# GNU General Public License for more details.

14−#

15−# You should have received a copy of the GNU General Public License

16−# along with this program. If not, see <http://www.gnu.org/licenses/>.

17−#

18−

193SETUP=false

204CLEAN=false

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

clickable.yamldeleted−153

@@ -1,153 +0,0 @@

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.cmakenew file+148

@@ -0,0 +1,148 @@

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+4−9

@@ -201,7 +201,7 @@ function(add_executable_test COMPONENT_NAME TARGET)

201201 add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}

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

203203 ${depends}

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

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

205205 TARGETS ${xvfb_targets}

206206 )

207207 endif()

@@ -264,16 +264,12 @@ endfunction()

264264# installed system.

265265

266266function(add_meta_test TARGET_NAME)

267− cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})

267+ cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})

268268

269269 add_custom_target(${TARGET_NAME})

270270

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

272+ file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")

277273

278274 add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})

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

@@ -311,7 +307,6 @@ function(install_test_script TARGET_NAME)

311307 foreach(ONE_CMD ${TEST_COMMAND})

312308 set(script "${script}'${ONE_CMD}' ")

313309 endforeach()

314− set(script "${script}\"\$@\"") # Allow passing arguments if desired

315310

316311 set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

317312

@@ -375,7 +370,7 @@ function(add_meta_dependencies UPSTREAM_TARGET)

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

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

377372 if (EXISTS "${filename}")

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

373+ file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh\n")

379374 endif()

380375 endforeach()

381376endfunction()

data/CMakeLists.txt+9−1

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

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)

34configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

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

56

67# install desktop files

78install(FILES

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

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

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

1012 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1113 )

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

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

2123 )

2224

25+# install dash icon

26+install(FILES

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

28+ DESTINATION ${SHELL_APP_DIR}/Dash/

29+ )

30+

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

2432

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

26−install(FILES com.canonical.Unity.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

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

2735install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)

data/com.canonical.Unity.gschema.xmldeleted−255

@@ -1,255 +0,0 @@

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+7−17

@@ -11,7 +11,7 @@

1111 <summary>The usage mode.</summary>

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

1313 </key>

14− <key type="u" name="edge-barrier-sensitivity">

14+ <key type="y" name="edge-barrier-sensitivity">

1515 <default>50</default>

1616 <range min="1" max="100"/>

1717 <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>

@@ -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>false</default>

36+ <default>true</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,26 +43,16 @@

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

47+ <default>true</default>

48+ <summary>Enable or disable the launcher</summary>

49+ <description>Toggle the availability of the launcher</description>

50+ </key>

4651 <key type="b" name="enable-indicator-menu">

4752 <default>true</default>

4853 <summary>Enable or disable the indicator pull down menus</summary>

4954 <description>Toggle the availability of the indicator pull down menus</description>

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

6656 </schema>

6757

6858 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">

data/test.sensorsdeleted−12

@@ -1,12 +0,0 @@

1−create light 0 10 1

2−create accel 0 1000 0.1

3−create proximity

4−

5−200 proximity near

6−500 light 5

7−# simulate crash on the ground

8−500 accel 0.2 0.1 10

9−100 accel 0.2 0.2 1000

10−20 accel 0 0 0

11−10 proximity far

12−10 light 10

data/unity8-dash.confnew file+25

@@ -0,0 +1,25 @@

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=unity8-dash.desktop

data/unity8-dash.desktop.innew file+9

@@ -0,0 +1,9 @@

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.pngnew file

Binary file not shown.

data/unity8-dash.svgnew file+326

@@ -0,0 +1,326 @@

1+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2+<!-- Created with Inkscape (http://www.inkscape.org/) -->

3+

4+<svg

5+ xmlns:dc="http://purl.org/dc/elements/1.1/"

6+ xmlns:cc="http://creativecommons.org/ns#"

7+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

8+ xmlns:svg="http://www.w3.org/2000/svg"

9+ xmlns="http://www.w3.org/2000/svg"

10+ xmlns:xlink="http://www.w3.org/1999/xlink"

11+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

12+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

13+ viewBox="0 0 512 512"

14+ style="enable-background:new"

15+ inkscape:export-ydpi="180"

16+ inkscape:export-xdpi="180"

17+ inkscape:export-filename="app_shape02.png"

18+ sodipodi:docname="apps-scope.svg"

19+ inkscape:version="0.91+devel r"

20+ version="1.1"

21+ id="svg3336"

22+ height="512"

23+ width="512">

24+ <sodipodi:namedview

25+ inkscape:snap-global="false"

26+ fit-margin-bottom="18"

27+ fit-margin-right="0"

28+ fit-margin-left="0"

29+ fit-margin-top="18"

30+ inkscape:snap-grids="true"

31+ inkscape:guide-bbox="true"

32+ showguides="false"

33+ inkscape:snap-center="true"

34+ inkscape:snap-object-midpoints="true"

35+ inkscape:snap-midpoints="true"

36+ inkscape:snap-smooth-nodes="true"

37+ inkscape:snap-intersection-paths="true"

38+ inkscape:object-nodes="true"

39+ inkscape:object-paths="true"

40+ inkscape:snap-bbox-midpoints="true"

41+ inkscape:snap-bbox-edge-midpoints="true"

42+ inkscape:bbox-nodes="true"

43+ inkscape:bbox-paths="true"

44+ inkscape:snap-bbox="true"

45+ showborder="true"

46+ inkscape:showpageshadow="false"

47+ inkscape:snap-page="true"

48+ inkscape:window-maximized="1"

49+ inkscape:window-y="24"

50+ inkscape:window-x="0"

51+ inkscape:window-height="1029"

52+ inkscape:window-width="1920"

53+ showgrid="false"

54+ inkscape:current-layer="layer3"

55+ inkscape:document-units="px"

56+ inkscape:cy="204.04409"

57+ inkscape:cx="-384.5809"

58+ inkscape:zoom="0.64"

59+ inkscape:pageshadow="2"

60+ inkscape:pageopacity="0"

61+ borderopacity="1.0"

62+ bordercolor="#666666"

63+ pagecolor="#4f4f4f"

64+ id="base">

65+ <inkscape:grid

66+ type="xygrid"

67+ id="grid811"

68+ originx="0"

69+ originy="15.999999"

70+ visible="true"

71+ enabled="true" />

72+ <sodipodi:guide

73+ orientation="1,0"

74+ position="104,176"

75+ id="guide819" />

76+ <sodipodi:guide

77+ orientation="1,0"

78+ position="120,160"

79+ id="guide821" />

80+ <sodipodi:guide

81+ orientation="1,0"

82+ position="392,144"

83+ id="guide823" />

84+ <sodipodi:guide

85+ orientation="1,0"

86+ position="408,144"

87+ id="guide825" />

88+ <sodipodi:guide

89+ orientation="0,1"

90+ position="328,408"

91+ id="guide827" />

92+ <sodipodi:guide

93+ orientation="0,1"

94+ position="336,392"

95+ id="guide829" />

96+ <sodipodi:guide

97+ orientation="0,1"

98+ position="176,120"

99+ id="guide831" />

100+ <sodipodi:guide

101+ orientation="0,1"

102+ position="216,104"

103+ id="guide833" />

104+ <inkscape:grid

105+ type="axonomgrid"

106+ id="grid835"

107+ units="px"

108+ empspacing="60"

109+ gridanglex="42.9"

110+ gridanglez="42.9"

111+ spacingy="3.522px"

112+ enabled="false"

113+ originx="0"

114+ originy="16.999996" />

115+ <sodipodi:guide

116+ orientation="0,1"

117+ position="344,376"

118+ id="guide4126" />

119+ <sodipodi:guide

120+ orientation="0,1"

121+ position="160,136"

122+ id="guide4128" />

123+ <sodipodi:guide

124+ orientation="1,0"

125+ position="136,96"

126+ id="guide4130" />

127+ <sodipodi:guide

128+ orientation="1,0"

129+ position="376,136"

130+ id="guide4134" />

131+ <sodipodi:guide

132+ orientation="-0.70710678,0.70710678"

133+ position="544,544"

134+ id="guide4136" />

135+ <sodipodi:guide

136+ orientation="1,0"

137+ position="256,-32.000001"

138+ id="guide4138" />

139+ <sodipodi:guide

140+ orientation="0,1"

141+ position="544,256"

142+ id="guide4140" />

143+ <sodipodi:guide

144+ orientation="0.70710678,0.70710678"

145+ position="544,-32.000001"

146+ id="guide4142" />

147+ <sodipodi:guide

148+ orientation="0,1"

149+ position="248,15.999999"

150+ id="guide4152" />

151+ <sodipodi:guide

152+ orientation="0,1"

153+ position="336,496"

154+ id="guide4154" />

155+ <sodipodi:guide

156+ position="344,96"

157+ orientation="1,0"

158+ id="guide4361" />

159+ <sodipodi:guide

160+ position="576,168"

161+ orientation="0,1"

162+ id="guide4363" />

163+ <sodipodi:guide

164+ position="168,192"

165+ orientation="1,0"

166+ id="guide4229" />

167+ <sodipodi:guide

168+ position="312,344"

169+ orientation="0,1"

170+ id="guide4233" />

171+ <sodipodi:guide

172+ position="180.48,-96"

173+ orientation="0,1"

174+ id="guide4235" />

175+ </sodipodi:namedview>

176+ <defs

177+ id="defs3338">

178+ <linearGradient

179+ inkscape:collect="always"

180+ id="linearGradient4203">

181+ <stop

182+ style="stop-color:#ea5420;stop-opacity:1"

183+ offset="0"

184+ id="stop4205" />

185+ <stop

186+ style="stop-color:#f37e40;stop-opacity:1"

187+ offset="1"

188+ id="stop4207" />

189+ </linearGradient>

190+ <clipPath

191+ clipPathUnits="userSpaceOnUse"

192+ id="clipPath4755">

193+ <path

194+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.24899998;fill:#5e2c73;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"

195+ d="M 360,50 594,284 V 215.89844 C 594,70.73665 573.2426,50 427.94531,50 Z"

196+ id="path4757"

197+ inkscape:connector-curvature="0" />

198+ </clipPath>

199+ <clipPath

200+ clipPathUnits="userSpaceOnUse"

201+ id="clipPath4767">

202+ <path

203+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"

204+ d="M 543.8125,454.1875 312.18945,685.81055 367.94531,681 C 512.70468,668.50896 526.55393,654.72881 539,510.10156 Z"

205+ id="path4769"

206+ inkscape:connector-curvature="0" />

207+ </clipPath>

208+ <linearGradient

209+ inkscape:collect="always"

210+ xlink:href="#linearGradient4203"

211+ id="linearGradient4209"

212+ x1="167.5"

213+ y1="17.25"

214+ x2="343.25"

215+ y2="491"

216+ gradientUnits="userSpaceOnUse" />

217+ <filter

218+ inkscape:collect="always"

219+ style="color-interpolation-filters:sRGB"

220+ id="filter4220"

221+ x="-0.012"

222+ width="1.024"

223+ y="-0.012"

224+ height="1.024">

225+ <feGaussianBlur

226+ inkscape:collect="always"

227+ stdDeviation="1.4390401"

228+ id="feGaussianBlur4222" />

229+ </filter>

230+ <linearGradient

231+ inkscape:collect="always"

232+ xlink:href="#linearGradient4226"

233+ id="linearGradient4232"

234+ x1="255.99998"

235+ y1="-255.99998"

236+ x2="405.35773"

237+ y2="-255.99998"

238+ gradientUnits="userSpaceOnUse"

239+ spreadMethod="reflect" />

240+ <linearGradient

241+ inkscape:collect="always"

242+ id="linearGradient4226">

243+ <stop

244+ style="stop-color:#a73812;stop-opacity:1"

245+ offset="0"

246+ id="stop4228" />

247+ <stop

248+ style="stop-color:#973310;stop-opacity:0"

249+ offset="1"

250+ id="stop4230" />

251+ </linearGradient>

252+ <filter

253+ inkscape:collect="always"

254+ style="color-interpolation-filters:sRGB"

255+ id="filter4234"

256+ x="-0.096000001"

257+ width="1.192"

258+ y="-0.096000001"

259+ height="1.192">

260+ <feGaussianBlur

261+ inkscape:collect="always"

262+ stdDeviation="11.512321"

263+ id="feGaussianBlur4236" />

264+ </filter>

265+ </defs>

266+ <metadata

267+ id="metadata3341">

268+ <rdf:RDF>

269+ <cc:Work

270+ rdf:about="">

271+ <dc:format>image/svg+xml</dc:format>

272+ <dc:type

273+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

274+ <dc:title></dc:title>

275+ </cc:Work>

276+ </rdf:RDF>

277+ </metadata>

278+ <g

279+ inkscape:groupmode="layer"

280+ id="layer3"

281+ inkscape:label="Background">

282+ <path

283+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"

284+ d="M 0 0 L 0 183.89844 L 0 328.10156 L 0 512 L 512 512 L 512 328.10156 L 512 183.89844 L 512 0 L 0 0 z "

285+ id="rect4158" />

286+ <path

287+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"

288+ d="M 0 256 L 0 328.10156 L 0 462.53516 C 0 479.69677 0.052846476 496.03174 0.13085938 512 L 511.86914 512 C 511.94715 496.03174 512 479.69677 512 462.53516 L 512 256 L 0 256 z "

289+ id="rect4286" />

290+ </g>

291+ <g

292+ inkscape:groupmode="layer"

293+ id="layer1"

294+ inkscape:label="Pictogram"

295+ style="display:inline"

296+ transform="translate(-32,-32)">

297+ <circle

298+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#d04616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4220);enable-background:accumulate"

299+ id="circle4218"

300+ cx="258"

301+ cy="-256"

302+ r="143.90401"

303+ transform="rotate(90,-7.1132638e-7,31.999996)" />

304+ <circle

305+ transform="rotate(90,-7.1132638e-7,31.999996)"

306+ r="143.90401"

307+ cy="-256"

308+ cx="258"

309+ id="circle4224"

310+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient4232);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter4234);enable-background:accumulate" />

311+ <circle

312+ transform="rotate(90)"

313+ r="143.90401"

314+ cy="-288"

315+ cx="288"

316+ id="circle4206"

317+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.99999952;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />

318+ <path

319+ style="display:inline;fill:#ea5420;fill-opacity:1;stroke-width:2.9398191;enable-background:new"

320+ id="path4258"

321+ d="m 193.9963,269.54024 c -10.19878,0 -18.46137,8.2634 -18.46137,18.46139 0,10.19309 8.26259,18.45568 18.46137,18.45568 10.19311,0 18.45569,-8.26259 18.45569,-18.45568 0,-10.19799 -8.26258,-18.46139 -18.45569,-18.46139 z m 131.78525,83.88906 c -8.82832,5.09898 -11.85536,16.38129 -6.75557,25.20475 5.0933,8.82834 16.37561,11.85455 25.20393,6.75556 8.82752,-5.0933 11.85457,-16.37561 6.75559,-25.20475 -5.0933,-8.82263 -16.38212,-11.84887 -25.20395,-6.75556 z m -91.69319,-65.42767 c 0,-18.24028 9.05999,-34.35498 22.92309,-44.11321 l -13.49406,-22.6012 c -16.14883,10.79461 -28.16435,27.28971 -33.15766,46.60863 5.82648,4.75434 9.55584,11.99194 9.55584,20.10497 0,8.10813 -3.72936,15.34572 -9.55584,20.10006 4.98681,19.32463 17.00232,35.82055 33.15766,46.61514 l 13.49406,-22.60689 c -13.8631,-9.75253 -22.92309,-25.86641 -22.92309,-44.1075 z m 53.91207,-53.91776 c 28.16514,0 51.27274,21.59491 53.69828,49.13495 l 26.30048,-0.38772 c -1.29405,-20.33173 -10.17604,-38.58421 -23.82372,-52.00594 -7.01814,2.65149 -15.12464,2.2459 -22.13139,-1.79314 -7.01894,-4.0504 -11.41969,-10.88319 -12.62271,-18.30044 -6.8214,-1.88254 -14.00046,-2.91323 -21.42257,-2.91323 -12.75925,0 -24.82271,2.99695 -35.53359,8.29836 l 12.82509,22.98243 c 6.89944,-3.21075 14.5963,-5.01526 22.71013,-5.01526 z m 0,107.82982 c -8.11383,0 -15.81069,-1.80533 -22.70931,-5.01528 l -12.82511,22.98163 c 10.71088,5.3079 22.77434,8.30568 35.53442,8.30568 7.42211,0 14.60118,-1.0315 21.42177,-2.91975 1.20301,-7.41724 5.60537,-14.24352 12.6227,-18.30125 7.01161,-4.04555 15.11326,-4.44382 22.13137,-1.79232 13.64769,-13.42174 22.52968,-31.67421 23.82372,-52.00595 l -26.30696,-0.38772 c -2.41986,27.54738 -25.52665,49.13496 -53.6926,49.13496 z m 37.77461,-119.35113 c 8.82834,5.09818 20.11145,2.07845 25.20475,-6.74987 5.099,-8.82833 2.07928,-20.11145 -6.74988,-25.21126 -8.82832,-5.0933 -20.11063,-2.06705 -25.21125,6.76127 -5.09247,8.82345 -2.06625,20.10657 6.75638,25.19986 z"

322+ inkscape:connector-curvature="0"

323+ inkscape:transform-center-x="16.232534"

324+ inkscape:transform-center-y="-0.0024900663" />

325+ </g>

326+</svg>

data/unity8-dash.url-dispatchernew file+6

@@ -0,0 +1,6 @@

1+[

2+ {

3+ "protocol": "scope"

4+ }

5+]

6+

data/unity8-greeter-wrapper+4−7

@@ -49,12 +49,9 @@ if which ubuntu-touch-session >/dev/null; then

4949 TOUCH_WRAPPER=ubuntu-touch-session

5050fi

5151

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

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

53+# will start.

54+export DESKTOP_SESSION=ubuntu-touch

5855

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

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

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

103100fi

104101

105102# And finally actually start the greeter

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

103+exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

107104CMD_PID=$!

108105wait $CMD_PID

109106CMD_PID=

data/unity8.conf+29−39

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

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

33

44emits indicator-services-start

5−emits indicator-services-end

65

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

87stop on desktop-end

98

109kill timeout 120

1110

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−

2111respawn

2212expect stop

2313

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

25−# work fine at least 2 times

26−

2714pre-start script

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

2916 initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

3017

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

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

3425

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

26+ # Point unity8 at unity-system-compositor

4227 MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket

43− fi

44− initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE

28+ initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE

29+ initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET

4530

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

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

35+ fi

5036

5137 # Remove the normal and trusted sockets if still there

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

@@ -65,9 +51,6 @@ pre-start script

6551 # reduces lag seen in apps:

6652 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1

6753

68− # Workaround for text not rendering correctly

69− initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1

70−

7154 if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then

7255 # On Ubuntu Touch, we currently use a trick where we auto-login the

7356 # user without a LightDM greeter at all. In this case, we want to

@@ -77,23 +60,30 @@ pre-start script

7760 else

7861 initctl set-env MODE=full-shell

7962 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

8663end script

8764

8865exec ${BINARY:-unity8} --mode=$MODE $ARGS

8966

9067post-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+

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

9282end script

9383

9484post-stop script

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

86+ initctl unset-env --global UNITY_MIR_SOCKET

9687 initctl unset-env --global MIR_SERVER_PROMPT_FILE

9788 initctl emit application-end

98− initctl emit indicator-services-end

9989end script

debian/changelog+20−393

@@ -1,371 +1,3 @@

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

2−

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

4−

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

6−

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

8−

9− * Imported to UBports

10−

11− -- UBports auto importer <infra@ubports.com> Mon, 31 Jul 2017 03:12:43 +0200

12−

13−unity8 (8.15+17.04.20170404.7-0ubuntu2) zesty; urgency=medium

14−

15− [ Michael Zanetti ]

16− * Make the default store uri point to gnome software center

17−

18− -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 06 Apr 2017 10:49:29 +0300

19−

20−unity8 (8.15+17.04.20170404.7-0ubuntu1) zesty; urgency=medium

21−

22− [ Albert Astals Cid ]

23− * Tweak app drawer a bit (LP: #1667570)

24−

25− [ Josh Arenson ]

26− * Make some small changes to the greeter's session list

27− * Handle a user in the greeter having never selected a session better

28− (LP: #1673199)

29−

30− [ Lukáš Tinkl ]

31− * Do not occlude windows with an ongoing unmaximize transition (LP:

32− #1666363)

33− * Show and implement close buttons for child windows (LP: #1668053)

34− * Sanitize the logic for pointer vs. touch menus, fixes hiding the

35− window title in staged mode, when hovering the panel with mouse and

36− no menus available.

37−

38− [ Michael Zanetti ]

39− * Don't hide the launcher on super press if it's locked visible (LP:

40− #1675373)

41− * fix searchfield selection in drawer (LP: #1677259)

42− * make sure the stage has focus when going to spread (LP: #1672053,

43− #1672673, #1676995)

44− * don't autostart the dash app, but show its .desktop file instead

45−

46− -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Apr 2017 22:56:06 +0000

47−

48−unity8 (8.15+17.04.20170328.3-0ubuntu1) zesty; urgency=medium

49−

50− [ Albert Astals Cid ]

51− * mock: Remove empty property and move invokable

52− * Tune quicklist item selection

53− * Fix unminimizing going to the wrong position the second time (LP:

54− #1671458)

55− * Remove unclickable gaps on the menubar (LP: #1672722)

56− * indicators client is a tool

57− * Make sure we destroy the popups when the item goes away (LP:

58− #1670338)

59− * UnityApplicationMocks: Initialize m_state and m_requestedState

60− * Don't use appInfo after checking it if is null

61− * Initialize m_privateMode

62− * Hook up aboutToShow for overflow menus (LP: #1676016)

63−

64− [ Daniel d'Andrada ]

65− * Give active focus to child surface qml items (LP: #1671072)

66− * Satellite child windows (LP: #1673415)

67− * Tell qtmir/miral about the available desktop area

68−

69− [ Florian Boucault ]

70− * WindowStateStorage: use a private QThreadPool to ensure that

71− WindowStateStorage::saveValue always has a thread available to

72− execute the query in. (LP: #1675424)

73−

74− [ Lukáš Tinkl ]

75− * Protect against loading invalid window geometry (LP: #1674262)

76− * Remove usage of the deprecated (and non-functional) system-image-

77− dbus service.

78− * Implement Ctrl+Alt+T to launch the terminal app (LP: #1673500)

79− * Only take normal and dialog surface types into account for launcher

80− items (LP: #1669047)

81− * Fix the shutdown dialog after recent refactoring in

82− DBusUnitySessionService (LP: #1676426)

83−

84− [ Michael Zanetti ]

85− * drop the grey background behind icons in the drawer (LP: #1675688)

86−

87− [ Pete Woods ]

88− * Fix Unity/Platform::isPC, and add tests (LP: #1670657)

89−

90− -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 28 Mar 2017 21:50:20 +0000

91−

92−unity8 (8.15+17.04.20170321-0ubuntu1) zesty; urgency=medium

93−

94− [ Albert Astals Cid ]

95− * Signal aboutToShow (LP: #1664578)

96− * Support Panel top level items to be disabled (LP: #1670694)

97− * Improve Launcher ←→ touch menu interaction (LP: #1667620, #1671069)

98− * Fix real world submenus (e.g. kate) not getting their first item

99− selected on open (LP: #1666859)

100−

101− [ Daniel d'Andrada ]

102− * Really disable the window decoration when in staged mode (LP:

103− #1670361)

104− * Don't let clients resize their surfaces while in staged

105− (phone/tablet) mode (LP: #1670390)

106− * TopLevelWindowModel: don't put hidden windows in the model (LP:

107− #1665286)

108−

109− [ Lukáš Tinkl ]

110− * Reset always-show-osk gsetting on startup to default value (false

111− atm)

112− * Fix the restored-to position with Miral due to the state changes

113− being async (LP: #1669819)

114− * Add a cursor name fallback mapping "grabbing" -> "closedhand" for

115− Breeze

116− * Fix unsnapping a maximized window from the panel (LP: #1671721)

117− * Disable altDrag feature outside windowed mode

118−

119− [ Michael Terry ]

120− * Don't lock the screen for guest users or users in the nopasswdlogin

121− group. (LP: #1644237)

122− * Support GNOME-style logout DBus API (making the Logout, Reboot, and

123− Shutdown launcher commands work) (LP: #1673229)

124−

125− [ Michael Zanetti ]

126− * Add support for closing apps from the spread with "Q" (LP: #1670327)

127− * hide "private" launcher quicklist entries when the greeter is locked

128− (LP: #1667649)

129− * add surface titles to launcher's quicklist (LP: #1661668)

130− * properly reset the drawer state when cancelling a horizontal drag

131− (LP: #1669536)

132− * fix the focus moving correctly between launcher and drawer (LP:

133− #1669880)

134− * unfocus the drawer's textfield when it is moved (LP: #1669839)

135−

136− [ Pete Woods ]

137− * Fix up indicators-client after refactoring (LP: #1672797)

138−

139− -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 21 Mar 2017 10:58:13 +0000

140−

141−unity8 (8.15+17.04.20170308-0ubuntu1) zesty; urgency=medium

142−

143− [ Albert Astals Cid ]

144− * Let's follow the keyboard order

145− * Enable the license check (LP: #1590044)

146− * Show a barebones error message if loading the QML doesn't work

147− * Make sure cursor is back to normal when closing the window (LP:

148− #1666158)

149− * Fix small warning when sensitive is undefined

150− * Remove unused member variable

151− * Initialize m_msecsSinceReference

152− * Add warning if registerService fails

153− * Move menus Component {} out of the repeater

154− * Add tool to browse menus of a running app

155−

156− [ Daniel d'Andrada ]

157− * Drag child windows with Alt+LeftMouseButton (LP: #1664947)

158−

159− [ Gerry Boland ]

160− * TopLevelWindowModel: connect to the OSK surface to know when it goes

161− away so we can clean up after it. (LP: #1670681)

162−

163− [ Josh Arenson ]

164− * Initialize sessionMode to single when mock is reset (LP: #1667463)

165−

166− [ Lukáš Tinkl ]

167− * Make the menu string "Back" translatable

168− * Let the OSK be driven by a switch in indicator-keyboard (LP:

169− #1521518)

170− * Disable the tutorial when there's no touchscreen (LP: #1661557)

171− * Shell chrome fixes (LP: #1658117, #1665723, #1665724, #1669010)

172− * Cancel the drag as soon as we're entering the spread (LP: #1668642)

173− * Fix being unable to use window control buttons or menus with touch

174− (LP: #1667604, #1668387)

175−

176− [ Michael Terry ]

177− * Set QT_IM_MODULE in the greeter so that the OSK can come up. (LP:

178− #1670383)

179− * Simplify our startup handling of Mir environment variables and set

180− the right socket path in snappy.

181−

182− [ Michael Zanetti ]

183− * Cancel the home key activation if something else is pressed along

184− with Meta (LP: #1670678)

185− * close the drawer when something is launched from the launcher (LP:

186− #1660367)

187− * use a svg instead of a png for the Launcher's BFB (LP: #1668057)

188− * change the default setting for the launcher autohiding (LP:

189− #1670655)

190−

191− [ Nick Dedekind ]

192− * Split up Shell::test_spreadDisabled to ensure initial state for each

193− test.

194−

195− -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 08 Mar 2017 09:56:46 +0000

196−

197−unity8 (8.15+17.04.20170221-0ubuntu1) zesty; urgency=medium

198−

199− * Handle ubuntu-app-launch API/ABI break

200−

201− -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2017 13:23:23 +0000

202−

203−unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium

204−

205− [ Albert Astals Cid ]

206− * Make menus items close the menu when clicking on them (LP: #1657082,

207− #1657399)

208− * Clicking on an open menu closes it + test

209− * Make the menus and submenus do not go outside the screen when

210− popping out

211− * Auto open submenus on hover (LP: #1657085)

212− * Make the double click on a menu not be maximize the window below

213− (LP: #1657079)

214− * Make the MenuBar InverseMouseArea eat hover events when there's a

215− popup open (LP: #1657763)

216− * Make double click on the window decoration maximize (LP: #1657758)

217− * Eat hover events when the launcher quicklist is open (LP: #1640776)

218− * Remove TODO now that we require Qt > 5.5

219− * Serialize two make targets that want to cp to the same target file

220− (LP: #1660576)

221− * Remove variable that is always false (LP: #1585910)

222−

223− [ Daniel d'Andrada ]

224− * Consolidate launcher API checks

225−

226− [ Lukáš Tinkl ]

227− * Fixes for activating minimized windows and restoring fullscreen ones

228− (LP: #1656808, #1658937, #1658938)

229−

230− [ Michael Zanetti ]

231− * move right edge push area up some levels so it can be used on top of

232− the indicators

233− * fix minimizing/restoring transitions (LP: #1658936)

234− * fix some glitches with spread positioning

235− * fix jumpy animation when closing an item from the spread

236− * Show the wallpaper while the focused app is moving in staged mode

237− (LP: #1648251)

238− * Update the tutorial to mention the app drawer instead of the dash on

239− long left edge swipe (LP: #1658932)

240− * prevent hiding the launcher when the mouse hover event is eaten by

241− the EdgePushArea (LP: #1657045)

242− * properly invalidate the whole model (LP: #1658190)

243− * stabilize OrientedShell test (LP: #1658994)

244−

245− [ Nick Dedekind ]

246− * Added overflow support to application menus.

247− * Updated menu colors

248−

249− -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 16 Feb 2017 13:49:18 +0000

250−

251−unity8 (8.15+17.04.20170206-0ubuntu1) zesty; urgency=medium

252−

253− [ Daniel d'Andrada ]

254− * Initial support for child windows (menus, dialogs, tooltips) (LP:

255− #1543467, #1591384, #1656727)

256−

257− -- Albert Astals Cid <albert.astals@canonical.com> Mon, 06 Feb 2017 09:12:23 +0000

258−

259−unity8 (8.15+17.04.20170131.1-0ubuntu1) zesty; urgency=medium

260−

261− [ Rodney Dawes ]

262− * Remove dependencies on clickscope.

263−

264− -- Albert Astals Cid <albert.astals@canonical.com> Tue, 31 Jan 2017 14:40:33 +0000

265−

266−unity8 (8.15+17.04.20170124-0ubuntu1) zesty; urgency=medium

267−

268− [ Albert Astals Cid ]

269− * Limit tab-focus travelling on dialogs with a fence

270− * Restore focus to where it was when our ShellDialogs get unloaded

271− * Update current session after changing the user

272− * Add keyboard navigation for Indicators

273− * a window -> the current window

274− * There's no spreadDelegate_ anymore

275−

276− [ Daniel d'Andrada ]

277− * Simplify DecoratedWindow

278− * Remove unnecessary warning message

279−

280− [ Josh Arenson ]

281− * Add a test for the session chooser icon in the greeter's sessions

282− list

283−

284− [ Lukáš Tinkl ]

285− * Fix keymap not being applied on the shell itself (LP: #1626435)

286− * Shell dialog improvements (kbd focus, mouse eater)

287− * Start searching directly as you type, w/o having to first

288− focus/click the search field.

289− * Add a test for the real implementation of WindowStateStorage

290− * Use a four finger gesture to open the drawer, much like in u7

291−

292− [ Michael Terry ]

293− * Simplify the lightdm mock to make future greeter improvements easier

294− to test.

295− * Add support for guest sessions in unity8-greeter.

296− * Use a model for PAM prompts, supporting more possible interactions.

297− * Fix grouping of autopkg output and allow optionally passing

298− arguments to installed test scripts.

299− * Add support for LightDM hints for manual logins and hiding normal

300− users.

301−

302− [ Michael Zanetti ]

303− * hint the launcher to indicate a successful size change to the user

304− (LP: #1646457)

305− * Improvements for the appdrawer (LP: #1648173)

306− * Adjust home key to still focus the dash instead of messing with the

307− drawer

308− * allow 4 finger simulation with mousetouchadaptor

309−

310− [ Nick Dedekind ]

311− * Added Alt+F10 shortcut to open app menus. (LP: #1656896)

312− * Fixed menu layout width calculations. (LP: #1657050)

313− * Skip Panel::test_drag_indicator_item_down_shows_menu

314−

315− -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 24 Jan 2017 07:46:58 +0000

316−

317−unity8 (8.15+17.04.20170110.4-0ubuntu1) zesty; urgency=medium

318−

319− [ Albert Astals Cid ]

320− * Give focus to one of the buttons of the dialog

321− * tst_WindowResizeArea: Use default values for mouseFlick speed and

322− iterations (LP: #1651580)

323− * Require Qt 5.6 & misc fixes

324−

325− [ Daniel van Vugt ]

326− * Deprecate usage of Mir's input resampling, instead opting for: (LP:

327− #1497105, #1591328)

328−

329− [ Josh Arenson ]

330− * Allow the scopes list to automatically scroll when a scope is being

331− dragged past the bounds of the screen. (LP: #1575319)

332−

333− [ Lukáš Tinkl ]

334− * Fix touch window controls being unreachable when the overlay is

335− being displayed (LP: #1648167)

336− * Fixup paths for window state storage in snappy environment

337− * Add Unity.Platform mock for our tests (LP: #1655336)

338−

339− [ Michael Zanetti ]

340− * PreviewRatingInput: Use displayText instead of text to

341− enable/disable the Send button (LP: #1595910)

342− * Add a D-Bus interface to control some debug facilities on the fly

343− * some launcher workarounds for the snapping

344−

345− [ Michał Sawicz ]

346− * Nuke leftover Platform in IndicatorsManager

347−

348− [ Nick Dedekind ]

349− * Added registry for application menus

350−

351− [ Michael Terry, Nick Dedekind ]

352− * Run the qmluitests.sh autopkg test against the installed package.

353−

354− [ Michał Sawicz, Nick Dedekind ]

355− * Application menus

356−

357− [ Rodney Dawes ]

358− * Remove the payments widget and dependency on libpay as no longer

359− needed.

360−

361− -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 10 Jan 2017 14:48:42 +0000

362−

363−unity8 (8.15+17.04.20161215-0ubuntu2~1) zesty; urgency=medium

364−

365− * No change rebuild

366−

367− -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 04 Jan 2017 10:54:32 +0200

368−

3691unity8 (8.15+17.04.20161215-0ubuntu1) zesty; urgency=medium

3702

3713 * Let the model deal with some window management decisions (LP:

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

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

1225857

1226858 [ Michael Terry ]

1227− *

859+ *

1228860 * Fix setting OSK layout in OOBE wizard

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

1230862 tutorial wants to be shown after receiving a call.

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

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

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

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

3939−

3571+

39403572 [ Michael Zanetti ]

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

39423574 * Add right-edge spread animation for tablet

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

42103842

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

42123844

4213− * debian/control:

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

3845+ * debian/control:

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

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

42163848 on amd64 and i386

42173849

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

73136945 [ Michał Sawicz ]

73146946 * Fix icons in ApplicationsFilterGrid.qml.

73156947 * Support flipped image in run_on_device.

7316−

6948+

73176949 [ Michael Zanetti ]

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

73196951 * Reworked Launcher folding.

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

73987030

73997031 [ Michael Terry ]

74007032 * Make greeter look like the desktop one

7401−

7033+

74027034 [ Gerry Boland ]

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

74047036 * Applied a workaround to reduce flickering when launching apps

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

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

74157047

74167048 [ Sergio Schvezov ]

7417− * Replacing the music and ski safari mock apps with calendar and weather in

7049+ * Replacing the music and ski safari mock apps with calendar and weather in

74187050 the launcher (LP: #1178262).

74197051

74207052 [ Daniel d'Andrada ]

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

74567088 [ Mathieu Trudel-Lapierre ]

74577089 * debian/control:

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

7459− - Add/update Vcs-Browser, Vcs-Bzr and add a notice to uploaders.

7091+ - Add/update Vcs-Browser, Vcs-Bzr and add a notice to uploaders.

74607092 * debian/copyright: fix syntax.

74617093

74627094 [ Michał Sawicz ]

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

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

74677099

74687100 [ Daniel d'Andrada ]

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

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

74707102 single-finger drag gestures.

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

74727104

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

79037535

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

79057537

7906− * fix launching of notepad

7538+ * fix launching of notepad

79077539

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

79097541

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

79167548

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

79187550

7919− * launch real notepad app

7551+ * launch real notepad app

79207552 * fix launching of mock apps

79217553

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

79237555

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

79257557

7926− * integrate ubuntu-browser instead of snowshoe

7558+ * integrate ubuntu-browser instead of snowshoe

79277559

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

79297561

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

80077639

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

80097641

8010− * New release with fullscreen launcher fixes

7642+ * New release with fullscreen launcher fixes

80117643

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

80137645

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

80197651

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

80217653

8022− * enable multi-threaded render for apps

7654+ * enable multi-threaded render for apps

80237655

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

80257657

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

80277659

80287660 [ Bill Filler ]

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

8030− and twitter

7662+ and twitter

80317663

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

80337665

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

80397671

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

80417673

8042− * fix to launch new gallery with correct args

7674+ * fix to launch new gallery with correct args

80437675

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

80457677

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

81017733

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

81037735

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

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

81057737

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

81077739

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

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

81307762 via dbus-luanch to properly setup session bus

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

8132− processes

7764+ processes

81337765

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

81357767

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

81377769

8138− * added additional Android env vars to upstart script

7770+ * added additional Android env vars to upstart script

81397771

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

81417773

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

81437775

8144− * added support to launch telephony-app

7776+ * added support to launch telephony-app

81457777

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

81477779

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

81687800 * Initial release

81697801

81707802 -- 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+198−215

@@ -2,224 +2,224 @@ Source: unity8

22Section: x11

33Priority: optional

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

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,

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+ 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+ libgnome-desktop-3-dev,

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

23+ libgl1-mesa-dri,

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

25+ libglib2.0-dev,

26+ libgsettings-qt-dev,

27+ libhardware-dev,

28+ liblightdm-qt5-3-dev,

29+ libpam0g-dev,

30+ libpay2-dev,

31+ libpulse-dev,

32+ libqmenumodel-dev (>= 0.2.10),

33+ libqt5svg5-dev,

34+ libqt5xmlpatterns5-dev,

35+ libsystemsettings-dev,

36+ libubuntu-app-launch2-dev,

37+ libubuntu-download-manager-common-dev,

38+ libubuntugestures5-dev (>= 1.3.2030),

39+ libubuntugestures5-private-dev (>= 1.3.2030),

40+ libudev-dev,

41+ libudm-common-dev,

42+ libunity-api-dev (>= 8.0),

43+ libusermetricsoutput1-dev,

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

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

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

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

48+# End of X11 libs

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-qtqml-statemachine,

55+ qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),

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

63+ qt5-default,

64+ qtbase5-dev (>= 5.4),

65+ qtbase5-dev-tools,

66+ qtbase5-private-dev (>= 5.4),

67+ qtdeclarative5-dev (>= 5.4),

68+ qtdeclarative5-dev-tools,

69+ qtdeclarative5-private-dev (>= 5.4),

70+ qtdeclarative5-ubuntu-content1,

71+ qtdeclarative5-ubuntu-settings-components (>= 0.11),

72+ ttf-ubuntu-font-family,

73+ xvfb,

7674Standards-Version: 3.9.4

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

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

75+Homepage: http://launchpad.net/unity

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

77+# packaging changes, just go ahead. ~unity-team will notice

78+# and sync up the code again.

79+Vcs-Bzr: https://code.launchpad.net/unity8

80+Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk

7981XS-Testsuite: autopkgtest

8082X-Ubuntu-Use-Langpack: yes

8183

8284Package: indicators-client

8385Architecture: any

84−Depends:

85− qmenumodel-qml (>= 0.2.11),

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

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

88− ${misc:Depends},

89− ${shlibs:Depends},

86+Depends: qmenumodel-qml (>= 0.2.10),

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

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

89+ ${misc:Depends},

90+ ${shlibs:Depends},

9091Description: Indicators client test application

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

9293

9394Package: unity8-greeter

9495Architecture: any

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,

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

97+ unity-system-compositor,

98+ ${misc:Depends},

99+ ${shlibs:Depends}

100+Recommends: lightdm

101+Provides: lightdm-greeter

104102Description: The Unity8 Greeter

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

106104

105+Package: unity-scope-tool

106+Architecture: any

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

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

109+ ${misc:Depends},

110+ ${shlibs:Depends},

111+# We do call pkg-config libunity-scopes from the code

112+ pkg-config,

113+ libunity-scopes-dev,

114+Description: Development tool for Unity scopes

115+ This package contains the development tool for new generation Unity scopes, based

116+ on Unity8.

117+

107118Package: unity8

108119Architecture: any

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,

120+Provides: indicator-renderer,

121+Depends: dmz-cursor-theme,

122+ gsettings-desktop-schemas,

123+ libcap2-bin,

124+ libglib2.0-bin,

125+ qmenumodel-qml (>= 0.2.10),

126+ qml-module-biometryd,

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

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

129+ qml-module-qtqml-statemachine,

130+ qml-module-qtquick-xmllistmodel,

131+ qml-module-qtsysteminfo,

132+ qml-module-ubuntu-web,

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

134+ qtdeclarative5-ubuntu-telephony0.1,

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

136+ unity-launcher-impl-10,

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

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

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

140+ ${misc:Depends},

141+ ${shlibs:Depends},

142+Recommends: indicator-keyboard,

143+ indicator-session,

144+ unity-greeter-session-broadcast,

145+ unity-scope-click,

146+Suggests: unity-scope-mediascanner2,

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

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

149+ unity8-greeter (<< 7.89),

150+ ubuntu-keyboard (<< 0.100),

151+Replaces: ubuntu-touch-session (<< 0.82~),

152+ unity8-greeter (<< 7.89),

153+Conflicts: ubuntu-system-settings-wizard,

148154Description: Unity 8 shell

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

150156

151157Package: unity8-common

152158Architecture: all

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

159+Depends: qml-module-qtquick-layouts,

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

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

162+ qtdeclarative5-ubuntu-settings-components (>= 0.11),

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

164+ qttranslations5-l10n,

165+ ubuntu-thumbnailer-impl-0,

166+ ubuntu-wallpapers,

167+ unity-application-impl-23,

168+ unity-notifications-impl-3,

169+ unity-plugin-scopes | unity-scopes-impl,

170+ unity-scopes-impl-12,

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

172+ ${misc:Depends},

173+Breaks: unity8 (<< 7.86),

174+Replaces: unity8 (<< 7.86),

170175Description: Unity 8 shell (common files)

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

172177 .

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

178+ This package contains the QML, graphics and locale files shared between

179+ unity8 and unity-scope-tool.

174180

175181Package: unity8-autopilot

176182Architecture: all

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

183+Depends: autopilot-qt5 (>= 1.4),

184+ gir1.2-glib-2.0,

185+ gir1.2-notify-0.7,

186+ libqt5test5,

187+ libqt5widgets5,

188+ ofono-phonesim,

189+ python3-autopilot,

190+ python3-evdev,

191+ python3-fixtures,

192+ python3-gi,

193+ qttestability-autopilot (>= 1.4),

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

195+ unity-scope-click,

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

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

198+ url-dispatcher-tools,

199+ xvfb,

200+ ${misc:Depends},

201+ ${python3:Depends},

196202Description: Test package for Unity 8 shell

197203 Autopilot tests for the unity8 package

198204

199205Package: unity8-tests

200206Architecture: any

201207Multi-Arch: same

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,

208+Pre-Depends: ${misc:Pre-Depends},

209+Depends: dbus-test-runner,

210+ parallel,

211+ qt5-default,

212+ qtdeclarative5-dev-tools,

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

214+ xvfb,

215+ ${misc:Depends},

216+ ${shlibs:Depends},

217+Provides: unity-application-impl,

218+ unity-application-impl-23,

219+ unity8-fake-env,

220+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),

221+ unity8-fake-env,

222+Conflicts: unity8-fake-env,

223223Description: Scripts and mocks for running Unity 8 shell tests

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

225225 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment

@@ -228,45 +228,28 @@ Description: Scripts and mocks for running Unity 8 shell tests

228228Package: unity8-private

229229Architecture: any

230230Multi-Arch: same

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,

231+Pre-Depends: ${misc:Pre-Depends},

232+Depends: accountsservice-ubuntu-schemas (>= 0.0.7),

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

234+ libhardware2,

235+ pay-service,

236+ unity-schemas (>= 7.3.1+14.10.20140915),

237+ qtdeclarative5-gsettings1.0,

238+ qml-module-qtmultimedia,

239+ ${misc:Depends},

240+ ${shlibs:Depends},

241+Provides: unity-launcher-impl,

242+ unity-launcher-impl-10,

245243Description: Unity 8 private libs

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

247245 .

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

249247 only used by the shell.

250248

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−

265249Package: unity8-doc

266250Section: doc

267251Architecture: all

268252Multi-Arch: foreign

269−Depends:

270− ${misc:Depends},

253+Depends: ${misc:Depends},

271254Description: Documentation for Unity8

272255 The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)

debian/rules+6−20

@@ -7,12 +7,6 @@ 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

1610

1711%:

1812 dh $@ --parallel --fail-missing --with python3

@@ -24,19 +18,7 @@ override_dh_auto_configure:

2418

2519override_dh_auto_build:

2620 # doc is not a default target

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

21+ dh_auto_build -- all doc

4022

4123override_dh_install:

4224 # install autopilot tests

@@ -47,6 +29,10 @@ override_dh_install:

4729 cd $(CURDIR)

4830 dh_install -X'*.pyc' --fail-missing

4931

32+override_dh_installdeb:

33+ dh_apparmor --profile-name=usr.bin.unity8-dash -punity8-dash

34+ dh_installdeb

35+

5036# use private lib directories

5137override_dh_makeshlibs:

5238 dh_makeshlibs -Nunity8-private -Nunity8-tests

@@ -54,4 +40,4 @@ override_dh_makeshlibs:

5440override_dh_shlibdeps:

5541 # Some mock libraries link against liblightdm-qt5-3.so which we want to

5642 # avoid, since we only really link against our mock one, not the system one.

57− dh_shlibdeps -XlibMockAccountsService-qml.so -Lunity8-private

43+ dh_shlibdeps -XlibMockLightDM-qml.so -XlibMockAccountsService-qml.so -Lunity8-private

debian/source/formatnew file+1

@@ -0,0 +1 @@

1+1.0

debian/tests/control+3−5

@@ -1,11 +1,9 @@

11Tests: qmluitests.sh

22Restrictions: allow-stderr

3−Depends:

4− dpkg-dev,

5− unity8-tests,

3+Depends: dpkg-dev,

4+ unity8-tests,

65

76Tests: autopilot.sh

87Restrictions: allow-stderr,

98 isolation-machine,

10−Depends:

11− unity8-autopilot,

9+Depends: unity8-autopilot,

debian/unity-scope-tool.installnew file+2

@@ -0,0 +1,2 @@

1+usr/bin/unity-scope-tool

2+usr/share/unity8/ScopeTool.qml

debian/unity8-common.install+2

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

1+usr/share/glib-2.0/schemas

12usr/share/locale

23usr/share/unity8/Components

4+usr/share/unity8/Dash

35usr/share/unity8/Notifications

46usr/share/unity8/graphics

57var/lib/polkit-1/localauthority/10-vendor.d

debian/unity8-greeter.install+1−1

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

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

21data/unity8-greeter-wrapper usr/bin/

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

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

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

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

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

33usr/lib/*/unity8/qml/Cursor

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

45usr/lib/*/unity8/qml/GlobalShortcut

56usr/lib/*/unity8/qml/Greeter

7+usr/lib/*/unity8/qml/ImageCache

68usr/lib/*/unity8/qml/LightDM

79usr/lib/*/unity8/qml/Lights

810usr/lib/*/unity8/qml/Powerd

911usr/lib/*/unity8/qml/ScreenshotDirectory

1012usr/lib/*/unity8/qml/SessionBroadcast

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

1213usr/lib/*/unity8/qml/Ubuntu

1314usr/lib/*/unity8/qml/Unity

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

1416usr/lib/*/unity8/qml/Utils

1517usr/lib/*/unity8/qml/WindowManager

1618usr/lib/*/unity8/qml/Wizard

debian/unity8-schemas.installdeleted−1

@@ -1 +0,0 @@

1−usr/share/glib-2.0/schemas

debian/unity8-tests.install+1

@@ -2,6 +2,7 @@ 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

56usr/lib/*/unity8/qml/utils

67usr/lib/*/unity8/tests

78usr/lib/*/unity8/uqmlscene

debian/unity8.install+10−7

@@ -1,19 +1,22 @@

1−data/devices.conf etc/ubuntu/

2−data/test.sensors etc/ubuntusensors/

1+debian/usr.bin.unity8-dash etc/apparmor.d

2+var/lib/unity8/version

3+data/unity8-dash.conf usr/share/upstart/sessions/

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

45data/unity8.conf usr/share/upstart/sessions/

6+data/devices.conf etc/ubuntu/

57usr/bin/unity8

8+usr/bin/unity8-dash

9+usr/share/applications/unity8-dash.desktop

610usr/share/applications/unity8.desktop

7−usr/share/unity8/ApplicationMenus

8−usr/share/unity8/DeviceConfiguration.qml

9−usr/share/unity8/DisabledScreenNotice.qml

1011usr/share/unity8/Greeter

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

1518usr/share/unity8/Shell.qml

1619usr/share/unity8/Stage

1720usr/share/unity8/Tutorial

1821usr/share/unity8/Wizard

19−var/lib/unity8/version

22+usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher

debian/usr.bin.unity8-dashnew file+21

@@ -0,0 +1,21 @@

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

plugins/AccountsService/AccountsService.cpp+30−1

@@ -25,6 +25,7 @@

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

2829#define IFACE_UBUNTU_INPUT QStringLiteral("com.ubuntu.AccountsService.Input")

2930#define IFACE_UBUNTU_SECURITY QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")

3031#define IFACE_UBUNTU_SECURITY_OLD QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")

@@ -32,7 +33,7 @@

3233#define IFACE_UNITY_PRIVATE QStringLiteral("com.canonical.unity.AccountsService.Private")

3334

3435#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")

35−#define PROP_DEMO_EDGES QStringLiteral("DemoEdges2")

36+#define PROP_DEMO_EDGES QStringLiteral("demo-edges")

3637#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")

3738#define PROP_EMAIL QStringLiteral("Email")

3839#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")

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

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

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

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

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

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

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

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

213216 return (PasswordDisplayHint)value.toInt();

214217}

215218

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+

216245QString AccountsService::realName() const

217246{

218247 auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);

plugins/AccountsService/AccountsService.h+17−1

@@ -29,6 +29,7 @@ class QDBusInterface;

2929class AccountsService: public QObject

3030{

3131 Q_OBJECT

32+ Q_ENUMS(PasswordDisplayHint)

3233 Q_PROPERTY (QString user

3334 READ user

3435 WRITE setUser

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

6667 READ failedFingerprintLogins

6768 WRITE setFailedFingerprintLogins

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

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

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

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

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

7586 Keyboard,

7687 Numeric,

7788 };

78− Q_ENUM(PasswordDisplayHint)

7989

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

8191 ~AccountsService() = default;

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

96106 void setFailedLogins(uint failedLogins);

97107 uint failedFingerprintLogins() const;

98108 void setFailedFingerprintLogins(uint failedFingerprintLogins);

109+ bool hereEnabled() const;

110+ void setHereEnabled(bool enabled);

111+ QString hereLicensePath() const;

112+ bool hereLicensePathValid() const;

99113 QString realName() const;

100114 void setRealName(const QString &realName);

101115 QString email() const;

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

115129 void passwordDisplayHintChanged();

116130 void failedLoginsChanged();

117131 void failedFingerprintLoginsChanged();

132+ void hereEnabledChanged();

133+ void hereLicensePathChanged();

118134 void realNameChanged();

119135 void emailChanged();

120136 void keymapsChanged();

plugins/AccountsService/CMakeLists.txt+2−1

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

77 plugin.cpp

88 )

99

10+qt5_use_modules(AccountsService-qml DBus Qml)

11+

1012target_link_libraries(AccountsService-qml

11− Qt5::DBus Qt5::Qml

1213 ${GLIB_LIBRARIES}

1314 )

1415

plugins/AccountsService/com.canonical.unity.AccountsService.xml−6

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

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

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

1111

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

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

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

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

1615 </property>

1716

18− <!-- Marks that V2 (post-8.21) edge demos have been run -->

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

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

21− </property>

22−

2317 <!-- List of tutorial pages that have been completed by the user -->

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

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

plugins/CMakeLists.txt+3−1

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

1−find_package(QmlPlugins)

1+include(QmlPlugins)

22

33# Set up and install a plugin for unity8.

44#

@@ -15,8 +15,10 @@ add_subdirectory(AccountsService)

1515add_subdirectory(Cursor)

1616add_subdirectory(GlobalShortcut)

1717add_subdirectory(Greeter)

18+add_subdirectory(ImageCache)

1819add_subdirectory(LightDM)

1920add_subdirectory(Lights)

21+add_subdirectory(Dash)

2022add_subdirectory(Powerd)

2123add_subdirectory(ScreenshotDirectory)

2224add_subdirectory(SessionBroadcast)

plugins/Cursor/CMakeLists.txt+2−1

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

2626target_link_libraries(Cursor-qml

2727 xcursorloader-static

2828 ${QT5PLATFORM_SUPPORT_LDFLAGS}

29− Qt5::Qml Qt5::Quick Qt5::Svg

3029)

3130

31+qt5_use_modules(Cursor-qml Qml Quick Svg)

32+

3233add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)

plugins/Cursor/CursorImageInfo.cpp+2−1

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

108108QUrl CursorImageInfo::imageSource() const

109109{

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

111− .arg(m_themeName, m_cursorName)

111+ .arg(m_themeName)

112+ .arg(m_cursorName)

112113 .arg(m_cursorHeight);

113114

114115 return QUrl(urlString);

plugins/Cursor/CursorImageProvider.cpp−2

@@ -174,8 +174,6 @@ 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−

179177 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointing_hand"));

180178 m_fallbackNames[QStringLiteral("hand")].append(QStringLiteral("pointer"));

181179

plugins/Dash/AudioProgressBar.qmlnew file+54

@@ -0,0 +1,54 @@

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+import Ubuntu.Components 1.3

19+import Dash 0.1

20+

21+Item {

22+ id: root

23+

24+ implicitHeight: progressBarImage.height

25+

26+ property url source

27+ readonly property double progress: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource) ? DashAudioPlayer.progress : 0

28+

29+ Image {

30+ id: progressBarImage

31+ anchors { left: parent.left; right: parent.right }

32+ height: units.dp(6)

33+ source: "graphics/music_progress_bg.png"

34+ asynchronous: true

35+ sourceSize.width: width

36+ sourceSize.height: height

37+ }

38+

39+ UbuntuShape {

40+ id: progressBarFill

41+ objectName: "progressBarFill"

42+

43+ readonly property int maxWidth: progressBarImage.width

44+

45+ anchors {

46+ left: progressBarImage.left

47+ right: progressBarImage.right

48+ verticalCenter: progressBarImage.verticalCenter

49+ rightMargin: maxWidth - (maxWidth * root.progress)

50+ }

51+ height: units.dp(2)

52+ backgroundColor: theme.palette.normal.activity

53+ }

54+}

plugins/Dash/CMakeLists.txtnew file+47

@@ -0,0 +1,47 @@

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.qmlnew file+71

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

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 1.3

20+

21+GridLayout {

22+ id: grid

23+ anchors {

24+ left: parent.left;

25+ right: parent.right;

26+ }

27+ columns: 2 + repeater.count % 2

28+ rowSpacing: units.gu(.5)

29+ property alias model: repeater.model

30+ property color color: theme.palette.normal.baseText

31+ property real fontScale: 1.0

32+

33+ Repeater {

34+ id: repeater

35+ delegate: Row {

36+ spacing: units.gu(0.5)

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

38+ Layout.alignment: {

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

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

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

42+ }

43+ Layout.column: index % grid.columns

44+ Layout.row: index / grid.columns

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

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

47+ Layout.fillWidth: true

48+ height: units.gu(2)

49+ Icon {

50+ id: icon

51+ height: units.gu(2)

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

53+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

54+ source: "icon" in modelData && modelData["icon"] || ""

55+ color: grid.color

56+ }

57+ Label {

58+ id: label

59+ width: parent.width - x

60+ anchors.verticalCenter: parent.verticalCenter

61+ text: "value" in modelData && modelData["value"] || "";

62+ elide: Text.ElideRight

63+ maximumLineCount: 1

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

65+ fontSize: "x-small"

66+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

67+ color: grid.color

68+ }

69+ }

70+ }

71+}

plugins/Dash/CardAudioProgress.qmlnew file+59

@@ -0,0 +1,59 @@

1+/*

2+ * Copyright 2015 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+import Ubuntu.Components 1.3

19+import Dash 0.1

20+

21+Item {

22+ id: root

23+

24+ implicitHeight: positionLabel.y + positionLabel.height

25+ visible: AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)

26+

27+ property int duration: 0

28+ property alias source: progress.source

29+ property color color: theme.palette.normal.baseText

30+ readonly property int position: root.visible ? DashAudioPlayer.position / 1000 : 0

31+

32+ AudioProgressBar {

33+ id: progress

34+ anchors { left: parent.left; right: parent.right }

35+ }

36+

37+ Label {

38+ id: positionLabel

39+ anchors {

40+ left: parent.left

41+ top: progress.bottom

42+ }

43+ verticalAlignment: Text.AlignBottom

44+ fontSize: "x-small"

45+ text: DashAudioPlayer.lengthToString(root.position)

46+ color: root.color

47+ }

48+

49+ Label {

50+ anchors {

51+ right: parent.right

52+ top: progress.bottom

53+ }

54+ verticalAlignment: Text.AlignBottom

55+ fontSize: "x-small"

56+ text: DashAudioPlayer.lengthToString(duration)

57+ color: root.color

58+ }

59+}

plugins/Dash/CardCreator.jsnew file+999

@@ -0,0 +1,999 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+.pragma library

18+

19+// %1 is the template["card-background"]["elements"][0]

20+// %2 is the template["card-background"]["elements"][1]

21+// %3 is whether the loader should be asynchronous or not

22+// %4 is the template["card-background"] string

23+var kBackgroundLoaderCode = 'Loader {\n\

24+ id: backgroundLoader; \n\

25+ objectName: "backgroundLoader"; \n\

26+ anchors.fill: parent; \n\

27+ asynchronous: %3; \n\

28+ visible: status === Loader.Ready; \n\

29+ sourceComponent: UbuntuShape { \n\

30+ objectName: "background"; \n\

31+ radius: "small"; \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: "small"; \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: "small"; \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: "small"; \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 { aspect: UbuntuShape.Flat; 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: 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 = 'Loader { \n\

335+ active: root.pressed; \n\

336+ anchors { %1 } \n\

337+ sourceComponent: UbuntuShape { \n\

338+ objectName: "touchdown"; \n\

339+ anchors.fill: parent; \n\

340+ radius: "small"; \n\

341+ borderSource: "radius_pressed.sci" \n\

342+ } \n\

343+ }\n';

344+

345+// %1 is used as anchors of subtitleLabel

346+// %2 is used as color of subtitleLabel

347+var kSubtitleLabelCode = 'Label { \n\

348+ id: subtitleLabel; \n\

349+ objectName: "subtitleLabel"; \n\

350+ anchors { %1 } \n\

351+ anchors.topMargin: units.dp(2); \n\

352+ elide: Text.ElideRight; \n\

353+ maximumLineCount: 1; \n\

354+ fontSize: "x-small"; \n\

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

356+ color: %2; \n\

357+ visible: titleLabel.visible && titleLabel.text; \n\

358+ text: cardData && cardData["subtitle"] || ""; \n\

359+ font.weight: Font.Light; \n\

360+ }\n';

361+

362+// %1 is used as anchors of attributesRow

363+// %2 is used as color of attributesRow

364+var kAttributesRowCode = 'CardAttributes { \n\

365+ id: attributesRow; \n\

366+ objectName: "attributesRow"; \n\

367+ anchors { %1 } \n\

368+ color: %2; \n\

369+ fontScale: root.fontScale; \n\

370+ model: cardData && cardData["attributes"]; \n\

371+ }\n';

372+

373+// %1 is used as anchors of socialActionsRow

374+// %2 is used as color of socialActionsRow

375+var kSocialActionsRowCode = 'CardSocialActions { \n\

376+ id: socialActionsRow; \n\

377+ objectName: "socialActionsRow"; \n\

378+ anchors { %1 } \n\

379+ color: %2; \n\

380+ model: cardData && cardData["socialActions"]; \n\

381+ onClicked: root.action(actionId); \n\

382+ }\n';

383+

384+// %1 is used as top anchor of summary

385+// %2 is used as topMargin anchor of summary

386+// %3 is used as color of summary

387+var kSummaryLabelCode = 'Label { \n\

388+ id: summary; \n\

389+ objectName: "summaryLabel"; \n\

390+ anchors { \n\

391+ top: %1; \n\

392+ left: parent.left; \n\

393+ right: parent.right; \n\

394+ margins: units.gu(1); \n\

395+ topMargin: %2; \n\

396+ } \n\

397+ wrapMode: Text.Wrap; \n\

398+ maximumLineCount: 5; \n\

399+ elide: Text.ElideRight; \n\

400+ text: cardData && cardData["summary"] || ""; \n\

401+ height: text ? implicitHeight : 0; \n\

402+ fontSize: "x-small"; \n\

403+ font.weight: Font.Light; \n\

404+ color: %3; \n\

405+ }\n';

406+

407+// %1 is used as bottom anchor of audio progress bar

408+// %2 is used as left anchor of audio progress bar

409+// %3 is used as text color

410+var kAudioProgressBarCode = 'CardAudioProgress { \n\

411+ id: audioProgressBar; \n\

412+ duration: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["duration"]) || 0; \n\

413+ source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\

414+ anchors { \n\

415+ bottom: %1; \n\

416+ left: %2; \n\

417+ right: parent.right; \n\

418+ margins: units.gu(1); \n\

419+ } \n\

420+ color: %3; \n\

421+ }';

422+

423+function sanitizeColor(colorString) {

424+ if (colorString !== undefined) {

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

426+ // This is not the perfect regexp for color

427+ // but what we're trying to do here is just protect

428+ // against injection so it's ok

429+ return "";

430+ }

431+ }

432+ return colorString;

433+}

434+

435+function cardString(template, components, isCardTool, artShapeStyle, categoryLayout) {

436+ var code;

437+

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

439+

440+ code = 'AbstractButton { \n\

441+ id: root; \n\

442+ property var cardData; \n\

443+ property string backgroundShapeStyle: "flat"; \n\

444+ property real fontScale: 1.0; \n\

445+ property var scopeStyle: null; \n\

446+ readonly property string title: cardData && cardData["title"] || ""; \n\

447+ property bool showHeader: true; \n\

448+ implicitWidth: childrenRect.width; \n\

449+ enabled: %1; \n\

450+ \n'.arg(templateInteractive);

451+

452+ if (!isCardTool) {

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

454+ property size fixedArtShapeSize: Qt.size(-1, -1); \n";

455+ }

456+

457+ var hasArt = components["art"] && components["art"]["field"] || false;

458+ var hasSummary = components["summary"] || false;

459+ var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;

460+ var artAndSummary = hasArt && hasSummary && !isConciergeMode;

461+ var isHorizontal = template["card-layout"] === "horizontal";

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

463+ (hasSummary && (template["card-background"] || components["background"]));

464+ var hasTitle = components["title"] || false;

465+ var hasMascot = components["mascot"] || false;

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

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

468+ var hasSubtitle = hasTitle && components["subtitle"] || false;

469+ var hasHeaderRow = hasMascot && hasTitle;

470+ var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;

471+ var hasSocialActions = hasTitle && components["social-actions"] || false;

472+ var isAudio = template["quick-preview-type"] === "audio";

473+ var asynchronous = isCardTool ? "false" : "true";

474+

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

476+ if (isAudio) {

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

478+ // in horizontal mode

479+ // Anything else makes it behave not like an audio card

480+ if (hasSummary) isAudio = false;

481+ if (!isHorizontal) isAudio = false;

482+ if (hasMascot) isAudio = false;

483+ if (hasEmblem) isAudio = false;

484+ if (headerAsOverlay) isAudio = false;

485+ if (hasAttributes) isAudio = false;

486+ }

487+

488+ if (hasBackground) {

489+ var templateCardBackground;

490+ if (template && typeof template["card-background"] === "string") {

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

492+ } else {

493+ templateCardBackground = '""';

494+ }

495+

496+ var backgroundElements0;

497+ var backgroundElements1;

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

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

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

501+ if (element0 !== undefined) {

502+ backgroundElements0 = '"%1"'.arg(element0);

503+ }

504+ if (element1 !== undefined) {

505+ backgroundElements1 = '"%1"'.arg(element1);

506+ }

507+ }

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

509+ }

510+

511+ if (hasArt) {

512+ var artShapeAspect;

513+ if (isCardTool) {

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

515+

516+ var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;

517+ if (isNaN(artShapeAspect)) {

518+ artShapeAspect = 1;

519+ }

520+ } else {

521+ artShapeAspect = "(root.fixedArtShapeSize.width / root.fixedArtShapeSize.height)";

522+ }

523+

524+ var widthCode, heightCode;

525+ var artAnchors;

526+ if (isHorizontal) {

527+ artAnchors = 'left: parent.left';

528+ if (hasMascot || hasTitle) {

529+ widthCode = 'height * ' + artShapeAspect;

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

531+ } else {

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

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

534+ widthCode = 'height * ' + artShapeAspect

535+ heightCode = 'units.gu(7.625)';

536+ }

537+ } else {

538+ artAnchors = 'horizontalCenter: parent.horizontalCenter;';

539+ widthCode = 'root.width'

540+ heightCode = 'width / ' + artShapeAspect;

541+ }

542+

543+ var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";

544+ fallback = encodeURI(fallback);

545+ var fallbackStatusCode = "";

546+ var fallbackURICode = '""';

547+ if (fallback !== "") {

548+ // fallbackStatusCode has %8 in it because we want to substitute it for fallbackURICode

549+ // which in kArtShapeHolderCode is %8

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

551+ fallbackURICode = 'decodeURI("%1")'.arg(fallback);

552+ }

553+ var artShapeHolderShapeCode;

554+ if (!isConciergeMode) {

555+ if (artShapeStyle === "icon") {

556+ artShapeHolderShapeCode = kArtProportionalShapeCode;

557+ } else {

558+ var artShapeHolderShapeAspect;

559+ switch (artShapeStyle) {

560+ case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;

561+ case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;

562+ default:

563+ case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;

564+ }

565+ artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(artShapeHolderShapeAspect);

566+ }

567+ } else {

568+ artShapeHolderShapeCode = "";

569+ }

570+ var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;

571+ code += artShapeHolderCode.arg(artAnchors)

572+ .arg(widthCode)

573+ .arg(heightCode)

574+ .arg(isConciergeMode ? "true" : "false")

575+ .arg(asynchronous)

576+ .arg(artShapeHolderShapeCode)

577+ .arg(fallbackStatusCode)

578+ .arg(fallbackURICode);

579+ } else if (isCardTool) {

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

581+ }

582+

583+ if (headerAsOverlay) {

584+ var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";

585+ code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);

586+ }

587+

588+ var headerVerticalAnchors;

589+ if (headerAsOverlay) {

590+ headerVerticalAnchors = 'bottom: artShapeLoader.bottom; \n\

591+ bottomMargin: units.gu(1);\n';

592+ } else {

593+ if (hasArt) {

594+ if (isHorizontal) {

595+ headerVerticalAnchors = 'top: artShapeLoader.top; \n\

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

597+ } else {

598+ headerVerticalAnchors = 'top: artShapeLoader.bottom; \n\

599+ topMargin: units.gu(1);\n';

600+ }

601+ } else {

602+ headerVerticalAnchors = 'top: parent.top; \n\

603+ topMargin: units.gu(1);\n';

604+ }

605+ }

606+

607+ var headerLeftAnchor;

608+ var headerLeftAnchorHasMargin = false;

609+ if (isHorizontal && hasArt) {

610+ headerLeftAnchor = 'left: artShapeLoader.right; \n\

611+ leftMargin: units.gu(1);\n';

612+ headerLeftAnchorHasMargin = true;

613+ } else if (isHorizontal && isAudio) {

614+ headerLeftAnchor = 'left: audioButton.right; \n\

615+ leftMargin: units.gu(1);\n';

616+ headerLeftAnchorHasMargin = true;

617+ } else {

618+ headerLeftAnchor = 'left: parent.left;\n';

619+ }

620+

621+ var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary && !isAudio;

622+

623+ if (hasHeaderRow) {

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

625+ } else if (hasMascot) {

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

627+ } else if (hasAttributes) {

628+ if (hasTitle && hasSubtitle) {

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

630+ } else if (hasTitle) {

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

632+ } else {

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

634+ }

635+ } else if (isAudio) {

636+ if (hasSubtitle) {

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

638+ } else if (hasTitle) {

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

640+ } else {

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

642+ }

643+ } else if (hasSubtitle) {

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

645+ } else if (hasTitle) {

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

647+ } else {

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

649+ }

650+

651+ var mascotShapeCode = '';

652+ var mascotCode = '';

653+ if (hasMascot) {

654+ var useMascotShape = !hasBackground && !headerAsOverlay;

655+ var mascotAnchors = '';

656+ if (!hasHeaderRow) {

657+ mascotAnchors += headerLeftAnchor;

658+ mascotAnchors += headerVerticalAnchors;

659+ if (!headerLeftAnchorHasMargin) {

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

661+ }

662+ } else {

663+ mascotAnchors = 'verticalCenter: parent.verticalCenter;'

664+ }

665+

666+ if (useMascotShape) {

667+ mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);

668+ }

669+

670+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';

671+ var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";

672+ fallback = encodeURI(fallback);

673+ var fallbackStatusCode = "";

674+ var fallbackURICode = '""';

675+ if (fallback !== "") {

676+ // fallbackStatusCode has %4 in it because we want to substitute it for fallbackURICode

677+ // which in kMascotImageCode is %4

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

679+ fallbackURICode = 'decodeURI("%1")'.arg(fallback);

680+ }

681+ mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackStatusCode).arg(fallbackURICode);

682+ }

683+

684+ 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")';

685+

686+ var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));

687+ var titleSubtitleCode = '';

688+ if (hasTitle) {

689+ var titleColor;

690+ if (headerAsOverlay) {

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

692+ } else if (hasSummary) {

693+ titleColor = 'summary.color';

694+ } else if (hasBackground) {

695+ titleColor = summaryColorWithBackground;

696+ } else {

697+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

698+ }

699+

700+ var titleAnchors;

701+ var subtitleAnchors;

702+ var attributesAnchors;

703+ var titleContainerAnchors;

704+ var titleRightAnchor;

705+ var titleWidth = "undefined";

706+

707+ var extraRightAnchor = '';

708+ var extraLeftAnchor = '';

709+ if (!touchdownOnArtShape) {

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

711+ extraLeftAnchor = 'leftMargin: units.gu(1); \n';

712+ } else if (headerAsOverlay && !hasEmblem) {

713+ extraRightAnchor = 'rightMargin: units.gu(1); \n';

714+ }

715+

716+ if (hasMascot) {

717+ titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';

718+ } else {

719+ titleContainerAnchors = 'right: parent.right; ';

720+ titleContainerAnchors += headerLeftAnchor;

721+ titleContainerAnchors += headerVerticalAnchors;

722+ if (!headerLeftAnchorHasMargin) {

723+ titleContainerAnchors += extraLeftAnchor;

724+ }

725+ }

726+ if (hasEmblem) {

727+ titleRightAnchor = 'right: emblemIcon.left; \n\

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

729+ } else {

730+ titleRightAnchor = 'right: parent.right; \n'

731+ titleRightAnchor += extraRightAnchor;

732+ }

733+

734+ if (hasTitleContainer) {

735+ // Using headerTitleContainer

736+ titleAnchors = titleRightAnchor;

737+ titleAnchors += 'left: parent.left; \n\

738+ top: parent.top;';

739+ subtitleAnchors = 'right: parent.right; \n\

740+ left: parent.left; \n';

741+ subtitleAnchors += extraRightAnchor;

742+ if (hasSubtitle) {

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

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

745+ } else {

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

747+ }

748+ } else if (hasMascot) {

749+ // Using row without titleContainer

750+ titleAnchors = 'verticalCenter: parent.verticalCenter;\n';

751+ titleWidth = "parent.width - x";

752+ } else {

753+ if (headerAsOverlay) {

754+ // Using anchors to the overlay

755+ titleAnchors = titleRightAnchor;

756+ titleAnchors += 'left: parent.left; \n\

757+ leftMargin: units.gu(1); \n\

758+ top: overlayLoader.top; \n\

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

760+ } else {

761+ // Using anchors to the mascot/parent

762+ titleAnchors = titleRightAnchor;

763+ titleAnchors += headerLeftAnchor;

764+ titleAnchors += headerVerticalAnchors;

765+ if (!headerLeftAnchorHasMargin) {

766+ titleAnchors += extraLeftAnchor;

767+ }

768+ }

769+ subtitleAnchors = 'left: titleLabel.left; \n\

770+ leftMargin: titleLabel.leftMargin; \n';

771+ subtitleAnchors += extraRightAnchor;

772+ if (hasEmblem) {

773+ // using container

774+ subtitleAnchors += 'right: parent.right; \n';

775+ } else {

776+ subtitleAnchors += 'right: titleLabel.right; \n';

777+ }

778+

779+ if (hasSubtitle) {

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

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

782+ } else {

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

784+ }

785+ }

786+

787+ var titleAlignment = "Text.AlignHCenter";

788+ if (template["card-layout"] === "horizontal"

789+ || typeof components["title"] !== "object"

790+ || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";

791+ var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];

792+ for (var key in keys) {

793+ key = keys[key];

794+ try {

795+ if (typeof components[key] === "string"

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

797+ } catch (e) {

798+ continue;

799+ }

800+ }

801+

802+ // code for different elements

803+ var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');

804+ var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);

805+ var subtitleCode;

806+ var attributesCode;

807+

808+ // code for the title container

809+ var containerCode = [];

810+ var containerHeight = 'titleLabel.height';

811+ containerCode.push(titleCode);

812+ if (hasSubtitle) {

813+ subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);

814+ containerCode.push(subtitleCode);

815+ containerHeight += ' + subtitleLabel.height';

816+ }

817+ if (hasEmblem) {

818+ containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));

819+ }

820+ if (hasAttributes) {

821+ attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);

822+ containerCode.push(attributesCode);

823+ containerHeight += ' + attributesRow.height';

824+ }

825+

826+ if (hasTitleContainer) {

827+ // use container

828+ titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);

829+ } else {

830+ // no container

831+ titleSubtitleCode = titleCode;

832+ if (hasSubtitle) {

833+ titleSubtitleCode += subtitleCode;

834+ }

835+ if (hasAttributes) {

836+ titleSubtitleCode += attributesCode;

837+ }

838+ }

839+ }

840+

841+ if (hasHeaderRow) {

842+ var rowCode = [mascotCode, titleSubtitleCode];

843+ if (mascotShapeCode != '') {

844+ rowCode.unshift(mascotShapeCode);

845+ }

846+ code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)

847+ } else {

848+ code += mascotShapeCode + mascotCode + titleSubtitleCode;

849+ }

850+

851+ if (isAudio) {

852+ var audioProgressBarLeftAnchor = 'audioButton.right';

853+ var audioProgressBarBottomAnchor = 'audioButton.bottom';

854+ var audioProgressBarTextColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

855+

856+ code += kAudioProgressBarCode.arg(audioProgressBarBottomAnchor)

857+ .arg(audioProgressBarLeftAnchor)

858+ .arg(audioProgressBarTextColor);

859+

860+ var audioButtonAnchorsFill;

861+ var audioButtonWidth;

862+ var audioButtonHeight;

863+ if (hasArt) {

864+ audioButtonAnchorsFill = 'artShapeLoader';

865+ audioButtonWidth = 'undefined';

866+ audioButtonHeight = 'undefined';

867+ } else {

868+ audioButtonAnchorsFill = 'undefined';

869+ audioButtonWidth = 'height';

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

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

872+ }

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

874+ }

875+

876+ if (hasSummary) {

877+ var summaryTopAnchor;

878+ if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

879+ else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

880+ else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';

881+ else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';

882+ else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';

883+ else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';

884+ else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';

885+ else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';

886+ else if (hasArt) summaryTopAnchor = 'artShapeLoader.bottom';

887+ else summaryTopAnchor = 'parent.top';

888+

889+ var summaryColor;

890+ if (hasBackground) {

891+ summaryColor = summaryColorWithBackground;

892+ } else {

893+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

894+ }

895+

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

897+

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

899+ }

900+

901+ if (hasSocialActions) {

902+ var socialAnchors;

903+ var socialTopAnchor;

904+

905+ if (hasSummary) socialTopAnchor = 'summary.bottom;';

906+ else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

907+ else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

908+ else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';

909+ else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';

910+ else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';

911+ else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';

912+ else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';

913+ else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';

914+ else if (hasArt) socialTopAnchor = 'artShapeLoader.bottom;';

915+ else socialTopAnchor = 'parent.top';

916+

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

918+

919+ var socialColor;

920+ if (hasBackground) {

921+ socialColor = summaryColorWithBackground;

922+ } else {

923+ socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';

924+ }

925+

926+ code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);

927+ }

928+

929+ if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {

930+ var touchdownAnchors;

931+ if (hasBackground) {

932+ touchdownAnchors = 'fill: backgroundLoader';

933+ } else if (touchdownOnArtShape) {

934+ touchdownAnchors = 'fill: artShapeLoader';

935+ } else {

936+ touchdownAnchors = 'fill: root'

937+ }

938+ code += kTouchdownCode.arg(touchdownAnchors);

939+ }

940+

941+ if (isCardTool || categoryLayout !== "grid") {

942+ var implicitHeight = 'implicitHeight: ';

943+ if (hasSocialActions) {

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

945+ } else if (hasSummary) {

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

947+ } else if (isAudio) {

948+ implicitHeight += 'audioButton.height;\n';

949+ } else if (headerAsOverlay) {

950+ implicitHeight += 'artShapeLoader.height;\n';

951+ } else if (hasHeaderRow) {

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

953+ } else if (hasMascot) {

954+ implicitHeight += 'mascotImage.y + mascotImage.height;\n';

955+ } else if (hasTitleContainer) {

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

957+ } else if (hasAttributes) {

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

959+ } else if (hasSubtitle) {

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

961+ } else if (hasTitle) {

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

963+ } else if (hasArt) {

964+ implicitHeight += 'artShapeLoader.height;\n';

965+ } else {

966+ implicitHeight = '';

967+ }

968+ } else {

969+ implicitHeight = '';

970+ }

971+

972+ // Close the AbstractButton

973+ code += implicitHeight + '}\n';

974+

975+ return code;

976+}

977+

978+function createCardComponent(parent, template, components, isCardTool, artShapeStyle, categoryLayout, identifier) {

979+ var imports = 'import QtQuick 2.4; \n\

980+ import Ubuntu.Components 1.3; \n\

981+ import Ubuntu.Settings.Components 0.1; \n\

982+ import Dash 0.1;\n\

983+ import Utils 0.1;\n';

984+ var card = cardString(template, components, isCardTool, artShapeStyle, categoryLayout);

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

986+

987+ try {

988+ return Qt.createQmlObject(code, parent, identifier);

989+ } catch (e) {

990+ console.error("ERROR: Invalid component created.");

991+ console.error("Template:");

992+ console.error(JSON.stringify(template));

993+ console.error("Components:");

994+ console.error(JSON.stringify(components));

995+ console.error("Code:");

996+ console.error(code);

997+ throw e;

998+ }

999+}

plugins/Dash/CardCreatorCache.qmlnew file+40

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+pragma Singleton

18+import QtQuick 2.4

19+import "CardCreator.js" as CardCreator

20+

21+QtObject {

22+ id: root

23+

24+ property var cache: new Object();

25+

26+ function getCardComponent(template, components, isCardTool, artShapeStyle, 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.qmlnew file+94

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

1+/*

2+ * Copyright 2016 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 1.3

20+

21+Column {

22+ id: socialActions

23+ spacing: units.gu(0.5)

24+

25+ property alias model: repeater.model

26+ property color color: theme.palette.normal.baseText

27+

28+ signal clicked(var actionId)

29+

30+ Rectangle {

31+ id: divider

32+ visible: repeater.count > 0

33+ anchors {

34+ left: parent.left;

35+ right: parent.right;

36+ leftMargin:units.dp(1);

37+ rightMargin: units.dp(1);

38+ }

39+ color: Qt.darker(theme.palette.normal.background, 1.12)

40+ height: visible ? units.dp(1) : 0

41+ }

42+

43+ Row {

44+ id: row

45+ anchors {

46+ left: parent.left

47+ right: parent.right

48+ leftMargin: units.gu(1)

49+ rightMargin: units.gu(1)

50+ }

51+ spacing: units.gu(2)

52+ readonly property int visibleItems: {

53+ if (width <= units.gu(12)) // small card

54+ return 2;

55+ else if (width <= units.gu(21)) // medium card

56+ return 3;

57+ else // large or horizontal card

58+ return 4;

59+ }

60+

61+ Repeater {

62+ id: repeater

63+ delegate: Loader {

64+ height: units.gu(2)

65+ active: index < row.visibleItems

66+ sourceComponent: AbstractButton {

67+ objectName: "delegate" + index

68+ height: units.gu(2)

69+ width: icon.width

70+ Icon {

71+ id: icon

72+ objectName: "icon"

73+

74+ readonly property url urlIcon: modelData && modelData["icon"] || ""

75+ readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""

76+

77+ height: units.gu(2)

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

79+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth

80+ source: urlIcon

81+ color: socialActions.color

82+

83+ onUrlIconChanged: {

84+ if (urlIcon) source = urlIcon

85+ }

86+ }

87+

88+ onClicked: socialActions.clicked(modelData["id"]);

89+ onPressedChanged: if (pressed && icon.urlTemporaryIcon != "") icon.source = icon.urlTemporaryIcon

90+ }

91+ }

92+ }

93+ }

94+}

plugins/Dash/CroppedImageMinimumSourceSize.qmlnew file+38

@@ -0,0 +1,38 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+

19+Image {

20+ id: root

21+

22+ fillMode: Image.PreserveAspectCrop

23+

24+ property bool useHeight: false

25+ function updateUseHeight()

26+ {

27+ // Do not turn into a binding since otherwise the qml

28+ // engine complains about binding loops

29+ useHeight = (implicitWidth / implicitHeight) > (width / height);

30+ }

31+

32+ onHeightChanged: updateUseHeight();

33+ onWidthChanged: updateUseHeight();

34+ onImplicitHeightChanged: updateUseHeight();

35+ onImplicitWidthChanged: updateUseHeight();

36+

37+ sourceSize: useHeight ? Qt.size(0, height) : Qt.size(width, 0)

38+}

plugins/Dash/DashAudioPlayer.qmlnew file+120

@@ -0,0 +1,120 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+pragma Singleton

18+import QtQuick 2.4

19+import QtMultimedia 5.6

20+import Dash 0.1

21+

22+QtObject {

23+ id: root

24+ readonly property real progress: priv.audio ? priv.audio.position / priv.audio.duration : 0.0

25+ readonly property bool playing: priv.audio ? priv.audio.playbackState === Audio.PlayingState : false

26+ readonly property bool paused: priv.audio ? priv.audio.playbackState === Audio.PausedState : false

27+ readonly property bool stopped: priv.audio ? priv.audio.playbackState === Audio.StoppedState : true

28+ readonly property int position: priv.audio ? priv.audio.position : 0

29+ readonly property url currentSource: priv.audio ? priv.audio.playlist.currentItemSource : ""

30+ readonly property Playlist playlist: priv.audio ? priv.audio.playlist : null

31+

32+ function playSource(newSource, newPlaylist) {

33+ if (!priv.audio) {

34+ console.info("DashAudioPlayer: creating player");

35+ priv.audio = priv.audioComponent.createObject(root);

36+ }

37+ stop();

38+ priv.audio.playlist.clear();

39+ if (newPlaylist) {

40+ // Look for newSource in newPlaylist

41+ var sourceIndex = -1;

42+ for (var i in newPlaylist) {

43+ if (AudioUrlComparer.compare(newSource, newPlaylist[i])) {

44+ sourceIndex = i;

45+ break;

46+ }

47+ }

48+ var urls = [];

49+ if (sourceIndex === -1 && newSource != "") {

50+ // If the playing song is not in the playlist, add it

51+ urls.push(newSource);

52+ sourceIndex = 0;

53+ }

54+ for (var i in newPlaylist) {

55+ urls.push(newPlaylist[i]);

56+ }

57+ priv.audio.playlist.addItems(urls);

58+ priv.audio.playlist.currentIndex = sourceIndex;

59+ } else {

60+ priv.audio.playlist.addItem(newSource);

61+ priv.audio.playlist.currentIndex = 0;

62+ }

63+ play();

64+ }

65+

66+ function stop() {

67+ if (priv.audio) {

68+ priv.audio.stop();

69+ }

70+ }

71+

72+ function play() {

73+ if (priv.audio) {

74+ priv.audio.play();

75+ }

76+ }

77+

78+ function pause() {

79+ if (priv.audio) {

80+ priv.audio.pause();

81+ }

82+ }

83+

84+ property QtObject priv: QtObject {

85+ id: priv

86+ property Audio audio: null

87+ property Component audioComponent: Component {

88+ Audio {

89+ playlist: Playlist {

90+ objectName: "playlist"

91+ }

92+ /* Remove player in case of error so it gets recreated next time

93+ * we need it. Happens if backend media player restarted, for

94+ * instance. qtmultimedia should probably handle this

95+ * transparently (LP: #1616425).

96+ */

97+ onError: {

98+ console.warn("DashAudioPlayer: error event (" +

99+ priv.audio.errorString + "), destroying");

100+ priv.audio.destroy();

101+ }

102+ }

103+ }

104+ }

105+

106+ function lengthToString(s) {

107+ if (typeof(s) !== "number" || s < 0) return "";

108+

109+ var sec = "" + s % 60;

110+ if (sec.length == 1) sec = "0" + sec;

111+ var hour = Math.floor(s / 3600);

112+ if (hour < 1) {

113+ return Math.floor(s / 60) + ":" + sec;

114+ } else {

115+ var min = "" + Math.floor(s / 60) % 60;

116+ if (min.length == 1) min = "0" + min;

117+ return hour + ":" + min + ":" + sec;

118+ }

119+ }

120+}

plugins/Dash/ScopeStyle.qmlnew file+95

@@ -0,0 +1,95 @@

1+/*

2+ * Copyright 2014 Canonical Ltd.

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+import Utils 0.1

19+import Ubuntu.Components 1.3

20+

21+/*! \brief Helper for processing scope customization options.

22+

23+ It will take the customizations object passed by the scope and

24+ process it to provide the scope UI with data such as colors or

25+ image paths.

26+ */

27+

28+QtObject {

29+ /// Style object passed from the scope

30+ property var style: Object()

31+

32+ /// Color used for text and symbolic icons

33+ readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark

34+

35+ /// Luminance of the foreground color

36+ readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)

37+

38+ /// Color used for the overall background

39+ readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"

40+

41+ /// Luminance of the background color

42+ readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)

43+

44+ /*! \brief Get the most contrasting available color based on luminance

45+ *

46+ * If background color is transparent, theme provided colors are taken into account

47+ */

48+ function getTextColor(luminance) {

49+ if (Math.abs(foregroundLuminance - luminance) >

50+ Math.abs(d.opaqueBackgroundLuminance - luminance)) {

51+ return foreground;

52+ } else {

53+ return d.opaqueBackground;

54+ }

55+ }

56+

57+ /// Source of the logo image for the header

58+ readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""

59+

60+ /// Background style for the header

61+ readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"

62+

63+ /// Foreground color for the header

64+ readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground

65+

66+ /// Color of the header divider

67+ readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"

68+

69+ /// Background style for the navigation

70+ readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"

71+

72+ /// Color of the primary preview button

73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive

74+

75+ //! @cond

76+ property var d: QtObject {

77+ // FIXME: should be taken from the theme

78+ readonly property color defaultLight: "white"

79+ readonly property color defaultDark: UbuntuColors.darkGrey

80+ readonly property real defaultLightLuminance: Style.luminance(defaultLight)

81+ readonly property real defaultDarkLuminance: Style.luminance(defaultDark)

82+

83+ readonly property color opaqueBackground: {

84+ background.a > 0 ?

85+ background :

86+ (Math.abs(foregroundLuminance - defaultLightLuminance) >

87+ Math.abs(foregroundLuminance - defaultDarkLuminance)) ?

88+ defaultLight : defaultDark

89+ }

90+ readonly property real opaqueBackgroundLuminance: Style.luminance(opaqueBackground)

91+

92+ readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }

93+ }

94+ //! @endcond

95+}

plugins/Dash/abstractdashview.cppnew file+359

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "abstractdashview.h"

18+

19+#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.hnew file+128

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef ABSTRACTDASHVIEW_H

18+#define ABSTRACTDASHVIEW_H

19+

20+#include <QQuickItem>

21+

22+class QAbstractItemModel;

23+class QQmlComponent;

24+

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.pngnew file

Binary file not shown.

plugins/Dash/horizontaljournal.cppnew file+239

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+/*

18+ * The implementation is centered around m_visibleItems

19+ * that a list for each of the items in the view.

20+ * m_firstVisibleIndex is the index of the first item in m_visibleItems

21+ * m_lastInRowIndexPosition is a map that contains the x position

22+ * of items that are the last ones of a row so we can reconstruct the rows

23+ * when building back

24+ */

25+

26+#include "horizontaljournal.h"

27+

28+#include <qqmlengine.h>

29+#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.hnew file+63

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

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef HORIZONTALJOURNAL_H

18+#define HORIZONTALJOURNAL_H

19+

20+#include "abstractdashview.h"

21+

22+ /** A horizontal journal is a view that creates delegates

23+ * based on a model and layouts them one after the other

24+ * in the same row until there is no more free space for the next item

25+ * and so that item is layouted in the next row

26+ *

27+ * All delegates are forced to rowHeight if they don't have it.

28+ */

29+ class HorizontalJournal : public AbstractDashView

30+{

31+ Q_OBJECT

32+

33+ Q_PROPERTY(qreal rowHeight READ rowHeight WRITE setRowHeight NOTIFY rowHeightChanged)

34+

35+friend class HorizontalJournalTest;

36+

37+public:

38+ HorizontalJournal();

39+

40+ qreal rowHeight() const;

41+ void setRowHeight(qreal rowHeight);

42+

43+Q_SIGNALS:

44+ void rowHeightChanged();

45+

46+private:

47+ void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

48+ void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

49+ bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

50+ void addItemToView(int modelIndex, QQuickItem *item) override;

51+ void cleanupExistingItems() override;

52+ void calculateImplicitHeight() override;

53+ void doRelayout() override;

54+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

56+

57+ int m_firstVisibleIndex;

58+ QList<QQuickItem*> m_visibleItems;

59+ QMap<int, double> m_lastInRowIndexPosition;

60+ int m_rowHeight;

61+};

62+

63+#endif

plugins/Dash/listviewwithpageheader.cppnew file+1394

@@ -0,0 +1,1394 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+/*

18+ * Some documentation on how this thing works:

19+ *

20+ * A flickable has two very important concepts that define the top and

21+ * height of the flickable area.

22+ * The top is returned in minYExtent()

23+ * The height is set using setContentHeight()

24+ * By changing those two values we can make the list grow up or down

25+ * as needed. e.g. if we are in the middle of the list

26+ * and something that is above the viewport grows, since we do not

27+ * want to change the viewport because of that we just adjust the

28+ * minYExtent so that the list grows up.

29+ *

30+ * The implementation on the list relies on the delegateModel doing

31+ * most of the instantiation work. You call createItem() when you

32+ * need to create an item asking for it async or not. If returns null

33+ * it means the item will be created async and the model will call the

34+ * itemCreated slot with the item.

35+ *

36+ * updatePolish is the central point of dispatch for the work of the

37+ * class. It is called by the scene graph just before drawing the class.

38+ * In it we:

39+ * * Make sure all items are positioned correctly

40+ * * Add/Remove items if needed

41+ * * Update the content height if it was dirty

42+ *

43+ * m_visibleItems contains all the items we have created at the moment.

44+ * Actually not all of them are visible since it includes the ones

45+ * in the cache area we create asynchronously to help performance.

46+ * The first item in m_visibleItems has the m_firstVisibleIndex in

47+ * the model. If you actually want to know what is the first

48+ * item in the viewport you have to find the first non culled element

49+ * in m_visibleItems

50+ *

51+ * All the items (except the header) are childs of m_clipItem which

52+ * is a child of the contentItem() of the flickable (The contentItem()

53+ * is what actually 'moves' in a a flickable). This way

54+ * we can implement the clipping needed so we can have the header

55+ * shown in the middle of the list over the items without the items

56+ * leaking under the header in case it is transparent.

57+ *

58+ * The first item of m_visibleItems is the one that defines the

59+ * positions of all the rest of items (see updatePolish()) and

60+ * this is why sometimes we move it even if it's not the item

61+ * that has triggered the function (i.e. in itemGeometryChanged())

62+ *

63+ * m_visibleItems is a list of ListItem. Each ListItem

64+ * will contain a item and potentially a sectionItem. The sectionItem

65+ * is only there when the list is using sectionDelegate+sectionProperty

66+ * and this is the first item of the section. Each ListItem is vertically

67+ * layouted with the sectionItem first and then the item.

68+ *

69+ * For sectioning we also have a section item alone (m_topSectionItem)

70+ * that is used for the cases we need to show the sticky section item at

71+ * the top of the view.

72+ *

73+ * Each delegate item has a context property called heightToClip that is

74+ * used to communicate to the delegate implementation in case it has to

75+ * clip itself because of overlapping with the top sticky section item.

76+ * This is an implementation decision since it has been agreed it

77+ * is easier to implement the clipping in QML with this info than to

78+ * do it at the C++ level.

79+ *

80+ * Note that minYExtent and height are not always totally accurate, since

81+ * we don't have the items created we can't guess their heights

82+ * so we can only guarantee the values are correct when the first/last

83+ * items of the list are visible, otherwise we just live with good enough

84+ * values that make the list scrollable

85+ *

86+ * There are a few things that are not really implemented or tested properly

87+ * which we don't use at the moment like changing the model, changing

88+ * the section delegate, having a section delegate that changes its size, etc.

89+ * The known missing features are marked with TODOs along the code.

90+ */

91+

92+#include "listviewwithpageheader.h"

93+

94+#include <QCoreApplication>

95+#include <QDebug>

96+#include <qqmlinfo.h>

97+#include <qqmlengine.h>

98+#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+ } else if (m_headerItemShownHeight == 0 && m_previousContentY > m_headerItem->y() && contentY() < m_headerItem->y()) {

591+ // The header was hidden but now that we've moved up (e.g. because of item removed) it's visible

592+ // make sure it isn't

593+ m_headerItem->setY(-m_minYExtent);

594+ }

595+ Q_EMIT headerItemShownHeightChanged();

596+ } else {

597+ // Stick the header item to the top when dragging down

598+ m_headerItem->setY(contentY());

599+ m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

600+ }

601+ // We will be changing the clip item, need to accomadate for it

602+ // otherwise we move the firstItem down/up twice (unless the

603+ // show header animation is running, where we want to keep the viewport stable)

604+ if (!showHeaderAnimationRunning) {

605+ diff += oldHeaderItemShownHeight - m_headerItemShownHeight;

606+ } else {

607+ diff = -diff;

608+ }

609+ }

610+ if (!m_visibleItems.isEmpty()) {

611+ updateClipItem();

612+ ListItem *firstItem = m_visibleItems.first();

613+ firstItem->setY(firstItem->y() + diff);

614+ if (showHeaderAnimationRunning) {

615+ adjustMinYExtent();

616+ }

617+ }

618+}

619+

620+void ListViewWithPageHeader::createDelegateModel()

621+{

622+ m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

623+ connect(m_delegateModel, &QQmlDelegateModel::createdItem, this, &ListViewWithPageHeader::itemCreated);

624+ if (isComponentComplete())

625+ m_delegateModel->componentComplete();

626+ updateWatchedRoles();

627+}

628+

629+void ListViewWithPageHeader::refill()

630+{

631+ if (m_inLayout) {

632+ return;

633+ }

634+ if (!isComponentComplete()) {

635+ return;

636+ }

637+

638+ const qreal from = contentY();

639+ const qreal to = from + height();

640+ const qreal bufferFrom = from - m_cacheBuffer;

641+ const qreal bufferTo = to + m_cacheBuffer;

642+

643+ bool added = addVisibleItems(from, to, false);

644+ bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

645+ added |= addVisibleItems(bufferFrom, bufferTo, true);

646+

647+ if (added || removed) {

648+ m_contentHeightDirty = true;

649+ }

650+}

651+

652+bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

653+{

654+ if (!delegate())

655+ return false;

656+

657+ if (m_delegateModel->count() == 0)

658+ return false;

659+

660+ ListItem *item;

661+// qDebug() << "ListViewWithPageHeader::addVisibleItems" << fillFrom << fillTo << asynchronous;

662+

663+ int modelIndex = 0;

664+ qreal pos = 0;

665+ if (!m_visibleItems.isEmpty()) {

666+ modelIndex = m_firstVisibleIndex + m_visibleItems.count();

667+ item = m_visibleItems.last();

668+ pos = item->y() + item->height() + m_clipItem->y();

669+ }

670+ bool changed = false;

671+// qDebug() << (modelIndex < m_delegateModel->count()) << pos << fillTo;

672+ while (modelIndex < m_delegateModel->count() && pos <= fillTo) {

673+// qDebug() << "refill: append item" << modelIndex << "pos" << pos << "asynchronous" << asynchronous;

674+ if (!(item = createItem(modelIndex, asynchronous)))

675+ break;

676+ pos += item->height();

677+ ++modelIndex;

678+ changed = true;

679+ }

680+

681+ modelIndex = 0;

682+ pos = 0;

683+ if (!m_visibleItems.isEmpty()) {

684+ modelIndex = m_firstVisibleIndex - 1;

685+ item = m_visibleItems.first();

686+ pos = item->y() + m_clipItem->y();

687+ }

688+ while (modelIndex >= 0 && pos > fillFrom) {

689+// qDebug() << "refill: prepend item" << modelIndex << "pos" << pos << "fillFrom" << fillFrom << "asynchronous" << asynchronous;

690+ if (!(item = createItem(modelIndex, asynchronous)))

691+ break;

692+ pos -= item->height();

693+ --modelIndex;

694+ changed = true;

695+ }

696+

697+ return changed;

698+}

699+

700+void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

701+{

702+ QQuickItem *item = listItem->m_item;

703+ QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

704+ if (flags & QQmlDelegateModel::Destroyed) {

705+ item->setParentItem(nullptr);

706+ }

707+ if (listItem->sectionItem()) {

708+ listItem->sectionItem()->deleteLater();

709+ }

710+ delete listItem;

711+}

712+

713+void ListViewWithPageHeader::releaseItem(ListItem *listItem)

714+{

715+ QQuickItemPrivate::get(listItem->m_item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

716+ if (listItem->sectionItem()) {

717+ QQuickItemPrivate::get(listItem->sectionItem())->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

718+ }

719+ m_itemsToRelease << listItem;

720+}

721+

722+void ListViewWithPageHeader::updateWatchedRoles()

723+{

724+ if (m_delegateModel) {

725+ QList<QByteArray> roles;

726+ if (!m_sectionProperty.isEmpty())

727+ roles << m_sectionProperty.toUtf8();

728+ m_delegateModel->setWatchedRoles(roles);

729+ }

730+}

731+

732+QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyInserted)

733+{

734+ if (!m_sectionDelegate)

735+ return nullptr;

736+

737+ const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

738+

739+ if (modelIndex > 0) {

740+ const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);

741+ if (section == prevSection)

742+ return nullptr;

743+ }

744+ if (modelIndex + 1 < model()->rowCount() && !alreadyInserted) {

745+ // Already inserted items can't steal next section header

746+ const QString nextSection = m_delegateModel->stringValue(modelIndex + 1, m_sectionProperty);

747+ if (section == nextSection) {

748+ // Steal the section header

749+ ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems

750+ if (nextItem) {

751+ QQuickItem *sectionItem = nextItem->sectionItem();

752+ nextItem->setSectionItem(nullptr);

753+ return sectionItem;

754+ }

755+ }

756+ }

757+

758+ return getSectionItem(section);

759+}

760+

761+QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, bool watchGeometry)

762+{

763+ QQuickItem *sectionItem = nullptr;

764+

765+ QQmlContext *creationContext = m_sectionDelegate->creationContext();

766+ QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));

767+ QObject *nobj = m_sectionDelegate->beginCreate(context);

768+ if (nobj) {

769+ QQml_setParent_noEvent(context, nobj);

770+ sectionItem = qobject_cast<QQuickItem *>(nobj);

771+ if (!sectionItem) {

772+ delete nobj;

773+ } else {

774+ sectionItem->setProperty("text", sectionText);

775+ sectionItem->setProperty("delegate", QVariant());

776+ sectionItem->setZ(2);

777+ QQml_setParent_noEvent(sectionItem, m_clipItem);

778+ sectionItem->setParentItem(m_clipItem);

779+ }

780+ } else {

781+ delete context;

782+ }

783+ m_sectionDelegate->completeCreate();

784+

785+ if (watchGeometry && sectionItem) {

786+ QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

787+ }

788+

789+ return sectionItem;

790+}

791+

792+void ListViewWithPageHeader::updateSectionItem(int modelIndex)

793+{

794+ ListItem *item = itemAtIndex(modelIndex);

795+ if (item) {

796+ const QString sectionText = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

797+

798+ bool needSectionHeader = true;

799+ // if it is the same section as the previous item need to drop the section

800+ if (modelIndex > 0) {

801+ const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);

802+ if (sectionText == prevSection) {

803+ needSectionHeader = false;

804+ }

805+ }

806+

807+ if (needSectionHeader) {

808+ if (!item->sectionItem()) {

809+ item->setSectionItem(getSectionItem(sectionText));

810+ } else {

811+ item->sectionItem()->setProperty("text", sectionText);

812+ }

813+ } else {

814+ if (item->sectionItem()) {

815+ item->sectionItem()->deleteLater();

816+ item->setSectionItem(nullptr);

817+ }

818+ }

819+ }

820+}

821+

822+bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

823+{

824+// qDebug() << "ListViewWithPageHeader::removeNonVisibleItems" << bufferFrom << bufferTo;

825+ // Do not remove items if we are overshooting up or down, since we'll come back

826+ // to the "stable" position and delete/create items without any reason

827+ if (contentY() < -m_minYExtent) {

828+ return false;

829+ } else if (contentY() + height() > contentHeight()) {

830+ return false;

831+ }

832+ bool changed = false;

833+

834+ bool foundVisible = false;

835+ int i = 0;

836+ int removedItems = 0;

837+ const auto oldFirstVisibleIndex = m_firstVisibleIndex;

838+ while (i < m_visibleItems.count()) {

839+ ListItem *item = m_visibleItems[i];

840+ const qreal pos = item->y() + m_clipItem->y();

841+// qDebug() << i << pos << (pos + item->height()) << bufferFrom << bufferTo;

842+ if (pos + item->height() < bufferFrom || pos > bufferTo) {

843+// qDebug() << "Releasing" << i << (pos + item->height() < bufferFrom) << pos + item->height() << bufferFrom << (pos > bufferTo) << pos << bufferTo;

844+ releaseItem(item);

845+ m_visibleItems.removeAt(i);

846+ changed = true;

847+ ++removedItems;

848+ } else {

849+ if (!foundVisible) {

850+ foundVisible = true;

851+ const int itemIndex = m_firstVisibleIndex + removedItems + i;

852+ m_firstVisibleIndex = itemIndex;

853+ }

854+ ++i;

855+ }

856+ }

857+ if (!foundVisible) {

858+ initializeValuesForEmptyList();

859+ }

860+ if (m_firstVisibleIndex != oldFirstVisibleIndex) {

861+ adjustMinYExtent();

862+ }

863+

864+ return changed;

865+}

866+

867+ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIndex, bool asynchronous)

868+{

869+// qDebug() << "CREATE ITEM" << modelIndex;

870+ if (asynchronous && m_asyncRequestedIndex != -1)

871+ return nullptr;

872+

873+ m_asyncRequestedIndex = -1;

874+ QObject* object = m_delegateModel->object(modelIndex, asynchronous);

875+ QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

876+ if (!item) {

877+ if (object) {

878+ m_delegateModel->release(object);

879+ if (!m_delegateValidated) {

880+ m_delegateValidated = true;

881+ QObject* delegateObj = delegate();

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

883+ }

884+ } else {

885+ m_asyncRequestedIndex = modelIndex;

886+ }

887+ return 0;

888+ } else {

889+// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

890+ ListItem *listItem = new ListItem;

891+ listItem->m_item = item;

892+ listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));

893+ QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

894+ ListItem *prevItem = itemAtIndex(modelIndex - 1);

895+ bool lostItem = false; // Is an item that we requested async but because of model changes

896+ // it is no longer attached to any of the existing items (has no prev nor next item)

897+ // nor is the first item

898+ if (prevItem) {

899+ listItem->setY(prevItem->y() + prevItem->height());

900+ } else {

901+ ListItem *currItem = itemAtIndex(modelIndex);

902+ if (currItem) {

903+ // There's something already in m_visibleItems at out index, meaning this is an insert, so attach to its top

904+ listItem->setY(currItem->y() - listItem->height());

905+ } else {

906+ ListItem *nextItem = itemAtIndex(modelIndex + 1);

907+ if (nextItem) {

908+ listItem->setY(nextItem->y() - listItem->height());

909+ } else if (modelIndex == 0) {

910+ listItem->setY(-m_clipItem->y() + (m_headerItem ? m_headerItem->height() : 0));

911+ } else if (!m_visibleItems.isEmpty()) {

912+ lostItem = true;

913+ }

914+ }

915+ }

916+ if (lostItem) {

917+ listItem->setCulled(true);

918+ releaseItem(listItem);

919+ listItem = nullptr;

920+ } else {

921+ listItem->setCulled(listItem->y() + listItem->height() + m_clipItem->y() <= contentY() || listItem->y() + m_clipItem->y() >= contentY() + height());

922+ if (m_visibleItems.isEmpty()) {

923+ m_visibleItems << listItem;

924+ } else {

925+ m_visibleItems.insert(modelIndex - m_firstVisibleIndex, listItem);

926+ }

927+ if (m_firstVisibleIndex < 0 || modelIndex < m_firstVisibleIndex) {

928+ m_firstVisibleIndex = modelIndex;

929+ polish();

930+ }

931+ if (listItem->sectionItem()) {

932+ listItem->sectionItem()->setProperty("delegate", QVariant::fromValue(listItem->m_item));

933+ }

934+ adjustMinYExtent();

935+ m_contentHeightDirty = true;

936+ }

937+ return listItem;

938+ }

939+}

940+

941+void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

942+{

943+ QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

944+ if (!item) {

945+ qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

946+ return;

947+ }

948+// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

949+ // Check we are not being taken down and don't paint anything

950+ // TODO Check if we still need this in 5.2

951+ // For reproduction just inifnite loop testDash or testDashContent

952+ if (!QQmlEngine::contextForObject(this)->parentContext())

953+ return;

954+

955+ item->setParentItem(m_clipItem);

956+ // FIXME Why do we need the refreshExpressions call?

957+ QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();

958+ QQmlContextPrivate::get(context)->data->refreshExpressions();

959+ item->setProperty("heightToClip", QVariant::fromValue<int>(0));

960+ if (modelIndex == m_asyncRequestedIndex) {

961+ createItem(modelIndex, false);

962+ refill();

963+ }

964+}

965+

966+void ListViewWithPageHeader::updateClipItem()

967+{

968+ m_clipItem->setHeight(height() - m_headerItemShownHeight);

969+ m_clipItem->setY(contentY() + m_headerItemShownHeight);

970+ m_clipItem->setClip(!m_forceNoClip && m_headerItemShownHeight > 0);

971+}

972+

973+void ListViewWithPageHeader::onContentHeightChanged()

974+{

975+ updateClipItem();

976+}

977+

978+void ListViewWithPageHeader::onContentWidthChanged()

979+{

980+ m_clipItem->setWidth(contentItem()->width());

981+}

982+

983+void ListViewWithPageHeader::onHeightChanged()

984+{

985+ m_clipItem->setHeight(height() - m_headerItemShownHeight);

986+ polish();

987+}

988+

989+

990+void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

991+{

992+ // TODO Do something with reset

993+// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

994+ const auto oldFirstVisibleIndex = m_firstVisibleIndex;

995+

996+ Q_FOREACH(const QQmlChangeSet::Change remove, changeSet.removes()) {

997+// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

998+ if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

999+ const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

1000+ // If all the items we are removing are either not created or culled

1001+ // we have to grow down to avoid viewport changing

1002+ bool growDown = true;

1003+ for (int i = 0; growDown && i < remove.count; ++i) {

1004+ const int modelIndex = remove.index + i;

1005+ ListItem *item = itemAtIndex(modelIndex);

1006+ if (item && !item->culled()) {

1007+ growDown = false;

1008+ }

1009+ }

1010+ for (int i = remove.count - 1; i >= 0; --i) {

1011+ const int visibleIndex = remove.index + i - m_firstVisibleIndex;

1012+ if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {

1013+ ListItem *item = m_visibleItems[visibleIndex];

1014+ // Pass the section item down if needed

1015+ if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {

1016+ ListItem *nextItem = m_visibleItems[visibleIndex + 1];

1017+ if (!nextItem->sectionItem()) {

1018+ nextItem->setSectionItem(item->sectionItem());

1019+ item->setSectionItem(nullptr);

1020+ }

1021+ }

1022+ releaseItem(item);

1023+ m_visibleItems.removeAt(visibleIndex);

1024+ }

1025+ }

1026+ if (growDown) {

1027+ adjustMinYExtent();

1028+ } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {

1029+ m_visibleItems.first()->setY(oldFirstValidIndexPos);

1030+ }

1031+ if (m_visibleItems.isEmpty()) {

1032+ m_firstVisibleIndex = -1;

1033+ } else {

1034+ m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);

1035+ }

1036+ } else if (remove.index + remove.count <= m_firstVisibleIndex) {

1037+ m_firstVisibleIndex -= remove.count;

1038+ }

1039+ for (int i = remove.count - 1; i >= 0; --i) {

1040+ const int modelIndex = remove.index + i;

1041+ if (modelIndex == m_asyncRequestedIndex) {

1042+ m_asyncRequestedIndex = -1;

1043+ } else if (modelIndex < m_asyncRequestedIndex) {

1044+ m_asyncRequestedIndex--;

1045+ }

1046+ }

1047+ }

1048+

1049+ Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {

1050+// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

1051+ const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

1052+ const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

1053+ if (insertingInValidIndexes || firstItemWithViewOnTop)

1054+ {

1055+ // If the items we are adding won't be really visible

1056+ // we grow up instead of down to not change the viewport

1057+ bool growUp = false;

1058+ if (!firstItemWithViewOnTop) {

1059+ for (int i = 0; i < m_visibleItems.count(); ++i) {

1060+ if (!m_visibleItems[i]->culled()) {

1061+ if (insert.index <= m_firstVisibleIndex + i) {

1062+ growUp = true;

1063+ }

1064+ break;

1065+ }

1066+ }

1067+ }

1068+

1069+ const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

1070+ for (int i = insert.count - 1; i >= 0; --i) {

1071+ const int modelIndex = insert.index + i;

1072+ ListItem *item = createItem(modelIndex, false);

1073+ if (growUp) {

1074+ ListItem *firstItem = m_visibleItems.first();

1075+ firstItem->setY(firstItem->y() - item->height());

1076+ }

1077+ // Adding an item may break a "same section" chain, so check

1078+ // if we need adding a new section item

1079+ if (m_sectionDelegate) {

1080+ ListItem *nextItem = itemAtIndex(modelIndex + 1);

1081+ if (nextItem && !nextItem->sectionItem()) {

1082+ nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));

1083+ if (growUp && nextItem->sectionItem()) {

1084+ ListItem *firstItem = m_visibleItems.first();

1085+ firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());

1086+ }

1087+ }

1088+ }

1089+ }

1090+ if (firstItemWithViewOnTop) {

1091+ ListItem *firstItem = m_visibleItems.first();

1092+ firstItem->setY(oldFirstValidIndexPos);

1093+ }

1094+ adjustMinYExtent();

1095+ } else if (insert.index <= m_firstVisibleIndex) {

1096+ m_firstVisibleIndex += insert.count;

1097+ }

1098+

1099+ for (int i = insert.count - 1; i >= 0; --i) {

1100+ const int modelIndex = insert.index + i;

1101+ if (modelIndex <= m_asyncRequestedIndex) {

1102+ m_asyncRequestedIndex++;

1103+ }

1104+ }

1105+ }

1106+

1107+ Q_FOREACH(const QQmlChangeSet::Change change, changeSet.changes()) {

1108+ for (int i = change.start(); i < change.end(); ++i) {

1109+ updateSectionItem(i);

1110+ }

1111+ // Also update the section header for the next item after the change since it may be influenced

1112+ updateSectionItem(change.end());

1113+ }

1114+

1115+ if (m_firstVisibleIndex != oldFirstVisibleIndex) {

1116+ if (m_visibleItems.isEmpty()) {

1117+ initializeValuesForEmptyList();

1118+ } else {

1119+ adjustMinYExtent();

1120+ }

1121+ }

1122+

1123+ for (int i = 0; i < m_visibleItems.count(); ++i) {

1124+ ListItem *item = m_visibleItems[i];

1125+ if (item->sectionItem()) {

1126+ item->sectionItem()->setProperty("delegate", QVariant::fromValue(item->m_item));

1127+ }

1128+ }

1129+

1130+ layout();

1131+ polish();

1132+ m_contentHeightDirty = true;

1133+}

1134+

1135+void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)

1136+{

1137+ setInteractive(!running);

1138+ if (!running) {

1139+ m_contentHeightDirty = true;

1140+ polish();

1141+ }

1142+}

1143+

1144+void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)

1145+{

1146+ const qreal heightDiff = newGeometry.height() - oldGeometry.height();

1147+ if (heightDiff != 0) {

1148+ if (!m_visibleItems.isEmpty()) {

1149+ ListItem *firstItem = m_visibleItems.first();

1150+ const auto prevFirstItemY = firstItem->y();

1151+ if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY()) {

1152+ firstItem->setY(firstItem->y() - heightDiff);

1153+ } else if (item == firstItem->sectionItem()) {

1154+ firstItem->setY(firstItem->y() + heightDiff);

1155+ }

1156+

1157+ if (firstItem->y() != prevFirstItemY) {

1158+ adjustMinYExtent();

1159+ layout();

1160+ }

1161+ }

1162+ refill();

1163+ adjustMinYExtent();

1164+ polish();

1165+ m_contentHeightDirty = true;

1166+ }

1167+}

1168+

1169+void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)

1170+{

1171+ if (item == m_headerItem) {

1172+ const qreal diff = m_headerItem->implicitHeight() - m_previousHeaderImplicitHeight;

1173+ if (diff != 0) {

1174+ adjustHeader(diff);

1175+ m_previousHeaderImplicitHeight = m_headerItem->implicitHeight();

1176+ layout();

1177+ polish();

1178+ m_contentHeightDirty = true;

1179+ }

1180+ }

1181+}

1182+

1183+void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY)

1184+{

1185+ const qreal heightDiff = newHeaderHeight - oldHeaderHeight;

1186+ if (m_headerItemShownHeight > 0) {

1187+ // If the header is shown because of the clip

1188+ // Change its size

1189+ m_headerItemShownHeight += heightDiff;

1190+ m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, newHeaderHeight);

1191+ updateClipItem();

1192+ adjustMinYExtent();

1193+ Q_EMIT headerItemShownHeightChanged();

1194+ } else {

1195+ if (oldHeaderY + oldHeaderHeight > contentY()) {

1196+ // If the header is shown because its position

1197+ // Change its size

1198+ ListItem *firstItem = m_visibleItems.first();

1199+ firstItem->setY(firstItem->y() + heightDiff);

1200+ layout();

1201+ } else {

1202+ // If the header is not on screen, just change the start of the list

1203+ // so the viewport is not changed

1204+ adjustMinYExtent();

1205+ }

1206+ }

1207+}

1208+

1209+

1210+void ListViewWithPageHeader::adjustMinYExtent()

1211+{

1212+ if (m_visibleItems.isEmpty() || (contentHeight() + m_minYExtent < height())) {

1213+ m_minYExtent = 0;

1214+ } else {

1215+ qreal nonCreatedHeight = 0;

1216+ if (m_firstVisibleIndex != 0) {

1217+ // Calculate the average height of items to estimate the position of the list start

1218+ const int visibleItems = m_visibleItems.count();

1219+ qreal visibleItemsHeight = 0;

1220+ Q_FOREACH(ListItem *item, m_visibleItems) {

1221+ visibleItemsHeight += item->height();

1222+ }

1223+ nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1224+// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1225+ }

1226+ const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1227+ m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1228+ if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1229+ m_minYExtent = 0;

1230+ m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1231+ }

1232+ }

1233+}

1234+

1235+ListViewWithPageHeader::ListItem *ListViewWithPageHeader::itemAtIndex(int modelIndex) const

1236+{

1237+ const int visibleIndexedModelIndex = modelIndex - m_firstVisibleIndex;

1238+ if (visibleIndexedModelIndex >= 0 && visibleIndexedModelIndex < m_visibleItems.count())

1239+ return m_visibleItems[visibleIndexedModelIndex];

1240+

1241+ return nullptr;

1242+}

1243+

1244+void ListViewWithPageHeader::layout()

1245+{

1246+ if (m_inLayout)

1247+ return;

1248+

1249+ m_inLayout = true;

1250+ if (!m_visibleItems.isEmpty()) {

1251+ const qreal visibleFrom = contentY() - m_clipItem->y() + m_headerItemShownHeight;

1252+ const qreal visibleTo = contentY() + height() - m_clipItem->y();

1253+

1254+ qreal pos = m_visibleItems.first()->y();

1255+

1256+// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();

1257+ int firstReallyVisibleItem = -1;

1258+ int modelIndex = m_firstVisibleIndex;

1259+ Q_FOREACH(ListItem *item, m_visibleItems) {

1260+ const bool cull = pos + item->height() <= visibleFrom || pos >= visibleTo;

1261+ item->setCulled(cull);

1262+ item->setY(pos);

1263+ if (!cull && firstReallyVisibleItem == -1) {

1264+ firstReallyVisibleItem = modelIndex;

1265+ if (m_topSectionItem) {

1266+ // Positing the top section sticky item is a two step process

1267+ // First we set it either we cull it (because it doesn't need to be sticked to the top)

1268+ // or stick it to the top

1269+ // Then after the loop we'll make sure that if there's another section just below it

1270+ // pushed the sticky section up to make it disappear

1271+ const qreal topSectionStickPos = m_headerItemShownHeight + contentY() - m_clipItem->y();

1272+ bool showStickySectionItem;

1273+ // We need to show the "top section sticky item" when the position at the "top" of the

1274+ // viewport is bigger than the start of the position of the first visible item

1275+ // i.e. the first visible item starts before the viewport, or when the first

1276+ // visible item starts just at the viewport start and it does not have its own section item

1277+ if (topSectionStickPos > pos) {

1278+ showStickySectionItem = true;

1279+ } else if (topSectionStickPos == pos) {

1280+ showStickySectionItem = !item->sectionItem();

1281+ } else {

1282+ showStickySectionItem = false;

1283+ }

1284+ if (!showStickySectionItem) {

1285+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

1286+ if (item->sectionItem()) {

1287+ // This seems it should happen since why would we cull the top section

1288+ // if the first visible item has no section header? This only happens briefly

1289+ // when increasing the height of a list that is at the bottom, the m_topSectionItem

1290+ // gets shown shortly in the next polish call

1291+ QQuickItemPrivate::get(item->sectionItem())->setCulled(false);

1292+ }

1293+ } else {

1294+ // Update the top sticky section header

1295+ const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

1296+ m_topSectionItem->setProperty("text", section);

1297+

1298+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);

1299+ m_topSectionItem->setY(topSectionStickPos);

1300+ m_topSectionItem->setProperty("delegate", QVariant::fromValue(item->m_item));

1301+ if (item->sectionItem()) {

1302+ QQuickItemPrivate::get(item->sectionItem())->setCulled(true);

1303+ }

1304+ }

1305+ }

1306+ }

1307+ const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);

1308+ if (!cull && pos < clipFrom) {

1309+ item->m_item->setProperty("heightToClip", clipFrom - pos);

1310+ } else {

1311+ item->m_item->setProperty("heightToClip", QVariant::fromValue<int>(0));

1312+ }

1313+// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;

1314+ pos += item->height();

1315+ ++modelIndex;

1316+ }

1317+

1318+ // Second step of section sticky item positioning

1319+ // Look at the next section header, check if it's pushing up the sticky one

1320+ if (m_topSectionItem) {

1321+ if (firstReallyVisibleItem >= 0) {

1322+ for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {

1323+ ListItem *item = m_visibleItems[i];

1324+ if (item->sectionItem()) {

1325+ if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {

1326+ m_topSectionItem->setY(item->y() - m_topSectionItem->height());

1327+ }

1328+ break;

1329+ }

1330+ }

1331+ }

1332+ }

1333+ }

1334+ if (m_headerItem) {

1335+ const bool cullHeader = m_headerItem->y() + m_headerItem->height() < contentY();

1336+ QQuickItemPrivate::get(m_headerItem)->setCulled(cullHeader);

1337+ }

1338+ m_inLayout = false;

1339+}

1340+

1341+void ListViewWithPageHeader::updatePolish()

1342+{

1343+ // Check we are not being taken down and don't paint anything

1344+ // TODO Check if we still need this in 5.2

1345+ // For reproduction just inifnite loop testDash or testDashContent

1346+ if (!QQmlEngine::contextForObject(this)->parentContext())

1347+ return;

1348+

1349+ Q_FOREACH(ListItem *item, m_itemsToRelease)

1350+ reallyReleaseItem(item);

1351+ m_itemsToRelease.clear();

1352+

1353+ if (!model())

1354+ return;

1355+

1356+ layout();

1357+

1358+ refill();

1359+

1360+ if (m_contentHeightDirty) {

1361+ qreal contentHeight;

1362+ if (m_visibleItems.isEmpty()) {

1363+ contentHeight = m_headerItem ? m_headerItem->height() : 0;

1364+ } else {

1365+ const int modelCount = model()->rowCount();

1366+ const int visibleItems = m_visibleItems.count();

1367+ const int lastValidIndex = m_firstVisibleIndex + visibleItems - 1;

1368+ qreal nonCreatedHeight = 0;

1369+ if (lastValidIndex != modelCount - 1) {

1370+ const int visibleItems = m_visibleItems.count();

1371+ qreal visibleItemsHeight = 0;

1372+ Q_FOREACH(ListItem *item, m_visibleItems) {

1373+ visibleItemsHeight += item->height();

1374+ }

1375+ const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);

1376+ nonCreatedHeight = unknownSizes * visibleItemsHeight / visibleItems;

1377+ }

1378+ ListItem *item = m_visibleItems.last();

1379+ contentHeight = nonCreatedHeight + item->y() + item->height() + m_clipItem->y();

1380+ if (m_firstVisibleIndex != 0) {

1381+ // Make sure that if we are shrinking we tell the view we still fit

1382+ m_minYExtent = qMax(m_minYExtent, -(contentHeight - height()));

1383+ }

1384+ }

1385+

1386+ m_contentHeightDirty = false;

1387+ adjustMinYExtent();

1388+ m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1389+ setContentHeight(contentHeight);

1390+ m_inContentHeightKeepHeaderShown = false;

1391+ }

1392+}

1393+

1394+#include "moc_listviewwithpageheader.cpp"

plugins/Dash/listviewwithpageheader.hnew file+218

@@ -0,0 +1,218 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef LISTVIEWWITHPAGEHEADER_H

18+#define LISTVIEWWITHPAGEHEADER_H

19+

20+#include <private/qquickitemchangelistener_p.h>

21+#include <private/qquickflickable_p.h>

22+

23+class QAbstractItemModel;

24+class QQuickNumberAnimation;

25+class QQmlChangeSet;

26+class QQmlDelegateModel;

27+

28+

29+/**

30+ Note for users of this class

31+

32+ ListViewWithPageHeader already loads delegates async when appropiate so if

33+ your delegate uses a Loader you should not enable the asynchronous feature since

34+ that will need to introduce sizing problems

35+

36+ With the double async it may happen what while we are scrolling down

37+ we reach to a point where given the size of the just created delegate with loader not yet loaded (which will be very close to 0)

38+ we are already "at the end" of the list, but then a few milliseconds later the loader finishes loading and we could

39+ have kept scrolling. This is specially visible at the end of the list where you realize

40+ that scrolling ended a bit before the end of the list but the speed of the flicking was good

41+ to reach the end

42+

43+ By not having the second async we get a better sizing when the delegate is created and things work better

44+*/

45+

46+class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeListener

47+{

48+ Q_OBJECT

49+ Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)

50+ Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

51+ Q_PROPERTY(QQuickItem *pageHeader READ header WRITE setHeader NOTIFY headerChanged)

52+ Q_PROPERTY(QQmlComponent *sectionDelegate READ sectionDelegate WRITE setSectionDelegate NOTIFY sectionDelegateChanged)

53+ Q_PROPERTY(QString sectionProperty READ sectionProperty WRITE setSectionProperty NOTIFY sectionPropertyChanged)

54+ Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)

55+ Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

56+ Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

57+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

58+

59+ friend class ListViewWithPageHeaderTest;

60+ friend class ListViewWithPageHeaderTestSection;

61+ friend class ListViewWithPageHeaderTestExternalModel;

62+

63+public:

64+ ListViewWithPageHeader();

65+ ~ListViewWithPageHeader();

66+

67+ QAbstractItemModel *model() const;

68+ void setModel(QAbstractItemModel *model);

69+

70+ QQmlComponent *delegate() const;

71+ void setDelegate(QQmlComponent *delegate);

72+

73+ QQuickItem *header() const;

74+ void setHeader(QQuickItem *header);

75+

76+ QQmlComponent *sectionDelegate() const;

77+ void setSectionDelegate(QQmlComponent *delegate);

78+

79+ QString sectionProperty() const;

80+ void setSectionProperty(const QString &property);

81+

82+ bool forceNoClip() const;

83+ void setForceNoClip(bool noClip);

84+

85+ int stickyHeaderHeight() const;

86+ qreal headerItemShownHeight() const;

87+

88+ int cacheBuffer() const;

89+ void setCacheBuffer(int cacheBuffer);

90+

91+ Q_INVOKABLE void positionAtBeginning();

92+ Q_INVOKABLE void showHeader();

93+ Q_INVOKABLE int firstCreatedIndex() const;

94+ Q_INVOKABLE int createdItemCount() const;

95+ Q_INVOKABLE QQuickItem *item(int modelIndex) const;

96+

97+ // The index has to be created for this to try to do something

98+ // Created items are those visible and the precached ones

99+ // Returns if the item existed or not

100+ Q_INVOKABLE bool maximizeVisibleArea(int modelIndex);

101+ Q_INVOKABLE bool maximizeVisibleArea(int modelIndex, int itemHeight);

102+

103+Q_SIGNALS:

104+ void modelChanged();

105+ void delegateChanged();

106+ void headerChanged();

107+ void sectionDelegateChanged();

108+ void sectionPropertyChanged();

109+ void forceNoClipChanged();

110+ void stickyHeaderHeightChanged();

111+ void headerItemShownHeightChanged();

112+ void cacheBufferChanged();

113+

114+protected:

115+ void componentComplete() override;

116+ void viewportMoved(Qt::Orientations orient) override;

117+ qreal minYExtent() const override;

118+ qreal maxYExtent() const override;

119+ void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;

120+ void itemImplicitHeightChanged(QQuickItem *item) override;

121+ void updatePolish() override;

122+

123+private Q_SLOTS:

124+ void itemCreated(int modelIndex, QObject *object);

125+ void onContentHeightChanged();

126+ void onContentWidthChanged();

127+ void onHeightChanged();

128+ void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

129+ void contentYAnimationRunningChanged(bool running);

130+

131+private:

132+ class ListItem

133+ {

134+ public:

135+ qreal height() const;

136+

137+ qreal y() const;

138+ void setY(qreal newY);

139+

140+ bool culled() const;

141+ void setCulled(bool culled);

142+

143+ QQuickItem *sectionItem() const { return m_sectionItem; }

144+ void setSectionItem(QQuickItem *sectionItem);

145+

146+ QQuickItem *m_item;

147+ private:

148+ QQuickItem *m_sectionItem;

149+ };

150+

151+ bool maximizeVisibleArea(ListItem *listItem, int listItemHeight);

152+

153+ void createDelegateModel();

154+

155+ void layout();

156+ void refill();

157+ bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);

158+ bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);

159+ ListItem *createItem(int modelIndex, bool asynchronous);

160+

161+ void adjustHeader(qreal diff);

162+ void adjustMinYExtent();

163+ void updateClipItem();

164+ void headerHeightChanged(qreal newHeaderHeight, qreal oldHeaderHeight, qreal oldHeaderY);

165+ ListItem *itemAtIndex(int modelIndex) const; // Returns the item at modelIndex if has been created

166+ void releaseItem(ListItem *item);

167+ void reallyReleaseItem(ListItem *item);

168+ void updateWatchedRoles();

169+ QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

170+ QQuickItem *getSectionItem(const QString &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.cppnew file+259

@@ -0,0 +1,259 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "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.hnew file+91

@@ -0,0 +1,91 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef ORGANICGRID_H

18+#define ORGANICGRID_H

19+

20+#include "abstractdashview.h"

21+

22+ /** An Organic Grid is is a view that creates delegates

23+ * based on a model and layouts them in groups of six items (called module).

24+ *

25+ * In each module there are 4 items that are forced to the small delegate size

26+ * and two that are forced to the big delegate size.

27+ *

28+ * Example:

29+ *

30+ * +---+ +---+ +-----+

31+ * | 1 | | 2 | | |

32+ * +---+ +---+ | 5 |

33+ * +-----+ | |

34+ * | | +-----+

35+ * | 3 | +---+ +---+

36+ * | | | 4 | | 6 |

37+ * +-----+ +---+ +---+

38+ *

39+ * Modules are positioned one after the other in a grid like fashion, i.e.

40+ *

41+ * +---+ +---+

42+ * | 1 | | 2 |

43+ * +---+ +---+

44+ * +---+ +---+

45+ * | 3 | | 4 |

46+ * +---+ +---+

47+ */

48+

49+class OrganicGrid : public AbstractDashView

50+{

51+ Q_OBJECT

52+

53+ Q_PROPERTY(QSizeF smallDelegateSize READ smallDelegateSize WRITE setSmallDelegateSize NOTIFY smallDelegateSizeChanged)

54+ Q_PROPERTY(QSizeF bigDelegateSize READ bigDelegateSize WRITE setBigDelegateSize NOTIFY bigDelegateSizeChanged)

55+

56+friend class OrganicGridTest;

57+

58+public:

59+ OrganicGrid();

60+

61+ QSizeF smallDelegateSize() const;

62+ void setSmallDelegateSize(const QSizeF size);

63+

64+ QSizeF bigDelegateSize() const;

65+ void setBigDelegateSize(const QSizeF size);

66+

67+Q_SIGNALS:

68+ void smallDelegateSizeChanged();

69+ void bigDelegateSizeChanged();

70+private:

71+ QPointF positionForIndex(int modelIndex) const;

72+ QSizeF sizeForIndex(int modelIndex) const;

73+

74+ void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

75+ void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

76+ void addItemToView(int modelIndex, QQuickItem *item) override;

77+ bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

78+ void cleanupExistingItems() override;

79+ void doRelayout() override;

80+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

81+ void calculateImplicitHeight() override;

82+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;

83+

84+ QSizeF m_smallDelegateSize;

85+ QSizeF m_bigDelegateSize;

86+ int m_firstVisibleIndex;

87+ int m_numberOfModulesPerRow;

88+ QList<QQuickItem*> m_visibleItems;

89+};

90+

91+#endif

plugins/Dash/plugin.cppnew file+70

@@ -0,0 +1,70 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#include "plugin.h"

19+

20+#include "horizontaljournal.h"

21+#include "listviewwithpageheader.h"

22+#include "organicgrid.h"

23+#include "verticaljournal.h"

24+

25+#include <QAbstractItemModel>

26+#include <QUrlQuery>

27+

28+static QUrl oauthCleanedUrl(QUrl u)

29+{

30+ QUrlQuery q(u);

31+ q.removeQueryItem(QStringLiteral("oauth_nonce"));

32+ q.removeQueryItem(QStringLiteral("oauth_timestamp"));

33+ q.removeQueryItem(QStringLiteral("oauth_consumer_key"));

34+ q.removeQueryItem(QStringLiteral("oauth_signature_method"));

35+ q.removeQueryItem(QStringLiteral("oauth_version"));

36+ q.removeQueryItem(QStringLiteral("oauth_signature"));

37+ u.setQuery(q);

38+ return u;

39+}

40+

41+class AudioComparer : public QObject

42+{

43+ Q_OBJECT

44+public:

45+ Q_INVOKABLE bool compare(const QUrl &url1, const QUrl &url2)

46+ {

47+ return oauthCleanedUrl(url1) == oauthCleanedUrl(url2);

48+ }

49+};

50+

51+static QObject *audio_comparer_singleton_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

52+{

53+ Q_UNUSED(engine)

54+ Q_UNUSED(scriptEngine)

55+

56+ return new AudioComparer();

57+}

58+

59+void DashPlugin::registerTypes(const char *uri)

60+{

61+ Q_ASSERT(uri == QLatin1String("Dash"));

62+ qmlRegisterType<QAbstractItemModel>();

63+ qmlRegisterType<HorizontalJournal>(uri, 0, 1, "HorizontalJournal");

64+ qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

65+ qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

66+ qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

67+ qmlRegisterSingletonType<AudioComparer>(uri, 0, 1, "AudioUrlComparer", audio_comparer_singleton_provider);

68+}

69+

70+#include "plugin.moc"

plugins/Dash/plugin.hnew file+33

@@ -0,0 +1,33 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef DASH_PLUGIN_H

19+#define DASH_PLUGIN_H

20+

21+#include <QtQml/QQmlEngine>

22+#include <QtQml/QQmlExtensionPlugin>

23+

24+class DashPlugin : public QQmlExtensionPlugin

25+{

26+ Q_OBJECT

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

28+

29+public:

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

31+};

32+

33+#endif

plugins/Dash/qmldirnew file+11

@@ -0,0 +1,11 @@

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.cppnew file+280

@@ -0,0 +1,280 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

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.hnew file+103

@@ -0,0 +1,103 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef VERTICALJOURNAL_H

18+#define VERTICALJOURNAL_H

19+

20+#include "abstractdashview.h"

21+

22+ /** A vertical journal is a view that creates delegates

23+ * based on a model and layouts them in columns following

24+ * a top-left most position rule.

25+ *

26+ * The number of columns is calculated using the width of

27+ * the view itself, the columnWidth (i.e. the width of each individual delegate)

28+ * and the columnSpacing between columns.

29+ *

30+ * All delegates are forced to columnWidth if they don't have it.

31+ *

32+ * The first nColumns items are layouted at row 0 from column 0

33+ * to column nColumns-1 in order. After that every new item

34+ * is positioned in the column which provides the free topmost

35+ * position as possible. If more than one column tie in providing

36+ * the topmost free position the leftmost column will be used.

37+ *

38+ * Example:

39+ *

40+ * +-----+ +-----+ +-----+

41+ * | | | 2 | | |

42+ * | | | | | |

43+ * | 1 | +-----+ | 3 |

44+ * | | +-----+ | |

45+ * | | | | +-----+

46+ * +-----+ | 4 | +-----+

47+ * +-----+ | | | 5 |

48+ * | 6 | +-----+ | |

49+ * | | +-----+

50+ * +-----+

51+ *

52+ */

53+

54+class VerticalJournal : public AbstractDashView

55+{

56+ Q_OBJECT

57+

58+ Q_PROPERTY(qreal columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged)

59+

60+friend class VerticalJournalTest;

61+

62+public:

63+ VerticalJournal();

64+

65+ qreal columnWidth() const;

66+ void setColumnWidth(qreal columnWidth);

67+

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

55

66add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})

77

8−target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)

8+qt5_use_modules(GlobalShortcut-qml Quick Gui)

99

1010add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)

plugins/GlobalShortcut/globalshortcut.cpp+4−15

@@ -58,26 +58,15 @@ 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− }

6461 connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);

6562}

6663

6764void GlobalShortcut::keyPressEvent(QKeyEvent * event)

6865{

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

66+ Q_UNUSED(event)

67+ if (m_active) {

68+ Q_EMIT triggered(m_shortcut.toString());

69+ }

8170}

8271

8372void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)

plugins/GlobalShortcut/globalshortcut.h−5

@@ -55,7 +55,6 @@ public:

5555protected:

5656 void componentComplete() override;

5757 void keyPressEvent(QKeyEvent * event) override;

58− void keyReleaseEvent(QKeyEvent * event) override;

5958

6059Q_SIGNALS:

6160 void shortcutChanged(const QVariant &shortcut);

@@ -63,10 +62,6 @@ Q_SIGNALS:

6362 * Emitted when a global keypress of @p shortcut is detected

6463 */

6564 void triggered(const QString &shortcut);

66− /**

67− * Emitted when a global keypress of @p shortcut is released

68− */

69− void released(const QString &shortcut);

7065 void activeChanged(bool active);

7166

7267private Q_SLOTS:

plugins/GlobalShortcut/globalshortcutregistry.cpp+4−14

@@ -73,30 +73,20 @@ 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 || event->type() == QEvent::KeyRelease) {

77−

76+ if (event->type() == QEvent::KeyPress) {

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

8978 int seq = keyEvent->key() + keyEvent->modifiers();

9079 if (m_shortcuts.contains(seq)) {

9180 const auto shortcuts = m_shortcuts.value(seq);

9281 Q_FOREACH(const auto &shortcut, shortcuts) {

9382 if (shortcut) {

94− qApp->sendEvent(shortcut, &eCopy);

83+ qApp->sendEvent(shortcut, keyEvent);

84+ event->accept();

9585 }

9686 }

9787 }

9888

99− return eCopy.isAccepted();

89+ return event->isAccepted();

10090 }

10191

10292 return QObject::eventFilter(obj, event);

plugins/Greeter/Unity/Launcher/CMakeLists.txt+3−1

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

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)

12pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

23

34add_definitions(-DSM_BUSNAME=systemBus)

@@ -29,7 +30,8 @@ add_library(UnityLauncherAS-qml MODULE

2930target_link_libraries(UnityLauncherAS-qml

3031 unity8-private

3132 ${GSETTINGS_QT_LDFLAGS}

32− Qt5::DBus Qt5::Qml Qt5::Gui

3333 )

3434

35+qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)

36+

3537add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)

plugins/Greeter/Unity/Launcher/launcheritem.cpp−6

@@ -89,12 +89,6 @@ void LauncherItem::setKeywords(const QStringList &keywords)

8989 }

9090}

9191

92−uint LauncherItem::popularity() const

93−{

94− // Not exposing usage order in greeter session at this point.

95− return 0;

96−}

97−

9892bool LauncherItem::pinned() const

9993{

10094 return m_pinned;

plugins/Greeter/Unity/Launcher/launcheritem.h−1

@@ -35,7 +35,6 @@ public:

3535 QString name() const override;

3636 QString icon() const override;

3737 QStringList keywords() const override;

38− uint popularity() const override;

3938 bool pinned() const override;

4039 bool running() const override;

4140 bool recent() const override;

plugins/Greeter/Unity/Launcher/quicklistmodel.cpp−2

@@ -65,8 +65,6 @@ 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

7068 }

7169 return QVariant();

7270}

plugins/ImageCache/CMakeLists.txtnew file+8

@@ -0,0 +1,8 @@

1+add_library(ImageCache-qml MODULE

2+ ImageCache.cpp

3+ plugin.cpp

4+ )

5+

6+qt5_use_modules(ImageCache-qml Gui Qml Quick)

7+

8+add_unity8_plugin(ImageCache 0.1 ImageCache TARGETS ImageCache-qml)

plugins/ImageCache/ImageCache.cppnew file+135

@@ -0,0 +1,135 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include <QDateTime>

18+#include <QDebug>

19+#include <QDir>

20+#include <QUrl>

21+#include <QUrlQuery>

22+

23+#include "ImageCache.h"

24+

25+ImageCache::ImageCache()

26+ : QQuickImageProvider(QQmlImageProviderBase::Image,

27+ QQmlImageProviderBase::ForceAsynchronousImageLoading)

28+{

29+}

30+

31+QString ImageCache::imageCacheRoot()

32+{

33+ QString xdgCache(qgetenv("XDG_CACHE_HOME"));

34+ if (xdgCache.isEmpty()) {

35+ xdgCache = QDir::homePath() + QStringLiteral("/.cache");

36+ }

37+

38+ return QDir::cleanPath(xdgCache) + QStringLiteral("/unity8/imagecache");

39+}

40+

41+QFileInfo ImageCache::imagePath(const QUrl &image)

42+{

43+ QUrlQuery query(image);

44+

45+ auto name = query.queryItemValue(QStringLiteral("name"));

46+ if (name.isEmpty()) {

47+ name = QStringLiteral("/paths") + image.toLocalFile();

48+ } else {

49+ name = QStringLiteral("/names/") + name;

50+ }

51+

52+ return QFileInfo(imageCacheRoot() + name);

53+}

54+

55+bool ImageCache::needsUpdate(const QUrl &image, const QFileInfo &cachePath, const QSize &imageSize, const QSize &requestedSize, QSize &finalSize)

56+{

57+ if (!cachePath.exists())

58+ return true;

59+

60+ QFileInfo imageInfo(image.toLocalFile());

61+ if (imageInfo.lastModified() > cachePath.lastModified())

62+ return true;

63+

64+ QSize cacheSize(QImageReader(cachePath.filePath()).size());

65+ finalSize = calculateSize(imageSize, requestedSize);

66+ if (finalSize.isValid() && cacheSize != finalSize)

67+ return true;

68+

69+ return false;

70+}

71+

72+QSize ImageCache::calculateSize(const QSize &imageSize, const QSize &requestedSize)

73+{

74+ QSize finalSize(requestedSize);

75+

76+ if (finalSize.width() == 0) {

77+ finalSize.setWidth(imageSize.width() * (((double)finalSize.height()) / imageSize.height()));

78+ } else if (finalSize.height() == 0) {

79+ finalSize.setHeight(imageSize.height() * (((double)finalSize.width()) / imageSize.width()));

80+ }

81+

82+ return finalSize;

83+}

84+

85+QImage ImageCache::loadAndCacheImage(QImageReader &reader, const QFileInfo &cachePath, const QSize &finalSize)

86+{

87+ reader.setQuality(100);

88+ reader.setScaledSize(finalSize);

89+ auto format = reader.format(); // can't get this after reading

90+

91+ QImage loadedImage(reader.read());

92+ if (loadedImage.isNull()) {

93+ qWarning() << "ImageCache could not read image" << reader.fileName() << ":" << reader.errorString();

94+ return QImage();

95+ }

96+

97+ cachePath.dir().mkpath(QStringLiteral("."));

98+ loadedImage.save(cachePath.filePath(), format, 100);

99+

100+ return loadedImage;

101+}

102+

103+QImage ImageCache::requestImage(const QString &id, QSize *size, const QSize &requestedSize)

104+{

105+ QUrl image(id);

106+ QImageReader imageReader(image.toLocalFile());

107+ QSize imageSize(imageReader.size());

108+ QImage result;

109+

110+ // Early exit here, with no sourceSize, scaled-up sourceSize, or bad source image

111+ if ((requestedSize.width() <= 0 && requestedSize.height() <= 0) ||

112+ imageSize.isEmpty() ||

113+ requestedSize.height() >= imageSize.height() ||

114+ requestedSize.width() >= imageSize.width()) {

115+ // We're only interested in scaling down, not up.

116+ result = imageReader.read();

117+ *size = result.size();

118+ return result;

119+ }

120+

121+ auto cachePath = imagePath(image);

122+ QSize finalSize;

123+

124+ if (needsUpdate(image, cachePath, imageSize, requestedSize, finalSize)) {

125+ if (finalSize.isEmpty()) {

126+ finalSize = calculateSize(imageSize, requestedSize);

127+ }

128+ result = loadAndCacheImage(imageReader, cachePath, finalSize);

129+ } else {

130+ result = QImage(cachePath.filePath());

131+ }

132+

133+ *size = result.size();

134+ return result;

135+}

plugins/ImageCache/ImageCache.hnew file+53

@@ -0,0 +1,53 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#pragma once

18+

19+#include <QFileInfo>

20+#include <QImageReader>

21+#include <QQuickImageProvider>

22+#include <QSize>

23+

24+/**

25+ * This class accepts an id formulated like a URL. So you'd use something like:

26+ *

27+ * Image {

28+ * source: "image://unity8imagecache/file:///usr/share/..."

29+ * }

30+ *

31+ * Right now, we only support file:/// URLs. We do accept some flags though:

32+ *

33+ * ?name=NAME

34+ * - This will use NAME as the cache lookup key instead of the provided URL.

35+ *

36+ * We don't do any cleaning of old cached files yet. So you may want to always

37+ * provide a name to avoid leaving lots of files around.

38+ */

39+

40+class ImageCache: public QQuickImageProvider

41+{

42+public:

43+ ImageCache();

44+

45+ QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;

46+

47+private:

48+ static QString imageCacheRoot();

49+ static QFileInfo imagePath(const QUrl &image);

50+ static bool needsUpdate(const QUrl &image, const QFileInfo &cachePath, const QSize &imageSize, const QSize &requestedSize, QSize &finalSize);

51+ static QSize calculateSize(const QSize &imageSize, const QSize &requestedSize);

52+ static QImage loadAndCacheImage(QImageReader &reader, const QFileInfo &cachePath, const QSize &finalSize);

53+};

tests/mocks/Unity/ApplicationMenu/plugin.cpp → plugins/ImageCache/plugin.cpprenamed+11−14

@@ -14,29 +14,26 @@

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

1515 */

1616

17+#include <QQmlEngine>

18+

19+#include "ImageCache.h"

1720#include "plugin.h"

18−#include "mockapplicationmenuregistry.h"

1921

2022#include <QtQml>

2123

22−static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)

24+void ImageCachePlugin::registerTypes(const char *uri)

2325{

24− Q_UNUSED(engine)

25− Q_UNUSED(scriptEngine)

26− return MockApplicationMenuRegistry::instance();

27−}

26+ Q_ASSERT(uri == QLatin1String("ImageCache"));

2827

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<ApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);

28+ qmlRegisterTypeNotAvailable(uri, 0, 1, "__ImageCacheIgnoreMe",

29+ QStringLiteral("Ignore this: QML plugins must contain at least one type"));

3530}

3631

37−void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

32+void ImageCachePlugin::initializeEngine(QQmlEngine* engine, const char* uri)

3833{

34+ Q_ASSERT(uri == QLatin1String("ImageCache"));

35+

3936 QQmlExtensionPlugin::initializeEngine(engine, uri);

4037

41− menuRegistry(nullptr, nullptr);

38+ engine->addImageProvider("unity8imagecache", new ImageCache);

4239}

plugins/ImageCache/plugin.hnew file+31

@@ -0,0 +1,31 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#pragma once

18+

19+#include <QQmlExtensionPlugin>

20+

21+class QQmlEngine;

22+

23+class ImageCachePlugin : public QQmlExtensionPlugin

24+{

25+ Q_OBJECT

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

27+

28+public:

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

30+ void initializeEngine(QQmlEngine* engine, const char* uri) override;

31+};

plugins/ImageCache/qmldirnew file+2

@@ -0,0 +1,2 @@

1+module ImageCache

2+plugin ImageCache-qml

plugins/LightDM/CMakeLists.txt+1−1

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

1011 ${libunity8-private_SOURCE_DIR}

1112 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

1213)

@@ -17,7 +18,6 @@ set(QMLPLUGIN_SRC

1718 DBusGreeterList.cpp

1819 Greeter.cpp

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

46+void DBusGreeterList::authenticationUserChangedHandler(const QString &user)

4747{

48− notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());

49− Q_EMIT EntrySelected(m_greeter->authenticationUser());

48+ notifyPropertyChanged(QStringLiteral("ActiveEntry"), user);

49+ Q_EMIT EntrySelected(user);

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

50+ void authenticationUserChangedHandler(const QString &user);

5151 void promptlessChangedHandler();

5252

5353private:

plugins/LightDM/FullLightDM/CMakeLists.txt+1−1

@@ -26,7 +26,7 @@ target_link_libraries(FullLightDM-qml

2626 unity8-private

2727 ${LIBLIGHTDM_LDFLAGS}

2828 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

29− Qt5::DBus Qt5::Gui Qt5::Qml

3029 )

3130

31+qt5_use_modules(FullLightDM-qml DBus Gui Qml)

3232add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

plugins/LightDM/Greeter.cpp+14−144

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

11/*

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

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

33 *

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

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

@@ -17,16 +17,12 @@

1717

1818#include "Greeter.h"

1919#include "GreeterPrivate.h"

20−#include <QCoreApplication>

2120#include <libintl.h>

2221

23−static Greeter *singleton = nullptr;

24−

2522GreeterPrivate::GreeterPrivate(Greeter* parent)

2623 : m_greeter(new QLightDM::Greeter(parent)),

2724 m_active(false),

28− responded(false),

29− everResponded(false),

25+ wasPrompted(false),

3026 promptless(false),

3127 q_ptr(parent)

3228{

@@ -45,32 +41,9 @@ Greeter::Greeter(QObject* parent)

4541 connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,

4642 this, &Greeter::authenticationCompleteFilter);

4743

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−

5244 d->m_greeter->connectSync();

5345}

5446

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−

7447bool Greeter::isActive() const

7548{

7649 Q_D(const Greeter);

@@ -95,16 +68,7 @@ bool Greeter::isAuthenticated() const

9568QString Greeter::authenticationUser() const

9669{

9770 Q_D(const Greeter);

98− return d->cachedAuthUser;

99−}

100−

101−void Greeter::checkAuthenticationUser()

102−{

103− Q_D(Greeter);

104− if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {

105− d->cachedAuthUser = d->m_greeter->authenticationUser();

106− Q_EMIT authenticationUserChanged();

107− }

71+ return d->m_greeter->authenticationUser();

10872}

10973

11074QString Greeter::defaultSessionHint() const

@@ -122,65 +86,26 @@ bool Greeter::promptless() const

12286QString Greeter::selectUser() const

12387{

12488 Q_D(const Greeter);

125− if (hasGuestAccount() && d->m_greeter->selectGuestHint()) {

126− return QStringLiteral("*guest");

127− } else {

128− return d->m_greeter->selectUserHint();

129− }

130−}

131−

132−bool Greeter::hasGuestAccount() const

133−{

134− Q_D(const Greeter);

135− return d->m_greeter->hasGuestAccountHint();

136−}

137−

138−bool Greeter::showManualLoginHint() const

139−{

140− Q_D(const Greeter);

141− return d->m_greeter->showManualLoginHint();

142−}

143−

144−bool Greeter::hideUsersHint() const

145−{

146− Q_D(const Greeter);

147− return d->m_greeter->hideUsersHint();

89+ return d->m_greeter->selectUserHint();

14890}

14991

15092void Greeter::authenticate(const QString &username)

15193{

15294 Q_D(Greeter);

153− d->prompts.clear();

154− d->responded = false;

155− d->everResponded = false;

95+ d->wasPrompted = false;

15696 if (d->promptless) {

15797 d->promptless = false;

15898 Q_EMIT promptlessChanged();

15999 }

160100

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

101+ d->m_greeter->authenticate(username);

175102 Q_EMIT isAuthenticatedChanged();

176− checkAuthenticationUser();

103+ Q_EMIT authenticationUserChanged(username);

177104}

178105

179106void Greeter::respond(const QString &response)

180107{

181108 Q_D(Greeter);

182− d->responded = true;

183− d->everResponded = true;

184109 d->m_greeter->respond(response);

185110}

186111

@@ -193,87 +118,32 @@ bool Greeter::startSessionSync(const QString &session)

193118void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)

194119{

195120 Q_D(Greeter);

196−

197− checkAuthenticationUser(); // may have changed in liblightdm

121+ d->wasPrompted = true;

198122

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

205124

206125 // Strip prompt of any colons at the end

126+ QString trimmedText = text.trimmed();

207127 if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {

208128 trimmedText.chop(1);

209129 }

210130

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

131+ Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);

223132}

224133

225134void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)

226135{

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

136+ Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);

238137}

239138

240139void Greeter::authenticationCompleteFilter()

241140{

242141 Q_D(Greeter);

243−

244− Q_EMIT isAuthenticatedChanged();

245−

246− bool automatic = !d->everResponded;

247− bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;

248−

249− if (isAuthenticated() && automatic) {

142+ if (!d->wasPrompted) {

250143 d->promptless = true;

251144 Q_EMIT promptlessChanged();

252145 }

253146

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

147+ Q_EMIT isAuthenticatedChanged();

148+ Q_EMIT authenticationComplete();

279149}

plugins/LightDM/Greeter.h+10−17

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

11/*

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

2+ * Copyright (C) 2012,2013,2015 Canonical, Ltd.

33 *

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

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

@@ -21,13 +21,13 @@

2121 such edits in the future, and by inserting ourselves here, we have more

2222 control. */

2323

24−#pragma once

24+#ifndef UNITY_GREETER_H

25+#define UNITY_GREETER_H

2526

2627#include <QLightDM/Greeter>

2728#include <QtCore/QObject>

2829

2930class GreeterPrivate;

30−class PromptsModel;

3131

3232class Greeter : public QObject

3333{

@@ -41,8 +41,7 @@ class Greeter : public QObject

4141 Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

4242

4343public:

44− static Greeter *instance();

45− virtual ~Greeter();

44+ explicit Greeter(QObject* parent=0);

4645

4746 bool isActive() const;

4847 bool isAuthenticated() const;

@@ -50,11 +49,6 @@ public:

5049 QString defaultSessionHint() const;

5150 bool promptless() const;

5251 QString selectUser() const;

53− bool hasGuestAccount() const;

54− bool showManualLoginHint() const;

55− bool hideUsersHint() const;

56−

57− PromptsModel *promptsModel();

5852

5953public Q_SLOTS:

6054 void authenticate(const QString &username=QString());

@@ -63,23 +57,21 @@ public Q_SLOTS:

6357 void setIsActive(bool isActive);

6458

6559Q_SIGNALS:

66− void authenticationUserChanged();

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

6764 void isActiveChanged();

6865 void isAuthenticatedChanged();

6966 void promptlessChanged();

7067 void showGreeter();

7168 void hideGreeter();

72− void loginError(bool automatic);

73− void loginSuccess(bool automatic);

74− void authenticationStarted(); // useful for testing

7569

7670 // This signal is emitted by external agents like indicators, and the UI

7771 // should switch to this user if possible.

7872 void requestAuthenticationUser(const QString &user);

7973

8074protected:

81− explicit Greeter(QObject* parent=0);

82−

8375 GreeterPrivate * const d_ptr;

8476

8577 Q_DECLARE_PRIVATE(Greeter)

@@ -88,5 +80,6 @@ private Q_SLOTS:

8880 void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);

8981 void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);

9082 void authenticationCompleteFilter();

91− void checkAuthenticationUser();

9283};

84+

85+#endif

plugins/LightDM/GreeterPrivate.h+7−13

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

11/*

2− * Copyright (C) 2015-2017 Canonical, Ltd.

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

33 *

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

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

@@ -14,14 +14,10 @@

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

1515 */

1616

17−#pragma once

17+#ifndef UNITY_GREETER_PRIVATE_H

18+#define UNITY_GREETER_PRIVATE_H

1819

19−#include "PromptsModel.h"

20−#include <QObject>

21−

22−namespace QLightDM {

23− class Greeter;

24−}

20+#include <QLightDM/Greeter>

2521

2622class GreeterPrivate

2723{

@@ -30,12 +26,8 @@ public:

3026

3127 QLightDM::Greeter *m_greeter;

3228 bool m_active;

33− PromptsModel prompts;

34− PromptsModel leftovers; // prompts to show during next auth for same user

35− bool responded;

36− bool everResponded;

29+ bool wasPrompted;

3730 bool promptless;

38− QString cachedAuthUser;

3931

4032protected:

4133 Greeter * const q_ptr;

@@ -43,3 +35,5 @@ protected:

4335private:

4436 Q_DECLARE_PUBLIC(Greeter)

4537};

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

2928 )

3029

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+4−3

@@ -26,21 +26,22 @@ target_link_libraries(integratedLightDM

2626 ${GLIB_LIBRARIES}

2727 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

2828 -lpam

29− Qt5::Concurrent Qt5::DBus Qt5::Gui

3029)

3130target_link_libraries(integratedLightDMSession

3231 ${GLIB_LIBRARIES}

3332 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

3433 -lpam

35− Qt5::Concurrent Qt5::DBus Qt5::Gui

3634)

3735target_link_libraries(MockLightDM-demo-shared

3836 ${GLIB_LIBRARIES}

3937 ${LIBUSERMETRICSOUTPUT_LDFLAGS}

4038 -lpam

41− Qt5::Concurrent Qt5::DBus Qt5::Gui

4239)

4340

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+

4445set_target_properties(integratedLightDM PROPERTIES

4546 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")

4647set_target_properties(integratedLightDMSession PROPERTIES

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp+4−7

@@ -49,7 +49,7 @@ QString Greeter::authenticationUser() const

4949

5050bool Greeter::hasGuestAccountHint() const

5151{

52− return false;

52+ return true;

5353}

5454

5555QString Greeter::getHint(const QString &name) const

@@ -70,12 +70,12 @@ bool Greeter::hideUsersHint() const

7070

7171bool Greeter::showManualLoginHint() const

7272{

73− return false;

73+ return true;

7474}

7575

7676bool Greeter::showRemoteLoginHint() const

7777{

78− return false;

78+ return true;

7979}

8080

8181QString Greeter::selectUserHint() const

@@ -146,10 +146,7 @@ void Greeter::authenticateRemote(const QString &session, const QString &username

146146}

147147

148148void Greeter::cancelAuthentication()

149−{

150− Q_D(Greeter);

151− d->cancelAuthentication();

152−}

149+{}

153150

154151void Greeter::setLanguage (const QString &language)

155152{

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h+2−2

@@ -46,18 +46,18 @@ class Q_DECL_EXPORT Greeter : public QObject

4646 Q_PROPERTY(QString hostname READ hostname CONSTANT)

4747 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

4848

49+ Q_ENUMS(PromptType MessageType)

50+

4951public:

5052 enum PromptType {

5153 PromptTypeQuestion,

5254 PromptTypeSecret

5355 };

54− Q_ENUM(PromptType)

5556

5657 enum MessageType {

5758 MessageTypeInfo,

5859 MessageTypeError

5960 };

60− Q_ENUM(MessageType)

6161

6262 explicit Greeter(QObject* parent=0);

6363 virtual ~Greeter();

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp+22−27

@@ -206,28 +206,6 @@ 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−

231209Q_SIGNALS:

232210 void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);

233211 void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);

@@ -269,6 +247,28 @@ private Q_SLOTS:

269247 }

270248

271249private:

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,11 +299,6 @@ void GreeterPrivate::handleRespond(const QString &response)

299299 m_impl->respond(response);

300300}

301301

302−void GreeterPrivate::cancelAuthentication()

303−{

304− m_impl->cancelPam();

305−}

306−

307302}

308303

309304#include "GreeterPrivate.moc"

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h−1

@@ -38,7 +38,6 @@ public:

3838

3939 void handleAuthenticate();

4040 void handleRespond(const QString &response);

41− void cancelAuthentication();

4241

4342protected:

4443 GreeterImpl *m_impl; // if the backend needs more private data

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp+1

@@ -38,6 +38,7 @@ SessionsModel::SessionsModel(QObject* parent) :

3838 QAbstractListModel(parent),

3939 d_ptr(new SessionsModelPrivate(this))

4040{

41+ Q_D(SessionsModel);

4142 m_roleNames = QAbstractListModel::roleNames();

4243 m_roleNames[KeyRole] = "key";

4344 m_roleNames[TypeRole] = "type";

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h+2−2

@@ -35,6 +35,8 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

3535 {

3636 Q_OBJECT

3737

38+ Q_ENUMS(SessionModelRoles SessionType)

39+

3840 public:

3941

4042 enum SessionModelRoles {

@@ -44,13 +46,11 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

4446 IdRole = KeyRole, /** Deprecated */

4547 TypeRole

4648 };

47− Q_ENUM(SessionModelRoles)

4849

4950 enum SessionType {

5051 LocalSessions,

5152 RemoteSessions

5253 };

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

@@ -37,6 +37,8 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel

3737{

3838 Q_OBJECT

3939

40+ Q_ENUMS(UserModelRoles)

41+

4042public:

4143 explicit UsersModel(QObject *parent = 0);

4244 virtual ~UsersModel() = default;

@@ -51,7 +53,6 @@ public:

5153 BackgroundPathRole,

5254 UidRole

5355 };

54− Q_ENUM(UserModelRoles)

5556

5657 int rowCount(const QModelIndex &parent) const override;

5758 QVariant data(const QModelIndex &index, int role) const override;

plugins/LightDM/PromptsModel.cppdeleted−97

@@ -1,97 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#include "PromptsModel.h"

19−

20−PromptsModel::PromptsModel(QObject* parent)

21− : QAbstractListModel(parent)

22−{

23− m_roleNames[TypeRole] = "type";

24− m_roleNames[TextRole] = "text";

25−}

26−

27−PromptsModel& PromptsModel::operator=(const PromptsModel &other)

28−{

29− beginResetModel();

30− m_prompts = other.m_prompts;

31− endResetModel();

32− Q_EMIT countChanged();

33− return *this;

34−}

35−

36−int PromptsModel::rowCount(const QModelIndex &parent) const

37−{

38− if (parent.isValid())

39− return 0;

40−

41− return m_prompts.size();

42−}

43−

44−QVariant PromptsModel::data(const QModelIndex &index, int role) const

45−{

46− if (!index.isValid() || index.column() > 0 || index.row() >= m_prompts.size())

47− return QVariant();

48−

49− switch (role) {

50− case Qt::DisplayRole: // fallthrough

51− case TextRole: return m_prompts[index.row()].prompt;

52− case TypeRole: return m_prompts[index.row()].type;

53− default: return QVariant();

54− }

55−}

56−

57−QHash<int, QByteArray> PromptsModel::roleNames() const

58−{

59− return m_roleNames;

60−}

61−

62−void PromptsModel::prepend(const QString &text, PromptType type)

63−{

64− beginInsertRows(QModelIndex(), 0, 0);

65− m_prompts.prepend(PromptInfo{text, type});

66− endInsertRows();

67−

68− Q_EMIT countChanged();

69−}

70−

71−void PromptsModel::append(const QString &text, PromptType type)

72−{

73− beginInsertRows(QModelIndex(), m_prompts.size(), m_prompts.size());

74− m_prompts.append(PromptInfo{text, type});

75− endInsertRows();

76−

77− Q_EMIT countChanged();

78−}

79−

80−void PromptsModel::clear()

81−{

82− beginResetModel();

83− m_prompts.clear();

84− endResetModel();

85−

86− Q_EMIT countChanged();

87−}

88−

89−bool PromptsModel::hasPrompt() const

90−{

91− Q_FOREACH(const PromptInfo &info, m_prompts) {

92− if (info.type == PromptType::Secret || info.type == PromptType::Question) {

93− return true;

94− }

95− }

96− return false;

97−}

plugins/LightDM/PromptsModel.hdeleted−70

@@ -1,70 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− */

17−

18−#pragma once

19−

20−#include <QAbstractListModel>

21−

22−class PromptsModel : public QAbstractListModel

23−{

24− Q_OBJECT

25−

26− Q_PROPERTY(int count READ rowCount NOTIFY countChanged)

27−

28−public:

29− enum PromptsModelRoles {

30− TypeRole = Qt::UserRole,

31− TextRole,

32− };

33− Q_ENUM(PromptsModelRoles)

34−

35− enum PromptType {

36− Message,

37− Error,

38− Secret,

39− Question,

40− Button,

41− };

42− Q_ENUM(PromptType)

43−

44− explicit PromptsModel(QObject* parent=0);

45−

46− PromptsModel& operator=(const PromptsModel &other);

47−

48− int rowCount(const QModelIndex &parent = QModelIndex()) const override;

49− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

50− QHash<int, QByteArray> roleNames() const override;

51−

52− Q_INVOKABLE void prepend(const QString &text, PromptType type);

53− Q_INVOKABLE void append(const QString &text, PromptType type);

54−

55− void clear();

56−

57− bool hasPrompt() const;

58−

59−Q_SIGNALS:

60− void countChanged();

61−

62−private:

63− struct PromptInfo {

64− QString prompt;

65− PromptType type;

66− };

67−

68− QList<PromptInfo> m_prompts;

69− QHash<int, QByteArray> m_roleNames;

70−};

plugins/LightDM/SessionsModel.cpp+2−1

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

11/*

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

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

33 *

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

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

@@ -128,6 +128,7 @@ SessionsModel::SessionsModel(QObject* parent)

128128 }

129129

130130 setModel(m_model);

131+ setSourceModel(m_model);

131132 setSortCaseSensitivity(Qt::CaseInsensitive);

132133 setSortLocaleAware(true);

133134 setSortRole(Qt::DisplayRole);

plugins/LightDM/SessionsModel.h+7−5

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

11/*

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

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

33 *

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

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

@@ -15,7 +15,8 @@

1515 *

1616 */

1717

18−#pragma once

18+#ifndef UNITY_SESSIONSMODEL_H

19+#define UNITY_SESSIONSMODEL_H

1920

2021#include <unitysortfilterproxymodelqml.h>

2122#include <QLightDM/SessionsModel>

@@ -27,9 +28,10 @@ class SessionsModel : public UnitySortFilterProxyModelQML

2728{

2829 Q_OBJECT

2930

31+ Q_ENUMS(SessionModelRoles)

32+

3033 Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories

3134 WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)

32−

3335Q_SIGNALS:

3436 void iconSearchDirectoriesChanged();

3537

@@ -43,7 +45,6 @@ public:

4345 TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,

4446 IconRole

4547 };

46− Q_ENUM(SessionModelRoles)

4748

4849 explicit SessionsModel(QObject* parent=nullptr);

4950

@@ -54,7 +55,6 @@ public:

5455 Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;

5556

5657 void setIconSearchDirectories(const QList<QUrl> searchDirectories);

57−

5858private:

5959 QLightDM::SessionsModel* m_model;

6060 QHash<int, QByteArray> m_roleNames;

@@ -64,3 +64,5 @@ private:

6464 QUrl("/usr/share/unity-greeter/")};

6565

6666};

67+

68+#endif // UNITY_SESSIONSMODEL_H

plugins/LightDM/UsersModel.cpp+9−176

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

11/*

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

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

33 *

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

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

@@ -12,22 +12,20 @@

1212 *

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

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

15+ *

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

1517 */

1618

17−#include "Greeter.h"

1819#include "UsersModel.h"

19−#include <QIdentityProxyModel>

2020#include <QLightDM/UsersModel>

21−

22−#include <libintl.h>

21+#include <QtCore/QSortFilterProxyModel>

2322

2423// First, we define an internal class that wraps LightDM's UsersModel. This

2524// class will modify some of the data coming from LightDM. For example, we

26−// modify any empty Real Names into just normal Names. We also add optional

27−// rows, depending on configuration.

25+// modify any empty Real Names into just normal Names.

2826// (We can't modify the data directly in UsersModel below because it won't sort

2927// using the modified data.)

30−class MangleModel : public QIdentityProxyModel

28+class MangleModel : public QSortFilterProxyModel

3129{

3230 Q_OBJECT

3331

@@ -35,177 +33,29 @@ public:

3533 explicit MangleModel(QObject* parent=0);

3634

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

5836};

5937

6038MangleModel::MangleModel(QObject* parent)

61− : QIdentityProxyModel(parent)

62− , m_updatingCustomRows(false)

39+ : QSortFilterProxyModel(parent)

6340{

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

7942}

8043

8144QVariant MangleModel::data(const QModelIndex &index, int role) const

8245{

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

46+ QVariant variantData = QSortFilterProxyModel::data(index, role);

10347

10448 // If user's real name is empty, switch to unix name

10549 if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {

106− variantData = data(index, QLightDM::UsersModel::NameRole);

50+ variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);

10751 } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {

10852 const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";

10953 variantData = stringData;

11054 }

11155

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−

11756 return variantData;

11857}

11958

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−

20959// **** Now we continue with actual UsersModel class ****

21060

21161UsersModel::UsersModel(QObject* parent)

@@ -218,21 +68,4 @@ UsersModel::UsersModel(QObject* parent)

21868 sort(0);

21969}

22070

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−

23871#include "UsersModel.moc"

plugins/LightDM/UsersModel.h+8−6

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

11/*

2− * Copyright (C) 2012-2013,2015-2016 Canonical, Ltd.

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

33 *

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

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

@@ -12,16 +12,19 @@

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>

1517 */

1618

1719/* This class is a really tiny filter around QLightDM::UsersModel. There are

1820 some operations that we want to edit a bit for the benefit of Qml.

1921 Specifically, we want to sort users according to realName. */

2022

21−#pragma once

23+#ifndef UNITY_USERSMODEL_H

24+#define UNITY_USERSMODEL_H

2225

2326#include <unitysortfilterproxymodelqml.h>

24−#include <QObject>

27+#include <QtCore/QObject>

2528

2629class UsersModel : public UnitySortFilterProxyModelQML

2730{

@@ -29,7 +32,6 @@ class UsersModel : public UnitySortFilterProxyModelQML

2932

3033public:

3134 explicit UsersModel(QObject* parent=0);

32−

33−protected:

34− bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

3535};

36+

37+#endif

plugins/LightDM/plugin.cpp+4−12

@@ -19,7 +19,6 @@

1919#include "DBusGreeter.h"

2020#include "DBusGreeterList.h"

2121#include "Greeter.h"

22−#include "PromptsModel.h"

2322#include "SessionsModel.h"

2423#include "UsersModel.h"

2524#include <libusermetricsoutput/ColorTheme.h>

@@ -33,24 +32,16 @@

3332

3433static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

3534{

35+ Q_UNUSED(engine)

3636 Q_UNUSED(scriptEngine)

3737

38− Greeter *greeter = Greeter::instance();

38+ Greeter *greeter = new Greeter();

3939 new DBusGreeter(greeter, QStringLiteral("/"));

4040 new DBusGreeterList(greeter, QStringLiteral("/list"));

4141

42− engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);

43−

4442 return greeter;

4543}

4644

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−

5445static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

5546{

5647 Q_UNUSED(engine)

@@ -87,7 +78,8 @@ void PLUGIN_CLASSNAME::registerTypes(const char *uri)

8778 #error No library defined in LightDM plugin

8879#endif

8980

90− qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);

81+ qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

82+ qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

9183

9284 qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

9385 qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

plugins/Lights/CMakeLists.txt+2−8

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

11pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3−pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)

43

54include_directories(

65 SYSTEM

@@ -10,14 +9,9 @@ include_directories(

109add_library(Lights-qml MODULE

1110 plugin.cpp

1211 Lights.cpp

13− LegacyLights.cpp

14− HfdLights.cpp

1512 )

1613

17−target_link_libraries(Lights-qml

18− Qt5::Qml Qt5::Gui Qt5::DBus

19− ${ANDROID_HARDWARE_LIBRARIES}

20− ${ANDROID_PROPERTIES_LIBRARIES}

21− )

14+qt5_use_modules(Lights-qml Qml Gui)

15+target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})

2216

2317add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)

plugins/Lights/HfdLights.cppdeleted−62

@@ -1,62 +0,0 @@

1−/*

2− * Copyright (C) 2021 UBports Foundation.

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− *

16− * Author: Florian Leeber <florian@ubports.com>

17− */

18−

19−#include "HfdLights.h"

20−#include <QtCore/QDebug>

21−#include <QDBusArgument>

22−#include <QDBusConnection>

23−#include <iostream>

24−

25−#define HFD_SERVICE_NAME "com.lomiri.hfd"

26−#define HFD_SERVICE_PATH "/com/lomiri/hfd"

27−#define HFD_SERVICE_INTERFACE "com.lomiri.hfd.Leds"

28−

29−HfdLights::HfdLights(QObject* parent)

30− : Lights(parent)

31−{

32− m_hfdInterface = new QDBusInterface(

33− QStringLiteral(HFD_SERVICE_NAME),

34− QStringLiteral(HFD_SERVICE_PATH),

35− QStringLiteral(HFD_SERVICE_INTERFACE),

36− QDBusConnection::systemBus(),

37− this

38− );

39−}

40−

41−bool HfdLights::init()

42−{

43− // hfd does not need any initalization to be used

44− return true;

45−}

46−

47−void HfdLights::turnOn()

48−{

49− m_hfdInterface->call(QStringLiteral("setState"), 0);

50− m_hfdInterface->call(QStringLiteral("setColor"), (quint32)m_color.rgba());

51− m_hfdInterface->call(QStringLiteral("setOnMs"), m_onMs);

52− m_hfdInterface->call(QStringLiteral("setOffMs"), m_offMs);

53− m_hfdInterface->call(QStringLiteral("setState"), 1);

54−}

55−

56−void HfdLights::turnOff()

57−{

58− m_hfdInterface->call(QStringLiteral("setState"), 0);

59− m_hfdInterface->call(QStringLiteral("setColor"), (quint32)0);

60− m_hfdInterface->call(QStringLiteral("setOnMs"), 0);

61− m_hfdInterface->call(QStringLiteral("setOffMs"), 0);

62−}

plugins/Lights/LegacyLights.cppdeleted−91

@@ -1,91 +0,0 @@

1−/*

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

3− * Copyright (C) 2021 UBports Foundation.

4− *

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

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

7− * the Free Software Foundation; version 3.

8− *

9− * This program is distributed in the hope that it will be useful,

10− * but WITHOUT ANY WARRANTY; without even the implied warranty of

11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12− * GNU General Public License for more details.

13− *

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

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

16− *

17− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

18− */

19−

20−#include "LegacyLights.h"

21−#include <QtCore/QDebug>

22−

23−extern "C" {

24−#include "android-hardware.h"

25−#include <string.h>

26−}

27−

28−LegacyLights::~LegacyLights()

29−{

30− if (m_lightDevice) {

31− hw_device_t* device = (hw_device_t*) m_lightDevice;

32− device->close(device);

33− }

34−}

35−

36−bool LegacyLights::init()

37−{

38− if (m_lightDevice) {

39− return true;

40− }

41−

42− int err;

43− hw_module_t* module;

44−

45− err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);

46− if (err == 0) {

47− hw_device_t* device;

48− err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);

49− if (err == 0) {

50− m_lightDevice = (light_device_t*)device;

51− turnOff();

52− return true;

53− } else {

54− qWarning() << "Failed to access notification lights";

55− }

56− } else {

57− qWarning() << "Failed to initialize lights hardware.";

58− }

59− return false;

60−}

61−

62−void LegacyLights::turnOn()

63−{

64− // pulse

65− light_state_t state;

66− memset(&state, 0, sizeof(light_state_t));

67− state.color = m_color.rgba();

68− state.flashMode = LIGHT_FLASH_TIMED;

69− state.flashOnMS = m_onMs;

70− state.flashOffMS = m_offMs;

71− state.brightnessMode = BRIGHTNESS_MODE_USER;

72−

73− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

74− qWarning() << "Failed to turn the light off";

75− }

76−}

77−

78−void LegacyLights::turnOff()

79−{

80− light_state_t state;

81− memset(&state, 0, sizeof(light_state_t));

82− state.color = 0x00000000;

83− state.flashMode = LIGHT_FLASH_NONE;

84− state.flashOnMS = 0;

85− state.flashOffMS = 0;

86− state.brightnessMode = 0;

87−

88− if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {

89− qWarning() << "Failed to turn the light off";

90− }

91−}

plugins/Lights/Lights.cpp+65

@@ -26,12 +26,20 @@ extern "C" {

2626

2727Lights::Lights(QObject* parent)

2828 : QObject(parent),

29+ m_lightDevice(0),

2930 m_color("blue"),

3031 m_state(Lights::Off),

3132 m_onMs(1000),

3233 m_offMs(3000)

3334{

35+}

3436

37+Lights::~Lights()

38+{

39+ if (m_lightDevice) {

40+ hw_device_t* device = (hw_device_t*) m_lightDevice;

41+ device->close(device);

42+ }

3543}

3644

3745void Lights::setState(Lights::State newState)

@@ -99,3 +107,60 @@ void Lights::setOffMillisec(int offMs)

99107 // FIXME: update the property if the light is already on

100108 }

101109}

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+9−5

@@ -22,9 +22,12 @@

2222#include <QtCore/QObject>

2323#include <QtGui/QColor>

2424

25+struct light_device_t;

26+

2527class Lights: public QObject

2628{

2729 Q_OBJECT

30+ Q_ENUMS(State)

2831 Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)

2932 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

3033 Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)

@@ -35,9 +38,9 @@ public:

3538 Off,

3639 On,

3740 };

38− Q_ENUM(State)

3941

4042 explicit Lights(QObject *parent = 0);

43+ ~Lights();

4144

4245 void setState(State newState);

4346 State state() const;

@@ -57,15 +60,16 @@ Q_SIGNALS:

5760 void onMillisecChanged(int onMs);

5861 void offMillisecChanged(int offMs);

5962

60−protected:

63+private:

64+ light_device_t* m_lightDevice;

6165 QColor m_color;

6266 State m_state;

6367 int m_onMs;

6468 int m_offMs;

6569

66− virtual bool init() = 0;

67− virtual void turnOff() = 0;

68− virtual void turnOn() = 0;

70+ bool init();

71+ void turnOff();

72+ void turnOn();

6973};

7074

7175#endif

plugins/Lights/plugin.cpp+1−20

@@ -18,11 +18,6 @@

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>

2621

2722#include <QtQml/qqml.h>

2823

@@ -30,21 +25,7 @@ static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

3025{

3126 Q_UNUSED(engine)

3227 Q_UNUSED(scriptEngine)

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

28+ return new Lights();

4829}

4930

5031void LightsPlugin::registerTypes(const char *uri)

plugins/Powerd/CMakeLists.txt+2−4

@@ -9,9 +9,7 @@ add_library(Powerd-qml MODULE

99 Powerd.cpp

1010 )

1111

12−target_link_libraries(Powerd-qml

13− Qt5::DBus Qt5::Qml

14− ${GIO_LDFLAGS}

15− )

12+qt5_use_modules(Powerd-qml DBus Qml)

13+target_link_libraries(Powerd-qml ${GIO_LDFLAGS})

1614

1715add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)

plugins/Powerd/Powerd.h+2−2

@@ -27,6 +27,8 @@

2727class Powerd: public QObject

2828{

2929 Q_OBJECT

30+ Q_ENUMS(Status)

31+ Q_ENUMS(DisplayStateChangeReason)

3032 Q_PROPERTY(Status status READ status NOTIFY statusChanged)

3133

3234public:

@@ -39,13 +41,11 @@ public:

3941 SnapDecision = 5, // Display changed state due to snap decision prompt

4042 CallDone = 6, // Display changed state due to voice call end

4143 };

42− Q_ENUM(DisplayStateChangeReason)

4344

4445 enum Status {

4546 Off,

4647 On,

4748 };

48− Q_ENUM(Status)

4949

5050 explicit Powerd(QObject *parent = 0);

5151 ~Powerd();

plugins/ScreenshotDirectory/CMakeLists.txt+1−1

@@ -4,6 +4,6 @@ set(PLUGIN_SOURCES

44)

55

66add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})

7−target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)

7+qt5_use_modules(ScreenshotDirectory-qml Qml Gui Quick)

88

99add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)

plugins/SessionBroadcast/CMakeLists.txt+2−1

@@ -6,8 +6,9 @@ add_library(SessionBroadcast-qml MODULE

66 plugin.cpp

77 )

88

9+qt5_use_modules(SessionBroadcast-qml DBus Qml)

10+

911target_link_libraries(SessionBroadcast-qml

10− Qt5::DBus Qt5::Qml

1112 ${GLIB_LIBRARIES}

1213 )

1314

plugins/UInput/CMakeLists.txt+1−1

@@ -3,5 +3,5 @@ add_library(UInput-qml MODULE

33 uinput.cpp

44)

55

6−target_link_libraries(UInput-qml Qt5::Qml)

6+qt5_use_modules(UInput-qml Qml)

77add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)

plugins/UInput/uinput.h+1−1

@@ -27,6 +27,7 @@

2727class UInput : public QObject

2828{

2929 Q_OBJECT

30+ Q_ENUMS(Button)

3031

3132public:

3233 enum Button {

@@ -34,7 +35,6 @@ public:

3435 ButtonRight,

3536 ButtonMiddle

3637 };

37− Q_ENUM(Button)

3838

3939 explicit UInput(QObject *parent = nullptr);

4040 ~UInput();

plugins/Ubuntu/CMakeLists.txt+2

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

11add_subdirectory(Gestures)

22add_subdirectory(DownloadDaemonListener)

3+add_subdirectory(Payments)

4+add_subdirectory(SystemImage)

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+2−4

@@ -11,10 +11,8 @@ set(DOWNLOADDAEMONLISTENER_SOURCES

1111

1212add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})

1313

14+qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)

1415pkg_check_modules(DDLADAPTER REQUIRED udm-common)

1516add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})

16−target_link_libraries(DownloadDaemonListener

17− Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core

18− ${DDLADAPTER_LIBRARIES}

19− )

17+target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})

2018add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)

plugins/Ubuntu/Gestures/CMakeLists.txt+3−1

@@ -17,7 +17,9 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

1717add_definitions(-DUBUNTUGESTURESQML_LIBRARY)

1818

1919add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})

20−target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick)

20+target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})

21+

22+qt5_use_modules(UbuntuGesturesQml Core Quick)

2123

2224# So that Foo.cpp can #include "Foo.moc"

2325include_directories(${CMAKE_CURRENT_BINARY_DIR})

plugins/Ubuntu/Gestures/Direction.h+1−1

@@ -26,6 +26,7 @@

2626 */

2727class UBUNTUGESTURESQML_EXPORT Direction : public QObject {

2828 Q_OBJECT

29+ Q_ENUMS(Type)

2930

3031public:

3132 // Make sure it is kept synchronized with SDK UCSwipeArea::Direction

@@ -37,7 +38,6 @@ public:

3738 Horizontal, // Along the X axis, in any direction

3839 Vertical // Along the Y axis, in any direction

3940 };

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/TouchGestureArea.cpp+5−6

@@ -328,12 +328,6 @@ 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();

337331}

338332

339333void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)

@@ -741,6 +735,7 @@ void TouchGestureArea::resyncCachedTouchPoints()

741735 bool added = false;

742736 bool ended = false;

743737 bool moved = false;

738+ bool wantsDrag = false;

744739

745740 // list of deletes

746741 QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);

@@ -770,6 +765,10 @@ void TouchGestureArea::resyncCachedTouchPoints()

770765 }

771766 }

772767

768+ if (wantsDrag && !dragging()) {

769+ setDragging(true);

770+ }

771+

773772 if (ended) {

774773 if (m_cachedTouchPoints.isEmpty()) {

775774 if (!dragging()) Q_EMIT clicked();

plugins/Ubuntu/Gestures/TouchGestureArea.h+1−1

@@ -114,6 +114,7 @@ private:

114114class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem

115115{

116116 Q_OBJECT

117+ Q_ENUMS(Status)

117118

118119 Q_PROPERTY(int status READ status NOTIFY statusChanged)

119120 Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)

@@ -136,7 +137,6 @@ public:

136137 Recognized,

137138 Rejected

138139 };

139− Q_ENUM(Status)

140140 TouchGestureArea(QQuickItem* parent = nullptr);

141141 ~TouchGestureArea();

142142

plugins/Ubuntu/Payments/CMakeLists.txtnew file+20

@@ -0,0 +1,20 @@

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.cppnew file+136

@@ -0,0 +1,136 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "Payments.h"

18+

19+#include <QLocale>

20+

21+#include <libpay/pay-package.h>

22+

23+

24+// The observer callback for the package we are watching.

25+static void observer(PayPackage* /* package */, const char* itemid, PayPackageItemStatus status, void* user_data) {

26+ // This function is called in libpay's thread, so be careful what you call

27+ // Emitting signals should be fine as long as they use Queued or Auto

28+ // connections (the default)

29+ // http://qt-project.org/doc/qt-5/threads-qobject.html#signals-and-slots-across-threads

30+

31+ Payments *self = static_cast<Payments*>(user_data);

32+

33+ // If the item ID is different, ignore it.

34+ if (itemid != self->storeItemId()) {

35+ return;

36+ }

37+

38+ // FIXME: No error reporting from libpay, but we need to show some

39+ // types of errors to the user. https://launchpad.net/bugs/1333403

40+ switch (status) {

41+ case PAY_PACKAGE_ITEM_STATUS_PURCHASED:

42+ Q_EMIT self->purchaseCompleted();

43+ break;

44+ case PAY_PACKAGE_ITEM_STATUS_PURCHASING:

45+ self->setPurchasing(true);

46+ break;

47+ case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:

48+ if (self->purchasing()) {

49+ self->setPurchasing(false);

50+ Q_EMIT self->purchaseCancelled();

51+ }

52+ break;

53+ default:

54+ break;

55+ }

56+}

57+

58+Payments::Payments(QObject *parent)

59+ : QObject(parent),

60+ m_purchasing(false)

61+{

62+ m_package = pay_package_new("click-scope");

63+ pay_package_item_observer_install(m_package, observer, this);

64+}

65+

66+Payments::~Payments()

67+{

68+ pay_package_item_observer_uninstall(m_package, observer, this);

69+ pay_package_delete(m_package);

70+}

71+

72+QString Payments::currency() const

73+{

74+ return m_currency;

75+}

76+

77+double Payments::price() const

78+{

79+ return m_price;

80+}

81+

82+QString Payments::storeItemId() const

83+{

84+ return m_store_item_id;

85+}

86+

87+QString Payments::formattedPrice() const

88+{

89+ QLocale locale;

90+ return locale.toCurrencyString(m_price, m_currency);

91+}

92+

93+bool Payments::purchasing() const

94+{

95+ return m_purchasing;

96+}

97+

98+void Payments::setCurrency(const QString &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.hnew file+69

@@ -0,0 +1,69 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef PAYMENTS_H

18+#define PAYMENTS_H

19+

20+#include <QObject>

21+

22+#include <libpay/pay-package.h>

23+

24+

25+class Payments : public QObject

26+{

27+ Q_OBJECT

28+ Q_DISABLE_COPY(Payments)

29+ Q_PROPERTY(QString currency READ currency WRITE setCurrency NOTIFY currencyChanged)

30+ Q_PROPERTY(double price READ price WRITE setPrice NOTIFY priceChanged)

31+ Q_PROPERTY(QString storeItemId READ storeItemId WRITE setStoreItemId NOTIFY storeItemIdChanged)

32+ Q_PROPERTY(QString formattedPrice READ formattedPrice NOTIFY formattedPriceChanged)

33+

34+public:

35+ explicit Payments(QObject *parent = 0);

36+ virtual ~Payments();

37+

38+ QString currency() const;

39+ double price() const;

40+ QString storeItemId() const;

41+ QString formattedPrice() const;

42+ bool purchasing() const;

43+

44+ void setCurrency(const QString& currency);

45+ void setPrice(const double price);

46+ void setStoreItemId(const QString& store_item_id);

47+ void setPurchasing(bool is_purchasing);

48+ Q_INVOKABLE void start();

49+

50+Q_SIGNALS:

51+ void currencyChanged(const QString& currency);

52+ void priceChanged(const double price);

53+ void storeItemIdChanged(const QString &store_item_id);

54+ void formattedPriceChanged(const QString &formatted_price);

55+

56+ void purchaseError(const QString &error);

57+ void purchaseCompleted();

58+ void purchaseCancelled();

59+

60+private:

61+ QString m_currency;

62+ double m_price;

63+ QString m_store_item_id;

64+ bool m_purchasing;

65+

66+ PayPackage *m_package;

67+};

68+

69+#endif // PAYMENTS_H

plugins/Ubuntu/Payments/plugin.cppnew file+28

@@ -0,0 +1,28 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "plugin.h"

18+#include "Payments.h"

19+

20+#include <QtQml>

21+

22+

23+void BackendPlugin::registerTypes(const char *uri)

24+{

25+ Q_ASSERT(uri == QLatin1String("Ubuntu.Payments"));

26+

27+ qmlRegisterType<Payments>(uri, 0, 1, "Payments");

28+}

tests/mocks/LightDMController/plugin.h → plugins/Ubuntu/Payments/plugin.hrenamed+6−4

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

11/*

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

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

33 *

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

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

@@ -14,12 +14,12 @@

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

1515 */

1616

17−#pragma once

17+#ifndef PAYMENTS_PLUGIN_H

18+#define PAYMENTS_PLUGIN_H

1819

19−#include <QQmlEngine>

2020#include <QQmlExtensionPlugin>

2121

22−class LightDMControllerPlugin : public QQmlExtensionPlugin

22+class BackendPlugin : public QQmlExtensionPlugin

2323{

2424 Q_OBJECT

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

@@ -27,3 +27,5 @@ class LightDMControllerPlugin : public QQmlExtensionPlugin

2727public:

2828 void registerTypes(const char *uri) override;

2929};

30+

31+#endif // PAYMENTS_PLUGIN_H

plugins/Ubuntu/Payments/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Ubuntu.Payments

2+plugin Payments

3+typeinfo Payments.qmltypes

plugins/Ubuntu/SystemImage/CMakeLists.txtnew file+15

@@ -0,0 +1,15 @@

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.cppnew file+155

@@ -0,0 +1,155 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include <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.hnew file+84

@@ -0,0 +1,84 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef 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/plugin.cppnew file+28

@@ -0,0 +1,28 @@

1+/*

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

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "plugin.h"

18+#include "SystemImage.h"

19+

20+#include <QtQml>

21+

22+void BackendPlugin::registerTypes(const char *uri)

23+{

24+ Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));

25+

26+ qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage",

27+ [](QQmlEngine*, QJSEngine*) -> QObject* { return new SystemImage; });

28+}

tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qml → plugins/Ubuntu/SystemImage/plugin.hrenamed+13−12

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

11/*

2− * Copyright (C) 2019 The UBports Foundation

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

33 *

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

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

@@ -14,17 +14,18 @@

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

1515 */

1616

17−pragma Singleton

18−import QtQuick 2.0

17+#ifndef SYSTEMIMAGE_PLUGIN_H

18+#define SYSTEMIMAGE_PLUGIN_H

1919

20−Item {

21− id: root

20+#include <QQmlExtensionPlugin>

2221

23− property int targetBuildNumber: 0

24− property bool checkingForUpdates: false

25− property bool updateAvailable: false

22+class BackendPlugin : public QQmlExtensionPlugin

23+{

24+ Q_OBJECT

25+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)

2626

27− signal updateDownloaded()

28− signal applyUpdate()

29− signal checkForUpdate()

30−}

27+public:

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

29+};

30+

31+#endif // SYSTEMIMAGE_PLUGIN_H

plugins/Ubuntu/SystemImage/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Ubuntu.SystemImage

2+plugin SystemImage

3+typeinfo SystemImage.qmltypes

plugins/Unity/ApplicationMenu/CMakeLists.txtdeleted−19

@@ -1,19 +0,0 @@

1−find_package(Qt5DBus REQUIRED)

2−

3−include_directories(

4− ${CMAKE_CURRENT_SOURCE_DIR}

5− ${CMAKE_CURRENT_BINARY_DIR}

6−)

7−

8−set(applicationMenu_SRCS

9− applicationmenuregistry.cpp

10− dbusapplicationmenuregistry.cpp

11− plugin.cpp)

12−

13−qt5_add_dbus_adaptor(applicationMenu_SRCS com.ubuntu.MenuRegistrar.xml dbusapplicationmenuregistry.h DBusApplicationMenuRegistry)

14−

15−add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})

16−

17−target_link_libraries(ApplicationMenu-qml Qt5::DBus Qt5::Qml)

18−

19−add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)

plugins/Unity/ApplicationMenu/applicationmenuregistry.cppdeleted−141

@@ -1,141 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "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.hdeleted−83

@@ -1,83 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#ifndef 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.xmldeleted−83

@@ -1,83 +0,0 @@

1−<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">

2−<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">

3− <dox:d><![CDATA[

4− @mainpage

5−

6− An interface to register menus that are associated with a window in an application. The

7− main interface is documented here: @ref com::ubuntu::MenuRegistrar.

8−

9− The actual menus are transported using the gmenumodel protocol

10− ]]></dox:d>

11− <interface name="com.ubuntu.MenuRegistrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">

12− <dox:d>

13− An interface to register a menu from an application to be displayed in another

14− window. This manages that association between processes and/or Mir surface IDs and the dbus

15− address and object that provides the menus using the org.gtk.Menus interface.

16− </dox:d>

17− <method name="RegisterAppMenu">

18− <dox:d><![CDATA[

19− Associates a gmenumodel with an application

20−

21− /note this method assumes that the connection from the caller is the DBus connection

22− to use for the object. Applications that use multiple DBus connections will need to

23− ensure this method is called with the same connection that implements the object.

24− ]]></dox:d>

25− <arg name="pid" type="u" direction="in">

26− <dox:d>The process ID of the application for which the menu is associated</dox:d>

27− </arg>

28− <arg name="menuObjectPath" type="o" direction="in">

29− <dox:d>The dbus path where the gmenumodel interface for the application menu has been exported</dox:d>

30− </arg>

31− <arg name="actionObjectPath" type="o" direction="in">

32− <dox:d>The dbus path where the gactionmenu interface for the application menu actions has been exported</dox:d>

33− </arg>

34− <arg name="service" type="s" direction="in">

35− <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>

36− </arg>

37− </method>

38− <method name="UnregisterAppMenu">

39− <dox:d>

40− A method to allow removing an application menu from the database.

41− </dox:d>

42− <arg name="pid" type="u" direction="in">

43− <dox:d>The process id of the application</dox:d>

44− </arg>

45− <arg name="menuObjectPath" type="o" direction="in">

46− <dox:d>The dbus path for the registered application menu to be unregistered</dox:d>

47− </arg>

48− </method>

49−

50− <method name="RegisterSurfaceMenu">

51− <dox:d><![CDATA[

52− Associates a gmenumodel with a surface

53−

54− /note this method assumes that the connection from the caller is the DBus connection

55− to use for the object. Applications that use multiple DBus connections will need to

56− ensure this method is called with the same connection that implements the object.

57− ]]></dox:d>

58− <arg name="surface" type="s" direction="in">

59− <dox:d>The surface ID of the surface</dox:d>

60− </arg>

61− <arg name="menuObjectPath" type="o" direction="in">

62− <dox:d>The dbus path where the gmenumodel interface for the surface menu has been exported</dox:d>

63− </arg>

64− <arg name="actionObjectPath" type="o" direction="in">

65− <dox:d>The dbus path where the gactionmenu interface for the surface menu actions has been exported</dox:d>

66− </arg>

67− <arg name="service" type="s" direction="in">

68− <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>

69− </arg>

70− </method>

71− <method name="UnregisterSurfaceMenu">

72− <dox:d>

73− A method to allow removing a surface menu from the database.

74− </dox:d>

75− <arg name="surfaceId" type="s" direction="in">

76− <dox:d>The surface id of the surface</dox:d>

77− </arg>

78− <arg name="menuObjectPath" type="o" direction="in">

79− <dox:d>The dbus path for the registered surface menu to be unregistered</dox:d>

80− </arg>

81− </method>

82− </interface>

83−</node>

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cppdeleted−44

@@ -1,44 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "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/Unity/ApplicationMenu/plugin.cppdeleted−42

@@ -1,42 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "plugin.h"

18−#include "dbusapplicationmenuregistry.h"

19−

20−#include <QtQml>

21−

22−static QObject *menuRegistry(QQmlEngine *engine, QJSEngine *scriptEngine)

23−{

24− Q_UNUSED(engine)

25− Q_UNUSED(scriptEngine)

26− return DBusApplicationMenuRegistry::instance();

27−}

28−

29−void ApplicationMenuPlugin::registerTypes(const char *uri)

30−{

31− Q_ASSERT(uri == QLatin1String("Unity.ApplicationMenu"));

32−

33− qmlRegisterUncreatableType<MenuServicePath>(uri, 0, 1, "MenuServicePath", "You cannot create a MenuServicePath");

34− qmlRegisterSingletonType<DBusApplicationMenuRegistry>(uri, 0, 1, "ApplicationMenuRegistry", menuRegistry);

35−}

36−

37−void ApplicationMenuPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

38−{

39− QQmlExtensionPlugin::initializeEngine(engine, uri);

40−

41− menuRegistry(nullptr, nullptr);

42−}

plugins/Unity/ApplicationMenu/qmldirdeleted−3

@@ -1,3 +0,0 @@

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)

21add_subdirectory(Connectivity)

32add_subdirectory(Indicators)

43add_subdirectory(Launcher)

54add_subdirectory(Session)

5+add_subdirectory(DashCommunicator)

66add_subdirectory(InputInfo)

77add_subdirectory(Platform)

plugins/Unity/Connectivity/CMakeLists.txt+1−1

@@ -5,6 +5,6 @@ set(CONNECTIVITY_SOURCES

55

66add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})

77

8−target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)

8+qt5_use_modules(Connectivity Qml DBus Core)

99

1010add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)

plugins/Unity/DashCommunicator/CMakeLists.txtnew file+25

@@ -0,0 +1,25 @@

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.cppnew file+58

@@ -0,0 +1,58 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#include "dashcommunicator.h"

18+#include "dashconnection.h"

19+

20+#include <QObject>

21+

22+DashCommunicator::DashCommunicator(QObject *parent):

23+ QThread(parent),

24+ m_dashConnection(nullptr),

25+ m_created(false)

26+{

27+ start();

28+}

29+

30+DashCommunicator::~DashCommunicator()

31+{

32+ quit();

33+ wait();

34+}

35+

36+void DashCommunicator::setCurrentScope(int index, bool animate, bool isSwipe)

37+{

38+ m_mutex.lock();

39+ if (m_created) {

40+ QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",

41+ Q_ARG(int, index),

42+ Q_ARG(bool, animate),

43+ Q_ARG(bool, isSwipe));

44+ }

45+ m_mutex.unlock();

46+}

47+

48+void DashCommunicator::run()

49+{

50+ m_dashConnection = new DashConnection(QStringLiteral("com.canonical.UnityDash"),

51+ QStringLiteral("/com/canonical/UnityDash"),

52+ QLatin1String(""), this);

53+ m_mutex.lock();

54+ m_created = true;

55+ m_mutex.unlock();

56+

57+ exec();

58+}

plugins/WindowManager/AvailableDesktopArea.h → plugins/Unity/DashCommunicator/dashcommunicator.hrenamed+21−14

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

11/*

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

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

33 *

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

55 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -14,25 +14,32 @@

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

1515 */

1616

17−#ifndef AVAILABLEDESKTOPAREA_H

18−#define AVAILABLEDESKTOPAREA_H

17+#ifndef DASHCOMMUNICATOR_H

18+#define DASHCOMMUNICATOR_H

1919

20−#include <QQuickItem>

20+// Qt

21+#include <QThread>

22+#include <QMutex>

2123

22−/**

23− @brief Used to inform qtmir/miral about the available desktop area of shell

24+class DashConnection;

2425

25− So that qtmir/miral can take correct window management decisions.

26− */

27−class AvailableDesktopArea : public QQuickItem

26+class DashCommunicator: public QThread

2827{

2928 Q_OBJECT

3029public:

31− AvailableDesktopArea(QQuickItem *parent = nullptr);

30+ explicit DashCommunicator(QObject *parent = 0);

31+ ~DashCommunicator();

32+

33+public Q_SLOTS:

34+ void setCurrentScope(int index, bool animate, bool isSwipe);

35+

3236protected:

33− void itemChange(ItemChange change, const ItemChangeData &value) override;

34−private Q_SLOTS:

35− void updatePlatformWindowProperty();

37+ void run() override;

38+

39+private:

40+ DashConnection *m_dashConnection;

41+ bool m_created;

42+ QMutex m_mutex;

3643};

3744

38−#endif // AVAILABLEDESKTOPAREA_H

45+#endif

plugins/Unity/DashCommunicator/dashcommunicatorservice.cppnew file+30

@@ -0,0 +1,30 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#include "dashcommunicatorservice.h"

18+

19+DashCommunicatorService::DashCommunicatorService(QObject *parent):

20+ QObject(parent),

21+ m_dbusService(new DBusDashCommunicatorService(this))

22+{

23+ connect(m_dbusService, &DBusDashCommunicatorService::setCurrentScopeRequested, this, &DashCommunicatorService::setCurrentScopeRequested);

24+}

25+

26+

27+DashCommunicatorService::~DashCommunicatorService()

28+{

29+

30+}

plugins/Unity/DashCommunicator/dashcommunicatorservice.hnew file+38

@@ -0,0 +1,38 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#ifndef DASHCOMMUNICATORSERVICE_H

18+#define DASHCOMMUNICATORSERVICE_H

19+

20+#include "dbusdashcommunicatorservice.h"

21+

22+#include <QObject>

23+

24+class DashCommunicatorService: public QObject

25+{

26+ Q_OBJECT

27+public:

28+ DashCommunicatorService(QObject *parent = 0);

29+ ~DashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScopeRequested(int index, bool animate, bool isSwipe);

33+

34+private:

35+ DBusDashCommunicatorService *m_dbusService;

36+};

37+

38+#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/DashCommunicator/dashconnection.cppnew file+63

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

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#include "dashconnection.h"

18+

19+#include <QDBusInterface>

20+#include <QDBusPendingCall>

21+

22+/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service

23+ * appears on the bus.

24+ *

25+ * On construction QDBusInterface synchronously introspects the service, which will block the GUI

26+ * thread of this process if the service is busy. QDBusAbstractInterface does not perform this

27+ * introspection, so let's subclass that and avoid the blocking scenario.

28+ *

29+ * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we

30+ * cannot easily connect to DBus signals with the usual connect() calls. So this approach only

31+ * suited to push communication with the DBus service.

32+ */

33+class AsyncDBusInterface : public QDBusAbstractInterface

34+{

35+public:

36+ AsyncDBusInterface(const QString &service, const QString &path,

37+ const QString &interface, const QDBusConnection &connection,

38+ QObject *parent = 0)

39+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)

40+ {}

41+ ~AsyncDBusInterface() = default;

42+};

43+

44+

45+DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

46+ AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

47+{

48+

49+}

50+

51+/* Override the default implementation to create a non-blocking DBus interface (see note above). */

52+QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,

53+ const QString &interface, const QDBusConnection &connection)

54+{

55+ return new AsyncDBusInterface(service, path, interface, connection);

56+}

57+

58+void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

59+{

60+ if (dbusInterface()) {

61+ dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);

62+ }

63+}

plugins/Unity/DashCommunicator/dashconnection.hnew file+37

@@ -0,0 +1,37 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#ifndef THREADEDDASHCONNECTION_H

18+#define THREADEDDASHCONNECTION_H

19+

20+// local

21+#include "abstractdbusservicemonitor.h"

22+

23+class DashConnection: public AbstractDBusServiceMonitor

24+{

25+ Q_OBJECT

26+public:

27+ DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);

28+

29+public Q_SLOTS:

30+ void setCurrentScope(int index, bool animate, bool isSwipe);

31+

32+private:

33+ QDBusAbstractInterface* createInterface(const QString &service, const QString &path,

34+ const QString &interface, const QDBusConnection &connection) override;

35+};

36+

37+#endif

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppnew file+35

@@ -0,0 +1,35 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#include "dbusdashcommunicatorservice.h"

18+

19+#include <QDBusConnection>

20+#include <QDBusInterface>

21+#include <QDebug>

22+

23+DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):

24+ UnityDBusObject(QStringLiteral("/com/canonical/UnityDash"), QStringLiteral("com.canonical.UnityDash"), false, parent)

25+{

26+}

27+

28+DBusDashCommunicatorService::~DBusDashCommunicatorService()

29+{

30+}

31+

32+void DBusDashCommunicatorService::SetCurrentScope(int index, bool animate, bool isSwipe)

33+{

34+ Q_EMIT setCurrentScopeRequested(index, animate, isSwipe);

35+}

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hnew file+39

@@ -0,0 +1,39 @@

1+/*

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

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ */

16+

17+#ifndef DBUSDASHCOMMUNICATORSERVICE_H

18+#define DBUSDASHCOMMUNICATORSERVICE_H

19+

20+#include "unitydbusobject.h"

21+

22+class DBusDashCommunicatorService: public UnityDBusObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DBusDashCommunicatorService(QObject *parent = 0);

29+ ~DBusDashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScopeRequested(int index, bool animate, bool isSwipe);

33+

34+public Q_SLOTS:

35+ Q_SCRIPTABLE void SetCurrentScope(int index, bool animate, bool isSwipe);

36+

37+};

38+

39+#endif // DBUSDASHCOMMUNICATORSERVICE_H

tests/mocks/LightDMController/plugin.cpp → plugins/Unity/DashCommunicator/plugin.cpprenamed+11−14

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

11/*

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

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

33 *

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

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

@@ -12,24 +12,21 @@

1212 *

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

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

15+ *

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

1517 */

1618

1719#include "plugin.h"

20+#include "dashcommunicator.h"

21+#include "dashcommunicatorservice.h"

1822

19−#include "MockController.h"

20−

23+#include <QDBusConnection>

2124#include <QtQml/qqml.h>

2225

23−static QObject *mock_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

24−{

25− Q_UNUSED(scriptEngine)

26− auto controller = QLightDM::MockController::instance();

27− engine->setObjectOwnership(controller, QQmlEngine::CppOwnership);

28− return controller;

29−}

30−

31−void LightDMControllerPlugin::registerTypes(const char *uri)

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

3227{

33− Q_ASSERT(uri == QLatin1String("LightDMController"));

34− qmlRegisterSingletonType<QLightDM::MockController>(uri, 0, 1, "LightDMController", mock_provider);

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

3532}

plugins/Lights/LegacyLights.h → plugins/Unity/DashCommunicator/plugin.hrenamed+8−19

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

11/*

22 * Copyright (C) 2014 Canonical, Ltd.

3− * Copyright (C) 2021 UBports Foundation.

43 *

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

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

@@ -14,32 +13,22 @@

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

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

1615 *

17− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

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

1817 */

1918

20−#ifndef UNITY_LEGACYLIGHTS_H

21−#define UNITY_LEGACYLIGHTS_H

19+#ifndef DASHCOMMUNICATOR_PLUGIN_H

20+#define DASHCOMMUNICATOR_PLUGIN_H

2221

23−#include <QtCore/QObject>

24−#include "Lights.h"

22+#include <QtQml/QQmlEngine>

23+#include <QtQml/QQmlExtensionPlugin>

2524

26−struct light_device_t;

27−

28−class LegacyLights: public Lights

25+class DashCommunicatorPlugin : public QQmlExtensionPlugin

2926{

3027 Q_OBJECT

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

3129

3230public:

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−

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

4332};

4433

4534#endif

plugins/Unity/DashCommunicator/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Unity.DashCommunicator

2+plugin DashCommunicator-qml

3+typeinfo DashCommunicator.qmltypes

plugins/Unity/Indicators/CMakeLists.txt+2−1

@@ -44,7 +44,8 @@ target_link_libraries(IndicatorsQml

4444 ${GLIB_LIBRARIES}

4545 ${GIO_LIBRARIES}

4646 ${QMENUMODEL_LDFLAGS}

47− Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus

4847)

4948

49+qt5_use_modules(IndicatorsQml Core Qml Quick DBus)

50+

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

3031 enum ActionStates {

3132 Label = 0x00,

3233 IconSource = 0x01,

3334 AccessableName = 0x02,

3435 Visible = 0x03,

3536 };

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)

4546 enum NetworkActionStates {

4647 Connection = 0x01,

4748 SignalStrength = 0x02,

4849 };

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)

5859 enum NetworkConnectionStates {

5960 Initial = 0x00,

6061 Activating = 0x01,

6162 Activated = 0x02,

6263 Deactivating = 0x03,

6364 };

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)

7374 enum Roles {

7475 Identifier = 0,

7576 Position,

7677 IndicatorProperties

7778 };

78− Q_ENUM(Roles)

7979

8080 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}

8181};

@@ -84,6 +84,7 @@ class UNITYINDICATORS_EXPORT FlatMenuProxyModelRole : public QObject

8484{

8585 Q_OBJECT

8686public:

87+ Q_ENUMS(Roles)

8788 enum Roles {

8889 Action = Qt::DisplayRole + 1,

8990 Label,

@@ -92,7 +93,6 @@ public:

9293 hasSection,

9394 hasSubMenu

9495 };

95− Q_ENUM(Roles)

9696

9797 FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}

9898};

plugins/Unity/Indicators/indicatorsmanager.h+2

@@ -76,6 +76,8 @@ private:

7676 QSharedPointer<QFileSystemWatcher> m_fsWatcher;

7777 bool m_loaded;

7878 QString m_profile;

79+

80+ Platform m_platform;

7981};

8082

8183#endif // INDICATORS_MANAGER_H

plugins/Unity/Indicators/indicatorsmodel.cpp−13

@@ -103,19 +103,6 @@ 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−

119106/*!

120107 \qmlmethod IndicatorsModel::unload()

121108

plugins/Unity/Indicators/indicatorsmodel.h+1−9

@@ -32,12 +32,10 @@ class IndicatorsManager;

3232class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel

3333{

3434 Q_OBJECT

35+ Q_ENUMS(Roles)

3536 Q_PROPERTY(int count READ count NOTIFY countChanged)

3637 Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)

3738

38− // Used for tests

39− Q_PROPERTY(bool light READ light WRITE setLight NOTIFY lightChanged)

40−

4139public:

4240

4341 IndicatorsModel(QObject *parent=nullptr);

@@ -51,9 +49,6 @@ public:

5149 QString profile() const;

5250 void setProfile(const QString& profile);

5351

54− bool light() const;

55− void setLight(const bool &light);

56−

5752 /* QAbstractItemModel */

5853 QHash<int, QByteArray> roleNames() const override;

5954 int columnCount(const QModelIndex &parent = QModelIndex()) const override;

@@ -66,7 +61,6 @@ Q_SIGNALS:

6661 void countChanged();

6762 void profileChanged();

6863 void indicatorDataChanged(const QVariant& data);

69− void lightChanged();

7064

7165private Q_SLOTS:

7266 void onIdentifierChanged();

@@ -81,8 +75,6 @@ private:

8175

8276 void notifyDataChanged(QObject *sender, int role);

8377 int count() const;

84−

85− bool m_light;

8678};

8779

8880#endif // INDICATORSMODEL_H

plugins/Unity/Indicators/sharedunitymenumodel.cpp−4

@@ -81,16 +81,12 @@ void SharedUnityMenuModel::initialize()

8181 }

8282 } else {

8383 QSharedPointer<UnityMenuModel> model = UnityMenuModelCache::singleton()->model(m_menuObjectPath);

84−

8584 if (model != m_model) {

8685 if (model->busName() != m_busName) model->setBusName(m_busName);

8786 if (model->actions() != m_actions) model->setActions(m_actions);

8887

8988 m_model = model;

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

9490 }

9591 }

9692}

plugins/Unity/InputInfo/CMakeLists.txt+2−1

@@ -32,7 +32,8 @@ add_library(InputInfo SHARED

3232target_link_libraries(InputInfo

3333 ${LIBUDEV_LDFLAGS}

3434 ${LIBEVDEV_LDFLAGS}

35− Qt5::Core Qt5::Qml Qt5::Quick

3635)

3736

37+qt5_use_modules(InputInfo Core Qml Quick)

38+

3839add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)

plugins/Unity/InputInfo/qinputinfo.h+3−2

@@ -57,6 +57,8 @@ class QInputDeviceManager;

5757class QInputDevice : public QObject

5858{

5959 Q_OBJECT

60+ Q_ENUMS(InputType)

61+ Q_FLAGS(InputType InputTypeFlags)

6062 friend class QInputDeviceManagerPrivate;

6163

6264public:

@@ -70,9 +72,8 @@ public:

7072 Keyboard = 16,

7173 Switch = 32

7274 };

73− Q_FLAG(InputType)

75+ Q_ENUMS(InputType)

7476 Q_DECLARE_FLAGS(InputTypeFlags, InputType)

75− Q_FLAG(InputTypeFlags)

7677

7778 explicit QInputDevice(QObject *parent = 0);

7879 QString name() const;

plugins/Unity/Launcher/CMakeLists.txt+3−4

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

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)

12pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

23

34add_definitions(-DSM_BUSNAME=systemBus)

@@ -26,13 +27,10 @@ set(QMLLAUNCHERPLUGIN_SRC

2627 asadapter.cpp

2728 appdrawermodel.cpp

2829 ualwrapper.cpp

29− xdgwatcher.cpp

3030 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

3131 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

3232 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

3333 ${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

3634 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

3735 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

3836 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

@@ -48,7 +46,8 @@ target_link_libraries(UnityLauncher-qml

4846 ${GSETTINGS_QT_LDFLAGS}

4947 ${GLIB_LIBRARIES}

5048 ${UAL_LIBRARIES}

51− Qt5::DBus Qt5::Qml Qt5::Gui Qt5::Concurrent

5249 )

5350

51+qt5_use_modules(UnityLauncher-qml DBus Qml Gui)

52+

5453add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)

plugins/Unity/Launcher/appdrawermodel.cpp+14−144

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

11/*

22 * Copyright (C) 2016 Canonical, Ltd.

3− * Copyright (C) 2020 UBports Foundation.

43 *

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

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

@@ -17,35 +16,23 @@

1716

1817#include "appdrawermodel.h"

1918#include "ualwrapper.h"

20−#include "xdgwatcher.h"

2119

2220#include <QDebug>

2321#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−}

3322

3423AppDrawerModel::AppDrawerModel(QObject *parent):

35− AppDrawerModelInterface(parent),

36− m_ual(new UalWrapper(this)),

37− m_xdgWatcher(new XdgWatcher(this)),

38− m_refreshing(false)

24+ AppDrawerModelInterface(parent)

3925{

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

26+ Q_FOREACH (const QString &appId, UalWrapper::installedApps()) {

27+ UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);

28+ if (!info.valid) {

29+ qWarning() << "Failed to get app info for app" << appId;

30+ continue;

31+ }

32+ m_list.append(new LauncherItem(appId, info.name, info.icon, this));

33+ m_list.last()->setKeywords(info.keywords);

34+ }

35+ qsrand(QDateTime::currentMSecsSinceEpoch() / 100);

4936}

5037

5138int AppDrawerModel::rowCount(const QModelIndex &parent) const

@@ -66,127 +53,10 @@ QVariant AppDrawerModel::data(const QModelIndex &index, int role) const

6653 case RoleKeywords:

6754 return m_list.at(index.row())->keywords();

6855 case RoleUsage:

69− return m_list.at(index.row())->popularity();

56+ // FIXME: u-a-l needs to provide API for usage stats.

57+ // don't forget to drop the qsrand() call in the ctor when dropping this.

58+ return qrand();

7059 }

7160

7261 return QVariant();

7362}

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.h+2−33

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

11/*

22 * Copyright (C) 2016 Canonical, Ltd.

3− * Copyright (C) 2020 UBports Foundation.

43 *

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

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

@@ -15,50 +14,20 @@

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

1615 */

1716

18−#include <memory>

19−#include <QFutureWatcher>

17+

2018#include <unity/shell/launcher/AppDrawerModelInterface.h>

2119

2220#include "launcheritem.h"

2321

24−class UalWrapper;

25−class XdgWatcher;

26−

2722class AppDrawerModel: public AppDrawerModelInterface

2823{

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

3325public:

3426 AppDrawerModel(QObject* parent = nullptr);

3527

3628 int rowCount(const QModelIndex &parent) const override;

3729 QVariant data(const QModelIndex &index, int role) const override;

3830

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−

5331private:

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;

32+ QList<LauncherItem*> m_list;

6433};

plugins/Unity/Launcher/launcheritem.cpp+7−43

@@ -35,8 +35,10 @@ 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),

3839 m_quickList(new QuickListModel(this))

3940{

41+ Q_ASSERT(parent != nullptr);

4042 QuickListEntry nameAction;

4143 nameAction.setActionId(QStringLiteral("launch_item"));

4244 nameAction.setText(m_name);

@@ -46,13 +48,11 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr

4648 QuickListEntry pinningAction;

4749 pinningAction.setActionId(QStringLiteral("pin_item"));

4850 pinningAction.setText(gettext("Pin shortcut"));

49− pinningAction.setIsPrivate(true);

5051 m_quickList->appendAction(pinningAction);

5152

5253 m_quitAction.setActionId(QStringLiteral("stop_item"));

5354 m_quitAction.setIcon(QStringLiteral("application-exit"));

5455 m_quitAction.setText(gettext("Quit"));

55− m_quitAction.setIsPrivate(true);

5656}

5757

5858QString LauncherItem::appId() const

@@ -120,7 +120,6 @@ void LauncherItem::setPinned(bool pinned)

120120 QuickListEntry entry;

121121 entry.setActionId(QStringLiteral("pin_item"));

122122 entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));

123− entry.setIsPrivate(true);

124123 m_quickList->updateAction(entry);

125124}

126125

@@ -222,49 +221,14 @@ void LauncherItem::setAlerting(bool alerting)

222221

223222int LauncherItem::surfaceCount() const

224223{

225− return m_surfaces.count();

224+ return m_surfaceCount;

226225}

227226

228−void LauncherItem::setSurfaces(const QList<QPair<QString, QString> > &surfaces)

227+void LauncherItem::setSurfaceCount(int surfaceCount)

229228{

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;

261−}

262−

263−void LauncherItem::setPopularity(uint popularity)

264−{

265− if (m_popularity != popularity) {

266− m_popularity = popularity;

267− Q_EMIT popularityChanged(popularity);

229+ if (m_surfaceCount != surfaceCount) {

230+ m_surfaceCount = surfaceCount;

231+ Q_EMIT surfaceCountChanged(surfaceCount);

268232 }

269233}

270234

plugins/Unity/Launcher/launcheritem.h+2−6

@@ -23,7 +23,6 @@

2323#include "quicklistmodel.h"

2424

2525#include <unity/shell/launcher/LauncherItemInterface.h>

26−#include <unity/shell/application/MirSurfaceInterface.h>

2726

2827class QuickListModel;

2928

@@ -39,7 +38,6 @@ public:

3938 QString name() const override;

4039 QString icon() const override;

4140 QStringList keywords() const override;

42− uint popularity() const override;

4341 bool pinned() const override;

4442 bool running() const override;

4543 bool recent() const override;

@@ -56,7 +54,6 @@ private:

5654 void setName(const QString &name);

5755 void setIcon(const QString &icon);

5856 void setKeywords(const QStringList &keywords);

59− void setPopularity(uint popularity);

6057 void setPinned(bool pinned);

6158 void setRunning(bool running);

6259 void setRecent(bool recent);

@@ -65,14 +62,13 @@ private:

6562 void setCountVisible(bool countVisible);

6663 void setFocused(bool focused);

6764 void setAlerting(bool alerting);

68− void setSurfaces(const QList<QPair<QString, QString >> &surfaces);

65+ void setSurfaceCount(int surfaceCount);

6966

7067private:

7168 QString m_appId;

7269 QString m_name;

7370 QString m_icon;

7471 QStringList m_keywords;

75− uint m_popularity;

7672 bool m_pinned;

7773 bool m_running;

7874 bool m_recent;

@@ -81,7 +77,7 @@ private:

8177 bool m_countVisible;

8278 bool m_focused;

8379 bool m_alerting;

84− QList<QPair<QString, QString> > m_surfaces;

80+ int m_surfaceCount;

8581 QuickListModel *m_quickList;

8682 QuickListEntry m_quitAction;

8783

plugins/Unity/Launcher/launchermodel.cpp+20−51

@@ -23,7 +23,6 @@

2323

2424#include <unity/shell/application/ApplicationInfoInterface.h>

2525#include <unity/shell/application/MirSurfaceListInterface.h>

26−#include <unity/shell/application/MirSurfaceInterface.h>

2726

2827#include <QDesktopServices>

2928#include <QDebug>

@@ -167,7 +166,6 @@ void LauncherModel::pin(const QString &appId, int index)

167166 appInfo.icon,

168167 this);

169168 item->setPinned(true);

170− item->setPopularity(appInfo.popularity);

171169 m_list.insert(index, item);

172170 endInsertRows();

173171 }

@@ -200,26 +198,12 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

200198 } else {

201199 pin(appId);

202200 }

203− } else if (actionId == QStringLiteral("launch_item")) {

201+ } else if (actionId == QLatin1String("launch_item")) {

204202 QDesktopServices::openUrl(getUrlForAppId(appId));

205− } else if (actionId == QStringLiteral("stop_item")) { // Quit

203+ } else if (actionId == QLatin1String("stop_item")) { // Quit

206204 if (m_appManager) {

207205 m_appManager->stopApplication(appId);

208206 }

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

223207 // Nope, we don't know this action, let the backend forward it to the application

224208 } else {

225209 // TODO: forward quicklist action to app, possibly via m_dbusIface

@@ -230,6 +214,7 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

230214void LauncherModel::setUser(const QString &username)

231215{

232216 Q_UNUSED(username)

217+ qWarning() << "This backend doesn't support multiple users";

233218}

234219

235220QString LauncherModel::getUrlForAppId(const QString &appId) const

@@ -521,6 +506,11 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

521506 return;

522507 }

523508

509+ if (app->appId() == QLatin1String("unity8-dash")) {

510+ // Not adding the dash app

511+ return;

512+ }

513+

524514 const int itemIndex = findApplication(app->appId());

525515 if (itemIndex != -1) {

526516 LauncherItem *item = m_list.at(itemIndex);

@@ -528,61 +518,40 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

528518 item->setRecent(true);

529519 Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});

530520 }

521+ if (item->surfaceCount() != app->surfaceCount()) {

522+ item->setSurfaceCount(app->surfaceCount());

523+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleSurfaceCount});

524+ }

525+

531526 item->setRunning(true);

532527 } else {

533528 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);

534529 item->setRecent(true);

535530 item->setRunning(true);

536531 item->setFocused(app->focused());

532+ item->setSurfaceCount(app->surfaceCount());

537533 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

538534 m_list.append(item);

539535 endInsertRows();

540536 }

541− connect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::updateSurfaceList);

537+ connect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);

542538 m_asAdapter->syncItems(m_list);

543539 Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRunning});

544540}

545541

546−void LauncherModel::updateSurfaceList()

542+void LauncherModel::applicationSurfaceCountChanged(int count)

547543{

548544 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−{

564545 int idx = findApplication(app->appId());

565546 if (idx < 0) {

566547 qWarning() << "Received a surface count changed event from an app that's not in the Launcher model";

567548 return;

568549 }

569550 LauncherItem *item = m_list.at(idx);

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

551+ if (item->surfaceCount() != count) {

552+ item->setSurfaceCount(count);

553+ Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});

583554 }

584− item->setSurfaces(surfaces);

585− Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});

586555}

587556

588557void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)

@@ -603,7 +572,7 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)

603572 return;

604573 }

605574

606− disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::updateSurfaceList);

575+ disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);

607576

608577 LauncherItem * item = m_list.at(appIndex);

609578

plugins/Unity/Launcher/launchermodel.h+1−3

@@ -75,9 +75,7 @@ private Q_SLOTS:

7575 void applicationAdded(const QModelIndex &parent, int row);

7676 void applicationRemoved(const QModelIndex &parent, int row);

7777 void focusedAppIdChanged();

78− void updateSurfaceList();

79− void updateSurfaceListForApp(ApplicationInfoInterface *app);

80− void updateSurfaceListForSurface();

78+ void applicationSurfaceCountChanged(int);

8179

8280private:

8381 QList<LauncherItem*> m_list;

plugins/Unity/Launcher/quicklistentry.cpp−11

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

2020

2121QuickListEntry::QuickListEntry()

2222 : m_hasSeparator(false)

23− , m_isPrivate(false)

2423{

2524}

2625

@@ -73,13 +72,3 @@ bool QuickListEntry::operator==(const QuickListEntry &other)

7372{

7473 return !other.actionId().isEmpty() && other.actionId() == m_actionId;

7574}

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

@@ -42,15 +42,11 @@ public:

4242

4343 bool operator==(const QuickListEntry & other);

4444

45− bool isPrivate() const;

46− void setIsPrivate(bool isPrivate);

47−

4845private:

4946 QString m_actionId;

5047 QString m_text;

5148 QString m_icon;

5249 bool m_hasSeparator;

53− bool m_isPrivate;

5450};

5551

5652#endif // QUICKLISTENTRY

plugins/Unity/Launcher/quicklistmodel.cpp−9

@@ -37,13 +37,6 @@ 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−

4740void QuickListModel::updateAction(const QuickListEntry &entry)

4841{

4942 for (int i = 0; i < m_list.count(); ++i) {

@@ -88,8 +81,6 @@ QVariant QuickListModel::data(const QModelIndex &index, int role) const

8881 return m_list.at(index.row()).clickable();

8982 case RoleHasSeparator:

9083 return m_list.at(index.row()).hasSeparator();

91− case RoleIsPrivate:

92− return m_list.at(index.row()).isPrivate();

9384 }

9485 return QVariant();

9586}

plugins/Unity/Launcher/quicklistmodel.h−1

@@ -36,7 +36,6 @@ public:

3636 ~QuickListModel();

3737

3838 void appendAction(const QuickListEntry &entry);

39− void insertAction(const QuickListEntry &entry, int index);

4039

4140 /**

4241 * @brief Update an existing action

plugins/Unity/Launcher/ualwrapper.cpp+2−3

@@ -24,6 +24,7 @@ using namespace ubuntu::app_launch;

2424UalWrapper::UalWrapper(QObject *parent):

2525 QObject(parent)

2626{

27+

2728}

2829

2930QStringList UalWrapper::installedApps()

@@ -38,7 +39,7 @@ QStringList UalWrapper::installedApps()

3839 }

3940 }

4041 } catch (const std::runtime_error &e) {

41− qWarning() << "ubuntu-app-launch threw an exception listing apps:" << e.what();

42+ qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();

4243 }

4344

4445 return appIds;

@@ -58,13 +59,11 @@ UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)

5859 std::shared_ptr<Application> ualApp;

5960 ualApp = Application::create(ualAppId, Registry::getDefault());

6061

61− info.appId = appId;

6262 info.name = QString::fromStdString(ualApp->info()->name());

6363 info.icon = QString::fromStdString(ualApp->info()->iconPath());

6464 for (const std::string &keyword : ualApp->info()->keywords().value()) {

6565 info.keywords << QString::fromStdString(keyword);

6666 }

67− //info.popularity = ualApp->info()->popularity();

6867 info.valid = true;

6968 } catch (const std::runtime_error &e) {

7069 qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();

plugins/Unity/Launcher/ualwrapper.h+1−2

@@ -21,16 +21,15 @@ class UalWrapper: public QObject

2121 Q_OBJECT

2222public:

2323 struct AppInfo {

24− QString appId;

2524 bool valid = false;

2625 QString name;

2726 QString icon;

2827 QStringList keywords;

29− uint popularity = 0;

3028 };

3129

3230 UalWrapper(QObject* parent = nullptr);

3331

3432 static QStringList installedApps();

3533 static AppInfo getApplicationInfo(const QString &appId);

34+

3635};

plugins/Unity/Launcher/xdgwatcher.cppdeleted−129

@@ -1,129 +0,0 @@

1−/*

2− * Copyright (C) 2019 UBports Foundation

3− * Author(s): Marius Gripsgard <marius@ubports.com>

4− *

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

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

7− * the Free Software Foundation; version 3.

8− *

9− * This program is distributed in the hope that it will be useful,

10− * but WITHOUT ANY WARRANTY; without even the implied warranty of

11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12− * GNU General Public License for more details.

13− *

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

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

16− */

17−

18−#include "xdgwatcher.h"

19−

20−#include <QDebug>

21−#include <QDir>

22−#include <QFile>

23−#include <QStandardPaths>

24−#include <QTextStream>

25−

26−XdgWatcher::XdgWatcher(QObject* parent)

27− : QObject(parent),

28− m_watcher(new QFileSystemWatcher(this))

29−{

30− connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &XdgWatcher::onDirectoryChanged);

31− connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &XdgWatcher::onFileChanged);

32−

33− const auto paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);

34− for (const auto &path: paths) {

35− const auto qdir = QDir(path);

36− if (!qdir.exists()) {

37− continue;

38− }

39−

40− // Add the path itself to watch for newly added apps

41− m_watcher->addPath(path);

42−

43− // Add watcher for eatch app to watch for changes

44− const auto files = qdir.entryInfoList(QDir::Files);

45− for (const auto &file: files) {

46− if (file.suffix() == "desktop") {

47− const auto path = file.absoluteFilePath();

48− m_watcher->addPath(path);

49− m_registry.insert(path, getAppId(file));

50− }

51− }

52− }

53−}

54−

55−// "Ubuntu style" appID is filename without versionNumber after last "_"

56−const QString XdgWatcher::stripAppIdVersion(const QString rawAppID) const {

57− auto appIdComponents = rawAppID.split("_");

58− appIdComponents.removeLast();

59− return appIdComponents.join("_");

60−}

61−

62−// Standard appID see:

63−// https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id

64−const QString XdgWatcher::toStandardAppId(const QFileInfo fileInfo) const {

65− const auto paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);

66− for (const auto &path: paths) {

67− if (fileInfo.absolutePath() == path) {

68− break;

69− }

70− if (fileInfo.absolutePath().contains(path)) {

71− auto fileStr = fileInfo.absoluteFilePath();

72− fileStr.replace(path, "");

73− fileStr.replace("/", "-");

74− fileStr.replace(".desktop", "");

75− return fileStr;

76− }

77− }

78− return fileInfo.completeBaseName();

79−}

80−

81−const QString XdgWatcher::getAppId(const QFileInfo fileInfo) const {

82− // We need to open the file to check if its and Ual application

83− // as we cant just rely on the app name as "normal" apps can also

84− // contain 3 _ causing us to belive its an ubuntu app

85− // Example kde_org_kate would become kde_org

86− QFile qFile(fileInfo.absoluteFilePath());

87− qFile.open(QIODevice::ReadOnly);

88− QTextStream fileStream(&qFile);

89− QString line;

90− while (fileStream.readLineInto(&line)) {

91− if (line.startsWith("X-Ubuntu-Application-ID=")) {

92− auto rawAppID = line.replace("X-Ubuntu-Application-ID=", "");

93− qFile.close();

94− return stripAppIdVersion(rawAppID);

95− }

96− }

97− qFile.close();

98−

99− // If it's not an "Ubuntu" appID, we follow freedesktop standard

100− return toStandardAppId(fileInfo);

101−}

102−

103−// Watch for newly added apps

104−void XdgWatcher::onDirectoryChanged(const QString &path) {

105− const auto files = QDir(path).entryInfoList(QDir::Files);

106− const auto watchedFiles = m_watcher->files();

107− for (const auto &file: files) {

108− const auto appPath = file.absoluteFilePath();

109− if (file.suffix() == "desktop" && !watchedFiles.contains(appPath)) {

110− m_watcher->addPath(appPath);

111−

112− const auto appId = getAppId(file);

113− m_registry.insert(appPath, appId);

114− Q_EMIT appAdded(appId);

115− }

116− }

117−}

118−

119−void XdgWatcher::onFileChanged(const QString &path) {

120− QFileInfo file(path);

121− if (file.exists()) {

122− // The file exists, this must be an modify event

123− Q_EMIT appInfoChanged(m_registry.value(path));

124− } else {

125− // File does not exist, assume this is an remove event.

126− // onDirectoryChanged will handle rename event

127− Q_EMIT appRemoved(m_registry.take(path));

128− }

129−}

plugins/Unity/Launcher/xdgwatcher.hdeleted−46

@@ -1,46 +0,0 @@

1−/*

2− * Copyright (C) 2019 UBports Foundation

3− * Author(s): Marius Gripsgard <marius@ubports.com>

4− *

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

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

7− * the Free Software Foundation; version 3.

8− *

9− * This program is distributed in the hope that it will be useful,

10− * but WITHOUT ANY WARRANTY; without even the implied warranty of

11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12− * GNU General Public License for more details.

13− *

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

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

16− */

17−

18−#include <QFileSystemWatcher>

19−#include <QHash>

20−#include <QFileInfo>

21−

22−class QFileInfo;

23−

24−class XdgWatcher: public QObject

25−{

26− Q_OBJECT

27−public:

28− XdgWatcher(QObject* parent = nullptr);

29−

30−Q_SIGNALS:

31− void appAdded(const QString &appId);

32− void appRemoved(const QString &appId);

33− void appInfoChanged(const QString &appId);

34−

35−private Q_SLOTS:

36− void onDirectoryChanged(const QString &path);

37− void onFileChanged(const QString &path);

38−

39−private:

40− const QString toStandardAppId(const QFileInfo fileInfo) const;

41− const QString getAppId(const QFileInfo file) const;

42− const QString stripAppIdVersion(const QString rawAppID) const;

43−

44− QFileSystemWatcher* m_watcher;

45− QHash<const QString, QString> m_registry;

46−};

plugins/Unity/Platform/CMakeLists.txt+1−1

@@ -6,6 +6,6 @@ set(platformplugin_SRCS

66

77add_library(Platform-qml SHARED ${platformplugin_SRCS})

88

9−target_link_libraries(Platform-qml Qt5::DBus Qt5::Qml)

9+qt5_use_modules(Platform-qml DBus Qml)

1010

1111add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)

plugins/Unity/Platform/platform.cpp+2−16

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

1717#include "platform.h"

1818

1919#include <QDBusConnection>

20−#include <QSet>

21−#include <QString>

2220

2321Platform::Platform(QObject *parent)

24− : QObject(parent), m_isPC(true), m_isMultiSession(true)

22+ : QObject(parent)

2523{

2624 QMetaObject::invokeMethod(this, "init");

2725}

@@ -33,20 +31,8 @@ void Platform::init()

3331 QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",

3432 QDBusConnection::systemBus(), this);

3533

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

4634 m_chassis = iface.property("Chassis").toString();

47−

48− // A PC is not a handset, tablet or watch.

49− m_isPC = !QSet<QString>{"handset", "tablet", "watch"}.contains(m_chassis);

35+ m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");

5036 m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();

5137}

5238

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)

2122target_link_libraries(UnitySession-qml

22− Qt5::DBus Qt5::Qml

2323 unity8-private

2424 ${GIO_LDFLAGS}

2525 ${GLIB_LIBRARIES}

plugins/Unity/Session/dbusunitysessionservice.cpp+4−75

@@ -18,7 +18,6 @@

1818#include "dbusunitysessionservice.h"

1919

2020// system

21−#include <grp.h>

2221#include <sys/types.h>

2322#include <unistd.h>

2423#include <pwd.h>

@@ -212,23 +211,6 @@ public:

212211 QDBusConnection::SM_BUSNAME().asyncCall(msg);

213212 }

214213

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−

232214private Q_SLOTS:

233215 void onPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)

234216 {

@@ -315,13 +297,7 @@ bool DBusUnitySessionService::CanShutdown() const

315297

316298bool DBusUnitySessionService::CanLock() const

317299{

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

300+ return true; // FIXME

325301}

326302

327303QString DBusUnitySessionService::UserName() const

@@ -359,10 +335,8 @@ void DBusUnitySessionService::PromptLock()

359335 // Prompt as in quick. No locking animation needed. Usually used by

360336 // indicator-session in combination with a switch to greeter or other

361337 // user session.

362− if (CanLock()) {

363− Q_EMIT LockRequested();

364− Q_EMIT lockRequested();

365− }

338+ Q_EMIT LockRequested();

339+ Q_EMIT lockRequested();

366340}

367341

368342void DBusUnitySessionService::Lock()

@@ -494,56 +468,11 @@ void performAsyncUnityCall(const QString &method)

494468

495469

496470DBusGnomeSessionManagerWrapper::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()

542471 : UnityDBusObject(QStringLiteral("/org/gnome/SessionManager/EndSessionDialog"), QStringLiteral("com.canonical.Unity"))

543472{

544473}

545474

546−void DBusGnomeSessionManagerDialogWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)

475+void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)

547476{

548477 Q_UNUSED(arg_1);

549478 Q_UNUSED(max_wait);

plugins/Unity/Session/dbusunitysessionservice.h+4−18

@@ -270,31 +270,17 @@ private:

270270class DBusGnomeSessionManagerWrapper : public UnityDBusObject

271271{

272272 Q_OBJECT

273− Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager")

273+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")

274274

275275public:

276276 DBusGnomeSessionManagerWrapper();

277277 ~DBusGnomeSessionManagerWrapper() = default;

278278

279−public Q_SLOTS:

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−};

286−

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−

296279public Q_SLOTS:

297280 Q_SCRIPTABLE void Open(const unsigned int type, const unsigned int arg_1, const unsigned int max_wait, const QList<QDBusObjectPath> &inhibitors);

281+

282+private:

283+ void performAsyncCall(const QString &method);

298284};

299285

300286class DBusGnomeScreensaverWrapper: public UnityDBusObject

plugins/Unity/Session/plugin.cpp−1

@@ -26,7 +26,6 @@

2626

2727static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)

2828{

29− new DBusGnomeSessionManagerDialogWrapper();

3029 new DBusGnomeSessionManagerWrapper();

3130 new DBusGnomeScreensaverWrapper();

3231 new DBusScreensaverWrapper();

plugins/Utils/CMakeLists.txt+4−6

@@ -7,6 +7,7 @@ include_directories(

77 SYSTEM

88 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

99 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

10+ ${GIO_INCLUDE_DIRS}

1011)

1112

1213set(QMLPLUGIN_SRC

@@ -33,9 +34,6 @@ set(QMLPLUGIN_SRC

3334 deviceconfigparser.cpp

3435 globalfunctions.cpp

3536 URLDispatcher.cpp

36− tabfocusfence.cpp

37− expressionfiltermodel.cpp

38− quicklistproxymodel.cpp

3937 plugin.cpp

4038 )

4139

@@ -43,9 +41,7 @@ add_library(Utils-qml SHARED

4341 ${QMLPLUGIN_SRC}

4442 )

4543

46−target_link_libraries(Utils-qml

47− Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent

48− )

44+target_link_libraries(Utils-qml ${GIO_LDFLAGS})

4945

5046# Because this is an internal support library, we want

5147# to expose all symbols in it. Consider changing this

@@ -53,4 +49,6 @@ target_link_libraries(Utils-qml

5349# files directly in targets.

5450set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

5551

52+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)

53+

5654add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)

plugins/Utils/URLDispatcher.cpp+2−5

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

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

33 *

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

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

@@ -17,7 +17,6 @@

1717#include "URLDispatcher.h"

1818

1919#include <QDBusConnection>

20−#include <QDebug>

2120

2221class URLDispatcherInterface : public QObject

2322{

@@ -64,9 +63,7 @@ void URLDispatcher::setActive(bool value)

6463 connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),

6564 dispatcher,

6665 QDBusConnection::ExportScriptableContents);

67− if (!connection.registerService(QStringLiteral("com.canonical.URLDispatcher"))) {

68− qWarning() << "Unable to register DBus service com.canonical.URLDispatcher";

69− }

66+ connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));

7067 m_dispatcher = dispatcher;

7168 } else {

7269 connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));

plugins/Utils/WindowInputMonitor.cpp−3

@@ -73,9 +73,6 @@ 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();

7976 }

8077

8178 } else if (event->type() == QEvent::KeyRelease) {

plugins/Utils/appdrawerproxymodel.cpp+5−5

@@ -43,8 +43,8 @@ void AppDrawerProxyModel::setSource(QAbstractItemModel *source)

4343 m_source = source;

4444 setSourceModel(m_source);

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

46+ connect(m_source, &QAbstractItemModel::rowsRemoved, this, &AppDrawerProxyModel::invalidateFilter);

47+ connect(m_source, &QAbstractItemModel::rowsInserted, this, &AppDrawerProxyModel::invalidateFilter);

4848 Q_EMIT sourceChanged();

4949 }

5050}

@@ -157,8 +157,8 @@ bool AppDrawerProxyModel::filterAcceptsRow(int source_row, const QModelIndex &so

157157 QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();

158158 allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());

159159 bool found = false;

160− Q_FOREACH (const QString &currentWord, allWords) {

161− if (currentWord.contains(m_filterString, Qt::CaseInsensitive)) {

160+ Q_FOREACH (const QString currentWord, allWords) {

161+ if (currentWord.toLower().startsWith(m_filterString.toLower())) {

162162 found = true;

163163 break;

164164 }

@@ -185,5 +185,5 @@ QString AppDrawerProxyModel::appId(int index) const

185185 return adpm->appId(sourceIndex.row());

186186 }

187187 }

188− return QString();

188+ return nullptr;

189189}

plugins/Utils/appdrawerproxymodel.h+2−2

@@ -23,6 +23,8 @@ using namespace unity::shell::launcher;

2323class AppDrawerProxyModel: public QSortFilterProxyModel

2424{

2525 Q_OBJECT

26+ Q_ENUMS(GroupBy)

27+ Q_ENUMS(SortBy)

2628 Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)

2729 Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)

2830 Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)

@@ -36,12 +38,10 @@ public:

3638 GroupByAll,

3739 GroupByAToZ

3840 };

39− Q_ENUM(GroupBy)

4041 enum SortBy {

4142 SortByAToZ,

4243 SortByUsage

4344 };

44− Q_ENUM(SortBy)

4545

4646 AppDrawerProxyModel(QObject* parent = nullptr);

4747

plugins/Utils/deviceconfigparser.cpp−18

@@ -116,24 +116,6 @@ 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−

137119QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const

138120{

139121 m_config->beginGroup(m_name);

plugins/Utils/deviceconfigparser.h−3

@@ -33,7 +33,6 @@ 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)

3736

3837public:

3938 DeviceConfigParser(QObject *parent = nullptr);

@@ -48,7 +47,6 @@ public:

4847 Qt::ScreenOrientation portraitOrientation() const;

4948 Qt::ScreenOrientation invertedPortraitOrientation() const;

5049 QString category() const;

51− bool supportsMultiColorLed() const;

5250

5351Q_SIGNALS:

5452 void changed();

@@ -60,7 +58,6 @@ private:

6058 QStringList readOrientationsFromConfig(const QString &key) const;

6159 QString readOrientationFromConfig(const QString &key) const;

6260 Qt::ScreenOrientation stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const;

63− bool readBoolFromConfig(const QString &key, bool defaultValue) const;

6461};

6562

6663#endif

plugins/Utils/easingcurve.h+1

@@ -36,6 +36,7 @@

3636class EasingCurve: public QObject

3737{

3838 Q_OBJECT

39+ Q_ENUMS(QEasingCurve::Type)

3940 Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)

4041 Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)

4142 Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)

plugins/Utils/expressionfiltermodel.cppdeleted−49

@@ -1,49 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "expressionfiltermodel.h"

18−

19−ExpressionFilterModel::ExpressionFilterModel(QObject *parent)

20− : UnitySortFilterProxyModelQML(parent)

21−{

22−}

23−

24−QJSValue ExpressionFilterModel::matchExpression() const

25−{

26− return m_matchExpression;

27−}

28−

29−void ExpressionFilterModel::setMatchExpression(const QJSValue &value)

30−{

31− m_matchExpression = value;

32− invalidateFilter();

33−}

34−

35−bool

36−ExpressionFilterModel::filterAcceptsRow(int sourceRow,

37− const QModelIndex &sourceParent) const

38−{

39− if (m_matchExpression.isCallable()) {

40− QJSValueList args;

41− args << sourceRow;

42− QJSValue ret = m_matchExpression.call(args);

43− if (ret.isBool()) {

44− return ret.toBool();

45− }

46− }

47−

48− return UnitySortFilterProxyModelQML::filterAcceptsRow(sourceRow, sourceParent);

49−}

plugins/Utils/expressionfiltermodel.hdeleted−42

@@ -1,42 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#ifndef EXPRESSIONFILTERMODEL_H

18−#define EXPRESSIONFILTERMODEL_H

19−

20−#include "unitysortfilterproxymodelqml.h"

21−#include <QJSValue>

22−

23−class ExpressionFilterModel : public UnitySortFilterProxyModelQML

24−{

25− Q_OBJECT

26− Q_PROPERTY(QJSValue matchExpression READ matchExpression WRITE setMatchExpression NOTIFY matchExpressionChanged)

27−public:

28− explicit ExpressionFilterModel(QObject *parent = 0);

29−

30− bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;

31−

32− QJSValue matchExpression() const;

33− void setMatchExpression(const QJSValue& value);

34−

35−Q_SIGNALS:

36− void matchExpressionChanged();

37−

38−private:

39− mutable QJSValue m_matchExpression;

40−};

41−

42−#endif // EXPRESSIONFILTERMODEL_H

plugins/Utils/plugin.cpp+1−7

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

11/*

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

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

33 *

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

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

@@ -40,9 +40,6 @@

4040#include "globalfunctions.h"

4141#include "URLDispatcher.h"

4242#include "appdrawerproxymodel.h"

43−#include "tabfocusfence.h"

44−#include "expressionfiltermodel.h"

45−#include "quicklistproxymodel.h"

4643

4744static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

4845{

@@ -87,7 +84,4 @@ void UtilsPlugin::registerTypes(const char *uri)

8784 qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);

8885 qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");

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

9387}

plugins/Utils/quicklistproxymodel.cppdeleted−72

@@ -1,72 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include "quicklistproxymodel.h"

18−

19−#include <QDebug>

20−

21−QuickListProxyModel::QuickListProxyModel(QObject *parent):

22− QSortFilterProxyModel(parent)

23−{

24− connect(this, &QAbstractListModel::rowsInserted, this, &QuickListProxyModel::countChanged);

25− connect(this, &QAbstractListModel::rowsRemoved, this, &QuickListProxyModel::countChanged);

26− connect(this, &QAbstractListModel::layoutChanged, this, &QuickListProxyModel::countChanged);

27−}

28−

29−QAbstractItemModel *QuickListProxyModel::source() const

30−{

31− return m_source;

32−}

33−

34−bool QuickListProxyModel::privateMode() const

35−{

36− return m_privateMode;

37−}

38−

39−void QuickListProxyModel::setPrivateMode(bool privateMode)

40−{

41− if (m_privateMode != privateMode) {

42− m_privateMode = privateMode;

43− invalidateFilter();

44− Q_EMIT privateModeChanged();

45− }

46−}

47−

48−void QuickListProxyModel::setSource(QAbstractItemModel *source)

49−{

50− if (m_source != source) {

51− m_source = source;

52− setSourceModel(m_source);

53− connect(m_source, &QAbstractItemModel::rowsRemoved, this, &QuickListProxyModel::invalidate);

54− connect(m_source, &QAbstractItemModel::rowsInserted, this, &QuickListProxyModel::invalidate);

55− Q_EMIT sourceChanged();

56− }

57−}

58−

59−int QuickListProxyModel::count() const

60−{

61− return rowCount();

62−}

63−

64−bool QuickListProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const

65−{

66− Q_UNUSED(source_parent)

67−

68− if (m_privateMode) {

69− return !m_source->data(m_source->index(source_row, 0), QuickListModelInterface::RoleIsPrivate).toBool();

70− }

71− return true;

72−}

plugins/Utils/quicklistproxymodel.hdeleted−52

@@ -1,52 +0,0 @@

1−/*

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

3− *

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

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

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

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

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

15− */

16−

17−#include <QSortFilterProxyModel>

18−

19−#include <unity/shell/launcher/QuickListModelInterface.h>

20−

21−using namespace unity::shell::launcher;

22−

23−class QuickListProxyModel: public QSortFilterProxyModel

24−{

25− Q_OBJECT

26− Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)

27− Q_PROPERTY(bool privateMode READ privateMode WRITE setPrivateMode NOTIFY privateModeChanged)

28− Q_PROPERTY(int count READ count NOTIFY countChanged)

29−

30−public:

31− QuickListProxyModel(QObject* parent = nullptr);

32−

33− QAbstractItemModel* source() const;

34− void setSource(QAbstractItemModel* source);

35−

36− bool privateMode() const;

37− void setPrivateMode(bool privateMode);

38−

39− int count() const;

40−

41−protected:

42− bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;

43−

44−Q_SIGNALS:

45− void sourceChanged();

46− void privateModeChanged();

47− void countChanged();

48−

49−private:

50− QAbstractItemModel* m_source = nullptr;

51− bool m_privateMode = false;

52−};

plugins/Utils/tabfocusfence.cppdeleted−72

@@ -1,72 +0,0 @@

1−/*

2− * Copyright 2017 Canonical Ltd.

3− *

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

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

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

15−*/

16−

17−#include "tabfocusfence.h"

18−

19−#include <private/qquickitem_p.h>

20−

21−TabFocusFenceItem::TabFocusFenceItem(QQuickItem *parent) : QQuickItem(parent)

22−{

23− QQuickItemPrivate *d = QQuickItemPrivate::get(this);

24− d->isTabFence = true;

25− setFlag(ItemIsFocusScope);

26−}

27−

28−bool TabFocusFenceItem::focusNext()

29−{

30− QQuickItem * current = scopedFocusItem();

31− if (current) {

32− QQuickItem * next = current->nextItemInFocusChain(true);

33− if (next) {

34− next->setFocus(true, Qt::TabFocusReason);

35− return true;

36− }

37− }

38− return false;

39−}

40−

41−bool TabFocusFenceItem::focusPrev()

42−{

43− QQuickItem * current = scopedFocusItem();

44− if (current) {

45− QQuickItem * prev = current->nextItemInFocusChain(false);

46− if (prev) {

47− prev->setFocus(true, Qt::BacktabFocusReason);

48− return true;

49− }

50− }

51− return false;

52−}

53−

54−void TabFocusFenceItem::keyPressEvent(QKeyEvent *event)

55−{

56− // Needed so we eat Tab keys when there's only one item inside the fence

57− if (event->key() == Qt::Key_Tab) {

58− event->accept();

59− } else {

60− QQuickItem::keyPressEvent(event);

61− }

62−}

63−

64−void TabFocusFenceItem::keyReleaseEvent(QKeyEvent *event)

65−{

66− // Needed so we eat Tab keys when there's only one item inside the fence

67− if (event->key() == Qt::Key_Tab) {

68− event->accept();

69− } else {

70− QQuickItem::keyReleaseEvent(event);

71− }

72−}

plugins/Utils/tabfocusfence.hdeleted−38

@@ -1,38 +0,0 @@

1−/*

2− * Copyright 2017 Canonical Ltd.

3− *

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

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

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

15−*/

16−

17−#ifndef TABFOCUSFENCE_H

18−#define TABFOCUSFENCE_H

19−

20−#include <QQuickItem>

21−

22−// An item that restricts focus Tab travelling

23−// to its children

24−class TabFocusFenceItem : public QQuickItem

25−{

26−Q_OBJECT

27−

28−public:

29− TabFocusFenceItem(QQuickItem *parent = nullptr);

30−

31− Q_INVOKABLE bool focusNext();

32− Q_INVOKABLE bool focusPrev();

33−

34− void keyPressEvent(QKeyEvent *event) override;

35− void keyReleaseEvent(QKeyEvent *event) override;

36−};

37−

38−#endif

plugins/Utils/unitysortfilterproxymodelqml.h−5

@@ -38,11 +38,6 @@ 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−

4641 /* getters */

4742 int totalCount() const;

4843 bool invertMatch() const;

plugins/Utils/windowstatestorage.cpp+126−295

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

11/*

2− * Copyright 2015-2016 Canonical Ltd.

3− * Copyright 2021 UBports Foundation

2+ * Copyright 2015 Canonical Ltd.

43 *

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

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

@@ -17,344 +16,178 @@

1716

1817#include "windowstatestorage.h"

1918

19+#include <QtConcurrent>

2020#include <QDebug>

21−#include <QDir>

22−#include <QMetaObject>

23−#include <QObject>

21+#include <QFutureSynchronizer>

2422#include <QSqlQuery>

2523#include <QSqlError>

2624#include <QSqlResult>

27−#include <QStandardPaths>

2825#include <QRect>

2926#include <unity/shell/application/ApplicationInfoInterface.h>

3027

28+QMutex WindowStateStorage::s_mutex;

3129

32−class AsyncQuery: public QObject

33−{

34− Q_OBJECT

30+inline QString sanitiseString(QString string) {

31+ return string.remove(QLatin1Char('\"'))

32+ .remove(QLatin1Char('\''))

33+ .remove(QLatin1Char('\\'));

34+}

3535

36−public:

37− AsyncQuery(const QString &dbName):

38− m_dbName(dbName)

39− {

40− }

36+WindowStateStorage::WindowStateStorage(QObject *parent):

37+ QObject(parent)

38+{

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

4146

42− ~AsyncQuery()

43− {

44− QSqlDatabase::removeDatabase(m_connectionName);

47+WindowStateStorage::~WindowStateStorage()

48+{

49+ QFutureSynchronizer<void> futureSync;

50+ for (int i = 0; i < m_asyncQueries.count(); ++i) {

51+ futureSync.addFuture(m_asyncQueries[i]);

4552 }

53+ futureSync.waitForFinished();

54+ m_db.close();

55+}

4656

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

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

5562

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

63+ saveValue(queryString);

64+}

9665

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

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

12470

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

71+ QSqlQuery query = getValue(queryString);

16372

73+ if (!query.first()) {

74+ return defaultValue;

16475 }

76+ return (WindowState)query.value(QStringLiteral("state")).toInt();

77+}

16578

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

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

19390

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

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

21096

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

97+ saveValue(queryString);

98+}

22899

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

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

243104

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

105+ QSqlQuery query = getValue(queryString);

259106

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;

107+ if (!query.first()) {

108+ return defaultValue;

285109 }

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

110+ return query.value("stage").toInt();

298111}

299112

300−WindowStateStorage::~WindowStateStorage()

113+void WindowStateStorage::executeAsyncQuery(const QString &queryString)

301114{

302− m_thread.quit();

303− m_thread.wait();

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

304124}

305125

306−WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

126+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

307127{

308− int state;

128+ QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

129+ .arg(sanitiseString(windowId));

309130

310− QMetaObject::invokeMethod(m_asyncQuery, "getState", Qt::BlockingQueuedConnection,

311− Q_RETURN_ARG(int, state),

312− Q_ARG(const QString&, windowId)

313− );

131+ QSqlQuery query = getValue(queryString);

314132

315− if (state == -1) {

133+ if (!query.first()) {

316134 return defaultValue;

317135 }

318−

319− return (WindowState)state;

136+ return QRect(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(),

137+ query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());

320138}

321139

322−int WindowStateStorage::getStage(const QString &appId, int defaultValue) const

140+void WindowStateStorage::initdb()

323141{

324− int stage;

142+ m_db.open();

143+ if (!m_db.open()) {

144+ qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();

145+ return;

146+ }

325147

326− QMetaObject::invokeMethod(m_asyncQuery, "getStage", Qt::BlockingQueuedConnection,

327− Q_RETURN_ARG(int, stage),

328− Q_ARG(const QString&, appId)

329− );

148+ if (!m_db.tables().contains(QStringLiteral("geometry"))) {

149+ QSqlQuery query;

150+ query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));

151+ }

330152

331− if (stage == -1) {

332− return defaultValue;

153+ if (!m_db.tables().contains(QStringLiteral("state"))) {

154+ QSqlQuery query;

155+ query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));

333156 }

334157

335− return stage;

158+ if (!m_db.tables().contains(QStringLiteral("stage"))) {

159+ QSqlQuery query;

160+ query.exec(QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);"));

161+ }

336162}

337163

338−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

164+void WindowStateStorage::saveValue(const QString &queryString)

339165{

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;

166+ QMutexLocker mutexLocker(&s_mutex);

167+

168+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

169+ m_asyncQueries.append(future);

170+

171+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

172+ futureWatcher->setFuture(future);

173+ connect(futureWatcher, &QFutureWatcher<void>::finished,

174+ this,

175+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());

176+ futureWatcher->deleteLater(); });

349177}

350178

351−const QString WindowStateStorage::getDbName()

179+QSqlQuery WindowStateStorage::getValue(const QString &queryString) const

352180{

353− QString dbName;

354− QMetaObject::invokeMethod(m_asyncQuery, "getDbName", Qt::BlockingQueuedConnection,

355− Q_RETURN_ARG(QString, dbName)

356− );

357− return QString(dbName);

181+ QMutexLocker l(&s_mutex);

182+ QSqlQuery query;

183+

184+ bool ok = query.exec(queryString);

185+ if (!ok) {

186+ qWarning() << "Error retrieving database query:" << queryString

187+ << "Driver error:" << query.lastError().driverText()

188+ << "Database error:" << query.lastError().databaseText();

189+ }

190+ return query;

358191}

359192

360193Mir::State WindowStateStorage::toMirState(WindowState state) const

@@ -379,5 +212,3 @@ Mir::State WindowStateStorage::toMirState(WindowState state) const

379212 return Mir::RestoredState;

380213 }

381214}

382−

383−#include "windowstatestorage.moc"

plugins/Utils/windowstatestorage.h+18−15

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

11/*

22 * Copyright 2015-2016 Canonical Ltd.

3− * Copyright 2021 UBports Foundation

43 *

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

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

@@ -17,19 +16,16 @@

1716

1817#include <QObject>

1918#include <QSqlDatabase>

20−#include <QSqlQuery>

2119#include <QMutex>

2220#include <QFuture>

23−#include <QThread>

2421

2522// unity-api

2623#include <unity/shell/application/Mir.h>

2724

28−class AsyncQuery;

29−

3025class WindowStateStorage: public QObject

3126{

3227 Q_OBJECT

28+ Q_ENUMS(WindowState)

3329public:

3430 enum WindowState {

3531 WindowStateNormal = 1 << 0,

@@ -46,29 +42,36 @@ public:

4642 WindowStateMaximizedBottomRight = 1 << 11,

4743 WindowStateRestored = 1 << 12

4844 };

49− Q_ENUM(WindowState)

5045 Q_DECLARE_FLAGS(WindowStates, WindowState)

46+#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))

5147 Q_FLAG(WindowStates)

48+#endif

5249

53− WindowStateStorage(const QString &dbName = QString(), QObject *parent = nullptr);

50+ WindowStateStorage(QObject *parent = 0);

5451 virtual ~WindowStateStorage();

5552

53+ Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

5654 Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

5755

56+ Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

5857 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;

5958

59+ Q_INVOKABLE void saveStage(const QString &appId, int stage);

6060 Q_INVOKABLE int getStage(const QString &appId, int defaultValue) const;

6161

6262 Q_INVOKABLE Mir::State toMirState(WindowState state) const;

6363

64− const QString getDbName();

64+private:

65+ void initdb();

6566

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

67+ void saveValue(const QString &queryString);

68+ QSqlQuery getValue(const QString &queryString) const;

7069

71−private:

72− QThread m_thread;

73− AsyncQuery *m_asyncQuery;

70+ static void executeAsyncQuery(const QString &queryString);

71+ static QMutex s_mutex;

72+

73+ // NB: This is accessed from threads. Make sure to mutex it.

74+ QSqlDatabase m_db;

75+

76+ QList< QFuture<void> > m_asyncQueries;

7477};

plugins/WindowManager/AvailableDesktopArea.cppdeleted−50

@@ -1,50 +0,0 @@

1−/*

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

3− *

4− * This program is free software: you can redistribute it and/or modify it under

5− * the terms of the GNU Lesser General Public License version 3, as published by

6− * the Free Software Foundation.

7− *

8− * This program is distributed in the hope that it will be useful, but WITHOUT

9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11− * Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

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

15− */

16−

17−#include "AvailableDesktopArea.h"

18−

19−#include <QGuiApplication>

20−#include <QQuickWindow>

21−#include <qpa/qplatformnativeinterface.h>

22−

23−AvailableDesktopArea::AvailableDesktopArea(QQuickItem *parent)

24− : QQuickItem(parent)

25−{

26− connect(this, &QQuickItem::xChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

27− connect(this, &QQuickItem::yChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

28− connect(this, &QQuickItem::widthChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

29− connect(this, &QQuickItem::heightChanged, this, &AvailableDesktopArea::updatePlatformWindowProperty);

30−}

31−

32−void AvailableDesktopArea::updatePlatformWindowProperty()

33−{

34− if (!window()) {

35− return;

36− }

37−

38− QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();

39−

40− QRect rect(x(), y(), width(), height());

41−

42− nativeInterface->setWindowProperty(window()->handle(), "availableDesktopArea", QVariant(rect));

43−}

44−

45−void AvailableDesktopArea::itemChange(ItemChange change, const ItemChangeData &)

46−{

47− if (change == ItemSceneChange) {

48− updatePlatformWindowProperty();

49− }

50−}

plugins/WindowManager/CMakeLists.txt+1−11

@@ -1,10 +1,7 @@

11set(WINDOWMANAGER_SRC

2− AvailableDesktopArea.cpp

32 TopLevelWindowModel.cpp

43 Window.cpp

54 WindowManagerPlugin.cpp

6− WindowMargins.cpp

7− InputMethodManager.cpp

85 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

96 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

107 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

@@ -12,15 +9,8 @@ set(WINDOWMANAGER_SRC

129 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h

1310 )

1411

15−add_definitions(-DWINDOWMANAGERQML_LIBRARY)

16−

17−include_directories(

18− SYSTEM

19− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

20−)

21−

2212add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})

2313

24−target_link_libraries(windowmanager-qml Qt5::Qml Qt5::Quick Qt5::Gui)

14+qt5_use_modules(windowmanager-qml Qml Quick Gui)

2515

2616add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)

plugins/WindowManager/InputMethodManager.cppdeleted−56

@@ -1,56 +0,0 @@

1−/*

2− * Copyright (C) 2019 UBports Foundation.

3− * Author(s) Marius Gripsgard <marius@ubports.com>

4− *

5− * This program is free software: you can redistribute it and/or modify it under

6− * the terms of the GNU Lesser General Public License version 3, as published by

7− * the Free Software Foundation.

8− *

9− * This program is distributed in the hope that it will be useful, but WITHOUT

10− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

11− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

12− * Lesser General Public License for more details.

13− *

14− * You should have received a copy of the GNU Lesser General Public License

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

16− */

17−

18−#include "InputMethodManager.h"

19−#include <QDebug>

20−

21−#include <unity/shell/application/MirSurfaceInterface.h>

22−

23−// local

24−#include "Window.h"

25−

26−Q_LOGGING_CATEGORY(INPUTMETHODMANAGER, "InputMethodManager", QtInfoMsg)

27−#define DEBUG_MSG qCDebug(INPUTMETHODMANAGER).nospace().noquote() << __func__

28−

29−namespace unityapi = unity::shell::application;

30−

31−InputMethodManager *InputMethodManager::instance()

32−{

33− static InputMethodManager* inputMethod(new InputMethodManager());

34− return inputMethod;

35−}

36−

37−InputMethodManager::InputMethodManager()

38−{

39−}

40−

41−void InputMethodManager::setWindow(Window* window)

42−{

43− if (window == m_inputMethodWindow) {

44− return;

45− }

46−

47− DEBUG_MSG << "(" << window << ")";

48−

49− m_inputMethodWindow = window;

50− Q_EMIT surfaceChanged(surface());

51−}

52−

53−unityapi::MirSurfaceInterface* InputMethodManager::surface() const

54−{

55− return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;

56−}

plugins/WindowManager/InputMethodManager.hdeleted−55

@@ -1,55 +0,0 @@

1−/*

2− * Copyright (C) 2019 UBports Foundation.

3− * Author(s) Marius Gripsgard <marius@ubports.com>

4− *

5− * This program is free software: you can redistribute it and/or modify it under

6− * the terms of the GNU Lesser General Public License version 3, as published by

7− * the Free Software Foundation.

8− *

9− * This program is distributed in the hope that it will be useful, but WITHOUT

10− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

11− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

12− * Lesser General Public License for more details.

13− *

14− * You should have received a copy of the GNU Lesser General Public License

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

16− */

17−

18−#pragma once

19−

20−#include <QLoggingCategory>

21−#include <QObject>

22−

23−#include "WindowManagerGlobal.h"

24−

25−Q_DECLARE_LOGGING_CATEGORY(INPUTMETHODMANAGER)

26−

27−class Window;

28−

29−namespace unity {

30− namespace shell {

31− namespace application {

32− class MirSurfaceInterface;

33− }

34− }

35−}

36−

37−class WINDOWMANAGERQML_EXPORT InputMethodManager : public QObject

38−{

39− Q_OBJECT

40− Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)

41−

42−public:

43− InputMethodManager();

44− static InputMethodManager* instance();

45−

46− void setWindow(Window* window);

47−

48−Q_SIGNALS:

49− void surfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);

50−

51−private:

52− unity::shell::application::MirSurfaceInterface* surface() const;

53−

54− Window* m_inputMethodWindow{nullptr};

55−};

plugins/WindowManager/TopLevelWindowModel.cpp+83−197

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

3− * Copyright 2019 UBports Foundation

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

43 *

54 * This program is free software: you can redistribute it and/or modify it under

65 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -30,7 +29,6 @@

3029

3130// local

3231#include "Window.h"

33−#include "InputMethodManager.h"

3432

3533Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)

3634

@@ -40,12 +38,7 @@ Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)

4038namespace unityapi = unity::shell::application;

4139

4240TopLevelWindowModel::TopLevelWindowModel()

43− : m_nullWindow(createNullWindow()),

44− m_surfaceManagerBusy(false)

4541{

46− connect(m_nullWindow, &Window::focusedChanged, this, [this] {

47− Q_EMIT rootFocusChanged();

48− });

4942}

5043

5144void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)

@@ -137,7 +130,7 @@ void TopLevelWindowModel::removeApplication(unityapi::ApplicationInfoInterface *

137130 int i = 0;

138131 while (i < m_windowModel.count()) {

139132 if (m_windowModel.at(i).application == application) {

140− deleteAt(i);

133+ removeAt(i);

141134 } else {

142135 ++i;

143136 }

@@ -155,13 +148,12 @@ void TopLevelWindowModel::prependSurface(unityapi::MirSurfaceInterface *surface,

155148{

156149 Q_ASSERT(surface != nullptr);

157150

158− connectSurface(surface);

159−

160151 bool filledPlaceholder = false;

161152 for (int i = 0; i < m_windowModel.count() && !filledPlaceholder; ++i) {

162153 ModelEntry &entry = m_windowModel[i];

163154 if (entry.application == application && entry.window->surface() == nullptr) {

164155 entry.window->setSurface(surface);

156+ connectSurface(surface);

165157 INFO_MSG << " appId=" << application->appId() << " surface=" << surface

166158 << ", filling out placeholder. after: " << toString();

167159 filledPlaceholder = true;

@@ -175,33 +167,6 @@ void TopLevelWindowModel::prependSurface(unityapi::MirSurfaceInterface *surface,

175167}

176168

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

205170{

206171 if (m_modelState == IdleState) {

207172 m_modelState = InsertingState;

@@ -211,7 +176,17 @@ void TopLevelWindowModel::prependWindow(Window *window, unityapi::ApplicationInf

211176 // No point in signaling anything if we're resetting the whole model

212177 }

213178

179+ int id = generateId();

180+ Window *window = new Window(id, this);

181+ if (surface) {

182+ window->setSurface(surface);

183+ }

214184 m_windowModel.prepend(ModelEntry(window, application));

185+ if (surface) {

186+ connectSurface(surface);

187+ }

188+

189+ connectWindow(window);

215190

216191 if (m_modelState == InsertingState) {

217192 endInsertRows();

@@ -219,6 +194,12 @@ void TopLevelWindowModel::prependWindow(Window *window, unityapi::ApplicationInf

219194 Q_EMIT listChanged();

220195 m_modelState = IdleState;

221196 }

197+

198+ if (!surface) {

199+ activateEmptyWindow(window);

200+ }

201+

202+ INFO_MSG << " after " << toString();

222203}

223204

224205void TopLevelWindowModel::connectWindow(Window *window)

@@ -267,13 +248,6 @@ void TopLevelWindowModel::connectWindow(Window *window)

267248 connect(window, &Window::emptyWindowActivated, this, [this, window]() {

268249 activateEmptyWindow(window);

269250 });

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

277251}

278252

279253void TopLevelWindowModel::activateEmptyWindow(Window *window)

@@ -317,11 +291,10 @@ void TopLevelWindowModel::onSurfaceDied(unityapi::MirSurfaceInterface *surface)

317291

318292 auto application = m_windowModel[i].application;

319293

320− DEBUG_MSG << " application->name()=" << application->name()

321− << " application->state()=" << application->state();

294+ // can't be starting if it already has a surface

295+ Q_ASSERT(application->state() != unityapi::ApplicationInfoInterface::Starting);

322296

323− if (application->state() == unityapi::ApplicationInfoInterface::Running

324− || application->state() == unityapi::ApplicationInfoInterface::Starting) {

297+ if (application->state() == unityapi::ApplicationInfoInterface::Running) {

325298 m_windowModel[i].removeOnceSurfaceDestroyed = true;

326299 } else {

327300 // assume it got killed by the out-of-memory daemon.

@@ -340,7 +313,7 @@ void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surf

340313 }

341314

342315 if (m_windowModel[i].removeOnceSurfaceDestroyed) {

343− deleteAt(i);

316+ removeAt(i);

344317 } else {

345318 auto window = m_windowModel[i].window;

346319 window->setSurface(nullptr);

@@ -349,78 +322,34 @@ void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surf

349322 }

350323}

351324

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−

373325void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)

374326{

375327 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− });

328+ if (surface->type() == Mir::InputMethodType) {

329+ int id = generateId();

330+ Window *qmlWindow = new Window(id, this);

331+ connectWindow(qmlWindow);

332+ qmlWindow->setSurface(surface);

333+ setInputMethodWindow(qmlWindow);

384334 } else {

385− if (surface->type() == Mir::InputMethodType) {

386− connectSurface(surface);

387− setInputMethodWindow(createWindow(surface));

335+ auto application = m_applicationManager->findApplicationWithSurface(surface);

336+ if (application) {

337+ prependSurface(surface, application);

388338 } 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− }

339+ // Must be a prompt session. No need to do add it as a prompt surface is not top-level.

340+ // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.

341+ // Still wrap it in a Window though, so that we keep focusedWindow() up to date.

342+ int id = generateId();

343+ Window *promptWindow = new Window(id, this);

344+ connectWindow(promptWindow);

345+ promptWindow->setSurface(surface);

346+ connect(surface, &QObject::destroyed, promptWindow, [=](){

347+ promptWindow->setSurface(nullptr);

348+ promptWindow->deleteLater();

349+ });

411350 }

412351 }

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;

352+ // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus

424353}

425354

426355void TopLevelWindowModel::removeAt(int index)

@@ -435,9 +364,8 @@ void TopLevelWindowModel::removeAt(int index)

435364

436365 auto window = m_windowModel[index].window;

437366

438− if (!window->surface()) {

439− window->setFocused(false);

440− }

367+ window->setSurface(nullptr);

368+ window->setFocused(false);

441369

442370 m_windowModel.removeAt(index);

443371

@@ -448,21 +376,13 @@ void TopLevelWindowModel::removeAt(int index)

448376 m_modelState = IdleState;

449377 }

450378

379+ disconnect(window, 0, this, 0);

451380 if (m_focusedWindow == window) {

452381 setFocusedWindow(nullptr);

453382 }

383+ delete window;

454384

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

385+ INFO_MSG << " after " << toString();

466386}

467387

468388void TopLevelWindowModel::setInputMethodWindow(Window *window)

@@ -473,7 +393,6 @@ void TopLevelWindowModel::setInputMethodWindow(Window *window)

473393 }

474394 m_inputMethodWindow = window;

475395 Q_EMIT inputMethodSurfaceChanged(m_inputMethodWindow->surface());

476− InputMethodManager::instance()->setWindow(window);

477396}

478397

479398void TopLevelWindowModel::removeInputMethodWindow()

@@ -482,7 +401,6 @@ void TopLevelWindowModel::removeInputMethodWindow()

482401 delete m_inputMethodWindow;

483402 m_inputMethodWindow = nullptr;

484403 Q_EMIT inputMethodSurfaceChanged(nullptr);

485− InputMethodManager::instance()->setWindow(nullptr);

486404 }

487405}

488406

@@ -528,6 +446,37 @@ int TopLevelWindowModel::findIndexOf(const unityapi::MirSurfaceInterface *surfac

528446 return -1;

529447}

530448

449+int TopLevelWindowModel::generateId()

450+{

451+ int id = m_nextId;

452+ m_nextId = nextFreeId(nextId(id), id);

453+ return id;

454+}

455+

456+int TopLevelWindowModel::nextId(int id) const

457+{

458+ if (id == m_maxId) {

459+ return id = 1;

460+ } else {

461+ return id + 1;

462+ }

463+}

464+

465+int TopLevelWindowModel::nextFreeId(int candidateId, const int latestId)

466+{

467+ int firstCandidateId = candidateId;

468+

469+ while (indexForId(candidateId) != -1 || candidateId == latestId) {

470+ candidateId = nextId(candidateId);

471+

472+ if (candidateId == firstCandidateId) {

473+ qFatal("TopLevelWindowModel: run out of window ids.");

474+ }

475+ }

476+

477+ return candidateId;

478+}

479+

531480QString TopLevelWindowModel::toString()

532481{

533482 QString str;

@@ -641,19 +590,16 @@ void TopLevelWindowModel::setFocusedWindow(Window *window)

641590 if (window != m_focusedWindow) {

642591 INFO_MSG << "(" << window << ")";

643592

644− m_previousWindow = m_focusedWindow;

593+ Window* previousWindow = m_focusedWindow;

645594

646595 m_focusedWindow = window;

647596 Q_EMIT focusedWindowChanged(m_focusedWindow);

648597

649− if (m_previousWindow && m_previousWindow->focused() && !m_previousWindow->surface()) {

598+ if (previousWindow && previousWindow->focused() && !previousWindow->surface()) {

650599 // do it ourselves. miral doesn't know about this window

651− m_previousWindow->setFocused(false);

600+ previousWindow->setFocused(false);

652601 }

653602 }

654−

655− // Reset

656− m_pendingActivation = false;

657603}

658604

659605unityapi::MirSurfaceInterface* TopLevelWindowModel::inputMethodSurface() const

@@ -697,7 +643,6 @@ void TopLevelWindowModel::move(int from, int to)

697643}

698644void TopLevelWindowModel::onModificationsStarted()

699645{

700− m_surfaceManagerBusy = true;

701646}

702647

703648void TopLevelWindowModel::onModificationsEnded()

@@ -708,7 +653,6 @@ void TopLevelWindowModel::onModificationsEnded()

708653 // reset

709654 m_focusedWindowChanged = false;

710655 m_newlyFocusedWindow = nullptr;

711− m_surfaceManagerBusy = false;

712656}

713657

714658void TopLevelWindowModel::activateTopMostWindowWithoutId(int forbiddenId)

@@ -719,64 +663,6 @@ void TopLevelWindowModel::activateTopMostWindowWithoutId(int forbiddenId)

719663 Window *window = m_windowModel[i].window;

720664 if (window->id() != forbiddenId) {

721665 window->activate();

722− break;

723666 }

724667 }

725668}

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.h+10−58

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

3− * Copyright 2019 UBports Foundation

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

43 *

54 * This program is free software: you can redistribute it and/or modify it under

65 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -19,11 +18,8 @@

1918#define TOPLEVELWINDOWMODEL_H

2019

2120#include <QAbstractListModel>

22−#include <QAtomicInteger>

2321#include <QLoggingCategory>

2422

25−#include "WindowManagerGlobal.h"

26−

2723Q_DECLARE_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL)

2824

2925class Window;

@@ -51,7 +47,7 @@ namespace unity {

5147 * As applications can have multiple surfaces and you can also have entries without surfaces at all,

5248 * the only way to unambiguously refer to an entry in this model is through its id.

5349 */

54−class WINDOWMANAGERQML_EXPORT TopLevelWindowModel : public QAbstractListModel

50+class TopLevelWindowModel : public QAbstractListModel

5551{

5652 Q_OBJECT

5753

@@ -88,28 +84,7 @@ class WINDOWMANAGERQML_EXPORT TopLevelWindowModel : public QAbstractListModel

8884 The id to be used on the next entry created

8985 Useful for tests

9086 */

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)

87+ Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)

11388

11489public:

11590 /**

@@ -145,7 +120,7 @@ public:

145120 unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }

146121 void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);

147122

148− int nextId() const { return m_nextId.load(); }

123+ int nextId() const { return m_nextId; }

149124

150125public:

151126 /**

@@ -187,19 +162,6 @@ public:

187162 */

188163 Q_INVOKABLE void raiseId(int id);

189164

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−

203165Q_SIGNALS:

204166 void countChanged();

205167 void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);

@@ -214,9 +176,7 @@ Q_SIGNALS:

214176 */

215177 void listChanged();

216178

217− void closedAllWindows();

218−

219− void rootFocusChanged();

179+ void nextIdChanged();

220180

221181private Q_SLOTS:

222182 void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);

@@ -237,7 +197,6 @@ private:

237197 void setFocusedWindow(Window *window);

238198 void removeInputMethodWindow();

239199 int findIndexOf(const unity::shell::application::MirSurfaceInterface *surface) const;

240− void deleteAt(int index);

241200 void removeAt(int index);

242201

243202 void addApplication(unity::shell::application::ApplicationInfoInterface *application);

@@ -248,7 +207,6 @@ private:

248207 unity::shell::application::ApplicationInfoInterface *application);

249208 void prependSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,

250209 unity::shell::application::ApplicationInfoInterface *application);

251− void prependWindow(Window *window, unity::shell::application::ApplicationInfoInterface *application);

252210

253211 void connectWindow(Window *window);

254212 void connectSurface(unity::shell::application::MirSurfaceInterface *surface);

@@ -262,10 +220,6 @@ private:

262220

263221 void activateTopMostWindowWithoutId(int forbiddenId);

264222

265− Window *createWindow(unity::shell::application::MirSurfaceInterface *surface);

266− Window *createWindowWithId(unity::shell::application::MirSurfaceInterface *surface, int id);

267− Window *createNullWindow();

268−

269223 struct ModelEntry {

270224 ModelEntry() {}

271225 ModelEntry(Window *window,

@@ -279,15 +233,15 @@ private:

279233 QVector<ModelEntry> m_windowModel;

280234 Window* m_inputMethodWindow{nullptr};

281235 Window* m_focusedWindow{nullptr};

282− Window* m_nullWindow;

283− Window* m_previousWindow{nullptr};

284− bool m_pendingActivation;

285236

286− QAtomicInteger<int> m_nextId{1};

237+ int m_nextId{1};

238+ // Just something big enough that we don't risk running out of unused id numbers.

239+ // Not sure if QML int type supports something close to std::numeric_limits<int>::max() and

240+ // there's no reason to try out its limits.

241+ static const int m_maxId{1000000};

287242

288243 unity::shell::application::ApplicationManagerInterface* m_applicationManager{nullptr};

289244 unity::shell::application::SurfaceManagerInterface *m_surfaceManager{nullptr};

290− bool m_surfaceManagerBusy;

291245

292246 enum ModelState {

293247 IdleState,

@@ -301,8 +255,6 @@ private:

301255 // Valid between modificationsStarted and modificationsEnded

302256 bool m_focusedWindowChanged{false};

303257 Window *m_newlyFocusedWindow{nullptr};

304−

305− bool m_closingAllApps{false};

306258};

307259

308260#endif // TOPLEVELWINDOWMODEL_H

plugins/WindowManager/Window.cpp+1−41

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

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

33 *

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

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

@@ -27,7 +27,6 @@ namespace unityapi = unity::shell::application;

2727Q_LOGGING_CATEGORY(UNITY_WINDOW, "unity.window", QtWarningMsg)

2828

2929#define DEBUG_MSG qCDebug(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__

30−#define WARNING_MSG qCWarning(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__

3130

3231Window::Window(int id, QObject *parent)

3332 : QObject(parent)

@@ -68,23 +67,6 @@ void Window::setRequestedPosition(const QPoint &value)

6867 }

6968}

7069

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−

8870Mir::State Window::state() const

8971{

9072 return m_state;

@@ -172,35 +154,13 @@ void Window::setSurface(unityapi::MirSurfaceInterface *surface)

172154 updateFocused();

173155 });

174156

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−

193157 // bring it up to speed

194− if (m_focused) {

195− m_surface->activate();

196− }

197158 if (m_positionRequested) {

198159 m_surface->setRequestedPosition(m_requestedPosition);

199160 }

200161 if (m_stateRequested && m_surface->state() == Mir::RestoredState) {

201162 m_surface->requestState(m_state);

202163 }

203− m_surface->setAllowClientResize(m_allowClientResize);

204164

205165 // and sync with surface

206166 updatePosition();

plugins/WindowManager/Window.h+3−18

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

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

33 *

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

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

@@ -24,8 +24,6 @@

2424// Unity API

2525#include <unity/shell/application/Mir.h>

2626

27−#include "WindowManagerGlobal.h"

28−

2927namespace unity {

3028 namespace shell {

3129 namespace application {

@@ -34,6 +32,7 @@ namespace unity {

3432 }

3533}

3634

35+

3736Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)

3837

3938/**

@@ -44,7 +43,7 @@ Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)

4443 was killed to free up memory, as it should still remain in the window list since the user

4544 did not explicitly close it).

4645 */

47−class WINDOWMANAGERQML_EXPORT Window : public QObject

46+class Window : public QObject

4847{

4948 Q_OBJECT

5049

@@ -91,13 +90,6 @@ class WINDOWMANAGERQML_EXPORT Window : public QObject

9190 */

9291 Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)

9392

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−

10193public:

10294 Window(int id, QObject *parent = nullptr);

10395 virtual ~Window();

@@ -113,9 +105,6 @@ public:

113105 void setSurface(unity::shell::application::MirSurfaceInterface *surface);

114106 void setFocused(bool value);

115107

116− bool allowClientResize() const;

117− void setAllowClientResize(bool);

118−

119108 QString toString() const;

120109

121110public Q_SLOTS:

@@ -145,8 +134,6 @@ Q_SIGNALS:

145134 void focusedChanged(bool value);

146135 void confinesMousePointerChanged(bool value);

147136 void surfaceChanged(unity::shell::application::MirSurfaceInterface *surface);

148− void allowClientResizeChanged(bool value);

149− void liveChanged(bool value);

150137

151138 /**

152139 * @brief Emitted when focus for this window is requested by an external party

@@ -166,8 +153,6 @@ private:

166153 Mir::State m_state{Mir::RestoredState};

167154 bool m_stateRequested{false};

168155 unity::shell::application::MirSurfaceInterface *m_surface{nullptr};

169−

170− bool m_allowClientResize{true};

171156};

172157

173158QDebug operator<<(QDebug dbg, const Window *window);

plugins/WindowManager/WindowManagerPlugin.cpp+1−14

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

11/*

2− * Copyright (C) 2016-2017 Canonical, Ltd.

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

33 *

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

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

@@ -16,27 +16,14 @@

1616

1717#include "WindowManagerPlugin.h"

1818

19−#include "AvailableDesktopArea.h"

2019#include "TopLevelWindowModel.h"

2120#include "Window.h"

22−#include "WindowMargins.h"

23−#include "InputMethodManager.h"

2421

2522#include <QtQml>

2623

27−QObject *inputMethodManager(QQmlEngine *engine, QJSEngine *scriptEngine)

28−{

29− Q_UNUSED(engine)

30− Q_UNUSED(scriptEngine)

31− return InputMethodManager::instance();

32−}

33−

3424void WindowManagerPlugin::registerTypes(const char *uri)

3525{

36− qmlRegisterType<AvailableDesktopArea>(uri, 1, 0, "AvailableDesktopArea");

3726 qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");

38− qmlRegisterType<WindowMargins>(uri, 1, 0, "WindowMargins");

39− qmlRegisterSingletonType<InputMethodManager>(uri, 1, 0, "InputMethodManager", inputMethodManager);

4027

4128 qRegisterMetaType<Window*>("Window*");

4229

plugins/WindowManager/WindowMargins.cppdeleted−74

@@ -1,74 +0,0 @@

1−/*

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

3− *

4− * This program is free software: you can redistribute it and/or modify it under

5− * the terms of the GNU Lesser General Public License version 3, as published by

6− * the Free Software Foundation.

7− *

8− * This program is distributed in the hope that it will be useful, but WITHOUT

9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11− * Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

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

15− */

16−

17−#include "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.hdeleted−59

@@ -1,59 +0,0 @@

1−/*

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

3− *

4− * This program is free software: you can redistribute it and/or modify it under

5− * the terms of the GNU Lesser General Public License version 3, as published by

6− * the Free Software Foundation.

7− *

8− * This program is distributed in the hope that it will be useful, but WITHOUT

9− * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10− * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11− * Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

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

15− */

16−

17−#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+2−5

@@ -10,13 +10,10 @@ add_library(Wizard-qml MODULE

1010 timezonemodel.cpp

1111 Status.cpp

1212 keyboardLayoutsModel.cpp

13− Changelog.cpp

1413)

1514

16−target_link_libraries(Wizard-qml

17− Qt5::DBus Qt5::Qml

18− ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS}

19−)

15+qt5_use_modules(Wizard-qml DBus Qml)

16+target_link_libraries(Wizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})

2017add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)

2118

2219set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")

plugins/Wizard/Changelog.cppdeleted−58

@@ -1,58 +0,0 @@

1−/*

2− * Copyright (C) 2018 The UBports project

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.hdeleted−52

@@ -1,52 +0,0 @@

1−/*

2− * Copyright (C) 2018 The UBports project

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/PageList.cpp+3−1

@@ -46,7 +46,9 @@ PageList::PageList(QObject *parent)

4646 QSet<QString> disabledPages;

4747 QStringList dataDirs;

4848

49− if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {

49+ if (getenv("WIZARD_TESTING") != nullptr) {

50+ dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);

51+ } else if (!isRunningInstalled()) {

5052 dataDirs << qmlDirectory();

5153 } else {

5254 dataDirs = shellDataDirs();

plugins/Wizard/System.cpp+7−69

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

11/*

2− * Copyright (C) 2018 The UBports project

32 * Copyright (C) 2014-2016 Canonical Ltd.

43 *

54 * This program is free software: you can redistribute it and/or modify it

@@ -47,93 +46,29 @@ QString System::wizardEnabledPath()

4746 return QDir::home().filePath(QStringLiteral(".config/ubuntu-system-settings/wizard-has-run"));

4847}

4948

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−

6849bool System::wizardEnabled() const

6950{

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

51+ return !QFile::exists(wizardEnabledPath());

10452}

10553

10654void System::setWizardEnabled(bool enabled)

10755{

108− if (wizardEnabled() == enabled && !isUpdate())

56+ if (wizardEnabled() == enabled)

10957 return;

11058

11159 if (enabled) {

11260 QFile::remove(wizardEnabledPath());

11361 } else {

11462 QDir(wizardEnabledPath()).mkpath(QStringLiteral(".."));

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

63+ QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);

12764 m_fsWatcher.addPath(wizardEnabledPath());

12865 Q_EMIT wizardEnabledChanged();

129− Q_EMIT isUpdateChanged();

13066 }

13167}

13268

13369void System::watcherFileChanged()

13470{

13571 Q_EMIT wizardEnabledChanged();

136− Q_EMIT isUpdateChanged();

13772 m_fsWatcher.removePath(wizardEnabledPath());

13873}

13974

@@ -168,10 +103,13 @@ void System::updateSessionLocale(const QString &locale)

168103

169104 // Restart bits of the session to pick up new language.

170105 QProcess::startDetached(QStringLiteral("sh -c \"initctl emit indicator-services-end; \

106+ initctl stop scope-registry; \

107+ initctl stop smart-scopes-proxy; \

171108 initctl emit --no-wait indicator-services-start; \

172109 initctl restart --no-wait ubuntu-location-service-trust-stored; \

173110 initctl restart --no-wait maliit-server; \

174− initctl restart --no-wait indicator-messages"));

111+ initctl restart --no-wait indicator-messages; \

112+ initctl restart --no-wait unity8-dash\""));

175113}

176114

177115void System::skipUntilFinishedPage()

plugins/Wizard/System.h−17

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

11/*

2− * Copyright (C) 2018 The UBports project

32 * Copyright (C) 2014-2016 Canonical Ltd.

43 *

54 * This program is free software: you can redistribute it and/or modify it

@@ -19,7 +18,6 @@

1918#define WIZARD_SYSTEM_H

2019

2120#include <QFileSystemWatcher>

22−#include <QVersionNumber>

2321#include <QObject>

2422#include <QString>

2523

@@ -27,21 +25,12 @@ class System : public QObject

2725{

2826 Q_OBJECT

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

3228

3329public:

3430 System();

3531 ~System() = default;

3632

37− /**

38− * Checks whether the wizard is enabled for first-run or otherwise.

39− */

4033 bool wizardEnabled() const;

41−

42− QString version() const;

43− bool isUpdate() const;

44−

4534 void setWizardEnabled(bool enabled);

4635

4736public Q_SLOTS:

@@ -53,8 +42,6 @@ public Q_SLOTS:

5342

5443Q_SIGNALS:

5544 void wizardEnabledChanged();

56− void versionChanged();

57− void isUpdateChanged();

5845

5946private Q_SLOTS:

6047 void watcherFileChanged();

@@ -63,11 +50,7 @@ private:

6350 Q_DISABLE_COPY(System)

6451

6552 static QString wizardEnabledPath();

66− static QString currentFrameworkPath();

6753 static void setSessionVariable(const QString &variable, const QString &value);

68− static QString readCurrentFramework();

69− static QString readWizardEnabled();

70− static bool wizardPathExists();

7154

7255 QFileSystemWatcher m_fsWatcher;

7356};

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−target_link_libraries(WizardUtils-qml Qt5::DBus Qt5::Qml Qt5::Quick)

23+qt5_use_modules(WizardUtils-qml DBus Qml 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,7 +20,6 @@

2020#include "timezonemodel.h"

2121#include "LocalePlugin.h"

2222#include "Status.h"

23−#include "Changelog.h"

2423#include "keyboardLayoutsModel.h"

2524

2625#include <QtQml/qqml.h>

@@ -31,7 +30,6 @@ void WizardPlugin::registerTypes(const char *uri)

3130 qmlRegisterType<PageList>(uri, 0, 1, "PageList");

3231 qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });

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

3533 qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");

3634 qmlRegisterType<KeyboardLayoutsModel>(uri, 0, 1, "KeyboardLayoutsModel");

3735 qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");

plugins/Wizard/test.shnew file+18

@@ -0,0 +1,18 @@

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+336−243

@@ -6,58 +6,28 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity8\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"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2016-12-15 16:17+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"

1614"MIME-Version: 1.0\n"

1715"Content-Type: text/plain; charset=UTF-8\n"

1816"Content-Transfer-Encoding: 8bit\n"

1917"Plural-Forms: nplurals=2; plural=n != 1;\n"

20−"X-Generator: Weblate 3.11.3\n"

21−"X-Launchpad-Export-Date: 2016-11-23 06:34+0000\n"

18+"X-Launchpad-Export-Date: 2016-12-23 04:58+0000\n"

19+"X-Generator: Launchpad (build 18298)\n"

2220

23−#: plugins/LightDM/Greeter.cpp:199

21+#: plugins/LightDM/Greeter.cpp:123

2422msgid "Password: "

25−msgstr ""

26−

27−#: plugins/LightDM/Greeter.cpp:214

28−msgid "Username"

29−msgstr ""

30−

31−#: plugins/LightDM/Greeter.cpp:258

32−msgid "Failed to authenticate"

33−msgstr ""

34−

35−#: plugins/LightDM/Greeter.cpp:260

36−msgid "Invalid password, please try again"

37−msgstr ""

38−

39−#: plugins/LightDM/Greeter.cpp:270

40−msgid "Log In"

41−msgstr ""

42−

43−#: plugins/LightDM/Greeter.cpp:270

44−msgid "Retry"

45−msgstr "Qagis"

23+msgstr "Cuumita "

4624

47−#: plugins/LightDM/UsersModel.cpp:157

48−msgid "Login"

49−msgstr ""

50−

51−#: plugins/LightDM/UsersModel.cpp:165

52−msgid "Guest Session"

53−msgstr ""

54−

55−#: plugins/Unity/Launcher/launcheritem.cpp:48

25+#: plugins/Unity/Launcher/launcheritem.cpp:50

5626#: plugins/Unity/Launcher/launcheritem.cpp:122

5727msgid "Pin shortcut"

5828msgstr ""

5929

60−#: plugins/Unity/Launcher/launcheritem.cpp:54

30+#: plugins/Unity/Launcher/launcheritem.cpp:55

6131msgid "Quit"

6232msgstr "Kat"

6333

@@ -65,79 +35,76 @@ msgstr "Kat"

6535msgid "Unpin shortcut"

6636msgstr ""

6737

68−#: qml/Components/Dialogs.qml:176

38+#: qml/Components/Dialogs.qml:149

6939msgctxt "Title: Lock/Log out dialog"

7040msgid "Log out"

7141msgstr "Eweq"

7242

73−#: qml/Components/Dialogs.qml:177

43+#: qml/Components/Dialogs.qml:150

7444msgid "Are you sure you want to log out?"

7545msgstr ""

7646

77−#: qml/Components/Dialogs.qml:180

47+#: qml/Components/Dialogs.qml:152

7848msgctxt "Button: Lock the system"

7949msgid "Lock"

8050msgstr "Koflis"

8151

82−#: qml/Components/Dialogs.qml:191

52+#: qml/Components/Dialogs.qml:159

8353msgctxt "Button: Log out from the system"

8454msgid "Log Out"

8555msgstr "Eweq"

8656

87−#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284

88−#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32

57+#: qml/Components/Dialogs.qml:166 qml/Components/Dialogs.qml:222

58+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:232

59+#: qml/Wizard/Pages/passcode-confirm.qml:32

8960#: qml/Wizard/Pages/passcode-set.qml:32

9061msgid "Cancel"

9162msgstr "Bayis"

9263

93−#: qml/Components/Dialogs.qml:211

64+#: qml/Components/Dialogs.qml:178

9465msgctxt "Title: Reboot dialog"

9566msgid "Reboot"

9667msgstr "Wadir-ugus"

9768

98−#: qml/Components/Dialogs.qml:212

69+#: qml/Components/Dialogs.qml:179

9970msgid "Are you sure you want to reboot?"

10071msgstr "Wadir-ugussuh digga maay litoo?"

10172

102−#: qml/Components/Dialogs.qml:215

73+#: qml/Components/Dialogs.qml:181

10374msgid "No"

10475msgstr "Maleey"

10576

106−#: qml/Components/Dialogs.qml:223

77+#: qml/Components/Dialogs.qml:187

10778msgid "Yes"

10879msgstr "Yeey"

10980

110−#: qml/Components/Dialogs.qml:243

81+#: qml/Components/Dialogs.qml:202

11182msgctxt "Title: Power off/Restart dialog"

11283msgid "Power"

11384msgstr "Cayla"

11485

115−#: qml/Components/Dialogs.qml:244

86+#: qml/Components/Dialogs.qml:203

11687msgid ""

11788"Are you sure you would like\n"

11889"to power off?"

11990msgstr "Timmi haytuh digga maay litoo?"

12091

121−#: qml/Components/Dialogs.qml:248

92+#: qml/Components/Dialogs.qml:205

12293msgctxt "Button: Power off the system"

12394msgid "Power off"

12495msgstr "Timmi hayis"

12596

126−#: qml/Components/Dialogs.qml:263

97+#: qml/Components/Dialogs.qml:214

12798msgctxt "Button: Restart the system"

12899msgid "Restart"

129100msgstr "Wadir-qimbis"

130101

131−#: qml/Components/Dialogs.qml:276

132−msgid "Screenshot"

133−msgstr ""

134−

135102#: qml/Components/KeyboardShortcutsOverlay.qml:41

136103msgid "Keyboard Shortcuts"

137104msgstr ""

138105

139106#: qml/Components/KeyboardShortcutsOverlay.qml:55

140−msgid "Lomiri"

107+msgid "Unity 8"

141108msgstr ""

142109

143110#: qml/Components/KeyboardShortcutsOverlay.qml:62

@@ -153,7 +120,7 @@ msgid "Alt + PrtScr"

153120msgstr ""

154121

155122#: qml/Components/KeyboardShortcutsOverlay.qml:80

156−msgid "Takes a screenshot of the current window."

123+msgid "Takes a screenshot of a window."

157124msgstr ""

158125

159126#: qml/Components/KeyboardShortcutsOverlay.qml:88

@@ -172,131 +139,135 @@ msgstr ""

172139msgid "Switches to previous keyboard layout."

173140msgstr ""

174141

175−#: qml/Components/KeyboardShortcutsOverlay.qml:114

176−msgid "Ctrl + Alt + T"

142+#: qml/Components/KeyboardShortcutsOverlay.qml:118

143+msgid "Launcher"

177144msgstr ""

178145

179−#: qml/Components/KeyboardShortcutsOverlay.qml:119

180−msgid "Starts the Terminal application."

146+#: qml/Components/KeyboardShortcutsOverlay.qml:125

147+msgid "Super (Hold)"

181148msgstr ""

182149

183−#: qml/Components/KeyboardShortcutsOverlay.qml:131

184−msgid "Launcher"

150+#: qml/Components/KeyboardShortcutsOverlay.qml:130

151+msgid "Opens the launcher, displays shortcuts."

185152msgstr ""

186153

187154#: qml/Components/KeyboardShortcutsOverlay.qml:138

188−msgid "Super (Hold)"

155+msgid "Alt + F1"

189156msgstr ""

190157

191158#: qml/Components/KeyboardShortcutsOverlay.qml:143

192−msgid "Opens the launcher, displays shortcuts."

159+msgid "Opens launcher keyboard navigation mode."

193160msgstr ""

194161

195162#: qml/Components/KeyboardShortcutsOverlay.qml:151

196−msgid "Alt + F1"

163+msgid "Super + Tab"

197164msgstr ""

198165

199166#: qml/Components/KeyboardShortcutsOverlay.qml:156

200−msgid "Opens launcher keyboard navigation mode."

167+msgid "Switches applications via the launcher."

201168msgstr ""

202169

203170#: qml/Components/KeyboardShortcutsOverlay.qml:164

204−msgid "Super + Tab"

171+msgid "Super + 0 to 9"

205172msgstr ""

206173

207174#: qml/Components/KeyboardShortcutsOverlay.qml:169

208−msgid "Switches applications via the launcher."

175+msgid "Same as clicking on a launcher icon."

209176msgstr ""

210177

211178#: qml/Components/KeyboardShortcutsOverlay.qml:177

212−msgid "Super + 1 to 0"

179+msgid "Super + A"

213180msgstr ""

214181

215182#: qml/Components/KeyboardShortcutsOverlay.qml:182

216−msgid "Same as clicking on a launcher icon."

183+msgid "Opens the Application Drawer."

217184msgstr ""

218185

219−#: qml/Components/KeyboardShortcutsOverlay.qml:190

220−msgid "Super + A"

186+#: qml/Components/KeyboardShortcutsOverlay.qml:194

187+msgid "Scopes"

221188msgstr ""

222189

223−#: qml/Components/KeyboardShortcutsOverlay.qml:195

224−msgid "Opens the Application Drawer."

190+#: qml/Components/KeyboardShortcutsOverlay.qml:201

191+msgid "Super (Tap)"

192+msgstr ""

193+

194+#: qml/Components/KeyboardShortcutsOverlay.qml:206

195+msgid "Opens the Scopes home."

225196msgstr ""

226197

227−#: qml/Components/KeyboardShortcutsOverlay.qml:235

198+#: qml/Components/KeyboardShortcutsOverlay.qml:222

228199msgid "Switching"

229200msgstr ""

230201

231−#: qml/Components/KeyboardShortcutsOverlay.qml:242

202+#: qml/Components/KeyboardShortcutsOverlay.qml:229

232203msgid "Alt + Tab"

233204msgstr ""

234205

235−#: qml/Components/KeyboardShortcutsOverlay.qml:247

206+#: qml/Components/KeyboardShortcutsOverlay.qml:234

236207msgid "Switches between applications."

237208msgstr ""

238209

239−#: qml/Components/KeyboardShortcutsOverlay.qml:255

210+#: qml/Components/KeyboardShortcutsOverlay.qml:242

240211msgid "Super + W"

241212msgstr ""

242213

243−#: qml/Components/KeyboardShortcutsOverlay.qml:260

214+#: qml/Components/KeyboardShortcutsOverlay.qml:247

244215msgid "Opens the desktop spread."

245216msgstr ""

246217

247−#: qml/Components/KeyboardShortcutsOverlay.qml:268

218+#: qml/Components/KeyboardShortcutsOverlay.qml:255

248219msgid "Cursor Left or Right"

249220msgstr ""

250221

251−#: qml/Components/KeyboardShortcutsOverlay.qml:273

222+#: qml/Components/KeyboardShortcutsOverlay.qml:260

252223msgid "Moves the focus."

253224msgstr ""

254225

255−#: qml/Components/KeyboardShortcutsOverlay.qml:285

226+#: qml/Components/KeyboardShortcutsOverlay.qml:272

256227msgid "Windows"

257228msgstr ""

258229

259−#: qml/Components/KeyboardShortcutsOverlay.qml:292

230+#: qml/Components/KeyboardShortcutsOverlay.qml:279

260231msgid "Ctrl + Super + D"

261232msgstr ""

262233

263−#: qml/Components/KeyboardShortcutsOverlay.qml:297

234+#: qml/Components/KeyboardShortcutsOverlay.qml:284

264235msgid "Minimizes all windows."

265236msgstr ""

266237

267−#: qml/Components/KeyboardShortcutsOverlay.qml:305

238+#: qml/Components/KeyboardShortcutsOverlay.qml:292

268239msgid "Ctrl + Super + Up"

269240msgstr ""

270241

271−#: qml/Components/KeyboardShortcutsOverlay.qml:310

242+#: qml/Components/KeyboardShortcutsOverlay.qml:297

272243msgid "Maximizes the current window."

273244msgstr ""

274245

275−#: qml/Components/KeyboardShortcutsOverlay.qml:318

246+#: qml/Components/KeyboardShortcutsOverlay.qml:305

276247msgid "Ctrl + Super + Down"

277248msgstr ""

278249

279−#: qml/Components/KeyboardShortcutsOverlay.qml:323

250+#: qml/Components/KeyboardShortcutsOverlay.qml:310

280251msgid "Minimizes or restores the current window."

281252msgstr ""

282253

283−#: qml/Components/KeyboardShortcutsOverlay.qml:331

254+#: qml/Components/KeyboardShortcutsOverlay.qml:318

284255msgid "Ctrl + Super + Left or Right"

285256msgstr ""

286257

287−#: qml/Components/KeyboardShortcutsOverlay.qml:336

258+#: qml/Components/KeyboardShortcutsOverlay.qml:323

288259msgid "Semi-maximizes the current window."

289260msgstr ""

290261

291−#: qml/Components/KeyboardShortcutsOverlay.qml:344

262+#: qml/Components/KeyboardShortcutsOverlay.qml:331

292263msgid "Alt + F4"

293264msgstr ""

294265

295−#: qml/Components/KeyboardShortcutsOverlay.qml:349

266+#: qml/Components/KeyboardShortcutsOverlay.qml:336

296267msgid "Closes the current window."

297268msgstr ""

298269

299−#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:235

270+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:252

300271msgid "Return to Call"

301272msgstr "Seecol gacis"

302273

@@ -304,7 +275,7 @@ msgstr "Seecol gacis"

304275msgid "Emergency Call"

305276msgstr ""

306277

307−#: qml/Components/Lockscreen.qml:245

278+#: qml/Components/Lockscreen.qml:244

308279msgid "OK"

309280msgstr "Hayya"

310281

@@ -318,29 +289,29 @@ msgstr ""

318289msgid "%1:%2"

319290msgstr ""

320291

321−#: qml/Components/ModeSwitchWarningDialog.qml:33

292+#: qml/Components/ModeSwitchWarningDialog.qml:32

322293msgid "Apps may have unsaved data:"

323294msgstr ""

324295

325−#: qml/Components/ModeSwitchWarningDialog.qml:60

296+#: qml/Components/ModeSwitchWarningDialog.qml:57

326297msgctxt ""

327298"Re-dock means connect the device again to an external screen/mouse/keyboard"

328299msgid "Re-dock, save your work and close these apps to continue."

329300msgstr ""

330301

331−#: qml/Components/ModeSwitchWarningDialog.qml:67

302+#: qml/Components/ModeSwitchWarningDialog.qml:63

332303msgid "Or force close now (unsaved data will be lost)."

333304msgstr ""

334305

335−#: qml/Components/ModeSwitchWarningDialog.qml:80

306+#: qml/Components/ModeSwitchWarningDialog.qml:75

336307msgid "OK, I will reconnect"

337308msgstr ""

338309

339−#: qml/Components/ModeSwitchWarningDialog.qml:81

310+#: qml/Components/ModeSwitchWarningDialog.qml:76

340311msgid "Reconnect now!"

341312msgstr ""

342313

343−#: qml/Components/ModeSwitchWarningDialog.qml:94

314+#: qml/Components/ModeSwitchWarningDialog.qml:88

344315msgid "Close all"

345316msgstr "Inkih alif"

346317

@@ -370,6 +341,103 @@ msgstr ""

370341msgid "Find more settings in the system settings."

371342msgstr ""

372343

344+#: qml/Dash/DashPageHeader.qml:361

345+msgctxt "Button: Open the Ubuntu Store"

346+msgid "Store"

347+msgstr ""

348+

349+#: qml/Dash/DashPageHeader.qml:368

350+msgctxt "Button: Start a search in the current dash scope"

351+msgid "Search"

352+msgstr "Goranto"

353+

354+#: qml/Dash/DashPageHeader.qml:378

355+msgctxt "Button: Show the current dash scope settings"

356+msgid "Settings"

357+msgstr "Massosu"

358+

359+#: qml/Dash/DashPageHeader.qml:385

360+msgid "Remove from Favorites"

361+msgstr ""

362+

363+#: qml/Dash/DashPageHeader.qml:385

364+msgid "Add to Favorites"

365+msgstr ""

366+

367+#: qml/Dash/FiltersPopover.qml:61

368+msgid "Refine your results"

369+msgstr ""

370+

371+#: qml/Dash/FiltersPopover.qml:70

372+msgid "Reset"

373+msgstr ""

374+

375+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/GenericScopeView.qml:718

376+msgid "Show less"

377+msgstr ""

378+

379+#: qml/Dash/GenericScopeView.qml:547

380+msgid "Show all"

381+msgstr ""

382+

383+#: qml/Dash/GenericScopeView.qml:578

384+msgctxt "Label: Hint for dash search line edit"

385+msgid "Search"

386+msgstr "Goranto"

387+

388+#: qml/Dash/PageHeaderExtraPanel.qml:67

389+msgid "Recent Searches"

390+msgstr ""

391+

392+#: qml/Dash/PageHeaderExtraPanel.qml:78

393+msgid "Clear All"

394+msgstr ""

395+

396+#: qml/Dash/Previews/PreviewActionCombo.qml:36

397+msgid "More..."

398+msgstr ""

399+

400+#: qml/Dash/Previews/PreviewActionCombo.qml:36

401+msgid "Less..."

402+msgstr ""

403+

404+#: qml/Dash/Previews/PreviewCommentInput.qml:83

405+#: qml/Dash/Previews/PreviewRatingInput.qml:202

406+msgid "Send"

407+msgstr "Rub"

408+

409+#: qml/Dash/Previews/PreviewRatingInput.qml:109

410+msgid "Rate this"

411+msgstr ""

412+

413+#: qml/Dash/Previews/PreviewRatingInput.qml:184

414+msgid "Add a review"

415+msgstr ""

416+

417+#: qml/Dash/PullToRefreshScopeStyle.qml:56

418+msgid "Pull to refresh…"

419+msgstr ""

420+

421+#: qml/Dash/PullToRefreshScopeStyle.qml:61

422+msgid "Release to refresh…"

423+msgstr ""

424+

425+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

426+msgid "Enable location data"

427+msgstr ""

428+

429+#: qml/Dash/ScopesList.qml:57

430+msgid "Manage"

431+msgstr ""

432+

433+#: qml/Dash/ScopesList.qml:104

434+msgid "Home"

435+msgstr "Dabqi"

436+

437+#: qml/Dash/ScopesList.qml:105

438+msgid "Also installed"

439+msgstr ""

440+

373441#: qml/Greeter/CoverPage.qml:127

374442msgid "Unlock"

375443msgstr ""

@@ -393,51 +461,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

393461msgstr[0] "Maganak %1 minit qambaalaay, kaadu gabbat"

394462msgstr[1] "Maganak %1 minit qambaalaay, kaadu gabbat"

395463

396−#: qml/Greeter/Greeter.qml:550

464+#: qml/Greeter/Greeter.qml:592

397465msgid "Try again"

398466msgstr ""

399467

400−#: qml/Greeter/Greeter.qml:551

401−#, fuzzy

402−#| msgid "Enter passphrase"

403−msgid "Enter passphrase to unlock"

404−msgstr "Tatur-maxco culus"

405−

406−#: qml/Greeter/Greeter.qml:552

407−#, fuzzy

408−#| msgid "Enter passcode"

409−msgid "Enter passcode to unlock"

410−msgstr "Tatur-mudenta culus"

468+#: qml/Greeter/LoginList.qml:70

469+msgid "Passphrase"

470+msgstr ""

411471

412−#: qml/Greeter/NarrowView.qml:235

413−msgid "Emergency"

472+#: qml/Greeter/LoginList.qml:71

473+msgid "Passcode"

414474msgstr ""

415475

416−#: qml/Greeter/PromptList.qml:126

417−msgid "Passphrase"

476+#: qml/Greeter/LoginList.qml:98

477+msgid "Retry"

478+msgstr "Qagis"

479+

480+#: qml/Greeter/LoginList.qml:99

481+msgid "Log In"

418482msgstr ""

419483

420−#: qml/Greeter/PromptList.qml:126

421−msgid "Passcode"

484+#: qml/Greeter/NarrowView.qml:252

485+msgid "Emergency"

422486msgstr ""

423487

424−#: qml/Greeter/SessionsList.qml:124

488+#: qml/Greeter/SessionsList.qml:122

425489msgid "Select desktop environment"

426490msgstr ""

427491

428−#: qml/Launcher/Drawer.qml:250

429−#, fuzzy

430−#| msgctxt "Button: Start a search in the current dash scope"

431−#| msgid "Search"

492+#: qml/Launcher/Drawer.qml:80

432493msgid "Search…"

433−msgstr "Goranto"

494+msgstr ""

434495

435−#: qml/Launcher/PullToRefreshScopeStyle.qml:56

436−msgid "Pull to refresh…"

496+#: qml/Launcher/Drawer.qml:101

497+msgctxt "Apps sorted alphabetically"

498+msgid "A-Z"

437499msgstr ""

438500

439−#: qml/Launcher/PullToRefreshScopeStyle.qml:61

440−msgid "Release to refresh…"

501+#: qml/Launcher/MoreAppsHeader.qml:32

502+msgid "More apps in the store"

441503msgstr ""

442504

443505#: qml/Notifications/NotificationMenuItemFactory.qml:124

@@ -452,62 +514,62 @@ msgstr ""

452514msgid "Conference"

453515msgstr "Koboxu"

454516

455−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:869

517+#: qml/Panel/Indicators/MenuItemFactory.qml:868

456518msgid "Nothing is playing"

457519msgstr ""

458520

459−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:997

521+#: qml/Panel/Indicators/MenuItemFactory.qml:996

460522#, qt-format

461523msgid "%1 hour"

462524msgid_plural "%1 hours"

463525msgstr[0] "%1 saaqata"

464526msgstr[1] "%1 saaqata"

465527

466−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1001

528+#: qml/Panel/Indicators/MenuItemFactory.qml:1000

467529#, qt-format

468530msgid "%1 minute"

469531msgid_plural "%1 minutes"

470532msgstr[0] "%1 miniti"

471533msgstr[1] "%1 miniti"

472534

473−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1006

535+#: qml/Panel/Indicators/MenuItemFactory.qml:1005

474536#, qt-format

475537msgid "%1 second"

476538msgid_plural "%1 seconds"

477539msgstr[0] "%1 nammayye"

478540msgstr[1] "%1 nammayye"

479541

480−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1009

542+#: qml/Panel/Indicators/MenuItemFactory.qml:1008

481543msgid "0 seconds"

482544msgstr "0 nammayye"

483545

484546#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

485−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1011

547+#: qml/Panel/Indicators/MenuItemFactory.qml:1010

486548#, qt-format

487549msgid "%1 remaining"

488550msgstr "%1 raaqe"

489551

490−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1017

552+#: qml/Panel/Indicators/MenuItemFactory.qml:1016

491553msgid "In queue…"

492554msgstr ""

493555

494−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1021

556+#: qml/Panel/Indicators/MenuItemFactory.qml:1020

495557msgid "Downloading"

496558msgstr "Qulluumah"

497559

498−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1023

560+#: qml/Panel/Indicators/MenuItemFactory.qml:1022

499561msgid "Paused, tap to resume"

500562msgstr ""

501563

502−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1025

564+#: qml/Panel/Indicators/MenuItemFactory.qml:1024

503565msgid "Canceled"

504566msgstr "Bayteh"

505567

506−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1027

568+#: qml/Panel/Indicators/MenuItemFactory.qml:1026

507569msgid "Finished"

508570msgstr "Duudumteh"

509571

510−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1029

572+#: qml/Panel/Indicators/MenuItemFactory.qml:1028

511573msgid "Failed, tap to retry"

512574msgstr ""

513575

@@ -527,34 +589,23 @@ msgctxt "Button: Call back on phone"

527589msgid "Call back"

528590msgstr ""

529591

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−

537592#: qml/Stage/SideStage.qml:76

538593msgid "Drag using 3 fingers any application from one window to the other"

539594msgstr ""

540595

541−#: qml/Stage/Stage.qml:671

542−msgid "No running apps"

543−msgstr ""

544−

545596#: qml/Tutorial/TutorialLeftLong.qml:49

546−msgid "Long swipe from the left edge to open the Application Drawer"

597+msgid "Long swipe from the left edge to open the Today scope"

547598msgstr ""

548599

549600#: qml/Tutorial/TutorialLeft.qml:47

550601msgid "Short swipe from the left edge to open the launcher"

551602msgstr ""

552603

553−#: qml/Tutorial/TutorialRight.qml:54

604+#: qml/Tutorial/TutorialRight.qml:55

554605msgid "Push your mouse against the right edge to view your open apps"

555606msgstr ""

556607

557−#: qml/Tutorial/TutorialRight.qml:55

608+#: qml/Tutorial/TutorialRight.qml:56

558609msgid "Swipe from the right edge to view your open apps"

559610msgstr ""

560611

@@ -562,41 +613,25 @@ msgstr ""

562613msgid "Swipe from the top edge to access notifications and quick settings"

563614msgstr ""

564615

565−#: qml/Wizard/Page.qml:59

616+#: qml/Wizard/Page.qml:54

566617msgctxt "Button: Go back one page in the Wizard"

567618msgid "Back"

568619msgstr "Derre"

569620

570−#: qml/Wizard/Pages/10-welcome.qml:29

621+#: qml/Wizard/Pages/10-welcome.qml:28

571622msgid "Language"

572623msgstr ""

573624

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

625+#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152

626+#: qml/Wizard/Pages/30-wifi.qml:207 qml/Wizard/Pages/40-location.qml:271

627+#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65

628+#: qml/Wizard/Pages/70-passwd-type.qml:145

629+#: qml/Wizard/Pages/75-report-check.qml:84

630+#: qml/Wizard/Pages/passcode-desktop.qml:142

631+#: qml/Wizard/Pages/password-set.qml:142

581632msgid "Next"

582633msgstr ""

583634

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−

600635#: qml/Wizard/Pages/20-keyboard.qml:31

601636msgid "Select Keyboard"

602637msgstr ""

@@ -609,8 +644,8 @@ msgstr ""

609644msgid "Keyboard layout"

610645msgstr ""

611646

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

647+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:207

648+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/77-system-update.qml:152

614649#: qml/Wizard/Pages/sim.qml:101

615650msgid "Skip"

616651msgstr "Kaqit"

@@ -619,23 +654,55 @@ msgstr "Kaqit"

619654msgid "Connect to Wi‑Fi"

620655msgstr ""

621656

622−#: qml/Wizard/Pages/30-wifi.qml:139

657+#: qml/Wizard/Pages/30-wifi.qml:132

623658msgid "Connected"

624659msgstr ""

625660

626−#: qml/Wizard/Pages/30-wifi.qml:172

661+#: qml/Wizard/Pages/30-wifi.qml:165

627662msgid "Available Wi-Fi networks"

628663msgstr ""

629664

630−#: qml/Wizard/Pages/30-wifi.qml:173

665+#: qml/Wizard/Pages/30-wifi.qml:166

631666msgid "No available Wi-Fi networks"

632667msgstr ""

633668

669+#: qml/Wizard/Pages/40-location.qml:27

670+msgid "Location Services"

671+msgstr ""

672+

673+#: qml/Wizard/Pages/40-location.qml:83

674+msgid ""

675+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

676+"(recommended)"

677+msgstr ""

678+

679+#: qml/Wizard/Pages/40-location.qml:105

680+#, qt-format

681+msgid "By selecting this option you agree to the Nokia HERE %1."

682+msgstr ""

683+

684+#: qml/Wizard/Pages/40-location.qml:106

685+msgctxt "part of: Nokia HERE terms and conditions"

686+msgid "terms and conditions"

687+msgstr ""

688+

689+#: qml/Wizard/Pages/40-location.qml:160

690+msgid "GPS only"

691+msgstr ""

692+

693+#: qml/Wizard/Pages/40-location.qml:214

694+msgid "Don't use my location"

695+msgstr ""

696+

697+#: qml/Wizard/Pages/40-location.qml:260

698+msgid "You can change it later in System Settings."

699+msgstr ""

700+

634701#: qml/Wizard/Pages/50-timezone.qml:30

635702msgid "Time Zone"

636703msgstr ""

637704

638−#: qml/Wizard/Pages/50-timezone.qml:183

705+#: qml/Wizard/Pages/50-timezone.qml:182

639706msgid "Enter your city"

640707msgstr ""

641708

@@ -643,7 +710,7 @@ msgstr ""

643710msgid "Personalize Your Device"

644711msgstr ""

645712

646−#: qml/Wizard/Pages/60-account.qml:54

713+#: qml/Wizard/Pages/60-account.qml:48

647714msgid "Preferred Name"

648715msgstr ""

649716

@@ -651,72 +718,110 @@ msgstr ""

651718msgid "Lock Screen"

652719msgstr ""

653720

654−#: qml/Wizard/Pages/70-passwd-type.qml:103

721+#: qml/Wizard/Pages/70-passwd-type.qml:102

655722msgctxt "Label: Type of security method"

656723msgid "Create new password"

657724msgstr ""

658725

659−#: qml/Wizard/Pages/70-passwd-type.qml:105

726+#: qml/Wizard/Pages/70-passwd-type.qml:104

660727msgctxt "Label: Type of security method"

661728msgid "Create passcode (numbers only)"

662729msgstr ""

663730

664−#: qml/Wizard/Pages/70-passwd-type.qml:107

731+#: qml/Wizard/Pages/70-passwd-type.qml:106

665732msgctxt "Label: Type of security method"

666733msgid "No lock code"

667734msgstr ""

668735

669−#: qml/Wizard/Pages/79-system-update.qml:28

736+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

737+msgid "Privacy Policy"

738+msgstr ""

739+

740+#: qml/Wizard/Pages/75-report-check.qml:26

741+msgid "Help Us Improve"

742+msgstr ""

743+

744+#: qml/Wizard/Pages/75-report-check.qml:59

745+msgid "Improve system performance by sending us crashes and error reports."

746+msgstr ""

747+

748+#: qml/Wizard/Pages/75-report-check.qml:60

749+msgid "Privacy policy"

750+msgstr ""

751+

752+#: qml/Wizard/Pages/77-system-update.qml:28

670753msgid "Update Device"

671754msgstr ""

672755

673−#: qml/Wizard/Pages/79-system-update.qml:55

756+#: qml/Wizard/Pages/77-system-update.qml:55

674757msgid ""

675758"There is a system update available and ready to install. Afterwards, the "

676759"device will automatically restart."

677760msgstr ""

678761

679−#: qml/Wizard/Pages/79-system-update.qml:76

762+#: qml/Wizard/Pages/77-system-update.qml:76

680763msgctxt "string identifying name of the update"

681−msgid "Ubuntu Touch system"

764+msgid "Ubuntu system"

682765msgstr ""

683766

684−#: qml/Wizard/Pages/79-system-update.qml:83

767+#: qml/Wizard/Pages/77-system-update.qml:83

685768#, qt-format

686769msgctxt "version of the system update"

687770msgid "Version %1"

688771msgstr ""

689772

690−#: qml/Wizard/Pages/79-system-update.qml:95

773+#: qml/Wizard/Pages/77-system-update.qml:102

691774msgid "This could take a few minutes..."

692775msgstr ""

693776

694−#: qml/Wizard/Pages/79-system-update.qml:109

777+#: qml/Wizard/Pages/77-system-update.qml:116

695778msgid "Install and restart now"

696779msgstr ""

697780

698−#: qml/Wizard/Pages/80-finished.qml:91

699−msgid "Welcome Back"

700−msgstr ""

701−

702−#: qml/Wizard/Pages/80-finished.qml:91

781+#: qml/Wizard/Pages/80-finished.qml:89

703782msgid "Welcome to Ubuntu"

704783msgstr ""

705784

706−#: qml/Wizard/Pages/80-finished.qml:106

785+#: qml/Wizard/Pages/80-finished.qml:104

707786msgid "You are ready to use your device now"

708787msgstr ""

709788

710−#: qml/Wizard/Pages/80-finished.qml:126

711−msgid "Continue"

712−msgstr "Tatur"

713−

714−#: qml/Wizard/Pages/80-finished.qml:126

789+#: qml/Wizard/Pages/80-finished.qml:124

715790msgid "Get Started"

716791msgstr ""

717792

793+#: qml/Wizard/Pages/here-terms.qml:25

794+msgid "Terms & Conditions"

795+msgstr ""

796+

797+#: qml/Wizard/Pages/here-terms.qml:69

798+msgid "Your device uses positioning technologies provided by HERE."

799+msgstr ""

800+

801+#: qml/Wizard/Pages/here-terms.qml:81

802+msgid ""

803+"To provide you with positioning services and to improve their quality, HERE "

804+"collects information about nearby cell towers and Wi-Fi hotspots around your "

805+"current location whenever your position is being found."

806+msgstr ""

807+

808+#: qml/Wizard/Pages/here-terms.qml:93

809+msgid ""

810+"The information collected is used to analyze the service and to improve the "

811+"use of service, but not to identify you personally."

812+msgstr ""

813+

814+#: qml/Wizard/Pages/here-terms.qml:106

815+#, qt-format

816+msgid "By continuing, you agree to the HERE platform %1 and %2."

817+msgstr ""

818+

819+#: qml/Wizard/Pages/here-terms.qml:107

820+msgid "Service Terms"

821+msgstr ""

822+

718823#: qml/Wizard/Pages/passcode-confirm.qml:43

719−#: qml/Wizard/Pages/passcode-desktop.qml:104

824+#: qml/Wizard/Pages/passcode-desktop.qml:97

720825msgid "Confirm passcode"

721826msgstr ""

722827

@@ -733,24 +838,24 @@ msgstr ""

733838msgid "Lock Screen Passcode"

734839msgstr ""

735840

736−#: qml/Wizard/Pages/passcode-desktop.qml:68

841+#: qml/Wizard/Pages/passcode-desktop.qml:61

737842msgid "Enter 4 numbers to setup your passcode"

738843msgstr ""

739844

740−#: qml/Wizard/Pages/passcode-desktop.qml:84

845+#: qml/Wizard/Pages/passcode-desktop.qml:77

741846#: qml/Wizard/Pages/passcode-set.qml:54

742847msgid "Choose passcode"

743848msgstr ""

744849

745−#: qml/Wizard/Pages/passcode-desktop.qml:139

850+#: qml/Wizard/Pages/passcode-desktop.qml:127

746851msgid "Passcode too short"

747852msgstr ""

748853

749−#: qml/Wizard/Pages/passcode-desktop.qml:141

854+#: qml/Wizard/Pages/passcode-desktop.qml:129

750855msgid "Passcodes match"

751856msgstr ""

752857

753−#: qml/Wizard/Pages/passcode-desktop.qml:143

858+#: qml/Wizard/Pages/passcode-desktop.qml:131

754859msgid "Passcodes do not match"

755860msgstr ""

756861

@@ -762,15 +867,15 @@ msgstr ""

762867msgid "Lock Screen Password"

763868msgstr ""

764869

765−#: qml/Wizard/Pages/password-set.qml:68

870+#: qml/Wizard/Pages/password-set.qml:62

766871msgid "Enter at least 8 characters"

767872msgstr ""

768873

769−#: qml/Wizard/Pages/password-set.qml:80

874+#: qml/Wizard/Pages/password-set.qml:74

770875msgid "Choose password"

771876msgstr ""

772877

773−#: qml/Wizard/Pages/password-set.qml:110

878+#: qml/Wizard/Pages/password-set.qml:104

774879msgid "Confirm password"

775880msgstr ""

776881

@@ -826,28 +931,6 @@ msgstr ""

826931msgid "Very weak password"

827932msgstr ""

828933

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−

851934#~ msgctxt "Title: Reboot/Shut down dialog"

852935#~ msgid "Shut down"

853936#~ msgstr "Bargus"

@@ -863,9 +946,16 @@ msgstr ""

863946#~ msgid "Reboot"

864947#~ msgstr "Wadir-ugus"

865948

949+#, qt-format

866950#~ msgid "Enter %1"

867951#~ msgstr "%1 culus"

868952

953+#~ msgid "Enter passphrase"

954+#~ msgstr "Tatur-maxco culus"

955+

956+#~ msgid "Enter passcode"

957+#~ msgstr "Tatur-mudenta culus"

958+

869959#~ msgctxt "Label: Type of security method"

870960#~ msgid "Swipe"

871961#~ msgstr "Uysuttuc"

@@ -878,3 +968,6 @@ msgstr ""

878968

879969#~ msgid "Let’s get started."

880970#~ msgstr "Hayya qimbisnay."

971+

972+#~ msgid "Continue"

973+#~ msgstr "Tatur"

po/am.po+377−453

@@ -6,58 +6,28 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: \n"

10−"POT-Creation-Date: 2021-01-29 11:42-0600\n"

11−"PO-Revision-Date: 2021-08-29 20:18+0000\n"

12−"Last-Translator: Samson <sambelet@yahoo.com>\n"

13−"Language-Team: Amharic <https://translate.ubports.com/projects/ubports/"

14−"lomiri/am/>\n"

15−"Language: am\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2016-12-15 16:17+0000\n"

11+"PO-Revision-Date: 2016-08-13 14:45+0000\n"

12+"Last-Translator: samson <Unknown>\n"

13+"Language-Team: Amharic <am@li.org>\n"

1614"MIME-Version: 1.0\n"

1715"Content-Type: text/plain; charset=UTF-8\n"

1816"Content-Transfer-Encoding: 8bit\n"

1917"Plural-Forms: nplurals=2; plural=n > 1;\n"

20−"X-Generator: Weblate 3.11.3\n"

21−"X-Launchpad-Export-Date: 2016-11-23 06:34+0000\n"

18+"X-Launchpad-Export-Date: 2016-12-23 04:58+0000\n"

19+"X-Generator: Launchpad (build 18298)\n"

2220

23−#: plugins/LightDM/Greeter.cpp:199

21+#: plugins/LightDM/Greeter.cpp:123

2422msgid "Password: "

2523msgstr "የ መግቢያ ቃል: "

2624

27−#: plugins/LightDM/Greeter.cpp:214

28−msgid "Username"

29−msgstr "የ ተጠቃሚ ስም"

30−

31−#: plugins/LightDM/Greeter.cpp:258

32−msgid "Failed to authenticate"

33−msgstr "ማረጋገጥ አልተቻለም"

34−

35−#: plugins/LightDM/Greeter.cpp:260

36−msgid "Invalid password, please try again"

37−msgstr "ዋጋ የሌለው የ መግቢያ ቃል: እባክዎን እንደገና ይሞክሩ"

38−

39−#: plugins/LightDM/Greeter.cpp:270

40−msgid "Log In"

41−msgstr "መግቢያ"

42−

43−#: plugins/LightDM/Greeter.cpp:270

44−msgid "Retry"

45−msgstr "እንደገና ይሞክሩ"

46−

47−#: plugins/LightDM/UsersModel.cpp:157

48−msgid "Login"

49−msgstr "መግቢያ"

50−

51−#: plugins/LightDM/UsersModel.cpp:165

52−msgid "Guest Session"

53−msgstr "የ እንግዳ ክፍለ ጊዜ"

54−

55−#: plugins/Unity/Launcher/launcheritem.cpp:48

25+#: plugins/Unity/Launcher/launcheritem.cpp:50

5626#: plugins/Unity/Launcher/launcheritem.cpp:122

5727msgid "Pin shortcut"

5828msgstr "አቋራጭ ማጣበቂያ"

5929

60−#: plugins/Unity/Launcher/launcheritem.cpp:54

30+#: plugins/Unity/Launcher/launcheritem.cpp:55

6131msgid "Quit"

6232msgstr "ማጥፊያ"

6333

@@ -65,54 +35,55 @@ msgstr "ማጥፊያ"

6535msgid "Unpin shortcut"

6636msgstr "አቋራጭ መለያያ"

6737

68−#: qml/Components/Dialogs.qml:176

38+#: qml/Components/Dialogs.qml:149

6939msgctxt "Title: Lock/Log out dialog"

7040msgid "Log out"

7141msgstr "መውጫ"

7242

73−#: qml/Components/Dialogs.qml:177

43+#: qml/Components/Dialogs.qml:150

7444msgid "Are you sure you want to log out?"

7545msgstr "በእርግጥ መውጣት ይፈልጋሉ?"

7646

77−#: qml/Components/Dialogs.qml:180

47+#: qml/Components/Dialogs.qml:152

7848msgctxt "Button: Lock the system"

7949msgid "Lock"

8050msgstr "መቆለፊያ"

8151

82−#: qml/Components/Dialogs.qml:191

52+#: qml/Components/Dialogs.qml:159

8353msgctxt "Button: Log out from the system"

8454msgid "Log Out"

8555msgstr "መውጫ"

8656

87−#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284

88−#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32

57+#: qml/Components/Dialogs.qml:166 qml/Components/Dialogs.qml:222

58+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:232

59+#: qml/Wizard/Pages/passcode-confirm.qml:32

8960#: qml/Wizard/Pages/passcode-set.qml:32

9061msgid "Cancel"

9162msgstr "መሰረዣ"

9263

93−#: qml/Components/Dialogs.qml:211

64+#: qml/Components/Dialogs.qml:178

9465msgctxt "Title: Reboot dialog"

9566msgid "Reboot"

9667msgstr "እንደገና ማስነሻ"

9768

98−#: qml/Components/Dialogs.qml:212

69+#: qml/Components/Dialogs.qml:179

9970msgid "Are you sure you want to reboot?"

10071msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"

10172

102−#: qml/Components/Dialogs.qml:215

73+#: qml/Components/Dialogs.qml:181

10374msgid "No"

10475msgstr "አይ"

10576

106−#: qml/Components/Dialogs.qml:223

77+#: qml/Components/Dialogs.qml:187

10778msgid "Yes"

10879msgstr "አዎ"

10980

110−#: qml/Components/Dialogs.qml:243

81+#: qml/Components/Dialogs.qml:202

11182msgctxt "Title: Power off/Restart dialog"

11283msgid "Power"

11384msgstr "ሐይል"

11485

115−#: qml/Components/Dialogs.qml:244

86+#: qml/Components/Dialogs.qml:203

11687msgid ""

11788"Are you sure you would like\n"

11889"to power off?"

@@ -120,27 +91,23 @@ msgstr ""

12091"በእርግጥ ሐይሉን ማጥፋት\n"

12192"ይፈልጋሉ?"

12293

123−#: qml/Components/Dialogs.qml:248

94+#: qml/Components/Dialogs.qml:205

12495msgctxt "Button: Power off the system"

12596msgid "Power off"

12697msgstr "ሐይል ማጥፊያ"

12798

128−#: qml/Components/Dialogs.qml:263

99+#: qml/Components/Dialogs.qml:214

129100msgctxt "Button: Restart the system"

130101msgid "Restart"

131102msgstr "እንደገና ማስጀመሪያ"

132103

133−#: qml/Components/Dialogs.qml:276

134−msgid "Screenshot"

135−msgstr "መመልከቻ ፎቶ ማንሻ"

136−

137104#: qml/Components/KeyboardShortcutsOverlay.qml:41

138105msgid "Keyboard Shortcuts"

139106msgstr "የ ፊደል ገበታ አቋራጮች"

140107

141108#: qml/Components/KeyboardShortcutsOverlay.qml:55

142−msgid "Lomiri"

143−msgstr "Lomiri"

109+msgid "Unity 8"

110+msgstr "Unity 8"

144111

145112#: qml/Components/KeyboardShortcutsOverlay.qml:62

146113msgid "PrtScr"

@@ -155,8 +122,8 @@ msgid "Alt + PrtScr"

155122msgstr "Alt + PrtScr"

156123

157124#: qml/Components/KeyboardShortcutsOverlay.qml:80

158−msgid "Takes a screenshot of the current window."

159−msgstr "የ አሁኑን መስኮት መመልከቻ ፎቶ ማንሻ"

125+msgid "Takes a screenshot of a window."

126+msgstr "የ መስኮት መመልከቻ ፎቶ ማንሻ"

160127

161128#: qml/Components/KeyboardShortcutsOverlay.qml:88

162129msgid "Super + Space"

@@ -174,131 +141,135 @@ msgstr "Super + Shift + Space"

174141msgid "Switches to previous keyboard layout."

175142msgstr "ወዳለፈው የ ፊደል ገበታ እቅድ መቀየሪያ"

176143

177−#: qml/Components/KeyboardShortcutsOverlay.qml:114

178−msgid "Ctrl + Alt + T"

179−msgstr "Ctrl + Alt + T"

180−

181−#: qml/Components/KeyboardShortcutsOverlay.qml:119

182−msgid "Starts the Terminal application."

183−msgstr "የ ተርሚናል መተግበሪያ ማስጀመሪያ"

184−

185−#: qml/Components/KeyboardShortcutsOverlay.qml:131

144+#: qml/Components/KeyboardShortcutsOverlay.qml:118

186145msgid "Launcher"

187146msgstr "ማስነሻ"

188147

189−#: qml/Components/KeyboardShortcutsOverlay.qml:138

148+#: qml/Components/KeyboardShortcutsOverlay.qml:125

190149msgid "Super (Hold)"

191150msgstr "Super (ይጫኑ)"

192151

193−#: qml/Components/KeyboardShortcutsOverlay.qml:143

152+#: qml/Components/KeyboardShortcutsOverlay.qml:130

194153msgid "Opens the launcher, displays shortcuts."

195154msgstr "ማስነሻውን መክፈቻ እና አቋራጮች ማሳያ"

196155

197−#: qml/Components/KeyboardShortcutsOverlay.qml:151

156+#: qml/Components/KeyboardShortcutsOverlay.qml:138

198157msgid "Alt + F1"

199158msgstr "Alt + F1"

200159

201−#: qml/Components/KeyboardShortcutsOverlay.qml:156

160+#: qml/Components/KeyboardShortcutsOverlay.qml:143

202161msgid "Opens launcher keyboard navigation mode."

203162msgstr "መክፈቻ በ ፊደል ገበታ መቃኛ ዘዴ ማስነሻ"

204163

205−#: qml/Components/KeyboardShortcutsOverlay.qml:164

164+#: qml/Components/KeyboardShortcutsOverlay.qml:151

206165msgid "Super + Tab"

207166msgstr "Super + Tab"

208167

209−#: qml/Components/KeyboardShortcutsOverlay.qml:169

168+#: qml/Components/KeyboardShortcutsOverlay.qml:156

210169msgid "Switches applications via the launcher."

211170msgstr "መተግበሪያዎችን በ ማስጀመሪያ መቀየሪያ"

212171

213−#: qml/Components/KeyboardShortcutsOverlay.qml:177

214−msgid "Super + 1 to 0"

172+#: qml/Components/KeyboardShortcutsOverlay.qml:164

173+msgid "Super + 0 to 9"

215174msgstr "Super + 0 እስከ 9"

216175

217−#: qml/Components/KeyboardShortcutsOverlay.qml:182

176+#: qml/Components/KeyboardShortcutsOverlay.qml:169

218177msgid "Same as clicking on a launcher icon."

219178msgstr "ተመሳሳይ በ ማስጀመሪያ ምልክት ላይ እንደ መጫን"

220179

221−#: qml/Components/KeyboardShortcutsOverlay.qml:190

180+#: qml/Components/KeyboardShortcutsOverlay.qml:177

222181msgid "Super + A"

223−msgstr "Super + A"

182+msgstr ""

224183

225−#: qml/Components/KeyboardShortcutsOverlay.qml:195

184+#: qml/Components/KeyboardShortcutsOverlay.qml:182

226185msgid "Opens the Application Drawer."

227−msgstr "የ መሳያ መተግበሪያ ማስጀመሪያ"

186+msgstr ""

187+

188+#: qml/Components/KeyboardShortcutsOverlay.qml:194

189+msgid "Scopes"

190+msgstr "ክልል"

228191

229−#: qml/Components/KeyboardShortcutsOverlay.qml:235

192+#: qml/Components/KeyboardShortcutsOverlay.qml:201

193+msgid "Super (Tap)"

194+msgstr "Super (Tap)"

195+

196+#: qml/Components/KeyboardShortcutsOverlay.qml:206

197+msgid "Opens the Scopes home."

198+msgstr "የ ክልል ቤት መክፈቻ"

199+

200+#: qml/Components/KeyboardShortcutsOverlay.qml:222

230201msgid "Switching"

231202msgstr "በ መቀየር ላይ"

232203

233−#: qml/Components/KeyboardShortcutsOverlay.qml:242

204+#: qml/Components/KeyboardShortcutsOverlay.qml:229

234205msgid "Alt + Tab"

235206msgstr "Alt + Tab"

236207

237−#: qml/Components/KeyboardShortcutsOverlay.qml:247

208+#: qml/Components/KeyboardShortcutsOverlay.qml:234

238209msgid "Switches between applications."

239210msgstr "በ መተግበሪያዎች መካከል መቀያየሪያ"

240211

241−#: qml/Components/KeyboardShortcutsOverlay.qml:255

212+#: qml/Components/KeyboardShortcutsOverlay.qml:242

242213msgid "Super + W"

243214msgstr "Super + W"

244215

245−#: qml/Components/KeyboardShortcutsOverlay.qml:260

216+#: qml/Components/KeyboardShortcutsOverlay.qml:247

246217msgid "Opens the desktop spread."

247218msgstr "የ ዴስክቶፕ ማስፊያ መክፈቻ"

248219

249−#: qml/Components/KeyboardShortcutsOverlay.qml:268

220+#: qml/Components/KeyboardShortcutsOverlay.qml:255

250221msgid "Cursor Left or Right"

251222msgstr "መጠቆሚያ የ ግራ ወይንም የ ቀኝ"

252223

253−#: qml/Components/KeyboardShortcutsOverlay.qml:273

224+#: qml/Components/KeyboardShortcutsOverlay.qml:260

254225msgid "Moves the focus."

255226msgstr "ትኩረት ማንቀሳቀሻ"

256227

257−#: qml/Components/KeyboardShortcutsOverlay.qml:285

228+#: qml/Components/KeyboardShortcutsOverlay.qml:272

258229msgid "Windows"

259230msgstr "መስኮቶች"

260231

261−#: qml/Components/KeyboardShortcutsOverlay.qml:292

232+#: qml/Components/KeyboardShortcutsOverlay.qml:279

262233msgid "Ctrl + Super + D"

263234msgstr "Ctrl + Super + D"

264235

265−#: qml/Components/KeyboardShortcutsOverlay.qml:297

236+#: qml/Components/KeyboardShortcutsOverlay.qml:284

266237msgid "Minimizes all windows."

267238msgstr "ሁሉንም መስኮቶች ማሳነሻ"

268239

269−#: qml/Components/KeyboardShortcutsOverlay.qml:305

240+#: qml/Components/KeyboardShortcutsOverlay.qml:292

270241msgid "Ctrl + Super + Up"

271242msgstr "Ctrl + Super + Up"

272243

273−#: qml/Components/KeyboardShortcutsOverlay.qml:310

244+#: qml/Components/KeyboardShortcutsOverlay.qml:297

274245msgid "Maximizes the current window."

275246msgstr "የ አሁኑን መስኮት ማሳደጊያ"

276247

277−#: qml/Components/KeyboardShortcutsOverlay.qml:318

248+#: qml/Components/KeyboardShortcutsOverlay.qml:305

278249msgid "Ctrl + Super + Down"

279250msgstr "Ctrl + Super + Down"

280251

281−#: qml/Components/KeyboardShortcutsOverlay.qml:323

252+#: qml/Components/KeyboardShortcutsOverlay.qml:310

282253msgid "Minimizes or restores the current window."

283254msgstr "የ አሁኑን መስኮትማሳነሻ ወይንም እንደ ነበር መመለሻ"

284255

285−#: qml/Components/KeyboardShortcutsOverlay.qml:331

256+#: qml/Components/KeyboardShortcutsOverlay.qml:318

286257msgid "Ctrl + Super + Left or Right"

287258msgstr "Ctrl + Super + Left or Right"

288259

289−#: qml/Components/KeyboardShortcutsOverlay.qml:336

260+#: qml/Components/KeyboardShortcutsOverlay.qml:323

290261msgid "Semi-maximizes the current window."

291262msgstr "የ አሁኑን መስኮት በ ንዑስ-ማሳደጊያ"

292263

293−#: qml/Components/KeyboardShortcutsOverlay.qml:344

264+#: qml/Components/KeyboardShortcutsOverlay.qml:331

294265msgid "Alt + F4"

295266msgstr "Alt + F4"

296267

297−#: qml/Components/KeyboardShortcutsOverlay.qml:349

268+#: qml/Components/KeyboardShortcutsOverlay.qml:336

298269msgid "Closes the current window."

299270msgstr "የ አሁኑን መስኮት መዝጊያ"

300271

301−#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:235

272+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:252

302273msgid "Return to Call"

303274msgstr "ወደ ጥሪ መመለሻ"

304275

@@ -306,7 +277,7 @@ msgstr "ወደ ጥሪ መመለሻ"

306277msgid "Emergency Call"

307278msgstr "የ ድንገተኛ ጥሪ"

308279

309−#: qml/Components/Lockscreen.qml:245

280+#: qml/Components/Lockscreen.qml:244

310281msgid "OK"

311282msgstr "እሺ"

312283

@@ -320,29 +291,29 @@ msgstr "%1:%2:%3"

320291msgid "%1:%2"

321292msgstr "%1:%2"

322293

323−#: qml/Components/ModeSwitchWarningDialog.qml:33

294+#: qml/Components/ModeSwitchWarningDialog.qml:32

324295msgid "Apps may have unsaved data:"

325296msgstr "መተግበሪያው ያልተቀመጠ ዳታ ይዟል:"

326297

327−#: qml/Components/ModeSwitchWarningDialog.qml:60

298+#: qml/Components/ModeSwitchWarningDialog.qml:57

328299msgctxt ""

329300"Re-dock means connect the device again to an external screen/mouse/keyboard"

330301msgid "Re-dock, save your work and close these apps to continue."

331302msgstr "እንደገና-ማሳረፊያ: ስራዎትን ያስቀምጡ እና ይዝጉ መተግበሪያው እንዲቀጥል"

332303

333−#: qml/Components/ModeSwitchWarningDialog.qml:67

304+#: qml/Components/ModeSwitchWarningDialog.qml:63

334305msgid "Or force close now (unsaved data will be lost)."

335306msgstr "ወይንም አሁን አስገድዶ ማጥፊያ (ያልተቀመጠ ዳታ ይጠፋል)"

336307

337−#: qml/Components/ModeSwitchWarningDialog.qml:80

308+#: qml/Components/ModeSwitchWarningDialog.qml:75

338309msgid "OK, I will reconnect"

339310msgstr "እሺ: እኔ አሁን እንደገና እገናኛለሁ"

340311

341−#: qml/Components/ModeSwitchWarningDialog.qml:81

312+#: qml/Components/ModeSwitchWarningDialog.qml:76

342313msgid "Reconnect now!"

343314msgstr "አሁን እንደገና መገናኛ!"

344315

345−#: qml/Components/ModeSwitchWarningDialog.qml:94

316+#: qml/Components/ModeSwitchWarningDialog.qml:88

346317msgid "Close all"

347318msgstr "ሁሉንም መዝጊያ"

348319

@@ -358,19 +329,116 @@ msgstr "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገ

358329

359330#: qml/Components/VirtualTouchPad.qml:327

360331msgid "Tap left button to click."

361−msgstr "የ ግራ ቁልፍ መታ ያድርጉ ለ መጫን"

332+msgstr ""

362333

363334#: qml/Components/VirtualTouchPad.qml:339

364335msgid "Tap right button to right click."

365−msgstr "የ ቀኝ ቁልፍ መታ ያድርጉ በ ቀኝ ለ መጫን"

336+msgstr ""

366337

367338#: qml/Components/VirtualTouchPad.qml:351

368339msgid "Swipe with two fingers to scroll."

369−msgstr "ለ መሸብለል በ ሁለት ጣቶች ይጥረጉ"

340+msgstr ""

370341

371342#: qml/Components/VirtualTouchPad.qml:396

372343msgid "Find more settings in the system settings."

373−msgstr "ተጨማሪ ማሰናጃ በ ስርአት ማሰናጃ ውስጥ መፈለጊያ"

344+msgstr ""

345+

346+#: qml/Dash/DashPageHeader.qml:361

347+msgctxt "Button: Open the Ubuntu Store"

348+msgid "Store"

349+msgstr "ማስቀመጫ"

350+

351+#: qml/Dash/DashPageHeader.qml:368

352+msgctxt "Button: Start a search in the current dash scope"

353+msgid "Search"

354+msgstr "መፈለጊያ"

355+

356+#: qml/Dash/DashPageHeader.qml:378

357+msgctxt "Button: Show the current dash scope settings"

358+msgid "Settings"

359+msgstr "ማሰናጃዎች"

360+

361+#: qml/Dash/DashPageHeader.qml:385

362+msgid "Remove from Favorites"

363+msgstr "ከምወዳቸው ማስወገጃ"

364+

365+#: qml/Dash/DashPageHeader.qml:385

366+msgid "Add to Favorites"

367+msgstr "ወደምወዳቸው መጨመሪያ"

368+

369+#: qml/Dash/FiltersPopover.qml:61

370+msgid "Refine your results"

371+msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"

372+

373+#: qml/Dash/FiltersPopover.qml:70

374+msgid "Reset"

375+msgstr "እንደ ነበረ መመለሻ"

376+

377+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/GenericScopeView.qml:718

378+msgid "Show less"

379+msgstr "ትንሽ ማሳያ"

380+

381+#: qml/Dash/GenericScopeView.qml:547

382+msgid "Show all"

383+msgstr "ሁሉንም ማሳያ"

384+

385+#: qml/Dash/GenericScopeView.qml:578

386+msgctxt "Label: Hint for dash search line edit"

387+msgid "Search"

388+msgstr "መፈለጊያ"

389+

390+#: qml/Dash/PageHeaderExtraPanel.qml:67

391+msgid "Recent Searches"

392+msgstr "የ ቅርብ ጊዜ ፍለጋዎች"

393+

394+#: qml/Dash/PageHeaderExtraPanel.qml:78

395+msgid "Clear All"

396+msgstr "ሁሉንም ማጽጃ"

397+

398+#: qml/Dash/Previews/PreviewActionCombo.qml:36

399+msgid "More..."

400+msgstr "ተጨማሪ..."

401+

402+#: qml/Dash/Previews/PreviewActionCombo.qml:36

403+msgid "Less..."

404+msgstr "አነስተኛ..."

405+

406+#: qml/Dash/Previews/PreviewCommentInput.qml:83

407+#: qml/Dash/Previews/PreviewRatingInput.qml:202

408+msgid "Send"

409+msgstr "መላኪያ"

410+

411+#: qml/Dash/Previews/PreviewRatingInput.qml:109

412+msgid "Rate this"

413+msgstr "ለዚህ ደረጃ ይስጡ"

414+

415+#: qml/Dash/Previews/PreviewRatingInput.qml:184

416+msgid "Add a review"

417+msgstr "ግምገማ መጨመሪያ"

418+

419+#: qml/Dash/PullToRefreshScopeStyle.qml:56

420+msgid "Pull to refresh…"

421+msgstr "ይሳቡ ለማነቃቃት…"

422+

423+#: qml/Dash/PullToRefreshScopeStyle.qml:61

424+msgid "Release to refresh…"

425+msgstr "ይልቀቁ ለማነቃቃት…"

426+

427+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

428+msgid "Enable location data"

429+msgstr "የአካባቢ ዳታ ማስቻያ"

430+

431+#: qml/Dash/ScopesList.qml:57

432+msgid "Manage"

433+msgstr "አስተዳዳሪ"

434+

435+#: qml/Dash/ScopesList.qml:104

436+msgid "Home"

437+msgstr "ቤት"

438+

439+#: qml/Dash/ScopesList.qml:105

440+msgid "Also installed"

441+msgstr "እንዲሁም የተገጠሙ"

374442

375443#: qml/Greeter/CoverPage.qml:127

376444msgid "Unlock"

@@ -395,45 +463,46 @@ msgid_plural "Please wait %1 minutes and then try again…"

395463msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"

396464msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"

397465

398−#: qml/Greeter/Greeter.qml:550

466+#: qml/Greeter/Greeter.qml:592

399467msgid "Try again"

400468msgstr "እንደገና ይሞክሩ"

401469

402−#: qml/Greeter/Greeter.qml:551

403−msgid "Enter passphrase to unlock"

404−msgstr "የ ማለፊያ ሀረግ ያስገቡ"

405−

406−#: qml/Greeter/Greeter.qml:552

407−msgid "Enter passcode to unlock"

408−msgstr "የ ማለፊያ ኮድ ያስገቡ ለ መክፈት"

409−

410−#: qml/Greeter/NarrowView.qml:235

411−msgid "Emergency"

412−msgstr "ድንገተኛ"

413−

414−#: qml/Greeter/PromptList.qml:126

470+#: qml/Greeter/LoginList.qml:70

415471msgid "Passphrase"

416472msgstr "የማለፊያ ሐረግ"

417473

418−#: qml/Greeter/PromptList.qml:126

474+#: qml/Greeter/LoginList.qml:71

419475msgid "Passcode"

420476msgstr "ማለፊያ ኮድ"

421477

422−#: qml/Greeter/SessionsList.qml:124

478+#: qml/Greeter/LoginList.qml:98

479+msgid "Retry"

480+msgstr "እንደገና ይሞክሩ"

481+

482+#: qml/Greeter/LoginList.qml:99

483+msgid "Log In"

484+msgstr "መግቢያ"

485+

486+#: qml/Greeter/NarrowView.qml:252

487+msgid "Emergency"

488+msgstr "ድንገተኛ"

489+

490+#: qml/Greeter/SessionsList.qml:122

423491msgid "Select desktop environment"

424492msgstr "የ ዴስክቶፕ አይነት ይምረጡ"

425493

426−#: qml/Launcher/Drawer.qml:250

494+#: qml/Launcher/Drawer.qml:80

427495msgid "Search…"

428−msgstr "መፈለጊያ…"

496+msgstr ""

429497

430−#: qml/Launcher/PullToRefreshScopeStyle.qml:56

431−msgid "Pull to refresh…"

432−msgstr "ይሳቡ ለማነቃቃት…"

498+#: qml/Launcher/Drawer.qml:101

499+msgctxt "Apps sorted alphabetically"

500+msgid "A-Z"

501+msgstr ""

433502

434−#: qml/Launcher/PullToRefreshScopeStyle.qml:61

435−msgid "Release to refresh…"

436−msgstr "ይልቀቁ ለማነቃቃት…"

503+#: qml/Launcher/MoreAppsHeader.qml:32

504+msgid "More apps in the store"

505+msgstr ""

437506

438507#: qml/Notifications/NotificationMenuItemFactory.qml:124

439508msgid "Show password"

@@ -447,62 +516,62 @@ msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."

447516msgid "Conference"

448517msgstr "ስብሰባ"

449518

450−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:869

519+#: qml/Panel/Indicators/MenuItemFactory.qml:868

451520msgid "Nothing is playing"

452521msgstr "ምንም አይጫወትም"

453522

454−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:997

523+#: qml/Panel/Indicators/MenuItemFactory.qml:996

455524#, qt-format

456525msgid "%1 hour"

457526msgid_plural "%1 hours"

458527msgstr[0] "%1 ሰአት"

459528msgstr[1] "%1 ሰአቶች"

460529

461−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1001

530+#: qml/Panel/Indicators/MenuItemFactory.qml:1000

462531#, qt-format

463532msgid "%1 minute"

464533msgid_plural "%1 minutes"

465534msgstr[0] "%1 ደቂቃ"

466535msgstr[1] "%1 ደቂቃዎች"

467536

468−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1006

537+#: qml/Panel/Indicators/MenuItemFactory.qml:1005

469538#, qt-format

470539msgid "%1 second"

471540msgid_plural "%1 seconds"

472541msgstr[0] "%1 ሰከንድ"

473542msgstr[1] "%1 ሰከንዶች"

474543

475−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1009

544+#: qml/Panel/Indicators/MenuItemFactory.qml:1008

476545msgid "0 seconds"

477546msgstr "0 ሰከንዶች"

478547

479548#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

480−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1011

549+#: qml/Panel/Indicators/MenuItemFactory.qml:1010

481550#, qt-format

482551msgid "%1 remaining"

483552msgstr "%1 የቀረው"

484553

485−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1017

554+#: qml/Panel/Indicators/MenuItemFactory.qml:1016

486555msgid "In queue…"

487556msgstr "ወረፋ በመጠበቅ ላይ…"

488557

489−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1021

558+#: qml/Panel/Indicators/MenuItemFactory.qml:1020

490559msgid "Downloading"

491560msgstr "በማውረድ ላይ"

492561

493−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1023

562+#: qml/Panel/Indicators/MenuItemFactory.qml:1022

494563msgid "Paused, tap to resume"

495564msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"

496565

497−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1025

566+#: qml/Panel/Indicators/MenuItemFactory.qml:1024

498567msgid "Canceled"

499568msgstr "ተሰርዟል"

500569

501−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1027

570+#: qml/Panel/Indicators/MenuItemFactory.qml:1026

502571msgid "Finished"

503572msgstr "ጨርሷል"

504573

505−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1029

574+#: qml/Panel/Indicators/MenuItemFactory.qml:1028

506575msgid "Failed, tap to retry"

507576msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"

508577

@@ -522,33 +591,23 @@ msgctxt "Button: Call back on phone"

522591msgid "Call back"

523592msgstr "መልሶ መደወያ"

524593

525−#: qml/Panel/PanelMenuPage.qml:92

526−msgid "Back"

527−msgstr "ወደ ኋላ"

528−

529594#: qml/Stage/SideStage.qml:76

530595msgid "Drag using 3 fingers any application from one window to the other"

531596msgstr "መጎተቻ 3 ጣቶች በ መጠቀም ማንኛውንም መተግበሪያ ከ አንድ መስኮት ወደ ሌላ"

532597

533−#: qml/Stage/Stage.qml:671

534−msgid "No running apps"

535−msgstr ""

536−

537598#: qml/Tutorial/TutorialLeftLong.qml:49

538−#, fuzzy

539−#| msgid "Long swipe from the left edge to open the Today scope"

540−msgid "Long swipe from the left edge to open the Application Drawer"

599+msgid "Long swipe from the left edge to open the Today scope"

541600msgstr "በ ረጅሙ ከ ግራ ጠርዝ በኩል ይጥረጉ የ ዛሬን ክልል ለ መክፈት"

542601

543602#: qml/Tutorial/TutorialLeft.qml:47

544603msgid "Short swipe from the left edge to open the launcher"

545604msgstr "በ አጭሩ ይጥረጉ ከ ግራ ጠርዝ በኩል ማስጀመሪያውን ለ መክፈት"

546605

547−#: qml/Tutorial/TutorialRight.qml:54

606+#: qml/Tutorial/TutorialRight.qml:55

548607msgid "Push your mouse against the right edge to view your open apps"

549608msgstr "የ እርስዎን አይጥ መጠቆሚያ ወደ ቀኝ ጠርዝ በኩል ያስጠጉ የ ተከፈቱ መተግበሪያዎችን ለ መመልከት"

550609

551−#: qml/Tutorial/TutorialRight.qml:55

610+#: qml/Tutorial/TutorialRight.qml:56

552611msgid "Swipe from the right edge to view your open apps"

553612msgstr "ከ ቀኝ በኩል ይጥረጉ የ ተከፈቱ መተግበሪያዎችን ለ መመልከት"

554613

@@ -556,44 +615,28 @@ msgstr "ከ ቀኝ በኩል ይጥረጉ የ ተከፈቱ መተግበሪያዎ

556615msgid "Swipe from the top edge to access notifications and quick settings"

557616msgstr "ከ ላይ ጠረዝ በኩል ይጥረጉ ማስታወቂያዎች እና በፍጥነት ማሰናጃዎች ጋር ለ መድረስ"

558617

559−#: qml/Wizard/Page.qml:59

618+#: qml/Wizard/Page.qml:54

560619msgctxt "Button: Go back one page in the Wizard"

561620msgid "Back"

562621msgstr "ወደ ኋላ"

563622

564−#: qml/Wizard/Pages/10-welcome.qml:29

623+#: qml/Wizard/Pages/10-welcome.qml:28

565624msgid "Language"

566625msgstr "ቋንቋ"

567626

568−#: qml/Wizard/Pages/10-welcome.qml:176

569−#: qml/Wizard/Pages/10-welcome-update.qml:126

570−#: qml/Wizard/Pages/11-changelog.qml:74 qml/Wizard/Pages/20-keyboard.qml:152

571−#: qml/Wizard/Pages/30-wifi.qml:214 qml/Wizard/Pages/50-timezone.qml:272

572−#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/70-passwd-type.qml:146

573−#: qml/Wizard/Pages/passcode-desktop.qml:154

574−#: qml/Wizard/Pages/password-set.qml:153

627+#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152

628+#: qml/Wizard/Pages/30-wifi.qml:207 qml/Wizard/Pages/40-location.qml:271

629+#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65

630+#: qml/Wizard/Pages/70-passwd-type.qml:145

631+#: qml/Wizard/Pages/75-report-check.qml:84

632+#: qml/Wizard/Pages/passcode-desktop.qml:142

633+#: qml/Wizard/Pages/password-set.qml:142

575634msgid "Next"

576635msgstr "ይቀጥሉ"

577636

578−#: qml/Wizard/Pages/10-welcome-update.qml:91

579−msgid "Welcome to "

580−msgstr "እንኳን ደህና መጡ ወደ: "

581−

582−#: qml/Wizard/Pages/10-welcome-update.qml:106

583−msgid "We will make sure your device is ready to use "

584−msgstr "የ እርስዎ አካል ለ መጠቀም ዝግጁ ነው: "

585−

586−#: qml/Wizard/Pages/11-changelog.qml:28

587−msgid "What's new"

588−msgstr "ምን አዲስ ነገር አለ"

589−

590−#: qml/Wizard/Pages/11-changelog.qml:74

591−msgid "Loading..."

592−msgstr "በ መጫን ላይ..."

593−

594637#: qml/Wizard/Pages/20-keyboard.qml:31

595638msgid "Select Keyboard"

596−msgstr "የ ፊደል ገበታ ይምረጡ"

639+msgstr "ቋንቋ ይምረጡ"

597640

598641#: qml/Wizard/Pages/20-keyboard.qml:71

599642msgid "Keyboard language"

@@ -603,8 +646,8 @@ msgstr "የ ፊደል ገበታ ቋንቋ"

603646msgid "Keyboard layout"

604647msgstr "የ ፊደል ገበታ አቀራረብ"

605648

606−#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:214

607−#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/79-system-update.qml:144

649+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:207

650+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/77-system-update.qml:152

608651#: qml/Wizard/Pages/sim.qml:101

609652msgid "Skip"

610653msgstr "መዝለያ"

@@ -613,23 +656,55 @@ msgstr "መዝለያ"

613656msgid "Connect to Wi‑Fi"

614657msgstr "ወደ ዋይ‑ፋይ መገናኛ"

615658

616−#: qml/Wizard/Pages/30-wifi.qml:139

659+#: qml/Wizard/Pages/30-wifi.qml:132

617660msgid "Connected"

618661msgstr "ተገናኝቷል"

619662

620−#: qml/Wizard/Pages/30-wifi.qml:172

663+#: qml/Wizard/Pages/30-wifi.qml:165

621664msgid "Available Wi-Fi networks"

622665msgstr "ዝግጁ የ ዋይ-ፋይ ኔትዎርኮች"

623666

624−#: qml/Wizard/Pages/30-wifi.qml:173

667+#: qml/Wizard/Pages/30-wifi.qml:166

625668msgid "No available Wi-Fi networks"

626669msgstr "ምንም ዝግጁ ዋይ-ፋይ ኔትዎርኮች አልተገኙም"

627670

671+#: qml/Wizard/Pages/40-location.qml:27

672+msgid "Location Services"

673+msgstr "የ አካባቢ ግልጋሎት"

674+

675+#: qml/Wizard/Pages/40-location.qml:83

676+msgid ""

677+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

678+"(recommended)"

679+msgstr "ይጠቀሙ ጂፒኤስ: ዋይ-ፋይ: hotspots እና ተንቀሳቃሽ ኔትዎርክ ሳይታወቁ አካባቢ ለማግኘት (ይመከራሉ)"

680+

681+#: qml/Wizard/Pages/40-location.qml:105

682+#, qt-format

683+msgid "By selecting this option you agree to the Nokia HERE %1."

684+msgstr "ይህን ምርጫ በ መምረጥ እርስዎ ተስማምተዋል ከ Nokia HERE %1."

685+

686+#: qml/Wizard/Pages/40-location.qml:106

687+msgctxt "part of: Nokia HERE terms and conditions"

688+msgid "terms and conditions"

689+msgstr "ስምምነት እና ሁኔታዎች"

690+

691+#: qml/Wizard/Pages/40-location.qml:160

692+msgid "GPS only"

693+msgstr "ጂፒኤስ ብቻ"

694+

695+#: qml/Wizard/Pages/40-location.qml:214

696+msgid "Don't use my location"

697+msgstr "የ እኔን አካባቢ አትጠቀም"

698+

699+#: qml/Wizard/Pages/40-location.qml:260

700+msgid "You can change it later in System Settings."

701+msgstr "እርስዎ በኋላ በ ስርአት ማሰናጃ ውስጥ መቀየር ይችላሉ"

702+

628703#: qml/Wizard/Pages/50-timezone.qml:30

629704msgid "Time Zone"

630705msgstr "የ ሰአት ክልል"

631706

632−#: qml/Wizard/Pages/50-timezone.qml:183

707+#: qml/Wizard/Pages/50-timezone.qml:182

633708msgid "Enter your city"

634709msgstr "የ እርስዎን ከተማ ያስገቡ"

635710

@@ -637,7 +712,7 @@ msgstr "የ እርስዎን ከተማ ያስገቡ"

637712msgid "Personalize Your Device"

638713msgstr "የ እርስዎን አካል የ ግልዎ ያድርጉ"

639714

640−#: qml/Wizard/Pages/60-account.qml:54

715+#: qml/Wizard/Pages/60-account.qml:48

641716msgid "Preferred Name"

642717msgstr "የመረጡት ስም"

643718

@@ -645,75 +720,112 @@ msgstr "የመረጡት ስም"

645720msgid "Lock Screen"

646721msgstr "መመልከቻውን መቆለፊያ"

647722

648−#: qml/Wizard/Pages/70-passwd-type.qml:103

723+#: qml/Wizard/Pages/70-passwd-type.qml:102

649724msgctxt "Label: Type of security method"

650725msgid "Create new password"

651726msgstr "አዲስ የ መግቢያ ቃል መፍጠሪያ"

652727

653−#: qml/Wizard/Pages/70-passwd-type.qml:105

728+#: qml/Wizard/Pages/70-passwd-type.qml:104

654729msgctxt "Label: Type of security method"

655730msgid "Create passcode (numbers only)"

656731msgstr "አዲስ የ ማለፊያ ኮድ መፍጠሪያ (ቁጥር ብቻ)"

657732

658−#: qml/Wizard/Pages/70-passwd-type.qml:107

733+#: qml/Wizard/Pages/70-passwd-type.qml:106

659734msgctxt "Label: Type of security method"

660735msgid "No lock code"

661736msgstr "ምንም መቆለፊያ ኮድ አልተገኘም"

662737

663−#: qml/Wizard/Pages/79-system-update.qml:28

738+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

739+msgid "Privacy Policy"

740+msgstr "የ ግላዊነት መመሪያ"

741+

742+#: qml/Wizard/Pages/75-report-check.qml:26

743+msgid "Help Us Improve"

744+msgstr "እንድንሻሻል ይርዱን"

745+

746+#: qml/Wizard/Pages/75-report-check.qml:59

747+msgid "Improve system performance by sending us crashes and error reports."

748+msgstr "የ ስርአቱን አፈጻጸም ለማሻሻል የ ግጭት እና የ ስህተት መልእክቶች ይላኩልን"

749+

750+#: qml/Wizard/Pages/75-report-check.qml:60

751+msgid "Privacy policy"

752+msgstr "የ ግላዊነት መመሪያ"

753+

754+#: qml/Wizard/Pages/77-system-update.qml:28

664755msgid "Update Device"

665756msgstr "አካሉን ማሻሻያ"

666757

667−#: qml/Wizard/Pages/79-system-update.qml:55

758+#: qml/Wizard/Pages/77-system-update.qml:55

668759msgid ""

669760"There is a system update available and ready to install. Afterwards, the "

670761"device will automatically restart."

671762msgstr "የ ስርአት ማሻሻያ ዝግጁ ነው ለ መግጠም: ከዚያ በኋላ አካሉ ራሱ በራሱ እንደገና ይጀምራል"

672763

673−#: qml/Wizard/Pages/79-system-update.qml:76

674−#, fuzzy

675−#| msgctxt "string identifying name of the update"

676−#| msgid "Ubuntu system"

764+#: qml/Wizard/Pages/77-system-update.qml:76

677765msgctxt "string identifying name of the update"

678−msgid "Ubuntu Touch system"

766+msgid "Ubuntu system"

679767msgstr "የ ኡቡቱ ስርአት"

680768

681−#: qml/Wizard/Pages/79-system-update.qml:83

769+#: qml/Wizard/Pages/77-system-update.qml:83

682770#, qt-format

683771msgctxt "version of the system update"

684772msgid "Version %1"

685773msgstr "እትም %1"

686774

687−#: qml/Wizard/Pages/79-system-update.qml:95

775+#: qml/Wizard/Pages/77-system-update.qml:102

688776msgid "This could take a few minutes..."

689−msgstr "ይህ ትንሽ ደቂቃዎች ይወስዳል..."

777+msgstr "ይህ ትንሽ ደቂቆች ይወስዳል"

690778

691−#: qml/Wizard/Pages/79-system-update.qml:109

779+#: qml/Wizard/Pages/77-system-update.qml:116

692780msgid "Install and restart now"

693781msgstr "መግጠሚያ እና እንደገና ማስጀመሪያ"

694782

695−#: qml/Wizard/Pages/80-finished.qml:91

696−msgid "Welcome Back"

697−msgstr "እንኳን ደህና መጡ:"

698−

699−#: qml/Wizard/Pages/80-finished.qml:91

783+#: qml/Wizard/Pages/80-finished.qml:89

700784msgid "Welcome to Ubuntu"

701785msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ"

702786

703−#: qml/Wizard/Pages/80-finished.qml:106

787+#: qml/Wizard/Pages/80-finished.qml:104

704788msgid "You are ready to use your device now"

705789msgstr "የ እርስዎን አካል ለ መጠቀም አሁን ዝግጁ ነው"

706790

707−#: qml/Wizard/Pages/80-finished.qml:126

708−msgid "Continue"

709−msgstr "ይቀጥሉ"

710−

711−#: qml/Wizard/Pages/80-finished.qml:126

791+#: qml/Wizard/Pages/80-finished.qml:124

712792msgid "Get Started"

713793msgstr "እንጀምር"

714794

795+#: qml/Wizard/Pages/here-terms.qml:25

796+msgid "Terms & Conditions"

797+msgstr "ውሎች & ሁኔታዎች"

798+

799+#: qml/Wizard/Pages/here-terms.qml:69

800+msgid "Your device uses positioning technologies provided by HERE."

801+msgstr "የ እርስዎ አካል ይጠቀማል ያሉበትን አካባቢ ቴክኖሎጂ የቀረበውን በ HERE."

802+

803+#: qml/Wizard/Pages/here-terms.qml:81

804+msgid ""

805+"To provide you with positioning services and to improve their quality, HERE "

806+"collects information about nearby cell towers and Wi-Fi hotspots around your "

807+"current location whenever your position is being found."

808+msgstr ""

809+"እርስዎ ያሉበትን አካባቢ ግልጋሎት ለ መስጠት እና ለማሻሻል: HERE መረጃ ይሰበስባል በቅርብ ያሉ የ ሴል ምሶሶዎች እና "

810+"ዋይ-ፋይ hotspots እርስዎ አሁን ያሉበትን አካባቢ ሲታወቅ"

811+

812+#: qml/Wizard/Pages/here-terms.qml:93

813+msgid ""

814+"The information collected is used to analyze the service and to improve the "

815+"use of service, but not to identify you personally."

816+msgstr "የ ተሰበሰበው መረጃ የሚጠቅመው ግልጋሎት ለማሻሻል ነው: ነገር ግን እርስዎን በ ግል ለ መለየት አይደለም"

817+

818+#: qml/Wizard/Pages/here-terms.qml:106

819+#, qt-format

820+msgid "By continuing, you agree to the HERE platform %1 and %2."

821+msgstr "በ መቀጠል እርስዎ ተስማምተዋል ከ HERE platform %1 እና %2."

822+

823+#: qml/Wizard/Pages/here-terms.qml:107

824+msgid "Service Terms"

825+msgstr "የ ግልጋሎት ስምምነቶች"

826+

715827#: qml/Wizard/Pages/passcode-confirm.qml:43

716−#: qml/Wizard/Pages/passcode-desktop.qml:104

828+#: qml/Wizard/Pages/passcode-desktop.qml:97

717829msgid "Confirm passcode"

718830msgstr "የማለፊያ ኮድ ማረጋገጫ"

719831

@@ -730,24 +842,24 @@ msgstr "እባክዎን እንደገና-ያስገቡ"

730842msgid "Lock Screen Passcode"

731843msgstr "የ መመልከቻው መቆለፊያ የ ማለፊያ ኮድ"

732844

733−#: qml/Wizard/Pages/passcode-desktop.qml:68

845+#: qml/Wizard/Pages/passcode-desktop.qml:61

734846msgid "Enter 4 numbers to setup your passcode"

735847msgstr "ያስገቡ 4 ቁጥሮች የ እርስዎን የ ማለፊያ ኮድ ለማሰናዳት"

736848

737−#: qml/Wizard/Pages/passcode-desktop.qml:84

849+#: qml/Wizard/Pages/passcode-desktop.qml:77

738850#: qml/Wizard/Pages/passcode-set.qml:54

739851msgid "Choose passcode"

740852msgstr "የ ማለፊያ ኮድ ይምረጡ"

741853

742−#: qml/Wizard/Pages/passcode-desktop.qml:139

854+#: qml/Wizard/Pages/passcode-desktop.qml:127

743855msgid "Passcode too short"

744856msgstr "የ ማለፊያ ኮዱ በጣም አጭር ነው"

745857

746−#: qml/Wizard/Pages/passcode-desktop.qml:141

858+#: qml/Wizard/Pages/passcode-desktop.qml:129

747859msgid "Passcodes match"

748860msgstr "የ ማለፊያ ኮዶቹ ተመሳሳይ ናቸው"

749861

750−#: qml/Wizard/Pages/passcode-desktop.qml:143

862+#: qml/Wizard/Pages/passcode-desktop.qml:131

751863msgid "Passcodes do not match"

752864msgstr "የ ማለፊያ ኮዶቹ አይመሳሰሉም"

753865

@@ -759,15 +871,15 @@ msgstr "የ ማለፊያ ኮድ 4 ባህሪዎች መሆን አለበት"

759871msgid "Lock Screen Password"

760872msgstr "የ መመልከቻ መቆለፊያ የ መግቢያ ቃል"

761873

762−#: qml/Wizard/Pages/password-set.qml:68

874+#: qml/Wizard/Pages/password-set.qml:62

763875msgid "Enter at least 8 characters"

764876msgstr "ያስገቡ ቢያንስ 8 ባህሪዎች"

765877

766−#: qml/Wizard/Pages/password-set.qml:80

878+#: qml/Wizard/Pages/password-set.qml:74

767879msgid "Choose password"

768880msgstr "የ መግቢያ ቃል ይምረጡ"

769881

770−#: qml/Wizard/Pages/password-set.qml:110

882+#: qml/Wizard/Pages/password-set.qml:104

771883msgid "Confirm password"

772884msgstr "የ መግቢያ ቃሉን ያረጋግጡ"

773885

@@ -823,217 +935,6 @@ msgstr "ደካማ የ መግቢያ ቃል"

823935msgid "Very weak password"

824936msgstr "በጣም ደካማ የ መግቢያ ቃል"

825937

826−#~ msgid "Unity 8"

827−#~ msgstr "Unity 8"

828−

829−#~ msgid "Scopes"

830−#~ msgstr "ክልል"

831−

832−#~ msgid "Super (Tap)"

833−#~ msgstr "Super (Tap)"

834−

835−#~ msgid "Opens the Scopes home."

836−#~ msgstr "የ ክልል ቤት መክፈቻ"

837−

838−#~ msgctxt "Button: Open the Ubuntu Store"

839−#~ msgid "Store"

840−#~ msgstr "ማስቀመጫ"

841−

842−#~ msgctxt "Button: Start a search in the current dash scope"

843−#~ msgid "Search"

844−#~ msgstr "መፈለጊያ"

845−

846−#~ msgctxt "Button: Show the current dash scope settings"

847−#~ msgid "Settings"

848−#~ msgstr "ማሰናጃዎች"

849−

850−#~ msgid "Remove from Favorites"

851−#~ msgstr "ከምወዳቸው ማስወገጃ"

852−

853−#~ msgid "Add to Favorites"

854−#~ msgstr "ወደምወዳቸው መጨመሪያ"

855−

856−#~ msgid "Refine your results"

857−#~ msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"

858−

859−#~ msgid "Reset"

860−#~ msgstr "እንደ ነበረ መመለሻ"

861−

862−#~ msgid "Show less"

863−#~ msgstr "ትንሽ ማሳያ"

864−

865−#~ msgid "Show all"

866−#~ msgstr "ሁሉንም ማሳያ"

867−

868−#~ msgctxt "Label: Hint for dash search line edit"

869−#~ msgid "Search"

870−#~ msgstr "መፈለጊያ"

871−

872−#~ msgid "Recent Searches"

873−#~ msgstr "የ ቅርብ ጊዜ ፍለጋዎች"

874−

875−#~ msgid "Clear All"

876−#~ msgstr "ሁሉንም ማጽጃ"

877−

878−#~ msgid "More..."

879−#~ msgstr "ተጨማሪ..."

880−

881−#~ msgid "Less..."

882−#~ msgstr "አነስተኛ..."

883−

884−#~ msgid "Send"

885−#~ msgstr "መላኪያ"

886−

887−#~ msgid "Rate this"

888−#~ msgstr "ለዚህ ደረጃ ይስጡ"

889−

890−#~ msgid "Add a review"

891−#~ msgstr "ግምገማ መጨመሪያ"

892−

893−#~ msgid "Enable location data"

894−#~ msgstr "የአካባቢ ዳታ ማስቻያ"

895−

896−#~ msgid "Manage"

897−#~ msgstr "አስተዳዳሪ"

898−

899−#~ msgid "Home"

900−#~ msgstr "ቤት"

901−

902−#~ msgid "Also installed"

903−#~ msgstr "እንዲሁም የተገጠሙ"

904−

905−#~ msgid "Privacy Policy"

906−#~ msgstr "የ ግላዊነት መመሪያ"

907−

908−#~ msgid "Help Us Improve"

909−#~ msgstr "እንድንሻሻል ይርዱን"

910−

911−#~ msgid "Improve system performance by sending us crashes and error reports."

912−#~ msgstr "የ ስርአቱን አፈጻጸም ለማሻሻል የ ግጭት እና የ ስህተት መልእክቶች ይላኩልን"

913−

914−#~ msgid "Privacy policy"

915−#~ msgstr "የ ግላዊነት መመሪያ"

916−

917−#~ msgid "Update Apps"

918−#~ msgstr "መተግበሪያ ማሻሻያ"

919−

920−#~ msgid "This device is not connected to the internet."

921−#~ msgstr "ይህ አካል ከ ኢንተርኔት ጋር አልተገናኘም:"

922−

923−#~ msgid "Software is up to date"

924−#~ msgstr "ሶፍትዌሩ ዘመናዊ ነው:"

925−

926−#~ msgid "The update server is not responding."

927−#~ msgstr "የ ማሻሻያ ሰርቨር አይመልስም:"

928−

929−#~ msgid "Please wait..."

930−#~ msgstr "እባክዎን ይቆዩ..."

931−

932−#~ msgid "Installation failed"

933−#~ msgstr "መግጠሙ አልተሳካም:"

934−

935−#~ msgid "Checking for updates…"

936−#~ msgstr "ማሻሻያ በ መፈለግ ላይ…"

937−

938−#~ msgid "%1 update available"

939−#~ msgid_plural "%1 updates available"

940−#~ msgstr[0] "%1 ማሻሻያ ዝግጁ ነው:"

941−#~ msgstr[1] "%1 ማሻሻያዎች ዝግጁ ናቸው:"

942−

943−#~ msgid "Update all…"

944−#~ msgstr "ሁሉንም ማሻሻያ…"

945−

946−#~ msgid "Update all"

947−#~ msgstr "ሁሉንም ማሻሻያ"

948−

949−#~ msgid "Update"

950−#~ msgstr "ማሻሻያ"

951−

952−#~ msgid "Download"

953−#~ msgstr "የ ወረደ"

954−

955−#~ msgid "Resume"

956−#~ msgstr "ይቀጥሉ"

957−

958−#~ msgid "Install…"

959−#~ msgstr "መግጠሚያ…"

960−

961−#~ msgid "Install"

962−#~ msgstr "መግጠሚያ"

963−

964−#~ msgid "Open"

965−#~ msgstr "መክፈቻ"

966−

967−#~ msgid "Installing"

968−#~ msgstr "በ መግጠም ላይ"

969−

970−#~ msgid "Waiting to download"

971−#~ msgstr "ለ ማውረድ በ መጠበቅ ላይ"

972−

973−#~ msgid "%1 of %2"

974−#~ msgstr "%1 ከ %2"

975−

976−#~ msgid "Downloaded"

977−#~ msgstr "የ ወረደ"

978−

979−#~ msgid "Installed"

980−#~ msgstr "ተገጥሟል:"

981−

982−#~ msgid "Updated %1"

983−#~ msgstr "ተሻሽሏል %1"

984−

985−#~ msgid "Update failed"

986−#~ msgstr "ማሻሻል አልተቻለም:"

987−

988−#~ msgid "Location Services"

989−#~ msgstr "የ አካባቢ ግልጋሎት"

990−

991−#~ msgid ""

992−#~ "Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

993−#~ "(recommended)"

994−#~ msgstr "ይጠቀሙ ጂፒኤስ: ዋይ-ፋይ: hotspots እና ተንቀሳቃሽ ኔትዎርክ ሳይታወቁ አካባቢ ለማግኘት (ይመከራሉ)"

995−

996−#~ msgid "By selecting this option you agree to the Nokia HERE %1."

997−#~ msgstr "ይህን ምርጫ በ መምረጥ እርስዎ ተስማምተዋል ከ Nokia HERE %1."

998−

999−#~ msgctxt "part of: Nokia HERE terms and conditions"

1000−#~ msgid "terms and conditions"

1001−#~ msgstr "ስምምነት እና ሁኔታዎች"

1002−

1003−#~ msgid "GPS only"

1004−#~ msgstr "ጂፒኤስ ብቻ"

1005−

1006−#~ msgid "Don't use my location"

1007−#~ msgstr "የ እኔን አካባቢ አትጠቀም"

1008−

1009−#~ msgid "You can change it later in System Settings."

1010−#~ msgstr "እርስዎ በኋላ በ ስርአት ማሰናጃ ውስጥ መቀየር ይችላሉ"

1011−

1012−#~ msgid "Terms & Conditions"

1013−#~ msgstr "ውሎች & ሁኔታዎች"

1014−

1015−#~ msgid "Your device uses positioning technologies provided by HERE."

1016−#~ msgstr "የ እርስዎ አካል ይጠቀማል ያሉበትን አካባቢ ቴክኖሎጂ የቀረበውን በ HERE."

1017−

1018−#~ msgid ""

1019−#~ "To provide you with positioning services and to improve their quality, "

1020−#~ "HERE collects information about nearby cell towers and Wi-Fi hotspots "

1021−#~ "around your current location whenever your position is being found."

1022−#~ msgstr ""

1023−#~ "እርስዎ ያሉበትን አካባቢ ግልጋሎት ለ መስጠት እና ለማሻሻል: HERE መረጃ ይሰበስባል በቅርብ ያሉ የ ሴል ምሶሶዎች "

1024−#~ "እና ዋይ-ፋይ hotspots እርስዎ አሁን ያሉበትን አካባቢ ሲታወቅ"

1025−

1026−#~ msgid ""

1027−#~ "The information collected is used to analyze the service and to improve "

1028−#~ "the use of service, but not to identify you personally."

1029−#~ msgstr "የ ተሰበሰበው መረጃ የሚጠቅመው ግልጋሎት ለማሻሻል ነው: ነገር ግን እርስዎን በ ግል ለ መለየት አይደለም"

1030−

1031−#~ msgid "By continuing, you agree to the HERE platform %1 and %2."

1032−#~ msgstr "በ መቀጠል እርስዎ ተስማምተዋል ከ HERE platform %1 እና %2."

1033−

1034−#~ msgid "Service Terms"

1035−#~ msgstr "የ ግልጋሎት ስምምነቶች"

1036−

1037938#~ msgid "Top edge"

1038939#~ msgstr "የላይ ጠርዝ"

1039940

@@ -1049,12 +950,21 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

1049950#~ msgid "Type or say a command"

1050951#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"

1051952

953+#~ msgid "Loading. Please Wait..."

954+#~ msgstr "እባክዎን ይቆዩ በመጫን ላይ..."

955+

956+#~ msgid "Speaking..."

957+#~ msgstr "በመናገር ላይ..."

958+

1052959#~ msgid "Speak Now..."

1053960#~ msgstr "አሁን ይናገሩ..."

1054961

1055962#~ msgid "Confirm"

1056963#~ msgstr "ማረጋገጫ"

1057964

965+#~ msgid "Search"

966+#~ msgstr "መፈለጊያ"

967+

1058968#~ msgid "See less"

1059969#~ msgstr "አነስተኛ መመልከቻ"

1060970

@@ -1097,6 +1007,7 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

10971007#~ msgid "This will be your last attempt."

10981008#~ msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

10991009

1010+#, qt-format

11001011#~ msgid "Sorry, incorrect %1"

11011012#~ msgstr "አዝናለሁ: የተሳሳተ%1"

11021013

@@ -1137,12 +1048,11 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

11371048#~ "You have now mastered the edge gestures and can start using the "

11381049#~ "phone<br><br>Tap on the screen to start"

11391050#~ msgstr ""

1140−#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ "

1141−#~ "ለመጀመር"

1051+#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"

11421052

11431053#~ msgid ""

1144−#~ "If passcode is entered incorrectly, your phone will conduct a factory "

1145−#~ "reset and all personal data will be deleted."

1054+#~ "If passcode is entered incorrectly, your phone will conduct a factory reset "

1055+#~ "and all personal data will be deleted."

11461056#~ msgstr ""

11471057#~ "የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

11481058#~ "ይጠፋል"

@@ -1151,8 +1061,8 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

11511061#~ "If passphrase is entered incorrectly, your phone will conduct a factory "

11521062#~ "reset and all personal data will be deleted."

11531063#~ msgstr ""

1154−#~ "የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ "

1155−#~ "በሙሉ ይጠፋል"

1064+#~ "የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

1065+#~ "ይጠፋል"

11561066

11571067#~ msgid "Roaming"

11581068#~ msgstr "ማዘዋወሪያ"

@@ -1160,12 +1070,19 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

11601070#~ msgid "Manage Scopes"

11611071#~ msgstr "የ ክልል አስተዳዳሪ"

11621072

1073+#, qt-format

11631074#~ msgid "Enter %1"

11641075#~ msgstr "ማስገቢያ %1"

11651076

11661077#~ msgid "Please re-enter"

11671078#~ msgstr "እባክዎን እንደገና-ያስገቡ"

11681079

1080+#~ msgid "Enter passphrase"

1081+#~ msgstr "የ ማለፊያ ሀረግ ያስገቡ"

1082+

1083+#~ msgid "Enter passcode"

1084+#~ msgstr "የ ማለፊያ ኮድ ያስገቡ"

1085+

11691086#~ msgid "Lock security"

11701087#~ msgstr "ደህንነት መቆለፊያ"

11711088

@@ -1188,8 +1105,7 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

11881105#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "

11891106#~ "Privacy</b>"

11901107#~ msgstr ""

1191−#~ "ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; "

1192−#~ "Privacy</b>"

1108+#~ "ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"

11931109

11941110#~ msgid "Nice work!"

11951111#~ msgstr "ጥሩ ሰርተዋል!"

@@ -1224,6 +1140,9 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

12241140#~ msgid "Let’s get started."

12251141#~ msgstr "ስራ እንጀምር"

12261142

1143+#~ msgid "Continue"

1144+#~ msgstr "ይቀጥሉ"

1145+

12271146#~ msgid "Passphrase must be 4 characters long"

12281147#~ msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"

12291148

@@ -1233,9 +1152,11 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

12331152#~ msgid "Let the phone detect your location:"

12341153#~ msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"

12351154

1155+#, qt-format

12361156#~ msgid "〈 %1"

12371157#~ msgstr "〈 %1"

12381158

1159+#, qt-format

12391160#~ msgid "%1 〉"

12401161#~ msgstr "%1 〉"

12411162

@@ -1252,12 +1173,12 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

12521173#~ "Your phone is set up to automatically report errors to Canonical and its "

12531174#~ "partners, the makers of the operating system."

12541175#~ msgstr ""

1255−#~ "የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ "

1256−#~ "ስርአት አምራቾች"

1176+#~ "የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "

1177+#~ "አምራቾች"

12571178

12581179#~ msgid ""

1259−#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms "

1260−#~ "and conditions</a>."

1180+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

1181+#~ "conditions</a>."

12611182#~ msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."

12621183

12631184#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

@@ -1272,6 +1193,9 @@ msgstr "በጣም ደካማ የ መግቢያ ቃል"

12721193#~ msgid "Short swipe from the left edge."

12731194#~ msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"

12741195

1196+#~ msgid "Open the launcher"

1197+#~ msgstr "ማስጀመሪያውን መክፈቻ"

1198+

12751199#~ msgid "Tap here to continue."

12761200#~ msgstr "እዚህ መታ ይድርጉ ለመቀጠል"

12771201

po/ar.po+509−499

@@ -6,114 +6,85 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

10−"POT-Creation-Date: 2021-01-29 11:42-0600\n"

11−"PO-Revision-Date: 2021-10-12 07:49+0000\n"

12−"Last-Translator: HEROBRINE7GAMER <tapermeerkat77@gmail.com>\n"

13−"Language-Team: Arabic <https://translate.ubports.com/projects/ubports/lomiri/"

14−"ar/>\n"

15−"Language: ar\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2016-12-15 16:17+0000\n"

11+"PO-Revision-Date: 2015-07-29 09:41+0000\n"

12+"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

13+"Language-Team: Arabic <ar@li.org>\n"

1614"MIME-Version: 1.0\n"

1715"Content-Type: text/plain; charset=UTF-8\n"

1816"Content-Transfer-Encoding: 8bit\n"

19−"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "

20−"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"

21−"X-Generator: Weblate 3.11.3\n"

22−"X-Launchpad-Export-Date: 2016-11-23 06:34+0000\n"

17+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19+"X-Launchpad-Export-Date: 2016-12-23 04:58+0000\n"

20+"X-Generator: Launchpad (build 18298)\n"

2321

24−#: plugins/LightDM/Greeter.cpp:199

22+#: plugins/LightDM/Greeter.cpp:123

2523msgid "Password: "

2624msgstr "كلمة السر: "

2725

28−#: plugins/LightDM/Greeter.cpp:214

29−msgid "Username"

30−msgstr "اسم المستخدم"

31−

32−#: plugins/LightDM/Greeter.cpp:258

33−msgid "Failed to authenticate"

34−msgstr "فشل التحقق"

35−

36−#: plugins/LightDM/Greeter.cpp:260

37−msgid "Invalid password, please try again"

38−msgstr "كلمة المرور غير صحيحة، الرجاء المحاولة مرة أخرى"

39−

40−#: plugins/LightDM/Greeter.cpp:270

41−msgid "Log In"

42−msgstr "سجل الدخول"

43−

44−#: plugins/LightDM/Greeter.cpp:270

45−msgid "Retry"

46−msgstr "حاول مجدداً"

47−

48−#: plugins/LightDM/UsersModel.cpp:157

49−msgid "Login"

50−msgstr "سجل الدخول"

51−

52−#: plugins/LightDM/UsersModel.cpp:165

53−msgid "Guest Session"

54−msgstr "جلسة ضيف"

55−

56−#: plugins/Unity/Launcher/launcheritem.cpp:48

26+#: plugins/Unity/Launcher/launcheritem.cpp:50

5727#: plugins/Unity/Launcher/launcheritem.cpp:122

5828msgid "Pin shortcut"

59−msgstr "ثبت اختصارًا"

29+msgstr "تثبيت الاختصار"

6030

61−#: plugins/Unity/Launcher/launcheritem.cpp:54

31+#: plugins/Unity/Launcher/launcheritem.cpp:55

6232msgid "Quit"

6333msgstr "خروج"

6434

6535#: plugins/Unity/Launcher/launcheritem.cpp:122

6636msgid "Unpin shortcut"

67−msgstr "ألغ تثبيت الاختصار"

37+msgstr "إزالة تثبيت الاختصار"

6838

69−#: qml/Components/Dialogs.qml:176

39+#: qml/Components/Dialogs.qml:149

7040msgctxt "Title: Lock/Log out dialog"

7141msgid "Log out"

72−msgstr "اخرج"

42+msgstr "خروج"

7343

74−#: qml/Components/Dialogs.qml:177

44+#: qml/Components/Dialogs.qml:150

7545msgid "Are you sure you want to log out?"

76−msgstr "أمتأكد أنك تريد تسجيل الخروج ؟"

46+msgstr "هل أنت متأكد من رغبتك في تسجيل الخروج؟"

7747

78−#: qml/Components/Dialogs.qml:180

48+#: qml/Components/Dialogs.qml:152

7949msgctxt "Button: Lock the system"

8050msgid "Lock"

8151msgstr "أوصِد"

8252

83−#: qml/Components/Dialogs.qml:191

53+#: qml/Components/Dialogs.qml:159

8454msgctxt "Button: Log out from the system"

8555msgid "Log Out"

86−msgstr "اخرج"

56+msgstr "خروج"

8757

88−#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284

89−#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32

58+#: qml/Components/Dialogs.qml:166 qml/Components/Dialogs.qml:222

59+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:232

60+#: qml/Wizard/Pages/passcode-confirm.qml:32

9061#: qml/Wizard/Pages/passcode-set.qml:32

9162msgid "Cancel"

92−msgstr "ألغ"

63+msgstr "إلغاء"

9364

94−#: qml/Components/Dialogs.qml:211

65+#: qml/Components/Dialogs.qml:178

9566msgctxt "Title: Reboot dialog"

9667msgid "Reboot"

97−msgstr "أعد التشغيل"

68+msgstr "إعادة التشغيل"

9869

99−#: qml/Components/Dialogs.qml:212

70+#: qml/Components/Dialogs.qml:179

10071msgid "Are you sure you want to reboot?"

101−msgstr "أمتأكد أنك تريد إعادة التشغيل؟"

72+msgstr "هل أنت متأكد من رغبتك في إعادة تشغيل الجهاز؟"

10273

103−#: qml/Components/Dialogs.qml:215

74+#: qml/Components/Dialogs.qml:181

10475msgid "No"

10576msgstr "لا"

10677

107−#: qml/Components/Dialogs.qml:223

78+#: qml/Components/Dialogs.qml:187

10879msgid "Yes"

10980msgstr "نعم"

11081

111−#: qml/Components/Dialogs.qml:243

82+#: qml/Components/Dialogs.qml:202

11283msgctxt "Title: Power off/Restart dialog"

11384msgid "Power"

11485msgstr "الطاقة"

11586

116−#: qml/Components/Dialogs.qml:244

87+#: qml/Components/Dialogs.qml:203

11788msgid ""

11889"Are you sure you would like\n"

11990"to power off?"

@@ -121,261 +92,358 @@ msgstr ""

12192"هل أنت متأكد من رغبتك\n"

12293"في إيقاف التشغيل؟"

12394

124−#: qml/Components/Dialogs.qml:248

95+#: qml/Components/Dialogs.qml:205

12596msgctxt "Button: Power off the system"

12697msgid "Power off"

127−msgstr "أوقف التشغيل"

98+msgstr "إيقاف التشغيل"

12899

129−#: qml/Components/Dialogs.qml:263

100+#: qml/Components/Dialogs.qml:214

130101msgctxt "Button: Restart the system"

131102msgid "Restart"

132−msgstr "أعد التشغيل"

133−

134−#: qml/Components/Dialogs.qml:276

135−msgid "Screenshot"

136−msgstr "لقطة شاشة"

103+msgstr "إعادة التشغيل"

137104

138105#: qml/Components/KeyboardShortcutsOverlay.qml:41

139106msgid "Keyboard Shortcuts"

140−msgstr "اختصارات لوحة المفاتيح"

107+msgstr ""

141108

142109#: qml/Components/KeyboardShortcutsOverlay.qml:55

143−msgid "Lomiri"

144−msgstr "لوميري"

110+msgid "Unity 8"

111+msgstr ""

145112

146113#: qml/Components/KeyboardShortcutsOverlay.qml:62

147114msgid "PrtScr"

148−msgstr "PrtScr"

115+msgstr ""

149116

150117#: qml/Components/KeyboardShortcutsOverlay.qml:67

151118msgid "Takes a screenshot."

152−msgstr "خُذ لقطة للشاشة."

119+msgstr ""

153120

154121#: qml/Components/KeyboardShortcutsOverlay.qml:75

155122msgid "Alt + PrtScr"

156−msgstr "Alt + PrtScr"

123+msgstr ""

157124

158125#: qml/Components/KeyboardShortcutsOverlay.qml:80

159−msgid "Takes a screenshot of the current window."

160−msgstr "خُذ لقطة شاشة للنافذة الحالية."

126+msgid "Takes a screenshot of a window."

127+msgstr ""

161128

162129#: qml/Components/KeyboardShortcutsOverlay.qml:88

163130msgid "Super + Space"

164−msgstr "Super + Space"

131+msgstr ""

165132

166133#: qml/Components/KeyboardShortcutsOverlay.qml:93

167134msgid "Switches to next keyboard layout."

168−msgstr "بدل إلى تخطيط لوحة المفاتيح التالي."

135+msgstr ""

169136

170137#: qml/Components/KeyboardShortcutsOverlay.qml:101

171138msgid "Super + Shift + Space"

172−msgstr "Super + Shift + Space"

139+msgstr ""

173140

174141#: qml/Components/KeyboardShortcutsOverlay.qml:106

175142msgid "Switches to previous keyboard layout."

176−msgstr "بدل إلى تخطيط لوحة المفاتيح السابق."

177−

178−#: qml/Components/KeyboardShortcutsOverlay.qml:114

179−msgid "Ctrl + Alt + T"

180−msgstr "Ctrl + Alt + T"

181−

182−#: qml/Components/KeyboardShortcutsOverlay.qml:119

183−msgid "Starts the Terminal application."

184−msgstr "شغِل الطرفية."

143+msgstr ""

185144

186−#: qml/Components/KeyboardShortcutsOverlay.qml:131

145+#: qml/Components/KeyboardShortcutsOverlay.qml:118

187146msgid "Launcher"

188−msgstr "مطلق"

147+msgstr ""

189148

190−#: qml/Components/KeyboardShortcutsOverlay.qml:138

149+#: qml/Components/KeyboardShortcutsOverlay.qml:125

191150msgid "Super (Hold)"

192−msgstr "Super (ضغط مع التعليق)"

151+msgstr ""

193152

194−#: qml/Components/KeyboardShortcutsOverlay.qml:143

153+#: qml/Components/KeyboardShortcutsOverlay.qml:130

195154msgid "Opens the launcher, displays shortcuts."

196−msgstr "يشغل المطلق، ويعرض الاختصارات."

155+msgstr ""

197156

198−#: qml/Components/KeyboardShortcutsOverlay.qml:151

157+#: qml/Components/KeyboardShortcutsOverlay.qml:138

199158msgid "Alt + F1"

200−msgstr "Alt + F1"

159+msgstr ""

201160

202−#: qml/Components/KeyboardShortcutsOverlay.qml:156

161+#: qml/Components/KeyboardShortcutsOverlay.qml:143

203162msgid "Opens launcher keyboard navigation mode."

204−msgstr "فتح وضع التنقل بلوحة المفاتيح المشغلة."

163+msgstr ""

205164

206−#: qml/Components/KeyboardShortcutsOverlay.qml:164

165+#: qml/Components/KeyboardShortcutsOverlay.qml:151

207166msgid "Super + Tab"

208−msgstr "Super + Tab"

167+msgstr ""

209168

210−#: qml/Components/KeyboardShortcutsOverlay.qml:169

169+#: qml/Components/KeyboardShortcutsOverlay.qml:156

211170msgid "Switches applications via the launcher."

212−msgstr "انتقل بين التطبيقات عبر المُطلق."

171+msgstr ""

213172

214−#: qml/Components/KeyboardShortcutsOverlay.qml:177

215−msgid "Super + 1 to 0"

216−msgstr "Super + 1 to 0"

173+#: qml/Components/KeyboardShortcutsOverlay.qml:164

174+msgid "Super + 0 to 9"

175+msgstr ""

217176

218−#: qml/Components/KeyboardShortcutsOverlay.qml:182

177+#: qml/Components/KeyboardShortcutsOverlay.qml:169

219178msgid "Same as clicking on a launcher icon."

220−msgstr "نفس تأثير النقر على أيقونة المطلق."

179+msgstr ""

221180

222−#: qml/Components/KeyboardShortcutsOverlay.qml:190

181+#: qml/Components/KeyboardShortcutsOverlay.qml:177

223182msgid "Super + A"

224−msgstr "Super + A"

183+msgstr ""

225184

226−#: qml/Components/KeyboardShortcutsOverlay.qml:195

185+#: qml/Components/KeyboardShortcutsOverlay.qml:182

227186msgid "Opens the Application Drawer."

228−msgstr "يفتح درج التطبيقات."

187+msgstr ""

188+

189+#: qml/Components/KeyboardShortcutsOverlay.qml:194

190+msgid "Scopes"

191+msgstr ""

229192

230−#: qml/Components/KeyboardShortcutsOverlay.qml:235

193+#: qml/Components/KeyboardShortcutsOverlay.qml:201

194+msgid "Super (Tap)"

195+msgstr ""

196+

197+#: qml/Components/KeyboardShortcutsOverlay.qml:206

198+msgid "Opens the Scopes home."

199+msgstr ""

200+

201+#: qml/Components/KeyboardShortcutsOverlay.qml:222

231202msgid "Switching"

232−msgstr "يبدل"

203+msgstr ""

233204

234−#: qml/Components/KeyboardShortcutsOverlay.qml:242

205+#: qml/Components/KeyboardShortcutsOverlay.qml:229

235206msgid "Alt + Tab"

236−msgstr "Alt + Tab"

207+msgstr ""

237208

238−#: qml/Components/KeyboardShortcutsOverlay.qml:247

209+#: qml/Components/KeyboardShortcutsOverlay.qml:234

239210msgid "Switches between applications."

240−msgstr "يبدل بين التطبيقات."

211+msgstr ""

241212

242−#: qml/Components/KeyboardShortcutsOverlay.qml:255

213+#: qml/Components/KeyboardShortcutsOverlay.qml:242

243214msgid "Super + W"

244−msgstr "Super + W"

215+msgstr ""

245216

246−#: qml/Components/KeyboardShortcutsOverlay.qml:260

217+#: qml/Components/KeyboardShortcutsOverlay.qml:247

247218msgid "Opens the desktop spread."

248−msgstr "يفتح وضع سطح المكتب."

219+msgstr ""

249220

250−#: qml/Components/KeyboardShortcutsOverlay.qml:268

221+#: qml/Components/KeyboardShortcutsOverlay.qml:255

251222msgid "Cursor Left or Right"

252−msgstr "اتجاه المؤشر لليمين أو اليسار"

223+msgstr ""

253224

254−#: qml/Components/KeyboardShortcutsOverlay.qml:273

225+#: qml/Components/KeyboardShortcutsOverlay.qml:260

255226msgid "Moves the focus."

256−msgstr "بدّل التركيز."

227+msgstr ""

257228

258−#: qml/Components/KeyboardShortcutsOverlay.qml:285

229+#: qml/Components/KeyboardShortcutsOverlay.qml:272

259230msgid "Windows"

260−msgstr "نوافذ"

231+msgstr ""

261232

262−#: qml/Components/KeyboardShortcutsOverlay.qml:292

233+#: qml/Components/KeyboardShortcutsOverlay.qml:279

263234msgid "Ctrl + Super + D"

264−msgstr "Ctrl + Super + D"

235+msgstr ""

265236

266−#: qml/Components/KeyboardShortcutsOverlay.qml:297

237+#: qml/Components/KeyboardShortcutsOverlay.qml:284

267238msgid "Minimizes all windows."

268−msgstr "يصغر كل النوافذ."

239+msgstr ""

269240

270−#: qml/Components/KeyboardShortcutsOverlay.qml:305

241+#: qml/Components/KeyboardShortcutsOverlay.qml:292

271242msgid "Ctrl + Super + Up"

272−msgstr "Ctrl + Super + Up"

243+msgstr ""

273244

274−#: qml/Components/KeyboardShortcutsOverlay.qml:310

245+#: qml/Components/KeyboardShortcutsOverlay.qml:297

275246msgid "Maximizes the current window."

276−msgstr "يكبر النافذة الحالية."

247+msgstr ""

277248

278−#: qml/Components/KeyboardShortcutsOverlay.qml:318

249+#: qml/Components/KeyboardShortcutsOverlay.qml:305

279250msgid "Ctrl + Super + Down"

280−msgstr "Ctrl + Super + Down"

251+msgstr ""

281252

282−#: qml/Components/KeyboardShortcutsOverlay.qml:323

253+#: qml/Components/KeyboardShortcutsOverlay.qml:310

283254msgid "Minimizes or restores the current window."

284−msgstr "يصغر أو يستعيد النافذة الحالية."

255+msgstr ""

285256

286−#: qml/Components/KeyboardShortcutsOverlay.qml:331

257+#: qml/Components/KeyboardShortcutsOverlay.qml:318

287258msgid "Ctrl + Super + Left or Right"

288−msgstr "Ctrl + Super + Left or Right"

259+msgstr ""

289260

290−#: qml/Components/KeyboardShortcutsOverlay.qml:336

261+#: qml/Components/KeyboardShortcutsOverlay.qml:323

291262msgid "Semi-maximizes the current window."

292−msgstr "كبر النافذة الحالة جزئيا."

263+msgstr ""

293264

294−#: qml/Components/KeyboardShortcutsOverlay.qml:344

265+#: qml/Components/KeyboardShortcutsOverlay.qml:331

295266msgid "Alt + F4"

296−msgstr "Alt + F4"

267+msgstr ""

297268

298−#: qml/Components/KeyboardShortcutsOverlay.qml:349

269+#: qml/Components/KeyboardShortcutsOverlay.qml:336

299270msgid "Closes the current window."

300−msgstr "يغلق النافذة الحالية."

271+msgstr ""

301272

302−#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:235

273+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:252

303274msgid "Return to Call"

304−msgstr "عُد للمكالمة"

275+msgstr "العودة إلى المكالمة"

305276

306277#: qml/Components/Lockscreen.qml:212

307278msgid "Emergency Call"

308279msgstr "مكالمة طوارئ"

309280

310−#: qml/Components/Lockscreen.qml:245

281+#: qml/Components/Lockscreen.qml:244

311282msgid "OK"

312283msgstr "موافق"

313284

314285#: qml/Components/MediaServices/VideoPlayerControls.qml:44

315286#, qt-format

316287msgid "%1:%2:%3"

317−msgstr "%1:%2:%3"

288+msgstr ""

318289

319290#: qml/Components/MediaServices/VideoPlayerControls.qml:49

320291#, qt-format

321292msgid "%1:%2"

322−msgstr "%1:%2"

293+msgstr ""

323294

324−#: qml/Components/ModeSwitchWarningDialog.qml:33

295+#: qml/Components/ModeSwitchWarningDialog.qml:32

325296msgid "Apps may have unsaved data:"

326−msgstr "ربما لم تَحفظ بيانات هذه التطبيقات:"

297+msgstr ""

327298

328−#: qml/Components/ModeSwitchWarningDialog.qml:60

299+#: qml/Components/ModeSwitchWarningDialog.qml:57

329300msgctxt ""

330301"Re-dock means connect the device again to an external screen/mouse/keyboard"

331302msgid "Re-dock, save your work and close these apps to continue."

332−msgstr "أعد الوصل، احفظ عملك على هذه التطبيقات ثم أغلقها للمتابعة."

303+msgstr ""

333304

334−#: qml/Components/ModeSwitchWarningDialog.qml:67

305+#: qml/Components/ModeSwitchWarningDialog.qml:63

335306msgid "Or force close now (unsaved data will be lost)."

336−msgstr "أو أغلقها قسريا (ستفقد البيانات غير المحفوظة)."

307+msgstr ""

337308

338−#: qml/Components/ModeSwitchWarningDialog.qml:80

309+#: qml/Components/ModeSwitchWarningDialog.qml:75

339310msgid "OK, I will reconnect"

340−msgstr "موافق، سؤعيد الاتصال"

311+msgstr ""

341312

342−#: qml/Components/ModeSwitchWarningDialog.qml:81

313+#: qml/Components/ModeSwitchWarningDialog.qml:76

343314msgid "Reconnect now!"

344−msgstr "أعد الاتصال الآن!"

315+msgstr ""

345316

346−#: qml/Components/ModeSwitchWarningDialog.qml:94

317+#: qml/Components/ModeSwitchWarningDialog.qml:88

347318msgid "Close all"

348−msgstr "أغلق الكل"

319+msgstr ""

349320

350321#: qml/Components/SharingPicker.qml:54

351322msgid "Preview Share Item"

352−msgstr "معاينة الملف المشارك"

323+msgstr ""

353324

354325#: qml/Components/VirtualTouchPad.qml:317

355326msgid ""

356327"Your device is now connected to an external display. Use this screen as a "

357328"touch pad to interact with the pointer."

358−msgstr "جهازك متصل بجهاز عرض خارجي. استخدم جهازك كلوحة لمس لتحكم بالمؤشر."

329+msgstr ""

359330

360331#: qml/Components/VirtualTouchPad.qml:327

361332msgid "Tap left button to click."

362−msgstr "اضغط الزر الأيسر للنقر."

333+msgstr ""

363334

364335#: qml/Components/VirtualTouchPad.qml:339

365336msgid "Tap right button to right click."

366−msgstr "اضغط على الزر الأيمن للنقر."

337+msgstr ""

367338

368339#: qml/Components/VirtualTouchPad.qml:351

369340msgid "Swipe with two fingers to scroll."

370−msgstr "اسحب بإصبعين للتمرير."

341+msgstr ""

371342

372343#: qml/Components/VirtualTouchPad.qml:396

373344msgid "Find more settings in the system settings."

374−msgstr "جد إعدادات إضافية في إعدادات النظام."

345+msgstr ""

346+

347+#: qml/Dash/DashPageHeader.qml:361

348+msgctxt "Button: Open the Ubuntu Store"

349+msgid "Store"

350+msgstr "المتجر"

351+

352+#: qml/Dash/DashPageHeader.qml:368

353+msgctxt "Button: Start a search in the current dash scope"

354+msgid "Search"

355+msgstr "بحث"

356+

357+#: qml/Dash/DashPageHeader.qml:378

358+msgctxt "Button: Show the current dash scope settings"

359+msgid "Settings"

360+msgstr "الإعدادات"

361+

362+#: qml/Dash/DashPageHeader.qml:385

363+msgid "Remove from Favorites"

364+msgstr "حذف من المفضلات"

365+

366+#: qml/Dash/DashPageHeader.qml:385

367+msgid "Add to Favorites"

368+msgstr "إضافة إلى المفضلات"

369+

370+#: qml/Dash/FiltersPopover.qml:61

371+msgid "Refine your results"

372+msgstr ""

373+

374+#: qml/Dash/FiltersPopover.qml:70

375+msgid "Reset"

376+msgstr ""

377+

378+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/GenericScopeView.qml:718

379+msgid "Show less"

380+msgstr ""

381+

382+#: qml/Dash/GenericScopeView.qml:547

383+msgid "Show all"

384+msgstr ""

385+

386+#: qml/Dash/GenericScopeView.qml:578

387+msgctxt "Label: Hint for dash search line edit"

388+msgid "Search"

389+msgstr "بحث"

390+

391+#: qml/Dash/PageHeaderExtraPanel.qml:67

392+msgid "Recent Searches"

393+msgstr ""

394+

395+#: qml/Dash/PageHeaderExtraPanel.qml:78

396+msgid "Clear All"

397+msgstr ""

398+

399+#: qml/Dash/Previews/PreviewActionCombo.qml:36

400+msgid "More..."

401+msgstr "المزيد..."

402+

403+#: qml/Dash/Previews/PreviewActionCombo.qml:36

404+msgid "Less..."

405+msgstr "أقل..."

406+

407+#: qml/Dash/Previews/PreviewCommentInput.qml:83

408+#: qml/Dash/Previews/PreviewRatingInput.qml:202

409+msgid "Send"

410+msgstr "أرسل"

411+

412+#: qml/Dash/Previews/PreviewRatingInput.qml:109

413+msgid "Rate this"

414+msgstr "قيّم ذلك"

415+

416+#: qml/Dash/Previews/PreviewRatingInput.qml:184

417+msgid "Add a review"

418+msgstr "أضف تعليق"

419+

420+#: qml/Dash/PullToRefreshScopeStyle.qml:56

421+msgid "Pull to refresh…"

422+msgstr "اسحب للتحديث..."

423+

424+#: qml/Dash/PullToRefreshScopeStyle.qml:61

425+msgid "Release to refresh…"

426+msgstr "حرّر للتحديث..."

427+

428+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43

429+msgid "Enable location data"

430+msgstr "تفعيل بيانات الموقع"

431+

432+#: qml/Dash/ScopesList.qml:57

433+msgid "Manage"

434+msgstr "إدارة"

435+

436+#: qml/Dash/ScopesList.qml:104

437+msgid "Home"

438+msgstr "الرئيسية"

439+

440+#: qml/Dash/ScopesList.qml:105

441+msgid "Also installed"

442+msgstr "أيضا تم تثبيت"

375443

376444#: qml/Greeter/CoverPage.qml:127

377445msgid "Unlock"

378−msgstr "فك الإيصاد"

446+msgstr "فك القفل"

379447

380448#: qml/Greeter/DelayedLockscreen.qml:43

381449msgid "Device Locked"

@@ -395,56 +463,57 @@ msgstr ""

395463#, qt-format

396464msgid "Please wait %1 minute and then try again…"

397465msgid_plural "Please wait %1 minutes and then try again…"

398−msgstr[0] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا…"

399−msgstr[1] "برجاء الانتظار دقيقة واحدة (%1) ثم المحاولة مجددًا…"

400−msgstr[2] "برجاء الانتظار دقيقتين (%1) ثم المحاولة مجددًا…"

401−msgstr[3] "برجاء الانتظار %1 دقائق ثم المحاولة مجددًا…"

402−msgstr[4] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا…"

403−msgstr[5] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا…"

404−

405−#: qml/Greeter/Greeter.qml:550

466+msgstr[0] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا..."

467+msgstr[1] "برجاء الانتظار دقيقة واحدة (%1) ثم المحاولة مجددًا..."

468+msgstr[2] "برجاء الانتظار دقيقتين (%1) ثم المحاولة مجددًا..."

469+msgstr[3] "برجاء الانتظار %1 دقائق ثم المحاولة مجددًا..."

470+msgstr[4] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا..."

471+msgstr[5] "برجاء الانتظار %1 دقيقة ثم المحاولة مجددًا..."

472+

473+#: qml/Greeter/Greeter.qml:592

406474msgid "Try again"

407−msgstr "حاول مجددا"

475+msgstr ""

408476

409−#: qml/Greeter/Greeter.qml:551

410−msgid "Enter passphrase to unlock"

411−msgstr "أدخِل العبارة السرية لفك الإيصاد"

477+#: qml/Greeter/LoginList.qml:70

478+msgid "Passphrase"

479+msgstr ""

412480

413−#: qml/Greeter/Greeter.qml:552

414−msgid "Enter passcode to unlock"

415−msgstr "أدخِل الرمز السرّي لفك الإيصاد"

481+#: qml/Greeter/LoginList.qml:71

482+msgid "Passcode"

483+msgstr ""

416484

417−#: qml/Greeter/NarrowView.qml:235

418−msgid "Emergency"

419−msgstr "طوارئ"

485+#: qml/Greeter/LoginList.qml:98

486+msgid "Retry"

487+msgstr "إعادة المحاولة"

420488

421−#: qml/Greeter/PromptList.qml:126

422−msgid "Passphrase"

423−msgstr "كلمة السر"

489+#: qml/Greeter/LoginList.qml:99

490+msgid "Log In"

491+msgstr ""

424492

425−#: qml/Greeter/PromptList.qml:126

426−msgid "Passcode"

427−msgstr "الرمز السري"

493+#: qml/Greeter/NarrowView.qml:252

494+msgid "Emergency"

495+msgstr ""

428496

429−#: qml/Greeter/SessionsList.qml:124

497+#: qml/Greeter/SessionsList.qml:122

430498msgid "Select desktop environment"

431−msgstr "اختر بيئة سطح المكتب"

499+msgstr ""

432500

433−#: qml/Launcher/Drawer.qml:250

501+#: qml/Launcher/Drawer.qml:80

434502msgid "Search…"

435−msgstr "ابحث…"

503+msgstr ""

436504

437−#: qml/Launcher/PullToRefreshScopeStyle.qml:56

438−msgid "Pull to refresh…"

439−msgstr "اسحب للتحديث…"

505+#: qml/Launcher/Drawer.qml:101

506+msgctxt "Apps sorted alphabetically"

507+msgid "A-Z"

508+msgstr ""

440509

441−#: qml/Launcher/PullToRefreshScopeStyle.qml:61

442−msgid "Release to refresh…"

443−msgstr "حرّر للتحديث…"

510+#: qml/Launcher/MoreAppsHeader.qml:32

511+msgid "More apps in the store"

512+msgstr ""

444513

445514#: qml/Notifications/NotificationMenuItemFactory.qml:124

446515msgid "Show password"

447−msgstr "اعرض كلمة السر"

516+msgstr "عرض كلمة السر"

448517

449518#: qml/Panel/ActiveCallHint.qml:79

450519msgid "Tap to return to call..."

@@ -454,11 +523,11 @@ msgstr "انقر للعودة إلى المكالمة..."

454523msgid "Conference"

455524msgstr "مؤتمر"

456525

457−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:869

526+#: qml/Panel/Indicators/MenuItemFactory.qml:868

458527msgid "Nothing is playing"

459528msgstr "لا شيء مُشغّل"

460529

461−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:997

530+#: qml/Panel/Indicators/MenuItemFactory.qml:996

462531#, qt-format

463532msgid "%1 hour"

464533msgid_plural "%1 hours"

@@ -469,18 +538,18 @@ msgstr[3] "%1 ساعات"

469538msgstr[4] "%1 ساعة"

470539msgstr[5] "%1 ساعة"

471540

472−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1001

541+#: qml/Panel/Indicators/MenuItemFactory.qml:1000

473542#, qt-format

474543msgid "%1 minute"

475544msgid_plural "%1 minutes"

476−msgstr[0] "%1 دقيقة"

477−msgstr[1] "دقيقة واحدة"

478−msgstr[2] "دقيقتان"

545+msgstr[0] "أقل من دقيقة (%1)"

546+msgstr[1] "دقيقة واحدة (%1)"

547+msgstr[2] "دقيقتان (%1)"

479548msgstr[3] "%1 دقائق"

480549msgstr[4] "%1 دقيقة"

481550msgstr[5] "%1 دقيقة"

482551

483−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1006

552+#: qml/Panel/Indicators/MenuItemFactory.qml:1005

484553#, qt-format

485554msgid "%1 second"

486555msgid_plural "%1 seconds"

@@ -491,45 +560,45 @@ msgstr[3] "%1 ثوان"

491560msgstr[4] "%1 ثانية"

492561msgstr[5] "%1 ثانية"

493562

494−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1009

563+#: qml/Panel/Indicators/MenuItemFactory.qml:1008

495564msgid "0 seconds"

496565msgstr "أقل من ثانية"

497566

498567#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"

499−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1011

568+#: qml/Panel/Indicators/MenuItemFactory.qml:1010

500569#, qt-format

501570msgid "%1 remaining"

502571msgstr "باق %1"

503572

504−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1017

573+#: qml/Panel/Indicators/MenuItemFactory.qml:1016

505574msgid "In queue…"

506−msgstr "في الانتظار…"

575+msgstr "في الانتظار..."

507576

508−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1021

577+#: qml/Panel/Indicators/MenuItemFactory.qml:1020

509578msgid "Downloading"

510−msgstr "ينزل"

579+msgstr "التنزيل"

511580

512−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1023

581+#: qml/Panel/Indicators/MenuItemFactory.qml:1022

513582msgid "Paused, tap to resume"

514583msgstr "مُلبث، انقر للاستئناف"

515584

516−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1025

585+#: qml/Panel/Indicators/MenuItemFactory.qml:1024

517586msgid "Canceled"

518−msgstr "أُلغي"

587+msgstr "تم إلغائه"

519588

520−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1027

589+#: qml/Panel/Indicators/MenuItemFactory.qml:1026

521590msgid "Finished"

522591msgstr "انتهى"

523592

524−#: qml/Panel/Indicators/IndicatorMenuItemFactory.qml:1029

593+#: qml/Panel/Indicators/MenuItemFactory.qml:1028

525594msgid "Failed, tap to retry"

526−msgstr "فشل، انقر لإعادة المحاولة"

595+msgstr "فشل، انقل لإعادة المحاولة"

527596

528597#: qml/Panel/Indicators/MessageMenuItemFactory.qml:151

529598#: qml/Panel/Indicators/MessageMenuItemFactory.qml:210

530599msgctxt "Button: Send a reply message"

531600msgid "Send"

532−msgstr "أرسل"

601+msgstr ""

533602

534603#: qml/Panel/Indicators/MessageMenuItemFactory.qml:152

535604msgctxt "Label: Hint in message indicator line edit"

@@ -539,431 +608,349 @@ msgstr "رد"

539608#: qml/Panel/Indicators/MessageMenuItemFactory.qml:209

540609msgctxt "Button: Call back on phone"

541610msgid "Call back"

542−msgstr "عاود الاتصال"

543−

544−#: qml/Panel/PanelMenuPage.qml:92

545−msgid "Back"

546−msgstr "للخلف"

611+msgstr ""

547612

548613#: qml/Stage/SideStage.qml:76

549614msgid "Drag using 3 fingers any application from one window to the other"

550−msgstr "اسحب أي تطبيق بثلاث أصابع من نافذة لأخرى"

551−

552−#: qml/Stage/Stage.qml:671

553−msgid "No running apps"

554−msgstr "لا توجد تطبيقات مشغلة"

615+msgstr ""

555616

556617#: qml/Tutorial/TutorialLeftLong.qml:49

557−msgid "Long swipe from the left edge to open the Application Drawer"

558−msgstr "اسحب اصبعك مطولا بدءً من الحافة اليسرى لفتح درج التطبيقات"

618+msgid "Long swipe from the left edge to open the Today scope"

619+msgstr ""

559620

560621#: qml/Tutorial/TutorialLeft.qml:47

561622msgid "Short swipe from the left edge to open the launcher"

562−msgstr "اسحب اصبعك سحبا قصيرا بدءً من الحافة اليسرى لفتح المُطلِق"

623+msgstr ""

563624

564−#: qml/Tutorial/TutorialRight.qml:54

625+#: qml/Tutorial/TutorialRight.qml:55

565626msgid "Push your mouse against the right edge to view your open apps"

566−msgstr "حرك المؤشر للحافة اليمنى لعرض التطبيقات المفتوحة"

627+msgstr ""

567628

568−#: qml/Tutorial/TutorialRight.qml:55

629+#: qml/Tutorial/TutorialRight.qml:56

569630msgid "Swipe from the right edge to view your open apps"

570−msgstr "اسحب اصبعك بدءً من الحافة اليمنى لعرض التطبيقات المفتوحة"

631+msgstr ""

571632

572633#: qml/Tutorial/TutorialTop.qml:53

573634msgid "Swipe from the top edge to access notifications and quick settings"

574635msgstr ""

575−"اسحب اصبعك بدءً من الحافة العلوية للوصول الى التنبيهات والإعدادات السريعة"

576636

577−#: qml/Wizard/Page.qml:59

637+#: qml/Wizard/Page.qml:54

578638msgctxt "Button: Go back one page in the Wizard"

579639msgid "Back"

580−msgstr "للخلف"

640+msgstr "عودة"

581641

582−#: qml/Wizard/Pages/10-welcome.qml:29

642+#: qml/Wizard/Pages/10-welcome.qml:28

583643msgid "Language"

584−msgstr "اللغة"

585−

586−#: qml/Wizard/Pages/10-welcome.qml:176

587−#: qml/Wizard/Pages/10-welcome-update.qml:126

588−#: qml/Wizard/Pages/11-changelog.qml:74 qml/Wizard/Pages/20-keyboard.qml:152

589−#: qml/Wizard/Pages/30-wifi.qml:214 qml/Wizard/Pages/50-timezone.qml:272

590−#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/70-passwd-type.qml:146

591−#: qml/Wizard/Pages/passcode-desktop.qml:154

592−#: qml/Wizard/Pages/password-set.qml:153

593−msgid "Next"

594−msgstr "التالي"

595−

596−#: qml/Wizard/Pages/10-welcome-update.qml:91

597−msgid "Welcome to "

598−msgstr "مرحبا بك في "

599−

600−#: qml/Wizard/Pages/10-welcome-update.qml:106

601−msgid "We will make sure your device is ready to use "

602−msgstr "سوف نتأكد أن جهازك معد للاستخدام "

603−

604−#: qml/Wizard/Pages/11-changelog.qml:28

605−msgid "What's new"

606−msgstr "ما الجديد"

644+msgstr ""

607645

608−#: qml/Wizard/Pages/11-changelog.qml:74

609−msgid "Loading..."

610−msgstr "يحمل..."

646+#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152

647+#: qml/Wizard/Pages/30-wifi.qml:207 qml/Wizard/Pages/40-location.qml:271

648+#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65

649+#: qml/Wizard/Pages/70-passwd-type.qml:145

650+#: qml/Wizard/Pages/75-report-check.qml:84

651+#: qml/Wizard/Pages/passcode-desktop.qml:142

652+#: qml/Wizard/Pages/password-set.qml:142

653+msgid "Next"

654+msgstr ""

611655

612656#: qml/Wizard/Pages/20-keyboard.qml:31

613657msgid "Select Keyboard"

614−msgstr "اختر لوحة المفاتيح"

658+msgstr ""

615659

616660#: qml/Wizard/Pages/20-keyboard.qml:71

617661msgid "Keyboard language"

618−msgstr "لغة لوحة المفاتيح"

662+msgstr ""

619663

620664#: qml/Wizard/Pages/20-keyboard.qml:93

621665msgid "Keyboard layout"

622−msgstr "تخطيط لوحة المفاتيح"

666+msgstr ""

623667

624−#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:214

625−#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/79-system-update.qml:144

668+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:207

669+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/77-system-update.qml:152

626670#: qml/Wizard/Pages/sim.qml:101

627671msgid "Skip"

628−msgstr "تخط"

672+msgstr "تخطي"

629673

630674#: qml/Wizard/Pages/30-wifi.qml:31

631675msgid "Connect to Wi‑Fi"

632−msgstr "اتصل بالإنترنت"

676+msgstr "اتصل بالواي فاي"

633677

634−#: qml/Wizard/Pages/30-wifi.qml:139

678+#: qml/Wizard/Pages/30-wifi.qml:132

635679msgid "Connected"

636−msgstr "متصل"

680+msgstr ""

637681

638−#: qml/Wizard/Pages/30-wifi.qml:172

682+#: qml/Wizard/Pages/30-wifi.qml:165

639683msgid "Available Wi-Fi networks"

640−msgstr "شبكات الواي فاي المتاحة"

684+msgstr ""

641685

642−#: qml/Wizard/Pages/30-wifi.qml:173

686+#: qml/Wizard/Pages/30-wifi.qml:166

643687msgid "No available Wi-Fi networks"

644−msgstr "لا توجد شبكات واي فاي"

688+msgstr ""

689+

690+#: qml/Wizard/Pages/40-location.qml:27

691+msgid "Location Services"

692+msgstr ""

693+

694+#: qml/Wizard/Pages/40-location.qml:83

695+msgid ""

696+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "

697+"(recommended)"

698+msgstr ""

699+

700+#: qml/Wizard/Pages/40-location.qml:105

701+#, qt-format

702+msgid "By selecting this option you agree to the Nokia HERE %1."

703+msgstr ""

704+

705+#: qml/Wizard/Pages/40-location.qml:106

706+msgctxt "part of: Nokia HERE terms and conditions"

707+msgid "terms and conditions"

708+msgstr ""

709+

710+#: qml/Wizard/Pages/40-location.qml:160

711+msgid "GPS only"

712+msgstr ""

713+

714+#: qml/Wizard/Pages/40-location.qml:214

715+msgid "Don't use my location"

716+msgstr ""

717+

718+#: qml/Wizard/Pages/40-location.qml:260

719+msgid "You can change it later in System Settings."

720+msgstr ""

645721

646722#: qml/Wizard/Pages/50-timezone.qml:30

647723msgid "Time Zone"

648−msgstr "المنطقة الزمنية"

724+msgstr ""

649725

650−#: qml/Wizard/Pages/50-timezone.qml:183

726+#: qml/Wizard/Pages/50-timezone.qml:182

651727msgid "Enter your city"

652−msgstr "أدخل مدينتك"

728+msgstr ""

653729

654730#: qml/Wizard/Pages/60-account.qml:24

655731msgid "Personalize Your Device"

656−msgstr "خصص جهازك"

732+msgstr ""

657733

658−#: qml/Wizard/Pages/60-account.qml:54

734+#: qml/Wizard/Pages/60-account.qml:48

659735msgid "Preferred Name"

660−msgstr "اسم مستحسن"

736+msgstr ""

661737

662738#: qml/Wizard/Pages/70-passwd-type.qml:40

663739msgid "Lock Screen"

664−msgstr "قفل الشاشة"

740+msgstr ""

665741

666−#: qml/Wizard/Pages/70-passwd-type.qml:103

742+#: qml/Wizard/Pages/70-passwd-type.qml:102

667743msgctxt "Label: Type of security method"

668744msgid "Create new password"

669−msgstr "أنشئ كلمة سر جديدة"

745+msgstr ""

670746

671−#: qml/Wizard/Pages/70-passwd-type.qml:105

747+#: qml/Wizard/Pages/70-passwd-type.qml:104

672748msgctxt "Label: Type of security method"

673749msgid "Create passcode (numbers only)"

674−msgstr "أنشئ رمز مرور (أرقام فقط)"

750+msgstr ""

675751

676−#: qml/Wizard/Pages/70-passwd-type.qml:107

752+#: qml/Wizard/Pages/70-passwd-type.qml:106

677753msgctxt "Label: Type of security method"

678754msgid "No lock code"

679−msgstr "لا يوجد رمز إيصاد"

755+msgstr ""

756+

757+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108

758+msgid "Privacy Policy"

759+msgstr ""

680760

681−#: qml/Wizard/Pages/79-system-update.qml:28

761+#: qml/Wizard/Pages/75-report-check.qml:26

762+msgid "Help Us Improve"

763+msgstr ""

764+

765+#: qml/Wizard/Pages/75-report-check.qml:59

766+msgid "Improve system performance by sending us crashes and error reports."

767+msgstr ""

768+

769+#: qml/Wizard/Pages/75-report-check.qml:60

770+msgid "Privacy policy"

771+msgstr ""

772+

773+#: qml/Wizard/Pages/77-system-update.qml:28

682774msgid "Update Device"

683−msgstr "حدث الجهاز"

775+msgstr ""

684776

685−#: qml/Wizard/Pages/79-system-update.qml:55

777+#: qml/Wizard/Pages/77-system-update.qml:55

686778msgid ""

687779"There is a system update available and ready to install. Afterwards, the "

688780"device will automatically restart."

689−msgstr "يتوفر تحديث للنظام وهو جاهز للتثبيت، سيُعاد تشغيل الجهاز تلقائيا."

781+msgstr ""

690782

691−#: qml/Wizard/Pages/79-system-update.qml:76

783+#: qml/Wizard/Pages/77-system-update.qml:76

692784msgctxt "string identifying name of the update"

693−msgid "Ubuntu Touch system"

694−msgstr "نظام أبونتو تاتش"

785+msgid "Ubuntu system"

786+msgstr ""

695787

696−#: qml/Wizard/Pages/79-system-update.qml:83

788+#: qml/Wizard/Pages/77-system-update.qml:83

697789#, qt-format

698790msgctxt "version of the system update"

699791msgid "Version %1"

700−msgstr "الإصدار %1"

792+msgstr ""

701793

702−#: qml/Wizard/Pages/79-system-update.qml:95

794+#: qml/Wizard/Pages/77-system-update.qml:102

703795msgid "This could take a few minutes..."

704−msgstr "قد يحتاج بضع دقائق..."

796+msgstr ""

705797

706−#: qml/Wizard/Pages/79-system-update.qml:109

798+#: qml/Wizard/Pages/77-system-update.qml:116

707799msgid "Install and restart now"

708−msgstr "ثبت وأعد التشغيل الآن"

709−

710−#: qml/Wizard/Pages/80-finished.qml:91

711−msgid "Welcome Back"

712−msgstr "مرحبا بعودتك"

800+msgstr ""

713801

714−#: qml/Wizard/Pages/80-finished.qml:91

802+#: qml/Wizard/Pages/80-finished.qml:89

715803msgid "Welcome to Ubuntu"

716−msgstr "مرحبا بك في أبونتو"

804+msgstr ""

717805

718−#: qml/Wizard/Pages/80-finished.qml:106

806+#: qml/Wizard/Pages/80-finished.qml:104

719807msgid "You are ready to use your device now"

720−msgstr "أنت مستعد لاستخدام جهازك"

721−

722−#: qml/Wizard/Pages/80-finished.qml:126

723−msgid "Continue"

724−msgstr "تابع"

808+msgstr ""

725809

726−#: qml/Wizard/Pages/80-finished.qml:126

810+#: qml/Wizard/Pages/80-finished.qml:124

727811msgid "Get Started"

728−msgstr "ابدأ"

812+msgstr ""

813+

814+#: qml/Wizard/Pages/here-terms.qml:25

815+msgid "Terms & Conditions"

816+msgstr "الشروط والأحكام"

817+

818+#: qml/Wizard/Pages/here-terms.qml:69

819+msgid "Your device uses positioning technologies provided by HERE."

820+msgstr ""

821+

822+#: qml/Wizard/Pages/here-terms.qml:81

823+msgid ""

824+"To provide you with positioning services and to improve their quality, HERE "

825+"collects information about nearby cell towers and Wi-Fi hotspots around your "

826+"current location whenever your position is being found."

827+msgstr ""

828+

829+#: qml/Wizard/Pages/here-terms.qml:93

830+msgid ""

831+"The information collected is used to analyze the service and to improve the "

832+"use of service, but not to identify you personally."

833+msgstr ""

834+

835+#: qml/Wizard/Pages/here-terms.qml:106

836+#, qt-format

837+msgid "By continuing, you agree to the HERE platform %1 and %2."

838+msgstr ""

839+

840+#: qml/Wizard/Pages/here-terms.qml:107

841+msgid "Service Terms"

842+msgstr ""

729843

730844#: qml/Wizard/Pages/passcode-confirm.qml:43

731−#: qml/Wizard/Pages/passcode-desktop.qml:104

845+#: qml/Wizard/Pages/passcode-desktop.qml:97

732846msgid "Confirm passcode"

733−msgstr "تأكيد كلمة السر"

847+msgstr "تأكيد الرمز السري"

734848

735849#: qml/Wizard/Pages/passcode-confirm.qml:45

736850msgid "Incorrect passcode."

737−msgstr "الرمز السري غير صحيح."

851+msgstr ""

738852

739853#: qml/Wizard/Pages/passcode-confirm.qml:45

740854msgctxt "Enter the passcode again"

741855msgid "Please re-enter."

742−msgstr "رجاء أعد الإدخال."

856+msgstr ""

743857

744858#: qml/Wizard/Pages/passcode-desktop.qml:31

745859msgid "Lock Screen Passcode"

746−msgstr "الرمز السري لقفل الشاشة"

860+msgstr ""

747861

748−#: qml/Wizard/Pages/passcode-desktop.qml:68

862+#: qml/Wizard/Pages/passcode-desktop.qml:61

749863msgid "Enter 4 numbers to setup your passcode"

750−msgstr "أدخل 4 أرقام لإعداد الرمز السري"

864+msgstr ""

751865

752−#: qml/Wizard/Pages/passcode-desktop.qml:84

866+#: qml/Wizard/Pages/passcode-desktop.qml:77

753867#: qml/Wizard/Pages/passcode-set.qml:54

754868msgid "Choose passcode"

755−msgstr "اختر كلمة السر"

869+msgstr ""

756870

757−#: qml/Wizard/Pages/passcode-desktop.qml:139

871+#: qml/Wizard/Pages/passcode-desktop.qml:127

758872msgid "Passcode too short"

759−msgstr "الرمز السري قصير جدا"

873+msgstr ""

760874

761−#: qml/Wizard/Pages/passcode-desktop.qml:141

875+#: qml/Wizard/Pages/passcode-desktop.qml:129

762876msgid "Passcodes match"

763−msgstr "الرمزان السريان متطابقة"

877+msgstr ""

764878

765−#: qml/Wizard/Pages/passcode-desktop.qml:143

879+#: qml/Wizard/Pages/passcode-desktop.qml:131

766880msgid "Passcodes do not match"

767−msgstr "الرمزان السريان لا يتطبقان"

881+msgstr ""

768882

769883#: qml/Wizard/Pages/passcode-set.qml:62

770884msgid "Passcode must be 4 characters long"

771−msgstr "يجب أن يكون الرمز السري 4 محارف"

885+msgstr ""

772886

773887#: qml/Wizard/Pages/password-set.qml:31

774888msgid "Lock Screen Password"

775−msgstr "كلمة سر قفل الشاشة"

889+msgstr ""

776890

777−#: qml/Wizard/Pages/password-set.qml:68

891+#: qml/Wizard/Pages/password-set.qml:62

778892msgid "Enter at least 8 characters"

779−msgstr "أدخل 8 محارف على الأقل"

893+msgstr ""

780894

781−#: qml/Wizard/Pages/password-set.qml:80

895+#: qml/Wizard/Pages/password-set.qml:74

782896msgid "Choose password"

783−msgstr "اختر كلمة السر"

897+msgstr ""

784898

785−#: qml/Wizard/Pages/password-set.qml:110

899+#: qml/Wizard/Pages/password-set.qml:104

786900msgid "Confirm password"

787−msgstr "أكد كلمة السر"

901+msgstr ""

788902

789903#: qml/Wizard/Pages/sim.qml:27

790904msgid "No SIM card installed"

791−msgstr "لم تدخل بطاقة SIM"

905+msgstr ""

792906

793907#: qml/Wizard/Pages/sim.qml:54

794908msgid "SIM card added"

795−msgstr "أُدخلت بطاقة SIM"

909+msgstr ""

796910

797911#: qml/Wizard/Pages/sim.qml:55

798912msgid "You must restart the device to access the mobile network."

799−msgstr "يجب عليك إعادة تشغيل الجهاز لتتمكن من دخول شبكة الجوال."

913+msgstr ""

800914

801915#: qml/Wizard/Pages/sim.qml:59

802916msgid "Restart"

803−msgstr "أعد التشغيل"

917+msgstr ""

804918

805919#: qml/Wizard/Pages/sim.qml:78

806920msgid "You won’t be able to make calls or use text messaging without a SIM."

807−msgstr "لن تتمكن من إجراء المكالمات أو إرسال الرسائل القصيرة بدون بطاقة SIM."

921+msgstr ""

808922

809923#: qml/Wizard/Pages/sim.qml:90

810924msgid "To proceed with no SIM tap Skip."

811−msgstr "للاستمرار بدون بطاقة SIM اضغط تخطى."

925+msgstr ""

812926

813927#: qml/Wizard/PasswordMeter.qml:87

814928msgid "Password too short"

815−msgstr "كلمة السر قصيرة جداً"

929+msgstr ""

816930

817931#: qml/Wizard/PasswordMeter.qml:89

818932msgid "Passwords match"

819−msgstr "كلمتا المرور متطابقتان"

933+msgstr ""

820934

821935#: qml/Wizard/PasswordMeter.qml:91

822936msgid "Passwords do not match"

823−msgstr "كلمتا المرور غير متطابقتين"

937+msgstr ""

824938

825939#: qml/Wizard/PasswordMeter.qml:95

826940msgid "Strong password"

827−msgstr "كلمة سر قوية"

941+msgstr ""

828942

829943#: qml/Wizard/PasswordMeter.qml:97

830944msgid "Fair password"

831−msgstr "كلمة سر متوسطة"

945+msgstr ""

832946

833947#: qml/Wizard/PasswordMeter.qml:99

834948msgid "Weak password"

835−msgstr "كلمة سر ضعيفة"

949+msgstr ""

836950

837951#: qml/Wizard/PasswordMeter.qml:101

838952msgid "Very weak password"

839−msgstr "كلمة السر ضعيفة جداً"

840−

841−#~ msgid "Unity 8"

842−#~ msgstr "يونتي 8"

843−

844−#~ msgid "Super (Tap)"

845−#~ msgstr "Super (نقر)"

846−

847−#~ msgctxt "Button: Open the Ubuntu Store"

848−#~ msgid "Store"

849−#~ msgstr "المتجر"

850−

851−#~ msgctxt "Button: Start a search in the current dash scope"

852−#~ msgid "Search"

853−#~ msgstr "بحث"

854−

855−#~ msgctxt "Button: Show the current dash scope settings"

856−#~ msgid "Settings"

857−#~ msgstr "الإعدادات"

858−

859−#~ msgid "Remove from Favorites"

860−#~ msgstr "حذف من المفضلات"

861−

862−#~ msgid "Add to Favorites"

863−#~ msgstr "إضافة إلى المفضلات"

864−

865−#~ msgctxt "Label: Hint for dash search line edit"

866−#~ msgid "Search"

867−#~ msgstr "بحث"

868−

869−#~ msgid "More..."

870−#~ msgstr "المزيد..."

871−

872−#~ msgid "Less..."

873−#~ msgstr "أقل..."

874−

875−#~ msgid "Send"

876−#~ msgstr "أرسل"

877−

878−#~ msgid "Rate this"

879−#~ msgstr "قيّم ذلك"

880−

881−#~ msgid "Add a review"

882−#~ msgstr "أضف تعليق"

883−

884−#~ msgid "Enable location data"

885−#~ msgstr "تفعيل بيانات الموقع"

886−

887−#~ msgid "Manage"

888−#~ msgstr "إدارة"

889−

890−#~ msgid "Home"

891−#~ msgstr "الرئيسية"

892−

893−#~ msgid "Also installed"

894−#~ msgstr "أيضا تم تثبيت"

895−

896−#~ msgid "Privacy Policy"

897−#~ msgstr "سياسة الخصوصية"

898−

899−#~ msgid "Help Us Improve"

900−#~ msgstr "ساعدنا على التحسن"

901−

902−#~ msgid "Improve system performance by sending us crashes and error reports."

903−#~ msgstr "تحسين أداء النظام عير إرسال تقارير التوقف والأخطاء"

904−

905−#~ msgid "Privacy policy"

906−#~ msgstr "سياسة الخصوصية"

907−

908−#~ msgid "Update Apps"

909−#~ msgstr "تحديث التطبيقات"

910−

911−#~ msgid "This device is not connected to the internet."

912−#~ msgstr "الجهاز غير متصل باﻹنترنت"

913−

914−#, fuzzy

915−#~ msgid "Please wait..."

916−#~ msgstr "يجري التحميل. برجاء الانتظار..."

917−

918−#~ msgid "Update"

919−#~ msgstr "تحديث"

920−

921−#~ msgid "Download"

922−#~ msgstr "تنزيل"

923−

924−#~ msgid "Resume"

925−#~ msgstr "استئناف"

926−

927−#~ msgid "Pause"

928−#~ msgstr "إيقاف"

929−

930−#~ msgid "Install…"

931−#~ msgstr "تثبيت …"

932−

933−#~ msgid "Install"

934−#~ msgstr "تثبيت"

935−

936−#~ msgid "Open"

937−#~ msgstr "فتح"

938−

939−#~ msgid "Installing"

940−#~ msgstr "جاري التثبيت"

941−

942−#~ msgid "Paused"

943−#~ msgstr "تم اﻹيقاف"

944−

945−#~ msgid "Waiting to download"

946−#~ msgstr "انتظار التنزيل"

947−

948−#~ msgid "%1 of %2"

949−#~ msgstr "%1 من 2%"

950−

951−#, fuzzy

952−#~ msgid "Downloaded"

953−#~ msgstr "التنزيل"

954−

955−#, fuzzy

956−#~ msgid "Installed"

957−#~ msgstr "أيضا تم تثبيت"

958−

959−#~ msgid "Updated %1"

960−#~ msgstr "تحديث 1%"

961−

962−#~ msgid "Update failed"

963−#~ msgstr "فشل التحديث"

964−

965−#~ msgid "Terms & Conditions"

966−#~ msgstr "الشروط والأحكام"

953+msgstr ""

967954

968955#~ msgid "Confirm"

969956#~ msgstr "التأكيد"

@@ -971,9 +958,21 @@ msgstr "كلمة السر ضعيفة جداً"

971958#~ msgid "Type or say a command"

972959#~ msgstr "اكتب أو قُل أمرا"

973960

961+#~ msgid "Loading. Please Wait..."

962+#~ msgstr "يجري التحميل. برجاء الانتظار..."

963+

974964#~ msgid "Speak Now..."

975965#~ msgstr "تكلم الآن..."

976966

967+#~ msgid "Speaking..."

968+#~ msgstr "تتكلم الآن..."

969+

970+#~ msgid "Search"

971+#~ msgstr "ابحث"

972+

973+#~ msgid "Try swiping from the top edge to access the indicators"

974+#~ msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"

975+

977976#~ msgid "Top edge"

978977#~ msgstr "الحافة العلوية"

979978

@@ -1009,8 +1008,8 @@ msgstr "كلمة السر ضعيفة جداً"

10091008#~ "You have now mastered the edge gestures and can start using the "

10101009#~ "phone<br><br>Tap on the screen to start"

10111010#~ msgstr ""

1012−#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر "

1013−#~ "على الشاشة للبدء"

1011+#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

1012+#~ "الشاشة للبدء"

10141013

10151014#~ msgid "%a %l:%M %p"

10161015#~ msgstr "%a %l:%M %p"

@@ -1063,18 +1062,26 @@ msgstr "كلمة السر ضعيفة جداً"

10631062#~ msgid "Tap to unlock"

10641063#~ msgstr "انقر لفك القفل"

10651064

1065+#, qt-format

10661066#~ msgid "Enter %1"

10671067#~ msgstr "أدخِل %1"

10681068

10691069#~ msgid "Sorry, incorrect passcode."

10701070#~ msgstr "عذرًا، رمز سرّي خاطيء."

10711071

1072+#~ msgid "Enter passphrase"

1073+#~ msgstr "أدخِل العبارة السرية"

1074+

1075+#~ msgid "Enter passcode"

1076+#~ msgstr "أدخِل الرمز السرّي"

1077+

10721078#~ msgid "Sorry, incorrect passphrase."

10731079#~ msgstr "عذرًا، عبارة سرّية خاطئة."

10741080

10751081#~ msgid "This will be your last attempt."

10761082#~ msgstr "هذه ستكون المحاولة الأخيرة لك."

10771083

1084+#, qt-format

10781085#~ msgid "Sorry, incorrect %1"

10791086#~ msgstr "نأسف، %1 غير صحيحية"

10801087

@@ -1145,6 +1152,9 @@ msgstr "كلمة السر ضعيفة جداً"

11451152#~ msgid "Let’s get started."

11461153#~ msgstr "هيا بنا نبدأ."

11471154

1155+#~ msgid "Continue"

1156+#~ msgstr "متابعة"

1157+

11481158#~ msgid "Choose your passcode"

11491159#~ msgstr "اختر الرمز السري خاصتك"

11501160

@@ -1241,15 +1251,15 @@ msgstr "كلمة السر ضعيفة جداً"

12411251#~ msgstr "فتح قفل بطاقة SIM"

12421252

12431253#~ msgid ""

1244−#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms "

1245−#~ "and conditions</a>."

1254+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

1255+#~ "conditions</a>."

12461256#~ msgstr ""

1247−#~ "باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> "

1248−#~ "الخاصة بـ Nokia HERE."

1257+#~ "باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "

1258+#~ "بـ Nokia HERE."

12491259

12501260#~ msgid ""

1251−#~ "If passcode is entered incorrectly, your phone will conduct a factory "

1252−#~ "reset and all personal data will be deleted."

1261+#~ "If passcode is entered incorrectly, your phone will conduct a factory reset "

1262+#~ "and all personal data will be deleted."

12531263#~ msgstr ""

12541264#~ "إذا تم إدخال العبارة السرية بشكل خاطئ، فسوف يتم إعادة الهاتف لحالة ضبط "

12551265#~ "المصنع وسيتم حذف كافة البيانات الشخصية."

po/ast.po+496−554

This diff is too big to show here.

po/az.po+339−250

This diff is too big to show here.

po/be.po+504−455

This diff is too big to show here.

po/bg.po+334−227

This diff is too big to show here.

po/bn.po+490−430

This diff is too big to show here.

po/br.po+374−397

This diff is too big to show here.

po/bs.po+356−300

This diff is too big to show here.

po/ca.po+399−481

This diff is too big to show here.

po/ca@valencia.po+361−284

This diff is too big to show here.

po/ce.po+317−201

This diff is too big to show here.

po/ckb.po+331−221

This diff is too big to show here.

po/co.po+347−367

This diff is too big to show here.

po/cs.po+505−549

This diff is too big to show here.

po/cy.po+355−300

This diff is too big to show here.

po/da.po+430−376

This diff is too big to show here.

po/de.po+403−485

This diff is too big to show here.

po/el.po+462−457

This diff is too big to show here.

po/en_AU.po+431−536

This diff is too big to show here.

po/en_GB.po+371−432

This diff is too big to show here.

po/en_US.podeleted−814

This diff is too big to show here.

po/eo.po+343−265

This diff is too big to show here.

po/es.po+412−493

This diff is too big to show here.

po/et.po+317−201

This diff is too big to show here.

po/eu.po+364−305

This diff is too big to show here.

po/fa.po+395−501

This diff is too big to show here.

po/fi.po+384−466

This diff is too big to show here.

po/fo.po+339−275

This diff is too big to show here.

po/fr.po+442−525

This diff is too big to show here.

po/ga.po+354−293

This diff is too big to show here.

po/gd.po+387−448

This diff is too big to show here.

po/gl.po+397−480

This diff is too big to show here.

po/gu.podeleted−814

This diff is too big to show here.

po/gv.po+331−241

This diff is too big to show here.

po/he.po+485−426

This diff is too big to show here.

po/hi.po+327−215

This diff is too big to show here.

po/hr.po+413−446

This diff is too big to show here.

po/hu.po+413−491

This diff is too big to show here.

po/hy.po+426−331

This diff is too big to show here.

po/ia.po+376−439

This diff is too big to show here.

po/id.po+359−283

This diff is too big to show here.

po/is.po+354−262

This diff is too big to show here.

po/it.po+409−491

This diff is too big to show here.

po/ja.po+410−335

This diff is too big to show here.

po/kk.podeleted−841

This diff is too big to show here.

po/km.po+358−297

This diff is too big to show here.

po/kn.po+327−209

This diff is too big to show here.

po/ko.po+479−439

This diff is too big to show here.

po/ku.po+336−248

This diff is too big to show here.

po/ky.po+327−209

This diff is too big to show here.

po/lo.po+324−208

This diff is too big to show here.

po/lt.po+438−488

This diff is too big to show here.

po/lv.po+371−313

This diff is too big to show here.

po/ml.po+333−222

This diff is too big to show here.

po/mr.po+322−224

This diff is too big to show here.

po/ms.po+445−460

This diff is too big to show here.

po/my.po+332−259

This diff is too big to show here.

po/nb.po+388−468

This diff is too big to show here.

po/ne.po+318−205

This diff is too big to show here.

po/nl.po+475−554

This diff is too big to show here.

po/nn.po+317−201

This diff is too big to show here.

po/oc.po+358−393

This diff is too big to show here.

po/or.po+317−201

This diff is too big to show here.

po/pa.po+367−309

This diff is too big to show here.

po/pl.po+415−496

This diff is too big to show here.

po/pt.po+405−486

This diff is too big to show here.

po/pt_BR.po+464−420

This diff is too big to show here.

po/ro.po+375−315

This diff is too big to show here.

po/ru.po+401−489

This diff is too big to show here.

po/sc.podeleted−904

This diff is too big to show here.

po/shn.po+317−201

This diff is too big to show here.

po/si.po+336−227

This diff is too big to show here.

po/sk.po+396−479

This diff is too big to show here.

po/sl.po+375−425

This diff is too big to show here.

po/sq.po+341−291

This diff is too big to show here.

po/sr.po+379−440

This diff is too big to show here.

po/sv.po+383−463

This diff is too big to show here.

po/sw.po+348−278

This diff is too big to show here.

po/ta.po+332−221

This diff is too big to show here.

po/te.po+331−229

This diff is too big to show here.

po/th.po+336−221

This diff is too big to show here.

po/tr.po+384−497

This diff is too big to show here.

po/ug.po+372−353

This diff is too big to show here.

po/uk.po+384−442

This diff is too big to show here.

po/unity8.pot+314−197

This diff is too big to show here.

po/update-unity-pot−17

This diff is too big to show here.

po/ur.po+335−222

This diff is too big to show here.

po/uz.po+317−201

This diff is too big to show here.

po/vi.po+317−201

This diff is too big to show here.

po/wo.po+368−309

This diff is too big to show here.

po/xh.po+317−201

This diff is too big to show here.

po/zh_CN.po+396−478

This diff is too big to show here.

po/zh_HK.po+332−238

This diff is too big to show here.

po/zh_TW.po+445−487

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenuItemFactory.qmldeleted−135

This diff is too big to show here.

qml/ApplicationMenus/MenuBar.qmldeleted−513

This diff is too big to show here.

qml/ApplicationMenus/MenuItem.qmldeleted−146

This diff is too big to show here.

qml/ApplicationMenus/MenuNavigator.qmldeleted−101

This diff is too big to show here.

qml/ApplicationMenus/MenuPopup.qmldeleted−510

This diff is too big to show here.

qml/ApplicationMenus/RegisteredApplicationMenuModel.qmldeleted−56

This diff is too big to show here.

qml/ApplicationMenus/qmldirdeleted−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.qmlnew file+42

This diff is too big to show here.

qml/Components/Carousel.qmlnew file+335

This diff is too big to show here.

qml/Components/Dialogs.qml+27−93

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/InputMethod.qml+1−2

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+28−17

This diff is too big to show here.

qml/Components/KeymapSwitcher.qml+7−15

This diff is too big to show here.

qml/Components/Lockscreen.qml+1−5

This diff is too big to show here.

qml/Components/ModeSwitchWarningDialog.qml+2−8

This diff is too big to show here.

qml/Components/PanelState/PanelState.qml+3−6

This diff is too big to show here.

qml/Components/PhysicalKeysMapper.qml+4−4

This diff is too big to show here.

qml/Components/ResponsiveGridView.qmlnew file+98

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qmlnew file+81

This diff is too big to show here.

qml/Components/ScrollCalculator.qml+2−21

This diff is too big to show here.

qml/Components/ShellDialog.qml+12−27

This diff is too big to show here.

qml/Components/Showable.qml+12−15

This diff is too big to show here.

qml/Components/Wallpaper.qml+16−68

This diff is too big to show here.

qml/Components/WallpaperResolver.qml+6−17

This diff is too big to show here.

qml/Components/WindowControlButtons.qml−2

This diff is too big to show here.

qml/Dash/CardCarousel.qmlnew file+74

This diff is too big to show here.

qml/Dash/CardGrid.qmlnew file+84

This diff is too big to show here.

qml/Dash/CardHorizontalList.qmlnew file+66

This diff is too big to show here.

qml/Dash/CardTool.qmlnew file+298

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qmlnew file+85

This diff is too big to show here.

qml/Dash/Dash.qmlnew file+381

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateMenu.qml → qml/Dash/DashApplication.qmlrenamed+15−17

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenusLimits.qml → qml/Dash/DashBackground.qmlrenamed+3−6

This diff is too big to show here.

qml/Dash/DashCategoryBase.qmlnew file+54

This diff is too big to show here.

qml/Dash/DashContent.qmlnew file+211

This diff is too big to show here.

qml/Dash/DashContentTabBarStyle.qmlnew file+24

This diff is too big to show here.

qml/Dash/DashNavigation.qmlnew file+199

This diff is too big to show here.

qml/Dash/DashNavigationHeader.qmlnew file+73

This diff is too big to show here.

qml/Dash/DashNavigationList.qmlnew file+118

This diff is too big to show here.

qml/Dash/DashPageHeader.qmlnew file+448

This diff is too big to show here.

qml/Dash/DashRenderer.qmlnew file+66

This diff is too big to show here.

qml/Dash/DashSectionHeader.qmlnew file+64

This diff is too big to show here.

qml/Dash/Filters/FilterExpandableWidget.qmlnew file+97

This diff is too big to show here.

qml/Dash/Filters/FilterOptionSelector.qmlnew file+97

This diff is too big to show here.

qml/Dash/Filters/FilterRangeInput.qmlnew file+136

This diff is too big to show here.

qml/Dash/Filters/FilterValueSlider.qmlnew file+87

This diff is too big to show here.

qml/Dash/Filters/FilterWidget.qmlnew file+32

This diff is too big to show here.

qml/Dash/Filters/FilterWidgetFactory.qmlnew file+89

This diff is too big to show here.

qml/Dash/FiltersPopover.qmlnew file+106

This diff is too big to show here.

qml/Dash/GenericScopeView.qmlnew file+797

This diff is too big to show here.

qml/Dash/PageHeaderExtraPanel.qmlnew file+201

This diff is too big to show here.

qml/Dash/PreviewView.qmlnew file+76

This diff is too big to show here.

qml/Dash/Previews/Preview.qmlnew file+145

This diff is too big to show here.

qml/Dash/Previews/PreviewActionButton.qmlnew file+27

This diff is too big to show here.

qml/Dash/Previews/PreviewActionCombo.qmlnew file+79

This diff is too big to show here.

qml/Dash/Previews/PreviewActions.qmlnew file+73

This diff is too big to show here.

qml/Dash/Previews/PreviewAudioPlayback.qmlnew file+152

This diff is too big to show here.

qml/Dash/Previews/PreviewComment.qmlnew file+86

This diff is too big to show here.

qml/Dash/Previews/PreviewCommentInput.qmlnew file+88

This diff is too big to show here.

qml/Dash/Previews/PreviewExpandable.qmlnew file+104

This diff is too big to show here.

qml/Dash/Previews/PreviewHeader.qmlnew file+170

This diff is too big to show here.

qml/Dash/Previews/PreviewIconActions.qmlnew file+88

This diff is too big to show here.

qml/Dash/Previews/PreviewImageGallery.qmlnew file+150

This diff is too big to show here.

qml/Dash/Previews/PreviewInlineVideo.qmlnew file+112

This diff is too big to show here.

qml/Dash/Previews/PreviewMediaToolbar.qmlnew file+57

This diff is too big to show here.

qml/Dash/Previews/PreviewOverlay.qmlnew file+166

This diff is too big to show here.

qml/Dash/Previews/PreviewPayments.qmlnew file+81

This diff is too big to show here.

qml/Dash/Previews/PreviewProgress.qmlnew file+74

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingDisplay.qmlnew file+117

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingEdit.qmlnew file+83

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingInput.qmlnew file+207

This diff is too big to show here.

qml/Dash/Previews/PreviewRatingSingleDisplay.qmlnew file+73

This diff is too big to show here.

tests/mocks/Unity/Platform/MockPlatform.qml → qml/Dash/Previews/PreviewSingleton/PreviewSingleton.qmlrenamed+3−6

This diff is too big to show here.

qml/Dash/Previews/PreviewSingleton/qmldirnew file+1

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qmlnew file+91

This diff is too big to show here.

qml/Dash/Previews/PreviewTextSummary.qmlnew file+78

This diff is too big to show here.

qml/Dash/Previews/PreviewVideoPlayback.qmlnew file+87

This diff is too big to show here.

qml/Dash/Previews/PreviewWidget.qmlnew file+60

This diff is too big to show here.

qml/Dash/Previews/PreviewWidgetFactory.qmlnew file+102

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qmlnew file+103

This diff is too big to show here.

qml/Launcher/PullToRefreshScopeStyle.qml → qml/Dash/PullToRefreshScopeStyle.qmlrenamed

The content is the same.

qml/Dash/ScopeListView.qmlnew file+28

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSetting.qmlnew file+46

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingBoolean.qmlnew file+63

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingList.qmlnew file+50

This diff is too big to show here.

qml/Panel/FakePanelMenu.qml → qml/Dash/ScopeSettings/ScopeSettingNumber.qmlrenamed+3−8

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingString.qmlnew file+89

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qmlnew file+61

This diff is too big to show here.

qml/Dash/ScopeSettingsPage.qmlnew file+72

This diff is too big to show here.

qml/Dash/ScopesList.qmlnew file+125

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmlnew file+181

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmlnew file+113

This diff is too big to show here.

qml/Dash/graphics/dark_background.jpgnew file

Binary file not shown.

qml/Dash/graphics/header_handlearrow2@27.pngnew file

Binary file not shown.

qml/Dash/graphics/header_handlearrow@27.pngnew file

Binary file not shown.

qml/Dash/graphics/icon_clear@20.pngnew file

Binary file not shown.

qml/Dash/graphics/icon_search_active@20.pngnew file

Binary file not shown.

qml/Dash/graphics/icon_search_inactive@20.pngnew file

Binary file not shown.

qml/Dash/graphics/overview_hint@30.pngnew file

Binary file not shown.

qml/Dash/graphics/pixel.pngnew file

Binary file not shown.

qml/Dash/graphics/play_button@18.pngnew file

Binary file not shown.

qml/Dash/graphics/play_button_active@18.pngnew file

Binary file not shown.

qml/Dash/graphics/play_button_active_big@20.pngnew file

Binary file not shown.

qml/Dash/graphics/play_button_big@20.pngnew file

Binary file not shown.

qml/Dash/graphics/rectangular_dropshadow@30.pngnew file

Binary file not shown.

qml/Dash/graphics/rectangular_dropshadow@30.scinew file+5

This diff is too big to show here.

qml/Dash/graphics/tabbarchevron@27.pngnew file

Binary file not shown.

qml/Dash/graphics/tablet/icon_close_preview@20.pngnew file

Binary file not shown.

qml/Dash/graphics/tooltip_arrow@27.pngnew file

Binary file not shown.

qml/DeviceConfiguration.qml−12

This diff is too big to show here.

qml/Greeter/ButtonPrompt.qmldeleted−51

This diff is too big to show here.

qml/Greeter/Circle.qml+1−1

This diff is too big to show here.

qml/Greeter/CoverPage.qml+11−32

This diff is too big to show here.

qml/Greeter/FullLightDMImpl.qml−1

This diff is too big to show here.

qml/Greeter/Greeter.qml+73−78

This diff is too big to show here.

qml/Greeter/GreeterPrompt.qml+167−66

This diff is too big to show here.

qml/Greeter/GreeterView.qmldeleted−534

This diff is too big to show here.

qml/Greeter/IntegratedLightDMImpl.qml−1

This diff is too big to show here.

qml/Greeter/LightDMService.qml+4−4

This diff is too big to show here.

qml/Greeter/LoginAreaContainer.qml+3−3

This diff is too big to show here.

qml/Greeter/LoginList.qml+190−110

This diff is too big to show here.

qml/Greeter/NarrowView.qmlnew file+287

This diff is too big to show here.

qml/Greeter/PinPrompt.qmldeleted−184

This diff is too big to show here.

qml/Greeter/PromptList.qmldeleted−151

This diff is too big to show here.

qml/Greeter/SessionsList.qml+18−36

This diff is too big to show here.

qml/Greeter/ShimGreeter.qml−2

This diff is too big to show here.

qml/Greeter/TextPrompt.qmldeleted−198

This diff is too big to show here.

qml/Greeter/WideView.qmlnew file+218

This diff is too big to show here.

qml/Launcher/Drawer.qml+179−286

This diff is too big to show here.

qml/Launcher/DrawerGridView.qml+6−44

This diff is too big to show here.

qml/Launcher/DrawerListView.qmlnew file+32

This diff is too big to show here.

qml/Launcher/Launcher.qml+52−95

This diff is too big to show here.

qml/Launcher/LauncherDelegate.qml+12−9

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+36−89

This diff is too big to show here.

qml/Launcher/MoreAppsHeader.qmlnew file+46

This diff is too big to show here.

qml/Launcher/graphics/home.svgdeleted−243

This diff is too big to show here.

qml/Launcher/graphics/home@18.pngnew file

Binary file not shown.

qml/Launcher/graphics/launcher-app-focus-ring.svgnew file+12

This diff is too big to show here.

qml/Notifications/Notification.qml+3−8

This diff is too big to show here.

qml/Notifications/NotificationButton.qml+1−2

This diff is too big to show here.

qml/Notifications/SwipeToAct.qml−4

This diff is too big to show here.

qml/OrientedShell.qml+7−26

This diff is too big to show here.

qml/Panel/ActiveCallHint.qml−3

This diff is too big to show here.

qml/Components/Handle.qml → qml/Panel/Handle.qmlrenamed−1

This diff is too big to show here.

qml/Panel/Indicators/IndicatorItem.qml → qml/Panel/IndicatorItem.qmlrenamed+3−16

This diff is too big to show here.

qml/Panel/PanelItemRow.qml → qml/Panel/IndicatorItemRow.qmlrenamed+106−65

This diff is too big to show here.

qml/Panel/IndicatorPage.qmlnew file+188

This diff is too big to show here.

qml/Panel/Indicators/IndicatorsLight.qml+12−185

This diff is too big to show here.

qml/Panel/Indicators/IndicatorMenuItemFactory.qml → qml/Panel/Indicators/MenuItemFactory.qmlrenamed+11−8

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorRepresentation.qml+5−18

This diff is too big to show here.

qml/Panel/PanelBar.qml → qml/Panel/IndicatorsBar.qmlrenamed+36−87

This diff is too big to show here.

qml/Panel/PanelMenu.qml → qml/Panel/IndicatorsMenu.qmlrenamed+36−80

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+95−372

This diff is too big to show here.

qml/Panel/PanelMenuPage.qmldeleted−226

This diff is too big to show here.

qml/Rotation/RotationStates.qml+5−2

This diff is too big to show here.

qml/ScopeTool.qmlnew file+165

This diff is too big to show here.

qml/Shell.qml+77−233

This diff is too big to show here.

qml/Stage/AbstractStage.qmlnew file+81

This diff is too big to show here.

qml/Stage/ApplicationWindow.qml+4−16

This diff is too big to show here.

qml/Stage/ChildWindow.qmldeleted−203

This diff is too big to show here.

qml/Stage/ChildWindowRepeater.qmldeleted−39

This diff is too big to show here.

qml/Stage/ChildWindowTree.qmldeleted−138

This diff is too big to show here.

qml/Stage/DecoratedWindow.qml+44−97

This diff is too big to show here.

qml/Stage/DesktopSpread.qmlnew file+576

This diff is too big to show here.

qml/Stage/DesktopSpreadDelegate.qmlnew file+126

This diff is too big to show here.

qml/Stage/MoveHandler.qml+30−43

This diff is too big to show here.

qml/Stage/PhoneStage.qmlnew file+800

This diff is too big to show here.

qml/Stage/SideStage.qml+6−10

This diff is too big to show here.

qml/Stage/Splash.qml+4−4

This diff is too big to show here.

qml/Stage/Spread/Spread.qml−11

This diff is too big to show here.

qml/Stage/SpreadDelegate.qmlnew file+433

This diff is too big to show here.

qml/Stage/SpreadMaths.qmlnew file+164

This diff is too big to show here.

qml/Stage/Stage.qml+153−421

This diff is too big to show here.

qml/Stage/StageMaths.qml+2−21

This diff is too big to show here.

qml/Stage/StagedFullscreenPolicy.qml+11−5

This diff is too big to show here.

qml/Stage/TabletStage.qmlnew file+1193

This diff is too big to show here.

qml/Stage/TransformedSpreadDelegate.qmlnew file+391

This diff is too big to show here.

qml/Stage/TransformedTabletSpreadDelegate.qmlnew file+437

This diff is too big to show here.

qml/Stage/WindowControlsOverlay.qml+25−22

This diff is too big to show here.

qml/Stage/WindowDecoration.qml+19−83

This diff is too big to show here.

qml/Stage/WindowInfoItem.qml−16

This diff is too big to show here.

qml/Stage/WindowResizeArea.qml+2−15

This diff is too big to show here.

qml/Stage/WindowStateSaver.qml+3−4

This diff is too big to show here.

qml/Stage/WindowedFullscreenPolicy.qml+12−4

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+43−61

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+2−2

This diff is too big to show here.

qml/Tutorial/TutorialRight.qml+3−2

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

This diff is too big to show here.

qml/Wizard/Pages/10-welcome-update.qmldeleted−137

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qml−3

This diff is too big to show here.

qml/Wizard/Pages/11-changelog.qmldeleted−95

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qml+10−13

This diff is too big to show here.

qml/Wizard/Pages/40-location.qmlnew file+290

This diff is too big to show here.

qml/Wizard/Pages/50-timezone.qml+12−11

This diff is too big to show here.

qml/Wizard/Pages/60-account.qml+10−12

This diff is too big to show here.

qml/Wizard/Pages/70-passwd-type.qml−1

This diff is too big to show here.

qml/Wizard/Pages/75-report-check.qmlnew file+91

This diff is too big to show here.

qml/Wizard/Pages/79-system-update.qml → qml/Wizard/Pages/77-system-update.qmlrenamed+12−4

This diff is too big to show here.

qml/Wizard/Pages/78-firmware-update.qml.disableddeleted−246

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qml+2−4

This diff is too big to show here.

qml/Wizard/Pages/here-terms.qmlnew file+126

This diff is too big to show here.

qml/Wizard/Pages/passcode-desktop.qml+5−14

This diff is too big to show here.

qml/Wizard/Pages/password-set.qml+4−12

This diff is too big to show here.

qml/Wizard/Wizard.qml+2−5

This diff is too big to show here.

src/ApplicationArguments.h−5

This diff is too big to show here.

src/CMakeLists.txt+6−15

This diff is too big to show here.

src/Dash/CMakeLists.txtnew file+29

This diff is too big to show here.

src/Dash/main.cppnew file+146

This diff is too big to show here.

src/DebuggingController.cppdeleted−92

This diff is too big to show here.

src/DebuggingController.hdeleted−57

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+1−28

This diff is too big to show here.

src/MouseTouchAdaptor.h−1

This diff is too big to show here.

src/Panel/CMakeLists.txtnew file+3

This diff is too big to show here.

src/Panel/Indicators/CMakeLists.txtnew file+1

This diff is too big to show here.

tools/indicatorsclient/CMakeLists.txt → src/Panel/Indicators/client/CMakeLists.txtrenamed+1−1

This diff is too big to show here.

tools/indicatorsclient/indicatorsclient.cpp → src/Panel/Indicators/client/indicatorsclient.cpprenamed

The content is the same.

tools/indicatorsclient/indicatorsclient.h → src/Panel/Indicators/client/indicatorsclient.hrenamed

The content is the same.

tools/indicatorsclient/main.cpp → src/Panel/Indicators/client/main.cpprenamed

The content is the same.

src/ShellApplication.cpp+5−21

This diff is too big to show here.

src/ShellApplication.h+3−1

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+2−10

This diff is too big to show here.

tests/CMakeLists.txt+5−16

This diff is too big to show here.

tests/autopilot/unity8/dash.pynew file+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/shell/fixture_setup.py+27−1

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+1−1

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_helpers.py+123

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+4−35

This diff is too big to show here.

tests/data/unity/backgrounds/20x30.pngdeleted

Binary file not shown.

tests/data/unity/backgrounds/black.pngdeleted

Binary file not shown.

tests/imports/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+39−2

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+27−4

This diff is too big to show here.

tests/mocks/AccountsService/CMakeLists.txt+4−4

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+2−3

This diff is too big to show here.

tests/mocks/GSettings.1.0/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.cpp+27−25

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.h+9−9

This diff is too big to show here.

tests/mocks/LightDM/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txtnew file+50

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cppnew file+51

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.hnew file+42

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cppnew file+66

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.hnew file+44

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cppnew file+44

This diff is too big to show here.

plugins/Lights/HfdLights.h → tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.hrenamed+13−16

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeternew file+17

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModelnew file+17

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModelnew file+17

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtnew file+21

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cppnew file+201

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed+23−10

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.cpp → tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/liblightdm/GreeterPrivate.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

tests/mocks/liblightdm/MockSessionsModel.cpp → tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpprenamed+42−39

This diff is too big to show here.

tests/mocks/liblightdm/MockSessionsModel.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hrenamed+19−11

This diff is too big to show here.

tests/mocks/liblightdm/SessionsModelPrivate.cpp → tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpprenamed

The content is the same.

tests/mocks/liblightdm/SessionsModelPrivate.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cppnew file+123

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+18−9

This diff is too big to show here.

tests/mocks/liblightdm/UsersModelPrivate.cpp → tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed

The content is the same.

tests/mocks/liblightdm/UsersModelPrivate.h → tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/IntegratedLightDM/plugin.cppnew file+79

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/LightDM/IntegratedLightDM/qmldirnew file+2

This diff is too big to show here.

tests/mocks/LightDMController/CMakeLists.txtdeleted−14

This diff is too big to show here.

tests/mocks/LightDMController/qmldirdeleted−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+2−1

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.h+3−2

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.cpp+13−78

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.h+1−12

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+2−2

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.h+6−6

This diff is too big to show here.

tests/mocks/SessionBroadcast/CMakeLists.txt+1−1

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

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.h+6−7

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/Payments/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.cppnew file+95

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.hnew file+62

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/plugin.cppnew file+28

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/plugin.h → tests/mocks/Ubuntu/Payments/plugin.hrenamed+5−6

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/MockSystemImage.cppnew file+50

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/MockSystemImage.hnew file+56

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/plugin.cppnew file+34

This diff is too big to show here.

plugins/Unity/ApplicationMenu/plugin.h → tests/mocks/Ubuntu/SystemImage/plugin.hrenamed+5−6

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/qmldirnew file+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+1−1

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.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/qmldirdeleted−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/Unity/Application/ApplicationInfo.cpp+5−16

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+7−6

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+8−29

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h+6−1

This diff is too big to show here.

tests/mocks/Unity/Application/CMakeLists.txt+2−2

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.cpp−13

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.h−4

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.cpp−52

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.h−16

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+5−20

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.cpp+7−7

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.h+10−7

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.cpp+15−24

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.h+2−6

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.cpp+4−5

This diff is too big to show here.

tests/mocks/Unity/Application/resources/Kate.qmldeleted−49

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateDialog.qmldeleted−48

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.txtdeleted−18

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cppdeleted−47

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.hdeleted−41

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+66−2

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.txtnew file+18

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicator.cppnew file+42

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicator.hnew file+39

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cppnew file+46

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.hnew file+41

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/plugin.cppnew file+31

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/plugin.hnew file+34

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Unity/Indicators/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/Unity/Indicators/IndicatorsModel.qml+12−30

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.js+6−23

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

This diff is too big to show here.

tests/mocks/Unity/Launcher/CMakeLists.txt+3−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp+5−28

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.h−11

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp−13

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h−3

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−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+1−3

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/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.h+1−2

This diff is too big to show here.

tests/mocks/Unity/Platform/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Unity/Platform/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Unity/Screens/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.cpp+1−1

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.h+1−1

This diff is too big to show here.

tests/mocks/Unity/fake_categories.cppnew file+165

This diff is too big to show here.

tests/mocks/Unity/fake_categories.hnew file+54

This diff is too big to show here.

tests/mocks/Unity/fake_expandablefilterwidget.cppnew file+53

This diff is too big to show here.

tests/mocks/Unity/fake_expandablefilterwidget.hnew file+48

This diff is too big to show here.

tests/mocks/Unity/fake_filters.cppnew file+136

This diff is too big to show here.

tests/mocks/Unity/fake_filters.hnew file+46

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.cppnew file+123

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.hnew file+61

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.cppnew file+70

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.hnew file+54

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.cppnew file+90

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.hnew file+49

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.cppnew file+103

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.hnew file+58

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.cppnew file+97

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.hnew file+47

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.cppnew file+167

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.hnew file+79

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.cppnew file+92

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.hnew file+52

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cppnew file+372

This diff is too big to show here.

tests/mocks/Unity/fake_scope.hnew file+128

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cppnew file+280

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.hnew file+83

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cppnew file+340

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.hnew file+117

This diff is too big to show here.

tests/mocks/Unity/fake_settingsmodel.cppnew file+95

This diff is too big to show here.

tests/mocks/Unity/fake_settingsmodel.hnew file+54

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.cppnew file+62

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.hnew file+34

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.cppnew file+84

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.hnew file+55

This diff is too big to show here.

tests/mocks/Unity/fake_valueslidervalues.cppnew file+51

This diff is too big to show here.

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.h → tests/mocks/Unity/fake_valueslidervalues.hrenamed+13−11

This diff is too big to show here.

tests/mocks/Unity/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Utils/CMakeLists.txt+3−8

This diff is too big to show here.

tests/mocks/Utils/plugin.cpp+1−7

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.h+3−1

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+4−19

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.h+1−11

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.txtdeleted−18

This diff is too big to show here.

tests/mocks/liblightdm/MockController.cppdeleted−192

This diff is too big to show here.

tests/mocks/liblightdm/MockController.hdeleted−106

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.cppdeleted−316

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.cppdeleted−220

This diff is too big to show here.

tests/mocks/liblightdm/demo/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/libusermetrics/CMakeLists.txt+1−2

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

This diff is too big to show here.

tests/plugins/AccountsService/CMakeLists.txt+2−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+34−6

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.txtnew file+104

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.resnew file+82

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.res.cardcreatornew file+69

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/10.resnew file+129

This diff is too big to show here.

tests/plugins/Dash/cardcreator/10.res.cardcreatornew file+127

This diff is too big to show here.

tests/plugins/Dash/cardcreator/10.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/11.resnew file+176

This diff is too big to show here.

tests/plugins/Dash/cardcreator/11.res.cardcreatornew file+160

This diff is too big to show here.

tests/plugins/Dash/cardcreator/11.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/12.resnew file+108

This diff is too big to show here.

tests/plugins/Dash/cardcreator/12.res.cardcreatornew file+95

This diff is too big to show here.

tests/plugins/Dash/cardcreator/12.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.resnew file+128

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.res.cardcreatornew file+126

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.resnew file+90

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res.cardcreatornew file+86

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.resnew file+111

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.res.cardcreatornew file+99

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.resnew file+102

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res.cardcreatornew file+99

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.resnew file+127

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.res.cardcreatornew file+116

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.resnew file+141

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.res.cardcreatornew file+139

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/8.resnew file+109

This diff is too big to show here.

tests/plugins/Dash/cardcreator/8.res.cardcreatornew file+97

This diff is too big to show here.

tests/plugins/Dash/cardcreator/8.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/9.resnew file+120

This diff is too big to show here.

tests/plugins/Dash/cardcreator/9.res.cardcreatornew file+109

This diff is too big to show here.

tests/plugins/Dash/cardcreator/9.tstnew file+4

This diff is too big to show here.

tests/plugins/Dash/cardcreatortest.cppnew file+126

This diff is too big to show here.

tests/plugins/Dash/cardcreatortest.qmlnew file+29

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.cppnew file+489

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.qmlnew file+44

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltry.cppnew file+91

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltry.qmlnew file+120

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cppnew file+245

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadersectiontest.cppnew file+2212

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cppnew file+2038

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.qmlnew file+96

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsection.qmlnew file+119

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qmlnew file+76

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.cppnew file+532

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qmlnew file+44

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.cppnew file+99

This diff is too big to show here.

tests/plugins/Dash/organicgridtry.qmlnew file+114

This diff is too big to show here.

tests/plugins/Dash/tst_CardAttributes.qmlnew file+57

This diff is too big to show here.

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qmlnew file+56

This diff is too big to show here.

tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qmlnew file+140

This diff is too big to show here.

tests/plugins/Dash/tst_ScopeStyle.qmlnew file+188

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.cppnew file+563

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qmlnew file+45

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltry.cppnew file+91

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltry.qmlnew file+121

This diff is too big to show here.

tests/plugins/GlobalShortcut/CMakeLists.txt+2−1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+3−1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+1

This diff is too big to show here.

tests/plugins/ImageCache/CMakeLists.txtnew file+30

This diff is too big to show here.

tests/plugins/ImageCache/graphics/wide.jpgnew file

Binary file not shown.

tests/plugins/ImageCache/test.cppnew file+216

This diff is too big to show here.

plugins/WindowManager/WindowManagerGlobal.h → tests/plugins/ImageCache/test.qmlrenamed+7−7

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt+11−39

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/dbus.cpp+11−20

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/greeter.qml+7−2

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cppdeleted−175

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+13−19

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp+16−100

This diff is too big to show here.

tests/plugins/SessionBroadcast/CMakeLists.txt+2−2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+2−4

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+1−10

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+2−11

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

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+2−39

This diff is too big to show here.

tests/plugins/Unity/Launcher/appdrawermodeltest.cppdeleted−68

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+12−91

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.cppdeleted−58

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.hdeleted−55

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.cppdeleted−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.hdeleted−39

This diff is too big to show here.

tests/plugins/Unity/Platform/CMakeLists.txtdeleted−30

This diff is too big to show here.

tests/plugins/Unity/Platform/platformtest.cppdeleted−142

This diff is too big to show here.

tests/plugins/Unity/Session/CMakeLists.txt+3−15

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.cdeleted−43

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cpp+11−130

This diff is too big to show here.

tests/plugins/Utils/CMakeLists.txt+5−6

This diff is too big to show here.

tests/plugins/Utils/DeviceConfigParserTest.cpp−3

This diff is too big to show here.

tests/plugins/Utils/ModelTest.cpp+1−2

This diff is too big to show here.

tests/plugins/Utils/WindowInputMonitorTest.cpp+1−31

This diff is too big to show here.

tests/plugins/Utils/WindowStateStorageTest.cppdeleted−121

This diff is too big to show here.

tests/plugins/WindowManager/CMakeLists.txtdeleted−36

This diff is too big to show here.

tests/plugins/WindowManager/UnityApplicationMocks.hdeleted−211

This diff is too big to show here.

tests/plugins/WindowManager/tst_TopLevelWindowModel.cppdeleted−193

This diff is too big to show here.

tests/plugins/Wizard/CMakeLists.txt+2−2

This diff is too big to show here.

tests/qmltests/ApplicationMenuDataLoader.qmldeleted−99

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuBar.qmldeleted−437

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuPopup.qmldeleted−361

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+59−16

This diff is too big to show here.

tests/qmltests/Components/CMakeLists.txt+4−8

This diff is too big to show here.

tests/qmltests/Components/tst_Carousel.qmlnew file+292

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+2−19

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_Lockscreen.qml+9−11

This diff is too big to show here.

tests/qmltests/Components/tst_MediaServices.qml+4−5

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+6−7

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.qmlnew file+157

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveVerticalJournal.qmlnew file+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_Wallpaper.qmldeleted−118

This diff is too big to show here.

tests/qmltests/Components/tst_WallpaperResolver.qml+18−104

This diff is too big to show here.

tests/qmltests/Dash/CardHelpers.jsnew file+115

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterExpandableWidget.qmlnew file+99

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qmlnew file+96

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterRangeInput.qmlnew file+247

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterValueSlider.qmlnew file+101

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qmlnew file+59

This diff is too big to show here.

tests/qmltests/Dash/Previews/MockPreviewWidget.qmlnew file+27

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_Preview.qmlnew file+214

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewActions.qmlnew file+262

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qmlnew file+182

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewComment.qmlnew file+84

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qmlnew file+113

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qmlnew file+358

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewHeader.qmlnew file+183

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewIconActions.qmlnew file+136

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qmlnew file+147

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qmlnew file+155

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewMediaToolbar.qmlnew file+69

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewPayments.qmlnew file+203

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewProgress.qmlnew file+100

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qmlnew file+123

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingDisplayCreationRanges.qmlnew file+131

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qmlnew file+87

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qmlnew file+246

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTable.qmlnew file+147

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qmlnew file+87

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qmlnew file+61

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qmlnew file+104

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmlnew file+138

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qmlnew file+62

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qmlnew file+84

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qmlnew file+98

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qmlnew file+88

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qmlnew file+65

This diff is too big to show here.

tests/qmltests/Dash/artwork/avatar@12.pngnew file

Binary file not shown.

tests/qmltests/Dash/artwork/background.pngnew file

Binary file not shown.

tests/qmltests/Dash/artwork/checkers.pngnew file

Binary file not shown.

tests/qmltests/Dash/artwork/emblem.pngnew file

Binary file not shown.

tests/qmltests/Dash/artwork/music-player-design.pngnew file

Binary file not shown.

tests/qmltests/Dash/tst_Card.qmlnew file+682

This diff is too big to show here.

tests/qmltests/Dash/tst_CardBenchmark.qmlnew file+95

This diff is too big to show here.

tests/qmltests/Dash/tst_CardCarousel.qmlnew file+111

This diff is too big to show here.

tests/qmltests/Dash/tst_CardTool.qmlnew file+379

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qmlnew file+694

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qmlnew file+730

This diff is too big to show here.

tests/qmltests/Dash/tst_DashPageHeader.qmlnew file+357

This diff is too big to show here.

tests/qmltests/Dash/tst_DashShell.qmlnew file+116

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qmlnew file+722

This diff is too big to show here.

tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svgnew file+60

This diff is too big to show here.

tests/qmltests/Dash/tst_PreviewView.qmlnew file+122

This diff is too big to show here.

tests/qmltests/Greeter/TestView.qml+22−16

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml+140−80

This diff is too big to show here.

tests/qmltests/Greeter/tst_GreeterView.qmldeleted−1366

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+11−1

This diff is too big to show here.

tests/qmltests/Greeter/tst_NarrowView.qmlnew file+589

This diff is too big to show here.

tests/qmltests/Greeter/tst_WideView.qmlnew file+757

This diff is too big to show here.

tests/qmltests/Launcher/tst_Drawer.qml+13−269

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+81−255

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+10−16

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+6−12

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+3−10

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/PanelTest.qml → tests/qmltests/Panel/IndicatorTest.qmlrenamed+5

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+8−168

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qml → tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qmlrenamed+81−35

This diff is too big to show here.

tests/qmltests/Panel/PanelUI.qmldeleted−286

This diff is too big to show here.

tests/qmltests/Panel/tst_ActiveCallHint.qml+9−14

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorItem.qml → tests/qmltests/Panel/tst_IndicatorItem.qmlrenamed+1−1

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelItemRow.qml → tests/qmltests/Panel/tst_IndicatorItemRow.qmlrenamed+34−38

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenuPage.qml → tests/qmltests/Panel/tst_IndicatorPage.qmlrenamed+47−53

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelBar.qml → tests/qmltests/Panel/tst_IndicatorsBar.qmlrenamed+33−24

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenu.qml → tests/qmltests/Panel/tst_IndicatorsMenu.qmlrenamed+34−91

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+4−16

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+236−413

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelSmallScreen.qmldeleted−133

This diff is too big to show here.

tests/qmltests/Stage/ApplicationCheckBox.qml+7−7

This diff is too big to show here.

tests/qmltests/Stage/tst_ApplicationWindow.qml+2−3

This diff is too big to show here.

tests/qmltests/Stage/tst_DecoratedWindow.qml+5−40

This diff is too big to show here.

tests/qmltests/Stage/tst_DesktopStage.qml+67−299

This diff is too big to show here.

tests/qmltests/Stage/tst_PhoneStage.qml+64−100

This diff is too big to show here.

tests/qmltests/Stage/tst_QMLTopLevelWindowModel.qmldeleted−191

This diff is too big to show here.

tests/qmltests/Stage/tst_SpreadDelegate.qmlnew file+320

This diff is too big to show here.

tests/qmltests/Stage/tst_SurfaceContainer.qml+8−9

This diff is too big to show here.

tests/qmltests/Stage/tst_TabletStage.qml+138−142

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowDecoration.qmldeleted−244

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowResizeArea.qml+12−21

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+193−192

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+142−100

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml+262−405

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+581−1215

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+131−120

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

This diff is too big to show here.

tests/uqmlscene/main.cpp+3−7

This diff is too big to show here.

tests/utils/modules/Unity/Test/CMakeLists.txt+4−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+1−1

This diff is too big to show here.

tests/utils/modules/Unity/Test/StageTestCase.qml+18−14

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+1−10

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+11−2

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+12−2

This diff is too big to show here.

tools/menutool/CMakeLists.txtdeleted−5

This diff is too big to show here.

tools/menutool/READMEdeleted−11

This diff is too big to show here.

tools/menutool/menutool.cppdeleted−62

This diff is too big to show here.

tools/menutool/menutool.qmldeleted−118

This diff is too big to show here.

tools/registry-tracker.cppnew file+146

This diff is too big to show here.

tools/registry-tracker.hnew file+49

This diff is too big to show here.

tools/scopetool.cppnew file+116

This diff is too big to show here.

tools/unlock-device−16

This diff is too big to show here.