7b5207e · unity8 · git.iko.soy

.crossbuilder/post_deploynew file+1

compare with xenial

unifiedsplit

@@ -0,0 +1 @@

1+restart unity8

CMakeLists.txt+3−1

@@ -57,11 +57,12 @@ find_package(Qt5DBus 5.4 REQUIRED)

57find_package(Qt5Concurrent 5.4 REQUIRED)

58find_package(Qt5Sql 5.4 REQUIRED)

59

60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=17)

60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)

61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

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

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

64pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

65+pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

65

66

66pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

67pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

67

68

@@ -128,6 +129,7 @@ set(SHELL_APP unity8)

128set(DASH_APP unity8-dash)

129set(DASH_APP unity8-dash)

129set(SCOPE_TOOL unity-scope-tool)

130set(SCOPE_TOOL unity-scope-tool)

130set(INDICATORS_CLIENT_APP indicators-client)

131set(INDICATORS_CLIENT_APP indicators-client)

132+set(GREETER_APP unity8-greeter)

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

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

132

134

133include_directories(

135include_directories(

CODING+20−59

@@ -15,23 +15,17 @@ download source

15 $ bzr branch lp:unity8 ~/unity8/trunk

16 $ cd ~/unity8/trunk

17

18−install dependencies

18+install dependencies and build Unity 8

19--------------------

20−If its your first time, install build dependencies

21

20

22$ cd ~/unity8/trunk

21$ cd ~/unity8/trunk

23−$ ./build.sh --setup

22+$ ./build.sh

24−

25− this will:

26− - install the required dependencies to build, as well as run on the desktop

27− - it should also install unity-scope-home and unity-lens-application which

28− are technically "recommends", not strict dependencies

29

23

30−build Unity 8

24+ If its your first time, this will install the required dependencies to build and

31−-------------

25+ build it.

32

26

33−$ cd ~/unity8/trunk

27+ You might want to also install unity-scope-home and unity-scope-click which

34−$ ./build.sh

28+ are technically "recommends", not strict dependencies

35

29

36You may also rebuild with the -c for clean, which just deletes the build

30You may also rebuild with the -c for clean, which just deletes the build

37directory.

31directory.

@@ -43,13 +37,15 @@ Running Unity 8 on your desktop

43run the Unity 8 shell

37run the Unity 8 shell

44---------------------

38---------------------

45$ cd ~/unity8/trunk

39$ cd ~/unity8/trunk

46−$ ./run.sh

40+$ cd builddir

47

41

48−Options can be passed to test the lock screen

42+Each component of unity8 can be ran independently for development and testing

49−$ ./run.sh -p OR -k

43+For example:

44+$ make tryShell

45+$ make tryLauncher

46+$ make tryLockscreen

50

47

51−-p is for pin lock, for which the default prompt answer is "1234"

48+Check out the tests/qmltests/ directory for a list of things that can be ran.

52−-k is for keylock passphrase, for which the default prompt answer is "password"

53

49

54Notes

50Notes

55-----

51-----

@@ -70,50 +66,15 @@ Notes

70

66

71Running Unity 8 on devices

67Running Unity 8 on devices

72==========================

68==========================

73−- Ubuntu Touch builds are currently only available in 14.04 flavour

74−- supported hardware should match one of those listed here

75− https://wiki.ubuntu.com/Touch/Devices#Running_fine

76−- follow the Ubuntu Touch install instructions for your chosen device

77− https://wiki.ubuntu.com/Touch/Install

78−- make sure your device is connected to a network

79−- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one

80− on the device yourself)

81−

82−$ cd ~/unity/trunk

83−$ ./run_on_device.sh --setup

84− this will:

85− - install your public SSH key on the device

86− - install the needed dependencies

87

69

88−$ ./run_on_device.sh

70+Running unity8 on a device should be done using crossbuilder.

89− this will:

71+Go to

90− - rsync the code to the device

72+* https://launchpad.net/crossbuilder and

91− - build on the device

73+* https://wiki.ubuntu.com/Touch/Crossbuilder

92− - replace the running shell

74+for more details on crossbuilder.

93−

94−Options can be passed to test the lock screen

95−$ ./run_on_device.sh -p OR -k

96−

97−-p is for pin lock, for which the default prompt answer is "1234"

98−-k is for keylock passphrase, for which the default prompt answer is "password"

99−

100−Notes

101−-----

102−- using adb over TCP has some advantages, Google will be of help here

103− - NOTE: this is not yet available for flipped images

104− - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`

105− - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`

106− - it's unsafe - anyone can connect to your device

107− - with TCP the Nexus 10 doesn't drop the adb connection when locking

108− the screen

109−- exporting ANDROID_SERIAL=$your_device_serial or

110− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

111− multiple devices

112−- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh

113− to not use adb forwarding - useful if you use multiple devices

114−- using Ninja (package ninja-build - run_on_device.sh -s installs this now)

115− will improve build times (especially in the nothing-to-build case)

116

75

76+unity8 will automatically restart on the phone once deployment

77+has finished due to post-build-steps set up in this repository.

117

78

118Coding guidelines

79Coding guidelines

119=================

80=================

build.sh+6−37

@@ -9,7 +9,6 @@ usage() {

9 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2

10 echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2

11 echo "OPTIONS:" >&2

12− echo " -s, --setup Setup the build environment and branch Unity" >&2

13 echo " -c, --clean Clean the build tree before building" >&2

12 echo " -c, --clean Clean the build tree before building" >&2

14 echo >&2

13 echo >&2

15 exit 1

14 exit 1

@@ -22,7 +21,6 @@ eval set -- "$ARGS"

22while [ $# -gt 0 ]

21while [ $# -gt 0 ]

23do

22do

24 case "$1" in

23 case "$1" in

25− -s|--setup) SETUP=true;;

26 -c|--clean) CLEAN=true;;

24 -c|--clean) CLEAN=true;;

27 -h|--help) usage;;

25 -h|--help) usage;;

28 --) shift;break;;

26 --) shift;break;;

@@ -35,31 +33,6 @@ done

35BUILD_TYPE="debug"

33BUILD_TYPE="debug"

36[ $# -eq 1 ] && BUILD_TYPE="$1"

34[ $# -eq 1 ] && BUILD_TYPE="$1"

37

35

38−install_dependencies() {

39− sudo apt-get update || exit 4

40− echo "Installing Unity 8 dependencies.."

41− sudo apt-get install devscripts \

42− equivs \

43− gsettings-desktop-schemas \

44− gsettings-ubuntu-schemas \

45− pay-service \

46− qmenumodel-qml \

47− qml-module-qtquick-layouts \

48− qml-module-qtquick-xmllistmodel \

49− qtdeclarative5-gsettings1.0 \

50− qtdeclarative5-ubuntu-ui-toolkit-plugin \

51− qtdeclarative5-ubuntu-settings-components \

52− qtdeclarative5-ubuntu-telephony0.1 \

53− qtdeclarative5-ubuntu-thumbnailer0.1 \

54− qtdeclarative5-unity-notifications-plugin \

55− qml-module-ubuntu-connectivity \

56− ubuntu-mobile-icons \

57− ubuntu-system-settings \

58− unity-plugin-scopes \

59− xvfb \

60− || exit 5

61−}

62−

63mk_build_deps() {

36mk_build_deps() {

64 if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

37 if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

65 sed 's/\:native//g' $CODE_DIR/debian/control > control

38 sed 's/\:native//g' $CODE_DIR/debian/control > control

@@ -85,13 +58,9 @@ else

85 BUILD_COMMAND="make -j$NUM_JOBS"

58 BUILD_COMMAND="make -j$NUM_JOBS"

86fi

59fi

87

60

88−if $SETUP; then

89− install_dependencies

90−else

91− if $CLEAN; then rm -rf builddir; fi

61+if $CLEAN; then rm -rf builddir; fi

92− mkdir -p builddir

62+mkdir -p builddir

93− cd builddir

63+cd builddir

94− mk_build_deps

64+mk_build_deps

95− cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

65+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

96− ${BUILD_COMMAND} || exit 7

66+${BUILD_COMMAND} || exit 7

97−fi

data/51-unity8-greeter.confnew file+2

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

1+[Seat:*]

2+greeter-session=unity8-greeter

data/CMakeLists.txt+11

@@ -2,6 +2,7 @@

2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

3configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

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

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

5

6

6# install desktop files

7# install desktop files

7install(FILES

8install(FILES

@@ -11,6 +12,16 @@ install(FILES

11 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

12 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

12 )

13 )

13

14

15+install(FILES

16+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop

17+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters

18+ )

19+

20+install(FILES

21+ 51-unity8-greeter.conf

22+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d

23+ )

24+

14# install dash icon

25# install dash icon

15install(FILES

26install(FILES

16 ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png

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

data/unity8-dash.png

Binary file not shown.

data/unity8-greeter-init.confnew file+12

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

1+description "Unity 8 Greeter initialization"

2+author "Michael Terry <mterry@ubuntu.com>"

3+

4+start on unity8-greeter-started

5+task

6+emits indicator-services-start

7+

8+script

9+ start --no-wait ofono-setup || true

10+ initctl emit --no-wait indicator-services-start || true

11+ start --no-wait maliit-server || true

12+end script

data/unity8-greeter-wrappernew file+98

@@ -0,0 +1,98 @@

1+#!/bin/sh

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

3+#

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

6+#

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

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

9+# Foundation, version 3 of the License.

10+#

11+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.

12+

13+# This wrapper merely ensures that init and friends live only as long as this

14+# script does. Otherwise, it's very easy for some processes to not notice that

15+# the session died. We could try to do this in-process, but we want to do this

16+# cleanup even if the greeter aborts.

17+

18+trap cleanup TERM EXIT

19+

20+cleanup()

21+{

22+ trap - TERM EXIT

23+ # Kill upstart and indicators

24+ if [ -n "$INIT_PID" ]; then

25+ kill "$INIT_PID"

26+ fi

27+ if [ -n "$CMD_PID" ]; then

28+ kill "$CMD_PID"

29+ fi

30+ exit 0

31+}

32+

33+set_greeter_var()

34+{

35+ export "$1=$2"

36+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"

37+ if [ -n "$INIT_PID" ]; then

38+ initctl set-env --global "$1=$2"

39+ fi

40+}

41+

42+SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket

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

44+

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

46+TOUCH_WRAPPER=

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

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

49+fi

50+

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

52+# will start.

53+export DESKTOP_SESSION=ubuntu-touch

54+

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

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

57+# eventually need the greeter to play ringtones for users that aren't logged in.

58+set_greeter_var PA_DISABLED 1

59+

60+# Normal unity8 sessions are entirely driven by Upstart. But greeters

61+# are special. They need access to the file descriptors that lightdm

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

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

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

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

66+INIT_PID=$!

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

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

69+

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

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

72+

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

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

75+# have permission to switch system language, only their own. So we notice if

76+# the phablet user exists and use their language if so. TODO: talk to design

77+# about whether we should switch language on fly as users are selected (this

78+# is very hard to do technically).

79+#

80+# Do this after unity8-greeter-starting, in case a customization upstart job

81+# changes language.

82+if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then

83+ USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)

84+ if [ -n "$USER_LANG" ]; then

85+ set_greeter_var LANGUAGE "$USER_LANG"

86+ fi

87+ USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)

88+ if [ -n "$USER_LOCALE" ]; then

89+ set_greeter_var LANG "$USER_LOCALE"

90+ set_greeter_var LC_ALL "$USER_LOCALE"

91+ fi

92+fi

93+

94+# And finally actually start the greeter

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

96+CMD_PID=$!

97+wait $CMD_PID

98+CMD_PID=

data/unity8-greeter.desktop.innew file+7

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

1+[Desktop Entry]

2+Type=Application

3+Name=Unity 8 Greeter

4+Comment=The converged Unity shell's Greeter

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter

6+X-LightDM-Session-Type=mir

7+X-Ubuntu-Touch=true

data/unity8-greeter.pklanew file+44

@@ -0,0 +1,44 @@

1+# DO NOT EDIT THIS FILE, it will be overwritten on update

2+# Place your local configurations under /etc/polkit-1/localauthority/

3+

4+[Disable Controlling of Network Devices]

5+Identity=unix-user:lightdm

6+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;

7+ResultActive=no

8+ResultInactive=no

9+ResultsAny=no

10+

11+[Disable Sleep and Wake]

12+Identity=unix-user:lightdm

13+Action=org.freedesktop.NetworkManager.sleep-wake

14+ResultActive=no

15+ResultInactive=no

16+ResultsAny=no

17+

18+[Disable WiFi Sharing]

19+Identity=unix-user:lightdm

20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open

21+ResultActive=no

22+ResultInactive=no

23+ResultsAny=no

24+

25+[Disable Settings Modifications]

26+Identity=unix-user:lightdm

27+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname

28+ResultActive=no

29+ResultInactive=no

30+ResultsAny=no

31+

32+[Disable User Connections]

33+Identity=unix-user:lightdm

34+Action=org.freedesktop.NetworkManager.use-user-connections

35+ResultActive=no

36+ResultInactive=no

37+ResultsAny=no

38+

39+[Enable Controlling of Network Connections]

40+Identity=unix-user:lightdm

41+Action=org.freedesktop.NetworkManager.network-control

42+ResultActive=yes

43+ResultInactive=no

44+ResultsAny=no

data/unity8.conf+25−2

@@ -3,7 +3,7 @@ author "Ricardo Mendoza <ricmm@ubuntu.com>"

3

4emits indicator-services-start

5

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

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

7stop on desktop-end

8

9kill timeout 120

@@ -50,11 +50,34 @@ pre-start script

50 # the lag seen in the indicator panel pull-down (LP: #1488327) and also

51 # reduces lag seen in apps:

52 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1

53+

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

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

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

57+ # start with the lockscreen visible. Once we switch to using a

58+ # proper greeter for the first login, we can remove this code path.

59+ initctl set-env MODE=full-greeter

60+ else

61+ initctl set-env MODE=full-shell

62+ fi

53end script

63end script

54

64

55−exec ${BINARY:-unity8} $ARGS

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

56

66

57post-start script

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

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

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

59end script

82end script

60

83

debian/changelog+323

@@ -1,3 +1,326 @@

1+unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium

2+

3+ [ Daniel d'Andrada ]

4+ * Added implementation for MirSurfaceInterface::persistentId

5+

6+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 31 Aug 2016 11:56:09 +0000

7+

8+unity8 (8.14+16.10.20160826-0ubuntu1) yakkety; urgency=medium

9+

10+ * Make sure we emit sounds when taking a screenshot even after media-

11+ hub (LP: #1544477)

12+

13+ -- Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com> Fri, 26 Aug 2016 08:14:14 +0000

14+

15+unity8 (8.14+16.10.20160819-0ubuntu1) yakkety; urgency=medium

16+

17+ [ Lukáš Tinkl ]

18+ * Reset topmostIsFullscreen to correctly rotate the shell when

19+ dismissing SIM PIN screen (LP: #1614070)

20+

21+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 19 Aug 2016 14:16:54 +0000

22+

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

24+

25+ [ Albert Astals Cid ]

26+ * Take into account carousel selectedItemScaleFactor when setting card

27+ fixedArtShapeSize (LP: #1599238)

28+ * Remove unused LimitProxyModel

29+ * Do not calculate implicitHeight for Cards in a CardGrid

30+ * Small clazy fixes

31+

32+ [ Daniel d'Andrada ]

33+ * Remove stage property from Application

34+

35+ [ Larry Price ]

36+ * Allow libertine-scope to show empty search result hint unmodified.

37+ (LP: #1606693)

38+

39+ [ Lukáš Tinkl ]

40+ * Open the quicklist (context) menu also using the Menu key (LP:

41+ #1608265)

42+ * Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:

43+ #1596076)

44+ * Apply the correct keymap also on prompt surfaces (LP: #1610124)

45+ * Implement an optional system update feature during OOBE wizard (LP:

46+ #1580785)

47+ * Implement a page for choosing HW keyboard layout in OOBE wizard

48+

49+ [ Michael Zanetti ]

50+ * Clean up some build script legacy

51+ * Add a crossbuilder_post file to make crossbuilder restart unity8

52+ after deploying

53+ * fixes for the automatic switching between usage modes (LP: #1590944)

54+

55+ [ Omer Akram ]

56+ * Add object names for setup wizard

57+

58+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 11 Aug 2016 06:28:20 +0000

59+

60+unity8 (8.14+16.10.20160803-0ubuntu1) yakkety; urgency=medium

61+

62+ [ Albert Astals Cid ]

63+ * Fix DisabledScreenNotice::test_rotation

64+ * Make the delegate of DashNavigationList an async Loader

65+ * unity-scope-tool: Use parse instead of process

66+ * VerticalJournal improvements regarding model insertions and item

67+ height changes (LP: #1599754)

68+ * Add math.h includes for compilation in yakkety (LP: #1605502)

69+

70+ [ Andrea Cimitan ]

71+ * Unfocus the search text field in the dash page header when requested

72+ (LP: #1590820)

73+ * Use binding for filter popover contentWidth (LP: #1595116)

74+ * Add few sourceSize for Image we forgot (LP: #1595113)

75+ * Replace Flickable with an Item inside DashPageHeader for

76+ headerContainer (LP: #1599235)

77+

78+ [ Albert Astals Cid, Andrea Cimitan ]

79+ * Unbox the artshapeLoader

80+

81+ [ Daniel d'Andrada ]

82+ * Fix splashscreen orientation when app rotates own contents (LP:

83+ #1586050)

84+ * tst_PreviewIconActions: Make test name match filename

85+ * Cursor: make its size grid unit based (LP: #1604014)

86+ * TouchEventSequenceWrapper: item might get deleted when touch

87+ sequence is committed (LP: #1607686)

88+

89+ [ Lukáš Tinkl ]

90+ * Implement frontend support for running keyboard indicator

91+ * Provide window/surface close shortcuts across all the stages (LP:

92+ #1578392, #1606528)

93+ * Restart the location trust prompt service when exiting the wizard

94+ (LP: #1594430)

95+ * Implement clearing the search and closing the panel on pressing

96+ Escape key in the dash header

97+ * Fix log timestamps (LP: #1602196)

98+ * Don't display the mode switch warning dialog on tablets (LP:

99+ #1600290)

100+

101+ [ Michael Terry ]

102+ * Fix indicator profile bug that caused sound indicator to say Mute

103+ instead of Silent Mode. (LP: #1604205)

104+ * Fix lockscreen appearing right after unlocking a locked session on

105+ the desktop. (LP: #1604374)

106+

107+ [ Michał Sawicz ]

108+ * Add arm64 support, drop unnecessary B-D on web plugin

109+

110+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 03 Aug 2016 15:56:27 +0000

111+

112+unity8 (8.14+16.10.20160728-0ubuntu1) yakkety; urgency=medium

113+

114+ [ Zoltán Balogh ]

115+ * Bump the version to secure UITK compatibility

116+

117+ [ Albert Astals Cid ]

118+ * Pass the correct number of arguments to mapToItem (LP: #1606835)

119+

120+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 28 Jul 2016 08:17:13 +0000

121+

122+unity8 (8.13+16.10.20160714+fix1-0ubuntu2~1) yakkety; urgency=medium

123+

124+ * Rebuild against Qt 5.6.

125+ * Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850

126+

127+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 22 Jul 2016 09:03:54 +0300

128+

129+unity8 (8.13+16.10.20160714-0ubuntu1) yakkety; urgency=medium

130+

131+ [ Daniel d'Andrada ]

132+ * Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

133+

134+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 14 Jul 2016 07:09:29 +0000

135+

136+unity8 (8.12+16.10.20160711-0ubuntu1) yakkety; urgency=medium

137+

138+ [ Josh Arenson ]

139+ * Add a SessionsModel to lightdm to support the greeter's session

140+ chooser

141+ * Add unity8-greeter package which contains a basic, but usable

142+ LightDM greeter. (LP: #1324602)

143+

144+ [ Michael Terry ]

145+ * Make sure indicators and launcher hide when power button is pressed

146+ on greeter. (LP: #1595569)

147+ * Fix tablet greeter focus to be always-on, no longer hiding the OSK

148+ or forcing a mouse click to type a password. (LP: #1435923)

149+

150+ -- Michael Terry <michael.terry@canonical.com> Mon, 11 Jul 2016 17:24:20 +0000

151+

152+unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium

153+

154+ [ Michael Zanetti ]

155+ * emit the correct role changed signal on count visible changed (LP:

156+ #1599925)

157+

158+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 07 Jul 2016 16:49:32 +0000

159+

160+unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium

161+

162+ [ Michael Zanetti ]

163+ * don't displace windows if the OSK is on another screen (LP:

164+ #1598917)

165+

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

167+

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

169+

170+ [ Albert Astals Cid ]

171+ * Stop watching the old header item height once it's not our header

172+ anymore

173+ * LVWPH: cull the header item when not on view to save some painting

174+ * Adapt test to new mock behaviour

175+ * Don't let the mouse go outside the parentItem (LP: #1525350)

176+ * Use non deprecated package names

177+ * Mark system includes as such

178+ * Fix initialization order warning

179+ * Do not rely on deleteLater not crashing on null pointers

180+ * Add more headers of classes we use for automoc to be run

181+ * CardTool: Fix the fallback value to be a size and not an integer

182+ * CardTool: Include Ubuntu Components since we're using units.gu

183+ * Rework tst_PreviewRatingDisplayCreationRanges

184+

185+ [ Daniel d'Andrada ]

186+ * Cursor: Let AnimatedSprite run only on animated cursors and while

187+ the display is on (LP: #1588873, #1594358)

188+ * Fix missing screenshot when orientation changes while shell rotation

189+ ongoing (LP: #1587796)

190+

191+ [ Josh Arenson ]

192+ * Make PreviewRatingSingleDisplay visible again after editing a

193+ review. (LP: #1587097)

194+ * Correct errors in all png images to prevent libpng warnings.

195+

196+ [ Lukáš Tinkl ]

197+ * Fix some smaller issues with OOBE wizard password pages (LP:

198+ #1590467)

199+ * Prevent mouse wheel events from going through shell elements (LP:

200+ #1536268)

201+ * Do not let mouse and wheel events pass thru the titlebar (LP:

202+ #1588424)

203+ * Hide the maximize window button based on size restrictions (LP:

204+ #1541982)

205+

206+ [ Marco Trevisan (Treviño) ]

207+ * Unity8.conf: ensure MIR_SOCKET is set for future customers (such as

208+ the dash)

209+ * ClientIndicator: be more informative about loading failures for

210+ dynamically created objects

211+

212+ [ Michael Terry ]

213+ * Stop unity8 from getting in a "switch-to-greeter" loop when locking

214+ on a desktop. (LP: #1593718)

215+

216+ [ Michael Zanetti ]

217+ * set minimum window sizes on dash

218+ * displace application windows when the OSK would cover them

219+

220+ [ Nick Dedekind ]

221+ * Force dash to always stay in the main stage. (lp:#1592404) (LP:

222+ #1592404)

223+ * Save the last surface stage on stage drop. (LP: #1579003)

224+ * Default portrait only apps to the side stage. (LP: #1573153)

225+

226+ [ Albert Astals Cid, Andrea Cimitan, Michał Sawicz, Nick Dedekind ]

227+ * Added live video playback in dash previews

228+

229+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 27 Jun 2016 18:48:59 +0000

230+

231+unity8 (8.12+16.10.20160620.3-0ubuntu1) yakkety; urgency=medium

232+

233+ [ Michael Terry, Michał Sawicz ]

234+ * Support unlocking via fingerprint, if one is registered.

235+

236+ -- Michael Terry <michael.terry@canonical.com> Mon, 20 Jun 2016 20:25:25 +0000

237+

238+unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium

239+

240+ [ Michael Terry ]

241+ * Do not create Label/Icon if we don't need it

242+ * Fix Z-ordering of prompt surfaces (LP: #1586219)

243+ * Drop bottom edge tutorials completely and small fixes for other

244+ edges. (LP: #1565103)

245+ * Redo visuals for greeter prompt box. (LP: #1435923)

246+ * Make tutorial qmltests more robust. (LP: #1590810)

247+ * Stop showing an extra lockscreen in desktop unity8 sessions. (LP:

248+ #1582987)

249+

250+ [ Albert Astals Cid ]

251+ * Improve dash plugin mock

252+ * Stabilize PreviewExpandableTest::test_all_widgets_height

253+ * Workaround QTBUG-53460

254+ * Split artShape code for cardTool card and regular card

255+ * Simplify the code since fixedArtSize code is mandatory for regular

256+ cards

257+ * Desktop stage: Support rotatesWindowContents (LP: #1547481)

258+ * Turn if if else into if elseif else

259+ * Fix leaks in QInputDeviceManagerPrivate::addDevice

260+ * Do not call |= on uninitialized sigterm.sa_flags

261+ * initialize udevMonitor

262+ * Make notifier and notifierFd function local variables

263+ * Fix crash if a component that is not an Item is given to

264+ sectionDelegate

265+ * Tests: Do not use dynamic_cast if we're not going to test it anyway

266+ * Minor coverity fixes

267+ * Fix warning about anchors.fill in ProportionalShape (LP: #1590963)

268+ * Make wait in cleanup() wait for snapTo animation to have finished

269+

270+ [ Alexandros Frantzis ]

271+ * Improve the way notifications interact with power management (LP:

272+ #1570922)

273+

274+ [ Andrea Cimitan ]

275+ * Correctly refresh cardcreator cache on artshapestyle changes (LP:

276+ #1588335)

277+ * Same tweaks we have for click scope now for libertine

278+ * add a timer to pull to refresh to work on small windows (LP:

279+ #1589060)

280+

281+ [ Daniel d'Andrada ]

282+ * Clean up debug leftovers

283+ * Ensure mouse and window movement are pixel-aligned (LP: #1510382)

284+ * Fix SpreadDelegate rotation animations

285+ * No point in version-controlling files that are automatically

286+ generated

287+ * Center cursor on screen when it's first shown

288+ * Custom cursor name just have to start with "custom"

289+ * Work around AnimatedSprite infinite loop bug (LP: #1588929)

290+

291+ [ Josh Arenson ]

292+ * Disable showDash when it is already shown. (LP: #1506708)

293+ * Add a timestamp to the dash log (LP: #1580074)

294+ * Add timestamp to unity8 log (LP: #1498169)

295+

296+ [ Lukáš Tinkl ]

297+ * Implement keyboard shortcuts info panel

298+ * Implement window controls overlay activatable with 3 fingers tap

299+ (LP: #1489020)

300+ * Select correct Chinese input method for OSK in the wizard (LP:

301+ #1588633)

302+

303+ [ Michael Zanetti ]

304+ * Add support for the launcher surface pips displaying the correct

305+ number of surfaces

306+ * Add support for the persistent alert state. (LP: #1575147, #1584348,

307+ #1586621)

308+ * send a Alt-release event on alt+tab instead of delaying it

309+ completely and invoking it later (LP: #1565236)

310+

311+ [ Stephen M. Webb ]

312+ * added a new upstart $SESSION for unity8-desktop-session (LP:

313+ #1376715)

314+

315+ -- Michael Terry <michael.terry@canonical.com> Fri, 17 Jun 2016 01:22:57 +0000

316+

317+unity8 (8.12+16.10.20160601.1-0ubuntu1) yakkety; urgency=medium

318+

319+ [ Pawel Stolowski ]

320+ * Added apparmor profile for unity8-dash.

321+

322+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 01 Jun 2016 20:59:03 +0000

323+

1unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium

324unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium

2

325

3 [ Albert Astals Cid ]

326 [ Albert Astals Cid ]

debian/control+39−21

@@ -5,9 +5,10 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>

5Build-Depends: cmake,

6 dbus-test-runner,

7 debhelper (>= 9),

8+ dh-apparmor,

8 doxyqml,

9 doxyqml,

9# To allow cross-compiling to work, we also must append :native

10# To allow cross-compiling to work, we also must append :native

10−# to g++ so we don't try to run armhf g++

11+# to g++ so we don't try to run arm g++

11# on an x86 CPU for example, when cross-compiling.

12# on an x86 CPU for example, when cross-compiling.

12 g++:native,

13 g++:native,

13 libandroid-properties-dev,

14 libandroid-properties-dev,

@@ -16,12 +17,14 @@ Build-Depends: cmake,

16 libconnectivity-qt1-dev (>= 0.7.1),

17 libconnectivity-qt1-dev (>= 0.7.1),

17 libevdev-dev,

18 libevdev-dev,

18 libgeonames-dev (>= 0.2),

19 libgeonames-dev (>= 0.2),

20+ libgnome-desktop-3-dev,

19− libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],

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

20 libgl1-mesa-dri,

22 libgl1-mesa-dri,

21− libgles2-mesa-dev[armhf],

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

22 libglib2.0-dev,

24 libglib2.0-dev,

23 libgsettings-qt-dev,

25 libgsettings-qt-dev,

24 libhardware-dev,

26 libhardware-dev,

27+ liblightdm-qt5-3-dev,

25 libpam0g-dev,

28 libpam0g-dev,

26 libpay2-dev,

29 libpay2-dev,

27 libpulse-dev,

30 libpulse-dev,

@@ -29,25 +32,28 @@ Build-Depends: cmake,

29 libqt5svg5-dev,

32 libqt5svg5-dev,

30 libqt5xmlpatterns5-dev,

33 libqt5xmlpatterns5-dev,

31 libsystemsettings-dev,

34 libsystemsettings-dev,

32− libubuntugestures5-dev,

35+ libubuntugestures5-dev (>= 1.3.2030),

33− libubuntugestures5-private-dev,

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

34 libudev-dev,

37 libudev-dev,

35− libunity-api-dev (>= 7.113),

38+ libunity-api-dev (>= 7.118),

36 libusermetricsoutput1-dev,

39 libusermetricsoutput1-dev,

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

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

38− libx11-dev[!armhf],

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

39− libxcb1-dev[!armhf],

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

40− libxi-dev[!armhf],

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

41# End of X11 libs

44# End of X11 libs

42 pkg-config,

45 pkg-config,

43 python3-all:any,

46 python3-all:any,

44 python3-setuptools,

47 python3-setuptools,

45 qml-module-qt-labs-folderlistmodel,

48 qml-module-qt-labs-folderlistmodel,

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

46 qml-module-qtquick-layouts,

50 qml-module-qtquick-layouts,

47 qml-module-qtquick-xmllistmodel,

51 qml-module-qtquick-xmllistmodel,

48 qml-module-qtquick2,

52 qml-module-qtquick2,

49 qml-module-qtsysteminfo,

53 qml-module-qtsysteminfo,

50 qml-module-qttest,

54 qml-module-qttest,

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

56+ qml-module-ubuntu-web,

51 qt5-default,

57 qt5-default,

52 qtbase5-dev (>= 5.4),

58 qtbase5-dev (>= 5.4),

53 qtbase5-dev-tools,

59 qtbase5-dev-tools,

@@ -55,11 +61,8 @@ Build-Depends: cmake,

55 qtdeclarative5-dev (>= 5.4),

61 qtdeclarative5-dev (>= 5.4),

56 qtdeclarative5-dev-tools,

62 qtdeclarative5-dev-tools,

57 qtdeclarative5-private-dev (>= 5.4),

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

58− qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),

59 qtdeclarative5-ubuntu-content1,

64 qtdeclarative5-ubuntu-content1,

60 qtdeclarative5-ubuntu-settings-components (>= 0.7),

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

61− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

62− qtdeclarative5-ubuntu-web-plugin,

63 ttf-ubuntu-font-family,

66 ttf-ubuntu-font-family,

64Standards-Version: 3.9.4

67Standards-Version: 3.9.4

65Homepage: http://launchpad.net/unity

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

@@ -72,15 +75,26 @@ XS-Testsuite: autopkgtest

72X-Ubuntu-Use-Langpack: yes

75X-Ubuntu-Use-Langpack: yes

73

76

74Package: indicators-client

77Package: indicators-client

75−Architecture: amd64 armhf i386

78+Architecture: any

76Depends: qmenumodel-qml (>= 0.2.9),

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

77− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

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

78 unity8 (= ${binary:Version}),

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

79 ${misc:Depends},

82 ${misc:Depends},

80 ${shlibs:Depends},

83 ${shlibs:Depends},

81Description: Indicators client test application

84Description: Indicators client test application

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

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

83

86

87+Package: unity8-greeter

88+Architecture: any

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

90+ unity-system-compositor,

91+ ${misc:Depends},

92+ ${shlibs:Depends}

93+Recommends: lightdm

94+Provides: lightdm-greeter

95+Description: The Unity8 Greeter

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

97+

84Package: unity-scope-tool

98Package: unity-scope-tool

85Architecture: any

99Architecture: any

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

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

@@ -102,9 +116,11 @@ Depends: dmz-cursor-theme,

102 libcap2-bin,

116 libcap2-bin,

103 libglib2.0-bin,

117 libglib2.0-bin,

104 qmenumodel-qml (>= 0.2.9),

118 qmenumodel-qml (>= 0.2.9),

119+ qml-module-biometryd,

105 qml-module-qt-labs-folderlistmodel,

120 qml-module-qt-labs-folderlistmodel,

106 qml-module-qtquick-xmllistmodel,

121 qml-module-qtquick-xmllistmodel,

107 qml-module-qtsysteminfo,

122 qml-module-qtsysteminfo,

123+ qml-module-ubuntu-web,

108 qtdeclarative5-qtmir-plugin (>= 0.4.8),

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

109 qtdeclarative5-ubuntu-telephony0.1,

125 qtdeclarative5-ubuntu-telephony0.1,

110 qtdeclarative5-ubuntu-web-plugin,

126 qtdeclarative5-ubuntu-web-plugin,

@@ -115,12 +131,14 @@ Depends: dmz-cursor-theme,

115 unity8-private | unity-launcher-impl,

131 unity8-private | unity-launcher-impl,

116 ${misc:Depends},

132 ${misc:Depends},

117 ${shlibs:Depends},

133 ${shlibs:Depends},

118−Recommends: indicator-session,

134+Recommends: indicator-keyboard,

135+ indicator-session,

119 unity-scope-click,

136 unity-scope-click,

120 unity-scope-mediascanner2,

137 unity-scope-mediascanner2,

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

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

122 ubuntu-touch-session (<< 0.107),

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

123 unity8-greeter (<< 7.89),

140 unity8-greeter (<< 7.89),

141+ ubuntu-keyboard (<< 0.100),

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

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

125 unity8-greeter (<< 7.89),

143 unity8-greeter (<< 7.89),

126Conflicts: ubuntu-system-settings-wizard,

144Conflicts: ubuntu-system-settings-wizard,

@@ -130,12 +148,12 @@ Description: Unity 8 shell

130Package: unity8-common

148Package: unity8-common

131Architecture: all

149Architecture: all

132Depends: qml-module-qtquick-layouts,

150Depends: qml-module-qtquick-layouts,

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

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

133 qtdeclarative5-ubuntu-settings-components (>= 0.7),

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

134− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

135− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

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

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

137 ubuntu-thumbnailer-impl-0,

155 ubuntu-thumbnailer-impl-0,

138− unity-application-impl-17,

156+ unity-application-impl-21,

139 unity-notifications-impl-3,

157 unity-notifications-impl-3,

140 unity-plugin-scopes | unity-scopes-impl,

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

141 unity-scopes-impl-12,

159 unity-scopes-impl-12,

@@ -162,7 +180,7 @@ Depends: autopilot-qt5 (>= 1.4),

162 python3-fixtures,

180 python3-fixtures,

163 python3-gi,

181 python3-gi,

164 qttestability-autopilot (>= 1.4),

182 qttestability-autopilot (>= 1.4),

165− ubuntu-ui-toolkit-autopilot (>= 1.3.1845),

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

166 unity-scope-click,

184 unity-scope-click,

167 unity8 (= ${source:Version}),

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

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

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

@@ -181,7 +199,7 @@ Pre-Depends: ${misc:Pre-Depends},

181Depends: ${misc:Depends},

199Depends: ${misc:Depends},

182 ${shlibs:Depends},

200 ${shlibs:Depends},

183Provides: unity-application-impl,

201Provides: unity-application-impl,

184− unity-application-impl-16,

202+ unity-application-impl-21,

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

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

186Description: Fake environment for running Unity 8 shell

204Description: Fake environment for running Unity 8 shell

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

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

@@ -191,7 +209,7 @@ Package: unity8-private

191Architecture: any

209Architecture: any

192Multi-Arch: same

210Multi-Arch: same

193Pre-Depends: ${misc:Pre-Depends},

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

194−Depends: accountsservice-ubuntu-schemas (>= 0.0.5),

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

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

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

196 libhardware2,

214 libhardware2,

197 pay-service,

215 pay-service,

debian/rules+5−1

@@ -29,10 +29,14 @@ override_dh_install:

29 cd $(CURDIR)

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

31

32+override_dh_installdeb:

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

34+ dh_installdeb

35+

32# use private lib directories

36# use private lib directories

33override_dh_makeshlibs:

37override_dh_makeshlibs:

34 dh_makeshlibs -Nunity8-private -Nunity8-fake-env

38 dh_makeshlibs -Nunity8-private -Nunity8-fake-env

35

39

36−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist

40+# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist

37override_dh_shlibdeps:

41override_dh_shlibdeps:

38 dh_shlibdeps -XlibMockLightDM-qml.so

42 dh_shlibdeps -XlibMockLightDM-qml.so

debian/unity8-greeter.installnew file+5

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

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

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

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

4+usr/share/lightdm/greeters/unity8-greeter.desktop

5+usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf

debian/unity8-private.install+1−1

@@ -4,7 +4,7 @@ usr/lib/*/unity8/qml/Cursor

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

5usr/lib/*/unity8/qml/GlobalShortcut

6usr/lib/*/unity8/qml/Greeter

7−usr/lib/*/unity8/qml/IntegratedLightDM

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

8usr/lib/*/unity8/qml/Lights

9usr/lib/*/unity8/qml/Powerd

10usr/lib/*/unity8/qml/ScreenshotDirectory

debian/unity8.install+1

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

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

1var/lib/unity8/version

2var/lib/unity8/version

2data/unity8-dash.conf usr/share/upstart/sessions/

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

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

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

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

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

1/*

3 *

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

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

@@ -36,8 +36,10 @@

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

37#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")

38#define PROP_EMAIL QStringLiteral("Email")

39+#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")

39#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")

40#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")

40#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")

41#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")

42+#define PROP_FAILED_FINGERPRINT_LOGINS QStringLiteral("FailedFingerprintLogins")

41#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")

43#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")

42#define PROP_INPUT_SOURCES QStringLiteral("InputSources")

44#define PROP_INPUT_SOURCES QStringLiteral("InputSources")

43#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

45#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

@@ -66,9 +68,9 @@ Q_DECLARE_METATYPE(StringMapList)

66QVariant primaryButtonConverter(const QVariant &value)

68QVariant primaryButtonConverter(const QVariant &value)

67{

69{

68 QString stringValue = value.toString();

70 QString stringValue = value.toString();

69− if (stringValue == "left") {

71+ if (stringValue == QLatin1String("left")) {

70 return QVariant::fromValue(0);

72 return QVariant::fromValue(0);

71− } else if (stringValue == "right") {

73+ } else if (stringValue == QLatin1String("right")) {

72 return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same

74 return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same

73 } else {

75 } else {

74 return QVariant::fromValue(0); // default to left

76 return QVariant::fromValue(0); // default to left

@@ -93,12 +95,14 @@ AccountsService::AccountsService(QObject* parent, const QString &user)

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

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

94 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));

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

95 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));

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

98+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));

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

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

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

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

98 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));

101 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));

99 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));

102 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));

100 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));

103 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));

101 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));

104 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));

105+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));

102 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));

106 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));

103

107

104 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,

108 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,

@@ -176,6 +180,12 @@ void AccountsService::markDemoEdgeCompleted(const QString &edge)

176 }

180 }

177}

181}

178

182

183+bool AccountsService::enableFingerprintIdentification() const

184+{

185+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);

186+ return value.toBool();

187+}

188+

179bool AccountsService::enableLauncherWhileLocked() const

189bool AccountsService::enableLauncherWhileLocked() const

180{

190{

181 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);

191 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);

@@ -274,6 +284,34 @@ QStringList AccountsService::keymaps() const

274 return {QStringLiteral("us")};

284 return {QStringLiteral("us")};

275}

285}

276

286

287+void AccountsService::setKeymaps(const QStringList &keymaps)

288+{

289+ if (keymaps.isEmpty()) {

290+ qWarning() << "Setting empty keymaps is not supported";

291+ return;

292+ }

293+

294+ StringMapList result;

295+ Q_FOREACH(const QString &keymap, keymaps) {

296+ StringMap map;

297+ map.insert(QStringLiteral("xkb"), keymap);

298+ result.append(map);

299+ }

300+

301+ setProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QVariant::fromValue(result));

302+ Q_EMIT keymapsChanged();

303+}

304+

305+uint AccountsService::failedFingerprintLogins() const

306+{

307+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();

308+}

309+

310+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)

311+{

312+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);

313+}

314+

277uint AccountsService::failedLogins() const

315uint AccountsService::failedLogins() const

278{

316{

279 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

317 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

plugins/AccountsService/AccountsService.h+15−4

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

1/*

3 *

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

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

@@ -41,6 +41,9 @@ class AccountsService: public QObject

41 Q_PROPERTY (QStringList demoEdgesCompleted

42 READ demoEdgesCompleted

43 NOTIFY demoEdgesCompletedChanged)

44+ Q_PROPERTY (bool enableFingerprintIdentification

45+ READ enableFingerprintIdentification

46+ NOTIFY enableFingerprintIdentificationChanged)

44 Q_PROPERTY (bool enableLauncherWhileLocked

47 Q_PROPERTY (bool enableLauncherWhileLocked

45 READ enableLauncherWhileLocked

48 READ enableLauncherWhileLocked

46 NOTIFY enableLauncherWhileLockedChanged)

49 NOTIFY enableLauncherWhileLockedChanged)

@@ -60,6 +63,10 @@ class AccountsService: public QObject

60 READ failedLogins

63 READ failedLogins

61 WRITE setFailedLogins

64 WRITE setFailedLogins

62 NOTIFY failedLoginsChanged)

65 NOTIFY failedLoginsChanged)

66+ Q_PROPERTY (uint failedFingerprintLogins

67+ READ failedFingerprintLogins

68+ WRITE setFailedFingerprintLogins

69+ NOTIFY failedFingerprintLoginsChanged)

63 Q_PROPERTY(bool hereEnabled

70 Q_PROPERTY(bool hereEnabled

64 READ hereEnabled

71 READ hereEnabled

65 WRITE setHereEnabled

72 WRITE setHereEnabled

@@ -72,9 +79,7 @@ class AccountsService: public QObject

72 NOTIFY hereLicensePathChanged)

79 NOTIFY hereLicensePathChanged)

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

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

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

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

75− Q_PROPERTY(QStringList keymaps

82+ Q_PROPERTY(QStringList keymaps READ keymaps WRITE setKeymaps NOTIFY keymapsChanged)

76− READ keymaps

77− NOTIFY keymapsChanged)

78

83

79public:

84public:

80 enum PasswordDisplayHint {

85 enum PasswordDisplayHint {

@@ -91,6 +96,7 @@ public:

91 void setDemoEdges(bool demoEdges);

96 void setDemoEdges(bool demoEdges);

92 QStringList demoEdgesCompleted() const;

97 QStringList demoEdgesCompleted() const;

93 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);

98 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);

99+ bool enableFingerprintIdentification() const;

94 bool enableLauncherWhileLocked() const;

100 bool enableLauncherWhileLocked() const;

95 bool enableIndicatorsWhileLocked() const;

101 bool enableIndicatorsWhileLocked() const;

96 QString backgroundFile() const;

102 QString backgroundFile() const;

@@ -98,6 +104,8 @@ public:

98 PasswordDisplayHint passwordDisplayHint() const;

104 PasswordDisplayHint passwordDisplayHint() const;

99 uint failedLogins() const;

105 uint failedLogins() const;

100 void setFailedLogins(uint failedLogins);

106 void setFailedLogins(uint failedLogins);

107+ uint failedFingerprintLogins() const;

108+ void setFailedFingerprintLogins(uint failedFingerprintLogins);

101 bool hereEnabled() const;

109 bool hereEnabled() const;

102 void setHereEnabled(bool enabled);

110 void setHereEnabled(bool enabled);

103 QString hereLicensePath() const;

111 QString hereLicensePath() const;

@@ -107,17 +115,20 @@ public:

107 QString email() const;

115 QString email() const;

108 void setEmail(const QString &email);

116 void setEmail(const QString &email);

109 QStringList keymaps() const;

117 QStringList keymaps() const;

118+ void setKeymaps(const QStringList &keymaps);

110

119

111Q_SIGNALS:

120Q_SIGNALS:

112 void userChanged();

121 void userChanged();

113 void demoEdgesChanged();

122 void demoEdgesChanged();

114 void demoEdgesCompletedChanged();

123 void demoEdgesCompletedChanged();

124+ void enableFingerprintIdentificationChanged();

115 void enableLauncherWhileLockedChanged();

125 void enableLauncherWhileLockedChanged();

116 void enableIndicatorsWhileLockedChanged();

126 void enableIndicatorsWhileLockedChanged();

117 void backgroundFileChanged();

127 void backgroundFileChanged();

118 void statsWelcomeScreenChanged();

128 void statsWelcomeScreenChanged();

119 void passwordDisplayHintChanged();

129 void passwordDisplayHintChanged();

120 void failedLoginsChanged();

130 void failedLoginsChanged();

131+ void failedFingerprintLoginsChanged();

121 void hereEnabledChanged();

132 void hereEnabledChanged();

122 void hereLicensePathChanged();

133 void hereLicensePathChanged();

123 void realNameChanged();

134 void realNameChanged();

plugins/AccountsService/AccountsService.qmltypesdeleted−41

@@ -1,41 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AccountsService"

12− prototype: "QObject"

13− exports: ["AccountsService/AccountsService 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "PasswordDisplayHint"

19− values: {

20− "Keyboard": 0,

21− "Numeric": 1

22− }

23− }

24− Property { name: "user"; type: "string" }

25− Property { name: "demoEdges"; type: "bool" }

26− Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }

27− Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }

28− Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }

29− Property { name: "backgroundFile"; type: "string"; isReadonly: true }

30− Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

31− Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

32− Property { name: "failedLogins"; type: "uint" }

33− Property { name: "hereEnabled"; type: "bool" }

34− Property { name: "hereLicensePath"; type: "string"; isReadonly: true }

35− Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }

36− Method {

37− name: "markDemoEdgeCompleted"

38− Parameter { name: "edge"; type: "string" }

39− }

40− }

41−}

plugins/AccountsService/com.canonical.unity.AccountsService.xml+4

@@ -47,5 +47,9 @@

47 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

48 </property>

49

50+ <property name="FailedFingerprintLogins" type="u" access="readwrite">

51+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

52+ </property>

53+

50 </interface>

54 </interface>

51</node>

55</node>

plugins/CMakeLists.txt+1−1

@@ -15,7 +15,7 @@ add_subdirectory(AccountsService)

15add_subdirectory(Cursor)

16add_subdirectory(GlobalShortcut)

17add_subdirectory(Greeter)

18−add_subdirectory(IntegratedLightDM)

18+add_subdirectory(LightDM)

19add_subdirectory(Lights)

20add_subdirectory(Dash)

21add_subdirectory(Powerd)

plugins/Cursor/CMakeLists.txt+4

@@ -3,6 +3,10 @@ add_subdirectory(3rd_party)

3include_directories(

4 ${CMAKE_CURRENT_SOURCE_DIR}

5 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor

6+)

7+

8+include_directories(

9+ SYSTEM

6 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

10 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

7)

11)

8

12

plugins/Cursor/Cursor.qml+29−11

@@ -16,6 +16,7 @@

16

17import QtQuick 2.4

18import Cursor 1.1

19+import Powerd 0.1

19

20

20MousePointer {

21MousePointer {

21 id: mousePointer

22 id: mousePointer

@@ -24,21 +25,38 @@ MousePointer {

24 id: imageInfo

25 id: imageInfo

25 themeName: mousePointer.themeName

26 themeName: mousePointer.themeName

26 cursorName: mousePointer.cursorName

27 cursorName: mousePointer.cursorName

28+ cursorHeight: mousePointer.height

27 }

29 }

28

30

31+ Loader {

32+ active: mousePointer.visible && imageInfo.frameCount > 1

29− AnimatedSprite {

33+ sourceComponent: AnimatedSprite {

30− x: -imageInfo.hotspot.x

34+ x: -imageInfo.hotspot.x

31− y: -imageInfo.hotspot.y

35+ y: -imageInfo.hotspot.y

32− source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName

36+ source: imageInfo.imageSource

33

37

34− interpolate: false

38+ interpolate: false

35

39

36− width: imageInfo.frameWidth

40+ width: imageInfo.frameWidth

37− height: imageInfo.frameHeight

41+ height: imageInfo.frameHeight

38

42

39− frameCount: imageInfo.frameCount

43+ frameCount: imageInfo.frameCount

40− frameDuration: imageInfo.frameDuration

44+ frameDuration: imageInfo.frameDuration

41− frameWidth: imageInfo.frameWidth

45+ frameWidth: imageInfo.frameWidth

42− frameHeight: imageInfo.frameHeight

46+ frameHeight: imageInfo.frameHeight

47+

48+ running: Powerd.status === Powerd.On

49+ }

50+ }

51+

52+ Loader {

53+ active: mousePointer.visible && imageInfo.frameCount === 1

54+ sourceComponent: Image {

55+ x: -imageInfo.hotspot.x

56+ y: -imageInfo.hotspot.y

57+ source: imageInfo.imageSource

58+ width: sourceSize.width

59+ height: sourceSize.height

60+ }

43 }

61 }

44}

62}

plugins/Cursor/CursorImageInfo.cpp+23−13

@@ -19,17 +19,23 @@

19CursorImageInfo::CursorImageInfo(QObject *parent)

20 : QObject(parent)

21{

22− m_updateTimer.setInterval(0);

23− m_updateTimer.setSingleShot(true);

24− connect(&m_updateTimer, &QTimer::timeout, this, &CursorImageInfo::update);

25}

22}

26

23

27void CursorImageInfo::setCursorName(const QString &cursorName)

24void CursorImageInfo::setCursorName(const QString &cursorName)

28{

25{

29 if (cursorName != m_cursorName) {

26 if (cursorName != m_cursorName) {

30 m_cursorName = cursorName;

27 m_cursorName = cursorName;

28+ update();

31 Q_EMIT cursorNameChanged();

29 Q_EMIT cursorNameChanged();

32− scheduleUpdate();

30+ }

31+

32+}

33+void CursorImageInfo::setCursorHeight(qreal cursorHeight)

34+{

35+ if (cursorHeight != m_cursorHeight) {

36+ m_cursorHeight = cursorHeight;

37+ update();

38+ Q_EMIT cursorHeightChanged();

33 }

39 }

34}

40}

35

41

@@ -37,27 +43,21 @@ void CursorImageInfo::setThemeName(const QString &themeName)

37{

43{

38 if (m_themeName != themeName) {

44 if (m_themeName != themeName) {

39 m_themeName = themeName;

45 m_themeName = themeName;

46+ update();

40 Q_EMIT themeNameChanged();

47 Q_EMIT themeNameChanged();

41− scheduleUpdate();

42− }

43−}

44−

45−void CursorImageInfo::scheduleUpdate()

46−{

47− if (!m_updateTimer.isActive()) {

48− m_updateTimer.start();

49 }

48 }

50}

49}

51

50

52void CursorImageInfo::update()

51void CursorImageInfo::update()

53{

52{

54− m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName);

53+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName, (int) m_cursorHeight);

55

54

56 Q_EMIT hotspotChanged();

55 Q_EMIT hotspotChanged();

57 Q_EMIT frameWidthChanged();

56 Q_EMIT frameWidthChanged();

58 Q_EMIT frameHeightChanged();

57 Q_EMIT frameHeightChanged();

59 Q_EMIT frameCountChanged();

58 Q_EMIT frameCountChanged();

60 Q_EMIT frameDurationChanged();

59 Q_EMIT frameDurationChanged();

60+ Q_EMIT imageSourceChanged();

61}

62

63QPoint CursorImageInfo::hotspot() const

@@ -104,3 +104,13 @@ int CursorImageInfo::frameDuration() const

104 return 0;

105 }

106}

107+

108+QUrl CursorImageInfo::imageSource() const

109+{

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

111+ .arg(m_themeName)

112+ .arg(m_cursorName)

113+ .arg(m_cursorHeight);

114+

115+ return QUrl(urlString);

116+}

plugins/Cursor/CursorImageInfo.h+10−4

@@ -21,7 +21,7 @@

21

22#include <QObject>

23#include <QString>

24−#include <QTimer>

24+#include <QUrl>

25

26class CursorImageInfo : public QObject

27{

@@ -29,12 +29,14 @@ class CursorImageInfo : public QObject

29

30 Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)

31 Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)

32+ Q_PROPERTY(qreal cursorHeight READ cursorHeight WRITE setCursorHeight NOTIFY cursorHeightChanged)

32

33

33 Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)

34 Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)

34 Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)

35 Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)

35 Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)

36 Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)

36 Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)

37 Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)

37 Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)

38 Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)

39+ Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)

38

40

39public:

41public:

40 CursorImageInfo(QObject *parent = nullptr);

42 CursorImageInfo(QObject *parent = nullptr);

@@ -45,30 +47,34 @@ public:

45 QString cursorName() const { return m_cursorName; }

47 QString cursorName() const { return m_cursorName; }

46 void setCursorName(const QString &);

48 void setCursorName(const QString &);

47

49

50+ qreal cursorHeight() const { return m_cursorHeight; }

51+ void setCursorHeight(qreal);

52+

48 QPoint hotspot() const;

53 QPoint hotspot() const;

49 qreal frameWidth() const;

54 qreal frameWidth() const;

50 qreal frameHeight() const;

55 qreal frameHeight() const;

51 int frameCount() const;

56 int frameCount() const;

52 int frameDuration() const;

57 int frameDuration() const;

58+ QUrl imageSource() const;

53

59

54Q_SIGNALS:

60Q_SIGNALS:

55 void themeNameChanged();

61 void themeNameChanged();

56 void cursorNameChanged();

62 void cursorNameChanged();

63+ void cursorHeightChanged();

57 void hotspotChanged();

64 void hotspotChanged();

58 void frameWidthChanged();

65 void frameWidthChanged();

59 void frameHeightChanged();

66 void frameHeightChanged();

60 void frameCountChanged();

67 void frameCountChanged();

61 void frameDurationChanged();

68 void frameDurationChanged();

69+ void imageSourceChanged();

62

70

63private Q_SLOTS:

71private Q_SLOTS:

64 void update();

72 void update();

65

73

66private:

74private:

67− void scheduleUpdate();

68− QTimer m_updateTimer;

69−

70 QString m_themeName;

75 QString m_themeName;

71 QString m_cursorName;

76 QString m_cursorName;

77+ qreal m_cursorHeight{0};

72

78

73 CursorImage *m_cursorImage{nullptr};

79 CursorImage *m_cursorImage{nullptr};

74};

80};

plugins/Cursor/CursorImageProvider.cpp+34−22

@@ -27,7 +27,7 @@ CursorImageProvider *CursorImageProvider::m_instance = nullptr;

27/////

28// BuiltInCursorImage

29

30−BuiltInCursorImage::BuiltInCursorImage()

30+BuiltInCursorImage::BuiltInCursorImage(int cursorHeight)

31{

32 const char *svgString =

33 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"

@@ -42,12 +42,14 @@ BuiltInCursorImage::BuiltInCursorImage()

42 " d=\"M 20.504,50.94931 460.42533,518.14486 266.47603,515.61948 366.48114,719.16522 274.05218,770.68296 172.53185,559.56112 20.504,716.13476 Z\" />"

43 "</svg>";

44

45+ // NB: Original image dimension is 20x32. Ensure aspect ratio is kept

45− qimage = QImage(20, 32, QImage::Format_ARGB32);

46+ qimage = QImage((20./32.)*cursorHeight, cursorHeight, QImage::Format_ARGB32);

46 qimage.fill(Qt::transparent);

47 qimage.fill(Qt::transparent);

47 QPainter imagePainter(&qimage);

48 QPainter imagePainter(&qimage);

48

49

49 frameWidth = qimage.width();

50 frameWidth = qimage.width();

50 frameHeight = qimage.height();

51 frameHeight = qimage.height();

52+ requestedHeight = cursorHeight;

51

53

52 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));

54 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));

53 svgRenderer->render(&imagePainter);

55 svgRenderer->render(&imagePainter);

@@ -81,11 +83,9 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)

81/////

83/////

82// XCursorImage

84// XCursorImage

83

85

84−XCursorImage::XCursorImage(const QString &theme, const QString &file)

86+XCursorImage::XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx)

85{

87{

86− // TODO: Consider grid unit value

87− // Hardcoding to a medium size for now

88− int preferredCursorHeightPx = 32;

88+ requestedHeight = preferredCursorHeightPx;

89

90 XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),

91 preferredCursorHeightPx);

@@ -96,7 +96,7 @@ XCursorImage::XCursorImage(const QString &theme, const QString &file)

96 frameCount = xcursorImages->nimage;

97

98 for (int i = 0; i < xcursorImages->nimage; ++i) {

99− XcursorImage *xcursorImage = xcursorImages->images[0];

99+ XcursorImage *xcursorImage = xcursorImages->images[i];

100 if (frameWidth < (int)xcursorImage->width) {

101 frameWidth = xcursorImage->width;

102 }

@@ -235,34 +235,43 @@ CursorImageProvider::~CursorImageProvider()

235 m_instance = nullptr;

236}

237

238−QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSize *size, const QSize & /*requestedSize*/)

238+QImage CursorImageProvider::requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize & /*requestedSize*/)

239{

240− CursorImage *cursorImage = fetchCursor(cursorThemeAndName);

240+ CursorImage *cursorImage = fetchCursor(cursorThemeAndNameAndHeight);

241 size->setWidth(cursorImage->qimage.width());

242 size->setHeight(cursorImage->qimage.height());

243

244 return cursorImage->qimage;

245}

246

247−CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)

247+CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndNameAndHeight)

248{

249 QString themeName;

250 QString cursorName;

251+ int cursorHeight;

251 {

252 {

252− QStringList themeAndNameList = cursorThemeAndName.split('/');

253+ QStringList themeAndNameList = cursorThemeAndNameAndHeight.split('/');

253− if (themeAndNameList.size() != 2) {

254+ if (themeAndNameList.size() != 3) {

254 return nullptr;

255 return nullptr;

255 }

256 }

256 themeName = themeAndNameList[0];

257 themeName = themeAndNameList[0];

257 cursorName = themeAndNameList[1];

258 cursorName = themeAndNameList[1];

259+

260+ bool ok;

261+ cursorHeight = themeAndNameList[2].toInt(&ok);

262+ if (!ok) {

263+ cursorHeight = 32;

264+ qWarning().nospace() << "CursorImageProvider: invalid cursor height ("<<themeAndNameList[2]<<")."

265+ " Falling back to "<<cursorHeight<<" pixels";

266+ }

258 }

267 }

259

268

260− return fetchCursor(themeName, cursorName);

269+ return fetchCursor(themeName, cursorName, cursorHeight);

261}

270}

262

271

263−CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName)

272+CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight)

264{

273{

265− CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName);

274+ CursorImage *cursorImage = fetchCursorHelper(themeName, cursorName, cursorHeight);

266

275

267 // Try some fallbacks

276 // Try some fallbacks

268 if (cursorImage->qimage.isNull()) {

277 if (cursorImage->qimage.isNull()) {

@@ -271,7 +280,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

271 int i = 0;

280 int i = 0;

272 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {

281 while (cursorImage->qimage.isNull() && i < fallbackNames.count()) {

273 qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);

282 qDebug().nospace() << "CursorImageProvider: "<< cursorName <<" not found, trying " << fallbackNames.at(i);

274− cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i));

283+ cursorImage = fetchCursorHelper(themeName, fallbackNames.at(i), cursorHeight);

275 ++i;

284 ++i;

276 }

285 }

277 }

286 }

@@ -281,14 +290,14 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

281 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {

290 if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {

282 qDebug() << "CursorImageProvider:" << cursorName

291 qDebug() << "CursorImageProvider:" << cursorName

283 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";

292 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";

284− cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"));

293+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"), cursorHeight);

285 }

294 }

286

295

287 if (cursorImage->qimage.isNull()) {

296 if (cursorImage->qimage.isNull()) {

288 // finally, go for the built-in cursor

297 // finally, go for the built-in cursor

289 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";

298 qWarning() << "CursorImageProvider: couldn't find any cursors. Using the built-in one";

290− if (!m_builtInCursorImage) {

299+ if (!m_builtInCursorImage || m_builtInCursorImage->requestedHeight != cursorHeight) {

291− m_builtInCursorImage.reset(new BuiltInCursorImage);

300+ m_builtInCursorImage.reset(new BuiltInCursorImage(cursorHeight));

292 }

301 }

293 cursorImage = m_builtInCursorImage.data();

302 cursorImage = m_builtInCursorImage.data();

294 }

303 }

@@ -296,17 +305,20 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

296 return cursorImage;

305 return cursorImage;

297}

306}

298

307

299−CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName)

308+CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight)

300{

309{

301 if (cursorName == QLatin1String("blank")) {

310 if (cursorName == QLatin1String("blank")) {

302 return &m_blankCursorImage;

311 return &m_blankCursorImage;

303− } else if (cursorName == QLatin1String("custom")) {

312+ } else if (cursorName.startsWith(QLatin1String("custom"))) {

304 return m_customCursorImage.data();

313 return m_customCursorImage.data();

305 } else {

314 } else {

306 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

315 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

307

316

308 if (!themeCursors.contains(cursorName)) {

317 if (!themeCursors.contains(cursorName)) {

309− themeCursors[cursorName] = new XCursorImage(themeName, cursorName);

318+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName, cursorHeight);

319+ } else if (themeCursors[cursorName]->requestedHeight != cursorHeight) {

320+ delete themeCursors.take(cursorName);

321+ themeCursors[cursorName] = new XCursorImage(themeName, cursorName, cursorHeight);

310 }

322 }

311

323

312 return themeCursors[cursorName];

324 return themeCursors[cursorName];

plugins/Cursor/CursorImageProvider.h+9−6

@@ -42,17 +42,20 @@ public:

42 int frameHeight{0};

43 int frameCount{1};

44 int frameDuration{40};

45+

46+ // Requested height when creating this cursor.

47+ int requestedHeight{0};

45};

48};

46

49

47class XCursorImage : public CursorImage {

50class XCursorImage : public CursorImage {

48public:

51public:

49− XCursorImage(const QString &theme, const QString &file);

52+ XCursorImage(const QString &theme, const QString &file, int preferredCursorHeightPx);

50 virtual ~XCursorImage();

53 virtual ~XCursorImage();

51};

54};

52

55

53class BuiltInCursorImage : public CursorImage {

56class BuiltInCursorImage : public CursorImage {

54public:

57public:

55− BuiltInCursorImage();

58+ BuiltInCursorImage(int cursorHeight);

56};

59};

57

60

58class BlankCursorImage : public CursorImage {

61class BlankCursorImage : public CursorImage {

@@ -74,15 +77,15 @@ public:

74 static CursorImageProvider *instance() { return m_instance; }

77 static CursorImageProvider *instance() { return m_instance; }

75

78

76

79

77− QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;

80+ QImage requestImage(const QString &cursorThemeAndNameAndHeight, QSize *size, const QSize &requestedSize) override;

78

81

79− CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);

82+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName, int cursorHeight);

80

83

81 void setCustomCursor(const QCursor &customCursor);

84 void setCustomCursor(const QCursor &customCursor);

82

85

83private:

86private:

84− CursorImage *fetchCursor(const QString &cursorThemeAndName);

87+ CursorImage *fetchCursor(const QString &cursorThemeAndNameAndHeight);

85− CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName);

88+ CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName, int cursorHeight);

86

89

87 // themeName -> (cursorName -> cursorImage)

90 // themeName -> (cursorName -> cursorImage)

88 // TODO: discard old, unused, cursors

91 // TODO: discard old, unused, cursors

plugins/Cursor/MousePointer.cpp+13−8

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

1/*

3 *

4 * This program is free software: you can redistribute it and/or modify it under

5 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -43,21 +43,26 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse

43 Q_EMIT mouseMoved();

44 }

45

46+ m_accumulatedMovement += movement;

47+ // don't apply the fractional part

48+ QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));

49+ m_accumulatedMovement -= appliedMovement;

50+

46− qreal newX = x() + movement.x();

51+ qreal newX = x() + appliedMovement.x();

47 if (newX < 0) {

52 if (newX < 0) {

48 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);

53 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);

49 newX = 0;

54 newX = 0;

50− } else if (newX > parentItem()->width()) {

55+ } else if (newX >= parentItem()->width()) {

51− Q_EMIT pushedRightBoundary(newX - parentItem()->width(), buttons);

56+ Q_EMIT pushedRightBoundary(newX - (parentItem()->width() - 1), buttons);

52− newX = parentItem()->width();

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

53 }

58 }

54 setX(newX);

59 setX(newX);

55

60

56− qreal newY = y() + movement.y();

61+ qreal newY = y() + appliedMovement.y();

57 if (newY < 0) {

62 if (newY < 0) {

58 newY = 0;

63 newY = 0;

59− } else if (newY > parentItem()->height()) {

64+ } else if (newY >= parentItem()->height()) {

60− newY = parentItem()->height();

65+ newY = parentItem()->height() - 1;

61 }

66 }

62 setY(newY);

67 setY(newY);

63

68

plugins/Cursor/MousePointer.h+4−1

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

1/*

3 *

4 * This program is free software: you can redistribute it and/or modify it under

5 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -61,6 +61,9 @@ private:

61 QPointer<QScreen> m_registeredScreen;

62 QString m_cursorName;

63 QString m_themeName;

64+

65+ // Accumulated, unapplied, mouse movement.

66+ QPointF m_accumulatedMovement;

64};

67};

65

68

66#endif // MOUSEPOINTER_H

69#endif // MOUSEPOINTER_H

plugins/Dash/CMakeLists.txt+4

@@ -10,6 +10,10 @@ endif()

10include_directories(

11 ${CMAKE_CURRENT_SOURCE_DIR}

12 ${CMAKE_CURRENT_BINARY_DIR}

13+)

14+

15+include_directories(

16+ SYSTEM

13 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

17 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

14 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

18 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

15 ${Qt5V8_PRIVATE_INCLUDE_DIR}

19 ${Qt5V8_PRIVATE_INCLUDE_DIR}

plugins/Dash/CardCreator.js+146−115

@@ -25,7 +25,7 @@ var kBackgroundLoaderCode = 'Loader {\n\

25 objectName: "backgroundLoader"; \n\

26 anchors.fill: parent; \n\

27 asynchronous: %3; \n\

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

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

29 sourceComponent: UbuntuShape { \n\

30 objectName: "background"; \n\

31 radius: "medium"; \n\

@@ -69,62 +69,86 @@ var kArtUbuntuShapeCode = 'UbuntuShape { \n\

69 }';

70

71var kArtProportionalShapeCode = 'ProportionalShape { \n\

72− anchors.fill: parent; \n\

72+ anchors.left: parent.left; \n\

73+ anchors.right: parent.right; \n\

73 source: artImage; \n\

74 source: artImage; \n\

74 aspect: UbuntuShape.DropShadow; \n\

75 aspect: UbuntuShape.DropShadow; \n\

75 }';

76 }';

76

77

77−// %1 is used as anchors of artShapeHolder

78+// %1 is used as anchors of artShapeLoader

78// %2 is used as image width

79// %2 is used as image width

79// %3 is used as image height

80// %3 is used as image height

80// %4 is whether the image should be visible

81// %4 is whether the image should be visible

81−// %5 is used as aspect ratio fallback

82−// %6 is whether the loader should be asynchronous or not

82+// %5 is whether the loader should be asynchronous or not

83−// %7 is the shape code we want to use

83+// %6 is the shape code we want to use

84−// %8 is injected as code to artImage

84+// %7 is injected as code to artImage

85−// %9 is used as image fallback

85+// %8 is used as image fallback

86−var kArtShapeHolderCode = 'Item { \n\

86+var kArtShapeHolderCode = 'Loader { \n\

87− id: artShapeHolder; \n\

87+ id: artShapeLoader; \n\

88− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

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

89− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

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

90 anchors { %1 } \n\

91− Loader { \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\

92− id: artShapeLoader; \n\

127+ id: artShapeLoader; \n\

128+ anchors { %1 } \n\

93− objectName: "artShapeLoader"; \n\

129+ objectName: "artShapeLoader"; \n\

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

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

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

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

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

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

97− asynchronous: %6; \n\

133+ asynchronous: %5; \n\

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

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

99− sourceComponent: Item { \n\

135+ sourceComponent: Item { \n\

100− id: artShape; \n\

136+ id: artShape; \n\

101− objectName: "artShape"; \n\

137+ objectName: "artShape"; \n\

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

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

103− readonly property alias image: artImage; \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\

104 %7 \n\

151 %7 \n\

105− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\

106− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : %5; \n\

107− Component.onCompleted: { updateWidthHeightBindings(); } \n\

108− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

109− function updateWidthHeightBindings() { \n\

110− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

111− width = root.fixedArtShapeSize.width; \n\

112− height = root.fixedArtShapeSize.height; \n\

113− } else { \n\

114− width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); \n\

115− height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

116− } \n\

117− } \n\

118− CroppedImageMinimumSourceSize { \n\

119− id: artImage; \n\

120− objectName: "artImage"; \n\

121− source: artShapeLoader.cardArt; \n\

122− asynchronous: %6; \n\

123− visible: %4; \n\

124− width: %2; \n\

125− height: %3; \n\

126− %8 \n\

127− } \n\

128 } \n\

152 } \n\

129 } \n\

153 } \n\

130 }\n';

154 }\n';

@@ -182,10 +206,10 @@ var kAudioButtonCode = 'AbstractButton { \n\

182var kOverlayLoaderCode = 'Loader { \n\

206var kOverlayLoaderCode = 'Loader { \n\

183 id: overlayLoader; \n\

207 id: overlayLoader; \n\

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

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

185− anchors.fill: artShapeHolder; \n\

209+ anchors.fill: artShapeLoader; \n\

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

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

187 asynchronous: %1; \n\

211 asynchronous: %1; \n\

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

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

189 sourceComponent: UbuntuShapeOverlay { \n\

213 sourceComponent: UbuntuShapeOverlay { \n\

190 id: overlay; \n\

214 id: overlay; \n\

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

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

@@ -242,7 +266,7 @@ var kMascotShapeLoaderCode = 'Loader { \n\

242 objectName: "mascotShapeLoader"; \n\

266 objectName: "mascotShapeLoader"; \n\

243 asynchronous: %2; \n\

267 asynchronous: %2; \n\

244 active: mascotImage.status === Image.Ready; \n\

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

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

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

246 width: units.gu(6); \n\

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

247 height: units.gu(5.625); \n\

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

248 sourceComponent: UbuntuShape { image: mascotImage } \n\

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

@@ -405,7 +429,7 @@ function sanitizeColor(colorString) {

405 return colorString;

429 return colorString;

406}

430}

407

431

408−function cardString(template, components, isCardTool, artShapeStyle) {

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

409 var code;

433 var code;

410

434

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

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

@@ -416,15 +440,16 @@ function cardString(template, components, isCardTool, artShapeStyle) {

416 property string backgroundShapeStyle: "inset"; \n\

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

417 property real fontScale: 1.0; \n\

441 property real fontScale: 1.0; \n\

418 property var scopeStyle: null; \n\

442 property var scopeStyle: null; \n\

419− %2\

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

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

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

422 property bool showHeader: true; \n\

444 property bool showHeader: true; \n\

423 implicitWidth: childrenRect.width; \n\

445 implicitWidth: childrenRect.width; \n\

424 enabled: %1; \n\

446 enabled: %1; \n\

425 \n'.arg(templateInteractive);

447 \n'.arg(templateInteractive);

426

448

449+ if (!isCardTool) {

427− code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");

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

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

452+ }

428

453

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

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

430 var hasSummary = components["summary"] || false;

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

@@ -483,37 +508,43 @@ function cardString(template, components, isCardTool, artShapeStyle) {

483 if (hasArt) {

508 if (hasArt) {

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

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

485

510

511+ var artShapeAspect;

512+ if (isCardTool) {

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

514+ if (isNaN(artShapeAspect)) {

515+ artShapeAspect = 1;

516+ }

517+ } else {

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

519+ }

520+

486 var widthCode, heightCode;

521 var widthCode, heightCode;

487 var artAnchors;

522 var artAnchors;

488 if (isHorizontal) {

523 if (isHorizontal) {

489 artAnchors = 'left: parent.left';

524 artAnchors = 'left: parent.left';

490 if (hasMascot || hasTitle) {

525 if (hasMascot || hasTitle) {

491− widthCode = 'height * artShape.aspect'

526+ widthCode = 'height * ' + artShapeAspect;

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

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

493 } else {

528 } else {

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

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

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

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

496− widthCode = 'height * artShape.aspect'

531+ widthCode = 'height * ' + artShapeAspect

497 heightCode = 'units.gu(7.625)';

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

498 }

533 }

499 } else {

534 } else {

500 artAnchors = 'horizontalCenter: parent.horizontalCenter;';

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

501 widthCode = 'root.width'

536 widthCode = 'root.width'

502− heightCode = 'width / artShape.aspect';

537+ heightCode = 'width / ' + artShapeAspect;

503 }

538 }

504

539

505− var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;

506− if (isNaN(aspectRatio)) {

507− aspectRatio = 1;

508− }

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

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

510 fallback = encodeURI(fallback);

541 fallback = encodeURI(fallback);

511 var fallbackStatusCode = "";

542 var fallbackStatusCode = "";

512 var fallbackURICode = '""';

543 var fallbackURICode = '""';

513 if (fallback !== "") {

544 if (fallback !== "") {

514− // fallbackStatusCode has %9 in it because we want to substitute it for fallbackURICode

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

515− // which in kArtShapeHolderCode is %9

546+ // which in kArtShapeHolderCode is %8

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

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

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

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

518 }

549 }

519 var artShapeHolderShapeCode;

550 var artShapeHolderShapeCode;

@@ -533,15 +564,15 @@ function cardString(template, components, isCardTool, artShapeStyle) {

533 } else {

564 } else {

534 artShapeHolderShapeCode = "";

565 artShapeHolderShapeCode = "";

535 }

566 }

567+ var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;

536− code += kArtShapeHolderCode.arg(artAnchors)

568+ code += artShapeHolderCode.arg(artAnchors)

537− .arg(widthCode)

569+ .arg(widthCode)

538− .arg(heightCode)

570+ .arg(heightCode)

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

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

540− .arg(aspectRatio)

541− .arg(asynchronous)

572+ .arg(asynchronous)

542− .arg(artShapeHolderShapeCode)

573+ .arg(artShapeHolderShapeCode)

543− .arg(fallbackStatusCode)

574+ .arg(fallbackStatusCode)

544− .arg(fallbackURICode);

575+ .arg(fallbackURICode);

545 } else {

576 } else {

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

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

547 }

578 }

@@ -553,15 +584,15 @@ function cardString(template, components, isCardTool, artShapeStyle) {

553

584

554 var headerVerticalAnchors;

585 var headerVerticalAnchors;

555 if (headerAsOverlay) {

586 if (headerAsOverlay) {

556− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\

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

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

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

558 } else {

589 } else {

559 if (hasArt) {

590 if (hasArt) {

560 if (isHorizontal) {

591 if (isHorizontal) {

561− headerVerticalAnchors = 'top: artShapeHolder.top; \n\

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

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

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

563 } else {

594 } else {

564− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\

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

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

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

566 }

597 }

567 } else {

598 } else {

@@ -573,7 +604,7 @@ function cardString(template, components, isCardTool, artShapeStyle) {

573 var headerLeftAnchor;

604 var headerLeftAnchor;

574 var headerLeftAnchorHasMargin = false;

605 var headerLeftAnchorHasMargin = false;

575 if (isHorizontal && hasArt) {

606 if (isHorizontal && hasArt) {

576− headerLeftAnchor = 'left: artShapeHolder.right; \n\

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

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

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

578 headerLeftAnchorHasMargin = true;

609 headerLeftAnchorHasMargin = true;

579 } else if (isHorizontal && isAudio) {

610 } else if (isHorizontal && isAudio) {

@@ -827,7 +858,7 @@ function cardString(template, components, isCardTool, artShapeStyle) {

827 var audioButtonWidth;

858 var audioButtonWidth;

828 var audioButtonHeight;

859 var audioButtonHeight;

829 if (hasArt) {

860 if (hasArt) {

830− audioButtonAnchorsFill = 'artShapeHolder';

861+ audioButtonAnchorsFill = 'artShapeLoader';

831 audioButtonWidth = 'undefined';

862 audioButtonWidth = 'undefined';

832 audioButtonHeight = 'undefined';

863 audioButtonHeight = 'undefined';

833 } else {

864 } else {

@@ -841,15 +872,15 @@ function cardString(template, components, isCardTool, artShapeStyle) {

841

872

842 if (hasSummary) {

873 if (hasSummary) {

843 var summaryTopAnchor;

874 var summaryTopAnchor;

844− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

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

845− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

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

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

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

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

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

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

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

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

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

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

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

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

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

852− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';

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

853 else summaryTopAnchor = 'parent.top';

884 else summaryTopAnchor = 'parent.top';

854

885

855 var summaryColor;

886 var summaryColor;

@@ -864,24 +895,20 @@ function cardString(template, components, isCardTool, artShapeStyle) {

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

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

865 }

896 }

866

897

867−// <<<<<<< TREE

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

869−// var touchdownAnchors;

870−// =======

871 if (hasSocialActions) {

898 if (hasSocialActions) {

872 var socialAnchors;

899 var socialAnchors;

873 var socialTopAnchor;

900 var socialTopAnchor;

874

901

875 if (hasSummary) socialTopAnchor = 'summary.bottom;';

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

876− else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

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

877− else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

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

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

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

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

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

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

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

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

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

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

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

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

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

884− else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';

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

885 else socialTopAnchor = 'parent.top';

912 else socialTopAnchor = 'parent.top';

886

913

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

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

@@ -901,36 +928,40 @@ function cardString(template, components, isCardTool, artShapeStyle) {

901 if (hasBackground) {

928 if (hasBackground) {

902 touchdownAnchors = 'fill: backgroundLoader';

929 touchdownAnchors = 'fill: backgroundLoader';

903 } else if (touchdownOnArtShape) {

930 } else if (touchdownOnArtShape) {

904− touchdownAnchors = 'fill: artShapeHolder';

931+ touchdownAnchors = 'fill: artShapeLoader';

905 } else {

932 } else {

906 touchdownAnchors = 'fill: root'

933 touchdownAnchors = 'fill: root'

907 }

934 }

908 code += kTouchdownCode.arg(touchdownAnchors);

935 code += kTouchdownCode.arg(touchdownAnchors);

909 }

936 }

910

937

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

911− var implicitHeight = 'implicitHeight: ';

939+ var implicitHeight = 'implicitHeight: ';

912− if (hasSocialActions) {

940+ if (hasSocialActions) {

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

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

914− } else if (hasSummary) {

942+ } else if (hasSummary) {

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

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

916− } else if (isAudio) {

944+ } else if (isAudio) {

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

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

918− } else if (headerAsOverlay) {

946+ } else if (headerAsOverlay) {

919− implicitHeight += 'artShapeHolder.height;\n';

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

920− } else if (hasHeaderRow) {

948+ } else if (hasHeaderRow) {

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

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

922− } else if (hasMascot) {

950+ } else if (hasMascot) {

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

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

924− } else if (hasTitleContainer) {

952+ } else if (hasTitleContainer) {

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

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

926− } else if (hasAttributes) {

954+ } else if (hasAttributes) {

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

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

928− } else if (hasSubtitle) {

956+ } else if (hasSubtitle) {

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

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

930− } else if (hasTitle) {

958+ } else if (hasTitle) {

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

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

932− } else if (hasArt) {

960+ } else if (hasArt) {

933− implicitHeight += 'artShapeHolder.height;\n';

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

962+ } else {

963+ implicitHeight = '';

964+ }

934 } else {

965 } else {

935 implicitHeight = '';

966 implicitHeight = '';

936 }

967 }

@@ -941,13 +972,13 @@ function cardString(template, components, isCardTool, artShapeStyle) {

941 return code;

972 return code;

942}

973}

943

974

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

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

945 var imports = 'import QtQuick 2.4; \n\

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

946 import Ubuntu.Components 1.3; \n\

977 import Ubuntu.Components 1.3; \n\

947 import Ubuntu.Settings.Components 0.1; \n\

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

948 import Dash 0.1;\n\

979 import Dash 0.1;\n\

949 import Utils 0.1;\n';

980 import Utils 0.1;\n';

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

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

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

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

952

983

953 try {

984 try {

plugins/Dash/CardCreatorCache.qml+3−3

@@ -23,16 +23,16 @@ QtObject {

23

24 property var cache: new Object();

25

26− function getCardComponent(template, components, isCardTool, artShapeStyle) {

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;

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

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

36 cache[allString] = component;

37 }

38 return component;

plugins/Dash/Dash.qmltypesdeleted−100

@@ -1,100 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Dash 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AbstractDashView"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

15− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

16− Property { name: "columnSpacing"; type: "double" }

17− Property { name: "rowSpacing"; type: "double" }

18− Property { name: "cacheBuffer"; type: "int" }

19− Property { name: "displayMarginBeginning"; type: "double" }

20− Property { name: "displayMarginEnd"; type: "double" }

21− }

22− Component {

23− name: "HorizontalJournal"

24− defaultProperty: "data"

25− prototype: "AbstractDashView"

26− exports: ["Dash/HorizontalJournal 0.1"]

27− exportMetaObjectRevisions: [0]

28− Property { name: "rowHeight"; type: "double" }

29− }

30− Component {

31− name: "ListViewWithPageHeader"

32− defaultProperty: "flickableData"

33− prototype: "QQuickFlickable"

34− exports: ["Dash/ListViewWithPageHeader 0.1"]

35− exportMetaObjectRevisions: [0]

36− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

37− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

38− Property { name: "pageHeader"; type: "QQuickItem"; isPointer: true }

39− Property { name: "sectionDelegate"; type: "QQmlComponent"; isPointer: true }

40− Property { name: "sectionProperty"; type: "string" }

41− Property { name: "forceNoClip"; type: "bool" }

42− Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

43− Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

44− Property { name: "cacheBuffer"; type: "int" }

45− Signal { name: "headerChanged" }

46− Method { name: "positionAtBeginning" }

47− Method { name: "showHeader" }

48− Method { name: "firstCreatedIndex"; type: "int" }

49− Method { name: "createdItemCount"; type: "int" }

50− Method {

51− name: "item"

52− type: "QQuickItem*"

53− Parameter { name: "modelIndex"; type: "int" }

54− }

55− Method {

56− name: "maximizeVisibleArea"

57− type: "bool"

58− Parameter { name: "modelIndex"; type: "int" }

59− }

60− Method {

61− name: "maximizeVisibleArea"

62− type: "bool"

63− Parameter { name: "modelIndex"; type: "int" }

64− Parameter { name: "itemHeight"; type: "int" }

65− }

66− }

67− Component {

68− name: "OrganicGrid"

69− defaultProperty: "data"

70− prototype: "AbstractDashView"

71− exports: ["Dash/OrganicGrid 0.1"]

72− exportMetaObjectRevisions: [0]

73− Property { name: "smallDelegateSize"; type: "QSizeF" }

74− Property { name: "bigDelegateSize"; type: "QSizeF" }

75− }

76− Component {

77− name: "VerticalJournal"

78− defaultProperty: "data"

79− prototype: "AbstractDashView"

80− exports: ["Dash/VerticalJournal 0.1"]

81− exportMetaObjectRevisions: [0]

82− Property { name: "columnWidth"; type: "double" }

83− }

84− Component {

85− prototype: "QObject"

86− name: "CardCreatorCache"

87− exports: ["CardCreatorCache -1.-1"]

88− exportMetaObjectRevisions: [-1]

89− isComposite: true

90− isCreatable: false

91− isSingleton: true

92− Property { name: "cache"; type: "QVariant" }

93− Method {

94− name: "getCardComponent"

95− type: "QVariant"

96− Parameter { name: "template"; type: "QVariant" }

97− Parameter { name: "components"; type: "QVariant" }

98− }

99− }

100−}

plugins/Dash/DashAudioPlayer.qml+45−21

@@ -20,16 +20,22 @@ import QtMultimedia 5.6

20import Dash 0.1

21

22QtObject {

23+ id: root

23− readonly property real progress: audio.position / audio.duration

24+ readonly property real progress: priv.audio ? priv.audio.position / priv.audio.duration : 0.0

24− readonly property bool playing: audio.playbackState === Audio.PlayingState

25+ readonly property bool playing: priv.audio ? priv.audio.playbackState === Audio.PlayingState : false

25− readonly property bool paused: audio.playbackState === Audio.PausedState

26+ readonly property bool paused: priv.audio ? priv.audio.playbackState === Audio.PausedState : false

26− readonly property bool stopped: audio.playbackState === Audio.StoppedState

27+ readonly property bool stopped: priv.audio ? priv.audio.playbackState === Audio.StoppedState : true

27− readonly property alias position: audio.position

28+ readonly property int position: priv.audio ? priv.audio.position : 0

28− readonly property url currentSource: audio.playlist.currentItemSource

29+ readonly property url currentSource: priv.audio ? priv.audio.playlist.currentItemSource : ""

30+ readonly property Playlist playlist: priv.audio ? priv.audio.playlist : null

29

31

30 function playSource(newSource, newPlaylist) {

32 function playSource(newSource, newPlaylist) {

33+ if (!priv.audio) {

34+ console.info("DashAudioPlayer: creating player");

35+ priv.audio = priv.audioComponent.createObject(root);

36+ }

31 stop();

37 stop();

32− audio.playlist.clear();

38+ priv.audio.playlist.clear();

33 if (newPlaylist) {

39 if (newPlaylist) {

34 // Look for newSource in newPlaylist

40 // Look for newSource in newPlaylist

35 var sourceIndex = -1;

41 var sourceIndex = -1;

@@ -48,35 +54,53 @@ QtObject {

48 for (var i in newPlaylist) {

54 for (var i in newPlaylist) {

49 urls.push(newPlaylist[i]);

55 urls.push(newPlaylist[i]);

50 }

56 }

51− audio.playlist.addItems(urls);

57+ priv.audio.playlist.addItems(urls);

52− audio.playlist.currentIndex = sourceIndex;

58+ priv.audio.playlist.currentIndex = sourceIndex;

53 } else {

59 } else {

54− audio.playlist.addItem(newSource);

60+ priv.audio.playlist.addItem(newSource);

55− audio.playlist.currentIndex = 0;

61+ priv.audio.playlist.currentIndex = 0;

56 }

62 }

57 play();

63 play();

58 }

64 }

59

65

60 function stop() {

66 function stop() {

67+ if (priv.audio) {

61− audio.stop();

68+ priv.audio.stop();

69+ }

62 }

70 }

63

71

64 function play() {

72 function play() {

73+ if (priv.audio) {

65− audio.play();

74+ priv.audio.play();

75+ }

66 }

76 }

67

77

68 function pause() {

78 function pause() {

79+ if (priv.audio) {

69− audio.pause();

80+ priv.audio.pause();

81+ }

70 }

82 }

71

83

72− property QtObject audio: Audio {

84+ property QtObject priv: QtObject {

73− id: audio

85+ id: priv

74− objectName: "audio"

86+ property Audio audio: null

87+ property Component audioComponent: Component {

88+ Audio {

75− playlist: Playlist {

89+ playlist: Playlist {

76− objectName: "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+ }

77 }

103 }

78−

79− onErrorStringChanged: console.warn("Dash Audio player error:", errorString)

80 }

104 }

81

105

82 function lengthToString(s) {

106 function lengthToString(s) {

plugins/Dash/abstractdashview.cpp+13

@@ -16,6 +16,8 @@

16

17#include "abstractdashview.h"

18

19+#include <private/qquickitem_p.h>

20+

19AbstractDashView::AbstractDashView()

21AbstractDashView::AbstractDashView()

20 : m_delegateModel(nullptr)

22 : m_delegateModel(nullptr)

21 , m_asyncRequestedIndex(-1)

23 , m_asyncRequestedIndex(-1)

@@ -249,6 +251,7 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

249 }

251 }

250 return nullptr;

252 return nullptr;

251 } else {

253 } else {

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

252 addItemToView(modelIndex, item);

255 addItemToView(modelIndex, item);

253 return item;

256 return item;

254 }

257 }

@@ -256,6 +259,7 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

256

259

257void AbstractDashView::releaseItem(QQuickItem *item)

260void AbstractDashView::releaseItem(QQuickItem *item)

258{

261{

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

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

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

260 if (flags & QQmlDelegateModel::Destroyed) {

264 if (flags & QQmlDelegateModel::Destroyed) {

261 item->setParentItem(nullptr);

265 item->setParentItem(nullptr);

@@ -294,6 +298,15 @@ void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset

294 cleanupExistingItems();

298 cleanupExistingItems();

295 } else {

299 } else {

296 processModelRemoves(changeSet.removes());

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

297 }

310 }

298 polish();

311 polish();

299}

312}

plugins/Dash/abstractdashview.h+3−4

@@ -21,13 +21,12 @@

21

22class QAbstractItemModel;

23class QQmlComponent;

24−#pragma GCC diagnostic push

24+

25−#pragma GCC diagnostic ignored "-pedantic"

26#include <private/qqmldelegatemodel_p.h>

25#include <private/qqmldelegatemodel_p.h>

26+#include <private/qquickitemchangelistener_p.h>

27#include <qqmlinfo.h>

28−#pragma GCC diagnostic pop

29

28

30−class AbstractDashView : public QQuickItem

29+class AbstractDashView : public QQuickItem, public QQuickItemChangeListener

31{

30{

32 Q_OBJECT

31 Q_OBJECT

33

32

plugins/Dash/graphics/music_progress_bg.png

Binary file not shown.

plugins/Dash/horizontaljournal.cpp+1−4

@@ -26,12 +26,9 @@

26#include "horizontaljournal.h"

27

28#include <qqmlengine.h>

29−#pragma GCC diagnostic push

30−#pragma GCC diagnostic ignored "-pedantic"

31−#include <private/qqmldelegatemodel_p.h>

32#include <qqmlinfo.h>

29#include <qqmlinfo.h>

30+#include <private/qqmldelegatemodel_p.h>

33#include <private/qquickitem_p.h>

31#include <private/qquickitem_p.h>

34−#pragma GCC diagnostic pop

35

32

36HorizontalJournal::HorizontalJournal()

33HorizontalJournal::HorizontalJournal()

37 : m_firstVisibleIndex(-1)

34 : m_firstVisibleIndex(-1)

plugins/Dash/listviewwithpageheader.cpp+14−8

@@ -95,14 +95,11 @@

95#include <QDebug>

96#include <qqmlinfo.h>

97#include <qqmlengine.h>

98−#pragma GCC diagnostic push

99−#pragma GCC diagnostic ignored "-pedantic"

100#include <private/qqmlcontext_p.h>

98#include <private/qqmlcontext_p.h>

101#include <private/qqmldelegatemodel_p.h>

99#include <private/qqmldelegatemodel_p.h>

102#include <private/qqmlglobal_p.h>

100#include <private/qqmlglobal_p.h>

103#include <private/qquickitem_p.h>

101#include <private/qquickitem_p.h>

104#include <private/qquickanimation_p.h>

102#include <private/qquickanimation_p.h>

105−#pragma GCC diagnostic pop

106// #include <private/qquickrectangle_p.h>

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

107

104

108qreal ListViewWithPageHeader::ListItem::height() const

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

@@ -256,6 +253,7 @@ void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)

256 oldHeaderHeight = m_headerItem->height();

253 oldHeaderHeight = m_headerItem->height();

257 oldHeaderY = m_headerItem->y();

254 oldHeaderY = m_headerItem->y();

258 m_headerItem->setParentItem(nullptr);

255 m_headerItem->setParentItem(nullptr);

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

259 }

257 }

260 m_headerItem = headerItem;

258 m_headerItem = headerItem;

261 if (m_headerItem) {

259 if (m_headerItem) {

@@ -287,9 +285,11 @@ void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

287 m_sectionDelegate = delegate;

285 m_sectionDelegate = delegate;

288

286

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

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

288+ if (m_topSectionItem) {

290− m_topSectionItem->setZ(3);

289+ m_topSectionItem->setZ(3);

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

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

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

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

292+ }

293

294 // TODO create sections for existing items

295

@@ -700,7 +700,9 @@ void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

700 if (flags & QQmlDelegateModel::Destroyed) {

701 item->setParentItem(nullptr);

702 }

703+ if (listItem->sectionItem()) {

703− listItem->sectionItem()->deleteLater();

704+ listItem->sectionItem()->deleteLater();

705+ }

704 delete listItem;

706 delete listItem;

705}

707}

706

708

@@ -776,7 +778,7 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, b

776 }

778 }

777 m_sectionDelegate->completeCreate();

779 m_sectionDelegate->completeCreate();

778

780

779− if (watchGeometry) {

781+ if (watchGeometry && sectionItem) {

780 QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

782 QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

781 }

783 }

782

784

@@ -1332,6 +1334,10 @@ void ListViewWithPageHeader::layout()

1332 }

1334 }

1333 }

1335 }

1334 }

1336 }

1337+ if (m_headerItem) {

1338+ const bool cullHeader = m_headerItem->y() + m_headerItem->height() < contentY();

1339+ QQuickItemPrivate::get(m_headerItem)->setCulled(cullHeader);

1340+ }

1335 m_inLayout = false;

1341 m_inLayout = false;

1336}

1342}

1337

1343

plugins/Dash/organicgrid.cpp+3−4

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

1/*

3 *

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

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

@@ -16,10 +16,9 @@

16

17#include "organicgrid.h"

18

19−#pragma GCC diagnostic push

19+#include <math.h>

20−#pragma GCC diagnostic ignored "-pedantic"

20+

21#include <private/qquickitem_p.h>

22−#pragma GCC diagnostic pop

23

22

24OrganicGrid::OrganicGrid()

23OrganicGrid::OrganicGrid()

25 : m_firstVisibleIndex(-1)

24 : m_firstVisibleIndex(-1)

plugins/Dash/verticaljournal.cpp+12−5

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

1/*

3 *

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

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

@@ -27,10 +27,9 @@

27 */

28#include "verticaljournal.h"

29

30−#pragma GCC diagnostic push

30+#include <math.h>

31−#pragma GCC diagnostic ignored "-pedantic"

31+

32#include <private/qquickitem_p.h>

33−#pragma GCC diagnostic pop

34

33

35VerticalJournal::VerticalJournal()

34VerticalJournal::VerticalJournal()

36 : m_columnWidth(0)

35 : m_columnWidth(0)

@@ -97,7 +96,7 @@ void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

97

96

98 if (*modelIndex > 0) {

97 if (*modelIndex > 0) {

99 Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

98 Q_ASSERT(m_indexColumnMap.contains(*modelIndex));

100− while (m_indexColumnMap[*modelIndex] != columnToAddTo) {

99+ while (*modelIndex > 0 && m_indexColumnMap[*modelIndex] != columnToAddTo) {

101 // We found out that we have to add to columnToAddTo

100 // We found out that we have to add to columnToAddTo

102 // and thought that we had to add *modelIndex, but history tells

101 // and thought that we had to add *modelIndex, but history tells

103 // it is not correct, so find up from *modelIndex until we found the index

102 // it is not correct, so find up from *modelIndex until we found the index

@@ -271,3 +270,11 @@ void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &

271 }

270 }

272 }

271 }

273}

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.h+3

@@ -65,6 +65,9 @@ public:

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+

68Q_SIGNALS:

71Q_SIGNALS:

69 void columnWidthChanged();

72 void columnWidthChanged();

70

73

plugins/GlobalShortcut/GlobalShortcut.qmltypesdeleted−31

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

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable GlobalShortcut 1.0 plugins'

8−

9−Module {

10− Component {

11− name: "GlobalShortcut"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− exports: ["GlobalShortcut/GlobalShortcut 1.0"]

15− exportMetaObjectRevisions: [0]

16− Property { name: "shortcut"; type: "QVariant" }

17− Property { name: "active"; type: "bool" }

18− Signal {

19− name: "shortcutChanged"

20− Parameter { name: "shortcut"; type: "QVariant" }

21− }

22− Signal {

23− name: "triggered"

24− Parameter { name: "shortcut"; type: "string" }

25− }

26− Signal {

27− name: "activeChanged"

28− Parameter { name: "active"; type: "bool" }

29− }

30− }

31−}

plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1

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

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3

4add_definitions(-DSM_BUSNAME=systemBus)

plugins/Greeter/Unity/Launcher/Launcher.qmltypesdeleted−182

@@ -1,182 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'

8−

9−Module {

10− Component {

11− name: "LauncherItem"

12− prototype: "unity::shell::launcher::LauncherItemInterface"

13− exports: ["Unity.Launcher/LauncherItem 0.1"]

14− isCreatable: false

15− exportMetaObjectRevisions: [0]

16− }

17− Component {

18− name: "LauncherModel"

19− prototype: "unity::shell::launcher::LauncherModelInterface"

20− exports: ["Unity.Launcher/LauncherModel 0.1"]

21− isCreatable: false

22− isSingleton: true

23− exportMetaObjectRevisions: [0]

24− Method {

25− name: "requestRemove"

26− Parameter { name: "appId"; type: "string" }

27− }

28− Method { name: "refresh" }

29− Method {

30− name: "get"

31− type: "unity::shell::launcher::LauncherItemInterface*"

32− Parameter { name: "index"; type: "int" }

33− }

34− Method {

35− name: "move"

36− Parameter { name: "oldIndex"; type: "int" }

37− Parameter { name: "newIndex"; type: "int" }

38− }

39− Method {

40− name: "pin"

41− Parameter { name: "appId"; type: "string" }

42− Parameter { name: "index"; type: "int" }

43− }

44− Method {

45− name: "pin"

46− Parameter { name: "appId"; type: "string" }

47− }

48− Method {

49− name: "quickListActionInvoked"

50− Parameter { name: "appId"; type: "string" }

51− Parameter { name: "actionIndex"; type: "int" }

52− }

53− Method {

54− name: "setUser"

55− Parameter { name: "username"; type: "string" }

56− }

57− Method {

58− name: "getUrlForAppId"

59− type: "string"

60− Parameter { name: "appId"; type: "string" }

61− }

62− }

63− Component {

64− name: "QuickListModel"

65− prototype: "unity::shell::launcher::QuickListModelInterface"

66− exports: ["Unity.Launcher/QuickListModel 0.1"]

67− isCreatable: false

68− exportMetaObjectRevisions: [0]

69− }

70− Component {

71− name: "unity::shell::launcher::LauncherItemInterface"

72− prototype: "QObject"

73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]

74− isCreatable: false

75− exportMetaObjectRevisions: [0]

76− Property { name: "appId"; type: "string"; isReadonly: true }

77− Property { name: "name"; type: "string"; isReadonly: true }

78− Property { name: "icon"; type: "string"; isReadonly: true }

79− Property { name: "pinned"; type: "bool"; isReadonly: true }

80− Property { name: "running"; type: "bool"; isReadonly: true }

81− Property { name: "recent"; type: "bool"; isReadonly: true }

82− Property { name: "progress"; type: "int"; isReadonly: true }

83− Property { name: "count"; type: "int"; isReadonly: true }

84− Property { name: "countVisible"; type: "bool"; isReadonly: true }

85− Property { name: "focused"; type: "bool"; isReadonly: true }

86− Property {

87− name: "quickList"

88− type: "unity::shell::launcher::QuickListModelInterface"

89− isReadonly: true

90− isPointer: true

91− }

92− Signal {

93− name: "nameChanged"

94− Parameter { name: "name"; type: "string" }

95− }

96− Signal {

97− name: "iconChanged"

98− Parameter { name: "icon"; type: "string" }

99− }

100− Signal {

101− name: "pinnedChanged"

102− Parameter { name: "pinned"; type: "bool" }

103− }

104− Signal {

105− name: "runningChanged"

106− Parameter { name: "running"; type: "bool" }

107− }

108− Signal {

109− name: "recentChanged"

110− Parameter { name: "running"; type: "bool" }

111− }

112− Signal {

113− name: "progressChanged"

114− Parameter { name: "progress"; type: "int" }

115− }

116− Signal {

117− name: "countChanged"

118− Parameter { name: "count"; type: "int" }

119− }

120− Signal {

121− name: "countVisibleChanged"

122− Parameter { name: "countVisible"; type: "bool" }

123− }

124− Signal {

125− name: "focusedChanged"

126− Parameter { name: "focused"; type: "bool" }

127− }

128− }

129− Component {

130− name: "unity::shell::launcher::LauncherModelInterface"

131− prototype: "QAbstractListModel"

132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]

133− isCreatable: false

134− exportMetaObjectRevisions: [0]

135− Property {

136− name: "applicationManager"

137− type: "unity::shell::application::ApplicationManagerInterface"

138− isPointer: true

139− }

140− Property { name: "onlyPinned"; type: "bool" }

141− Signal { name: "hint" }

142− Method {

143− name: "move"

144− Parameter { name: "oldIndex"; type: "int" }

145− Parameter { name: "newIndex"; type: "int" }

146− }

147− Method {

148− name: "get"

149− type: "unity::shell::launcher::LauncherItemInterface*"

150− Parameter { name: "index"; type: "int" }

151− }

152− Method {

153− name: "pin"

154− Parameter { name: "appId"; type: "string" }

155− Parameter { name: "index"; type: "int" }

156− }

157− Method {

158− name: "pin"

159− Parameter { name: "appId"; type: "string" }

160− }

161− Method {

162− name: "requestRemove"

163− Parameter { name: "appId"; type: "string" }

164− }

165− Method {

166− name: "quickListActionInvoked"

167− Parameter { name: "appId"; type: "string" }

168− Parameter { name: "actionIndex"; type: "int" }

169− }

170− Method {

171− name: "setUser"

172− Parameter { name: "username"; type: "string" }

173− }

174− }

175− Component {

176− name: "unity::shell::launcher::QuickListModelInterface"

177− prototype: "QAbstractListModel"

178− exports: ["Unity.Launcher/QuickListInterface 0.1"]

179− isCreatable: false

180− exportMetaObjectRevisions: [0]

181− }

182−}

plugins/Greeter/Unity/Launcher/launcheritem.cpp+14

@@ -32,6 +32,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr

32 m_countVisible(false),

33 m_focused(false),

34 m_alerting(false),

35+ m_surfaceCount(0),

35 m_quickList(new QuickListModel(this))

36 m_quickList(new QuickListModel(this))

36{

37{

37 QuickListEntry nameAction;

38 QuickListEntry nameAction;

@@ -179,6 +180,19 @@ void LauncherItem::setAlerting(bool alerting)

179 }

180 }

180}

181}

181

182

183+int LauncherItem::surfaceCount() const

184+{

185+ return m_surfaceCount;

186+}

187+

188+void LauncherItem::setSurfaceCount(int surfaceCount)

189+{

190+ if (m_surfaceCount != surfaceCount) {

191+ m_surfaceCount = surfaceCount;

192+ Q_EMIT surfaceCountChanged(surfaceCount);

193+ }

194+}

195+

182unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

196unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

183{

197{

184 return m_quickList;

198 return m_quickList;

plugins/Greeter/Unity/Launcher/launcheritem.h+3−1

@@ -42,6 +42,7 @@ public:

42 bool countVisible() const override;

43 bool focused() const override;

44 bool alerting() const override;

45+ int surfaceCount() const override;

45

46

46 unity::shell::launcher::QuickListModelInterface *quickList() const override;

47 unity::shell::launcher::QuickListModelInterface *quickList() const override;

47

48

@@ -56,7 +57,7 @@ private:

56 void setCountVisible(bool countVisible);

57 void setCountVisible(bool countVisible);

57 void setFocused(bool focused);

58 void setFocused(bool focused);

58 void setAlerting(bool alerting);

59 void setAlerting(bool alerting);

59−

60+ void setSurfaceCount(int surfaceCount);

60

61

61private:

62private:

62 QString m_appId;

63 QString m_appId;

@@ -70,6 +71,7 @@ private:

70 bool m_countVisible;

71 bool m_countVisible;

71 bool m_focused;

72 bool m_focused;

72 bool m_alerting;

73 bool m_alerting;

74+ int m_surfaceCount;

73 QuickListModel *m_quickList;

75 QuickListModel *m_quickList;

74

76

75 friend class LauncherModel;

77 friend class LauncherModel;

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−7

@@ -69,18 +69,13 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

69 return item->focused();

70 case RoleRunning:

71 return item->running();

72+ case RoleSurfaceCount:

73+ return item->surfaceCount();

72 }

74 }

73

75

74 return QVariant();

76 return QVariant();

75}

77}

76

78

77−void LauncherModel::setAlerting(const QString &appId, bool alerting)

78−{

79− Q_UNUSED(appId)

80− Q_UNUSED(alerting)

81− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";

82−}

83−

84unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

79unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

85{

80{

86 if (index < 0 || index >= m_list.count()) {

81 if (index < 0 || index >= m_list.count()) {

plugins/Greeter/Unity/Launcher/launchermodelas.h−1

@@ -41,7 +41,6 @@ public:

41

42 QVariant data(const QModelIndex &index, int role) const override;

43

44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

45 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

44 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

46 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

45 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

47 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

46 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

plugins/IntegratedLightDM/CMakeLists.txtdeleted−40

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

1−pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2−# TODO: Once we split out a separate greeter process, uncomment these lines

3−#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

4−

5−add_subdirectory(liblightdm)

6−

7−include_directories(

8− ${CMAKE_CURRENT_SOURCE_DIR}

9− ${CMAKE_CURRENT_BINARY_DIR}

10− ${CMAKE_SOURCE_DIR}/plugins/Utils

11− ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM

12− #${LIBLIGHTDM_INCLUDE_DIRS}

13− ${libunity8-private_SOURCE_DIR}

14− ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15−)

16−

17−set(QMLPLUGIN_SRC

18− ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

19− DBusGreeter.cpp

20− DBusGreeterList.cpp

21− Greeter.cpp

22− plugin.cpp

23− UsersModel.cpp

24− )

25−

26−add_library(IntegratedLightDM-qml MODULE

27− ${QMLPLUGIN_SRC}

28− )

29−

30−target_link_libraries(IntegratedLightDM-qml

31− integratedLightDM

32− unity8-private

33−# TODO: Once we split out a separate greeter process, uncomment these lines

34−# ${LIBLIGHTDM_LDFLAGS}

35− ${LIBUSERMETRICSOUTPUT_LDFLAGS}

36− )

37−

38−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)

39−

40−add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)

plugins/LightDM/CMakeLists.txtnew file+26

@@ -0,0 +1,26 @@

1+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2+

3+find_package(Qt5Core REQUIRED)

4+find_package(Qt5Quick REQUIRED)

5+

6+include_directories(

7+ ${CMAKE_CURRENT_SOURCE_DIR}

8+ ${CMAKE_CURRENT_BINARY_DIR}

9+ ${CMAKE_SOURCE_DIR}/plugins/Utils

10+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM

11+ ${libunity8-private_SOURCE_DIR}

12+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

13+)

14+

15+set(QMLPLUGIN_SRC

16+ ../Utils/unitysortfilterproxymodelqml.cpp

17+ DBusGreeter.cpp

18+ DBusGreeterList.cpp

19+ Greeter.cpp

20+ plugin.cpp

21+ SessionsModel.cpp

22+ UsersModel.cpp

23+ )

24+

25+add_subdirectory(FullLightDM)

26+add_subdirectory(IntegratedLightDM)

plugins/IntegratedLightDM/DBusGreeter.cpp → plugins/LightDM/DBusGreeter.cpprenamed+5−4

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

1/*

3 *

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

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

@@ -24,7 +24,8 @@ DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)

24 : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

25 m_greeter(greeter)

26{

27− connect(m_greeter, &Greeter::isActiveChanged, this, &DBusGreeter::isActiveChangedHandler);

27+ connect(m_greeter, &Greeter::isActiveChanged,

28+ this, &DBusGreeter::isActiveChangedHandler);

28}

29}

29

30

30bool DBusGreeter::isActive() const

31bool DBusGreeter::isActive() const

@@ -34,12 +35,12 @@ bool DBusGreeter::isActive() const

34

35

35void DBusGreeter::ShowGreeter()

36void DBusGreeter::ShowGreeter()

36{

37{

37− return Q_EMIT m_greeter->showGreeter();

38+ Q_EMIT m_greeter->showGreeter();

38}

39}

39

40

40void DBusGreeter::HideGreeter()

41void DBusGreeter::HideGreeter()

41{

42{

42− return Q_EMIT m_greeter->hideGreeter();

43+ Q_EMIT m_greeter->hideGreeter();

43}

44}

44

45

45void DBusGreeter::isActiveChangedHandler()

46void DBusGreeter::isActiveChangedHandler()

plugins/IntegratedLightDM/DBusGreeter.h → plugins/LightDM/DBusGreeter.hrenamed

The content is the same.

plugins/IntegratedLightDM/DBusGreeterList.cpp → plugins/LightDM/DBusGreeterList.cpprenamed

The content is the same.

plugins/IntegratedLightDM/DBusGreeterList.h → plugins/LightDM/DBusGreeterList.hrenamed

The content is the same.

plugins/LightDM/FullLightDM/CMakeLists.txtnew file+28

@@ -0,0 +1,28 @@

1+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)

2+

3+set(PLUGIN_CLASSNAME "FullLightDM")

4+

5+add_definitions(-DFULL_LIGHTDM)

6+

7+include_directories(

8+ ../

9+ ${LIBLIGHTDM_INCLUDE_DIRS}

10+ ${CMAKE_CURRENT_BINARY_DIR}

11+ )

12+

13+foreach(source_file ${QMLPLUGIN_SRC})

14+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

15+endforeach()

16+

17+add_library(FullLightDM-qml MODULE

18+ ${RELATIVE_QMLPLUGIN_SRC}

19+ )

20+

21+target_link_libraries(FullLightDM-qml

22+ unity8-private

23+ ${LIBLIGHTDM_LDFLAGS}

24+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

25+ )

26+

27+qt5_use_modules(FullLightDM-qml DBus Gui Qml)

28+add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

plugins/LightDM/FullLightDM/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module LightDM.FullLightDM

2+plugin FullLightDM-qml

3+typeinfo FullLightDM.qmltypes

plugins/IntegratedLightDM/Greeter.cpp → plugins/LightDM/Greeter.cpprenamed+13−2

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

1/*

3 *

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

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

@@ -13,7 +13,6 @@

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

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

15 *

16− * Author: Michael Terry <michael.terry@canonical.com>

17 */

16 */

18

17

19#include "Greeter.h"

18#include "Greeter.h"

@@ -72,12 +71,24 @@ QString Greeter::authenticationUser() const

72 return d->m_greeter->authenticationUser();

71 return d->m_greeter->authenticationUser();

73}

72}

74

73

74+QString Greeter::defaultSessionHint() const

75+{

76+ Q_D(const Greeter);

77+ return d->m_greeter->defaultSessionHint();

78+}

79+

75bool Greeter::promptless() const

80bool Greeter::promptless() const

76{

81{

77 Q_D(const Greeter);

82 Q_D(const Greeter);

78 return d->promptless;

83 return d->promptless;

79}

84}

80

85

86+QString Greeter::selectUser() const

87+{

88+ Q_D(const Greeter);

89+ return d->m_greeter->selectUserHint();

90+}

91+

81void Greeter::authenticate(const QString &username)

92void Greeter::authenticate(const QString &username)

82{

93{

83 Q_D(Greeter);

94 Q_D(Greeter);

plugins/IntegratedLightDM/Greeter.h → plugins/LightDM/Greeter.hrenamed+5−2

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

1/*

3 *

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

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

@@ -13,7 +13,6 @@

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

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

15 *

16− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

16 */

18

17

19/* This class is a really tiny filter around QLightDM::Greeter. There are some

18/* This class is a really tiny filter around QLightDM::Greeter. There are some

@@ -37,7 +36,9 @@ class Greeter : public QObject

37 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

36 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

38 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

37 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

39 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

38 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

41

42

42public:

43public:

43 explicit Greeter(QObject* parent=0);

44 explicit Greeter(QObject* parent=0);

@@ -45,7 +46,9 @@ public:

45 bool isActive() const;

46 bool isActive() const;

46 bool isAuthenticated() const;

47 bool isAuthenticated() const;

47 QString authenticationUser() const;

48 QString authenticationUser() const;

49+ QString defaultSessionHint() const;

48 bool promptless() const;

50 bool promptless() const;

51+ QString selectUser() const;

49

52

50public Q_SLOTS:

53public Q_SLOTS:

51 void authenticate(const QString &username=QString());

54 void authenticate(const QString &username=QString());

plugins/IntegratedLightDM/GreeterPrivate.h → plugins/LightDM/GreeterPrivate.hrenamed

The content is the same.

plugins/IntegratedLightDM/IntegratedLightDM.qmltypes → plugins/LightDM/IntegratedLightDM.qmltypesrenamed

The content is the same.

plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+33

@@ -0,0 +1,33 @@

1+set(PLUGIN_CLASSNAME "IntegratedLightDM")

2+

3+add_definitions(-DINTEGRATED_LIGHTDM)

4+

5+foreach(include_directory ${QMLPLUGIN_INCLUDES})

6+ list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})

7+endforeach()

8+

9+include_directories(

10+ . #QLightDM

11+ ${QMLPLUGIN_INCLUDES}

12+ ${libunity8-private_SOURCE_DIR}

13+ ${CMAKE_CURRENT_BINARY_DIR}

14+)

15+

16+foreach(source_file ${QMLPLUGIN_SRC})

17+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

18+endforeach()

19+

20+add_library(IntegratedLightDM-qml MODULE

21+ ${RELATIVE_QMLPLUGIN_SRC}

22+ )

23+

24+target_link_libraries(IntegratedLightDM-qml

25+ integratedLightDM

26+ unity8-private

27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28+ )

29+

30+qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)

31+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)

32+

33+add_subdirectory(liblightdm)

plugins/LightDM/IntegratedLightDM/QLightDM/Greeternew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "../liblightdm/Greeter.h"

plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelnew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "../liblightdm/SessionsModel.h"

plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelnew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#include "../liblightdm/UsersModel.h"

plugins/IntegratedLightDM/liblightdm/CMakeLists.txt → plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed+4−2

@@ -2,8 +2,10 @@ pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2

3set(LibLightDM_SOURCES

4 Greeter.cpp

5+ SessionsModel.cpp

5 UsersModel.cpp

6 UsersModel.cpp

6 GreeterPrivate.cpp

7 GreeterPrivate.cpp

8+ SessionsModelPrivate.cpp

7 UsersModelPrivate.cpp

9 UsersModelPrivate.cpp

8 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

10 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

9 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

11 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

@@ -46,8 +48,8 @@ set_target_properties(integratedLightDMSession PROPERTIES

46 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")

48 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")

47set_target_properties(MockLightDM-demo-shared PROPERTIES

49set_target_properties(MockLightDM-demo-shared PROPERTIES

48 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"

50 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"

49− OUTPUT_NAME lightdm-qt5-2)

51+ OUTPUT_NAME lightdm-qt5-3)

50

52

51install(TARGETS MockLightDM-demo-shared

53install(TARGETS MockLightDM-demo-shared

52− DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo

54+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo

53 )

55 )

plugins/IntegratedLightDM/liblightdm/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

plugins/IntegratedLightDM/liblightdm/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+1−2

@@ -50,8 +50,7 @@ public:

50 {

51 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

52

53− connect(&futureWatcher, &QFutureWatcher<int>::finished,

53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);

54− this, &GreeterImpl::finishPam);

55 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

54 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

56 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

55 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

57 // This next connect is how we pass ResponseFutures between threads

56 // This next connect is how we pass ResponseFutures between threads

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppnew file+88

@@ -0,0 +1,88 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+

19+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

20+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

21+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

22+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

23+

24+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

25+// To use the same method of setting role name that it does, we

26+// set our compatibility to Qt4 here too.

27+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)

28+

29+#include "SessionsModel.h"

30+#include "SessionsModelPrivate.h"

31+#include <QtCore/QDir>

32+#include <QtCore/QString>

33+

34+namespace QLightDM

35+{

36+

37+SessionsModel::SessionsModel(QObject* parent) :

38+ QAbstractListModel(parent),

39+ d_ptr(new SessionsModelPrivate(this))

40+{

41+ Q_D(SessionsModel);

42+ m_roleNames = QAbstractListModel::roleNames();

43+ m_roleNames[KeyRole] = "key";

44+ m_roleNames[TypeRole] = "type";

45+}

46+

47+SessionsModel::~SessionsModel()

48+{

49+ delete d_ptr;

50+}

51+

52+QVariant SessionsModel::data(const QModelIndex& index, int role) const

53+{

54+ Q_D(const SessionsModel);

55+

56+ if(!index.isValid()) {

57+ return QVariant();

58+ }

59+

60+ int row = index.row();

61+

62+ switch (role) {

63+ case QLightDM::SessionsModel::KeyRole:

64+ return d->sessionItems[row].key;

65+ case Qt::DisplayRole:

66+ return d->sessionItems[row].name;

67+ default:

68+ return QVariant();

69+ }

70+}

71+

72+QHash<int, QByteArray> SessionsModel::roleNames() const

73+{

74+ return m_roleNames;

75+}

76+

77+int SessionsModel::rowCount(const QModelIndex& parent) const

78+{

79+ Q_D(const SessionsModel);

80+

81+ if (parent.isValid()) {

82+ return 0;

83+ } else { // parent is root

84+ return d->sessionItems.size();

85+ }

86+}

87+

88+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hnew file+72

@@ -0,0 +1,72 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_H

20+

21+#include <QtCore/QAbstractListModel>

22+#include <QtCore/QString>

23+

24+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

25+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

26+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

27+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

28+

29+// This is taken from liblightdm and modified to confirm to our syle conventions

30+namespace QLightDM

31+{

32+class SessionsModelPrivate;

33+

34+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

35+ {

36+ Q_OBJECT

37+

38+ Q_ENUMS(SessionModelRoles SessionType)

39+

40+ public:

41+

42+ enum SessionModelRoles {

43+ //name is exposed as Qt::DisplayRole

44+ //comment is exposed as Qt::TooltipRole

45+ KeyRole = Qt::UserRole,

46+ IdRole = KeyRole, /** Deprecated */

47+ TypeRole

48+ };

49+

50+ enum SessionType {

51+ LocalSessions,

52+ RemoteSessions

53+ };

54+

55+ explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/

56+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

57+ virtual ~SessionsModel();

58+

59+ QHash<int, QByteArray> roleNames() const override;

60+ int rowCount(const QModelIndex& parent) const override;

61+ QVariant data(const QModelIndex& index, int role) const override;

62+

63+ protected:

64+ SessionsModelPrivate* const d_ptr;

65+

66+ private:

67+ QHash<int, QByteArray> m_roleNames;

68+ Q_DECLARE_PRIVATE(SessionsModel)

69+ };

70+}

71+

72+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppnew file+36

@@ -0,0 +1,36 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#include "SessionsModelPrivate.h"

19+

20+#include <QDir>

21+#include <QSettings>

22+#include <QStringList>

23+

24+namespace QLightDM

25+{

26+

27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)

28+ : q_ptr(parent)

29+{

30+ // Since this model is never visible, as there is only 1 session,

31+ // just use the session name as the key

32+ QString sessionName = qgetenv("XDG_SESSION_DESKTOP");

33+ sessionItems.append({sessionName, "", sessionName, ""});

34+}

35+

36+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hnew file+54

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

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

20+

21+#include <QtCore/QList>

22+#include <QtCore/QString>

23+

24+namespace QLightDM

25+{

26+class SessionsModel;

27+

28+class SessionItem

29+{

30+public:

31+ QString key;

32+ QString type; // unused

33+ QString name;

34+ QString comment; // unused

35+};

36+

37+class SessionsModelPrivate

38+{

39+public:

40+ explicit SessionsModelPrivate(SessionsModel* parent=0);

41+ virtual ~SessionsModelPrivate() = default;

42+

43+ QList<SessionItem> sessionItems;

44+

45+protected:

46+ SessionsModel* const q_ptr;

47+

48+private:

49+ Q_DECLARE_PUBLIC(SessionsModel)

50+};

51+

52+} // namespace QLightDM

53+

54+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

plugins/IntegratedLightDM/liblightdm/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+4−3

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

1/*

3 *

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

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

@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :

40 QAbstractListModel(parent),

41 d_ptr(new UsersModelPrivate(this))

42{

43− Q_D(UsersModel);

44−

45 // Extend roleNames (we want to keep the "display" role)

43 // Extend roleNames (we want to keep the "display" role)

46 QHash<int, QByteArray> roles = roleNames();

44 QHash<int, QByteArray> roles = roleNames();

47 roles[NameRole] = "name";

45 roles[NameRole] = "name";

@@ -52,6 +50,7 @@ UsersModel::UsersModel(QObject *parent) :

52 roles[SessionRole] = "session";

50 roles[SessionRole] = "session";

53 roles[HasMessagesRole] = "hasMessages";

51 roles[HasMessagesRole] = "hasMessages";

54 roles[ImagePathRole] = "imagePath";

52 roles[ImagePathRole] = "imagePath";

53+ roles[UidRole] = "uid";

55 setRoleNames(roles);

54 setRoleNames(roles);

56

55

57 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {

56 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {

@@ -101,6 +100,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const

101 return d->entries[row].has_messages;

100 return d->entries[row].has_messages;

102 case UsersModel::ImagePathRole:

101 case UsersModel::ImagePathRole:

103 return "";

102 return "";

103+ case UsersModel::UidRole:

104+ return d->entries[row].uid;

104 default:

105 default:

105 return QVariant();

106 return QVariant();

106 }

107 }

plugins/IntegratedLightDM/liblightdm/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+2−1

@@ -50,7 +50,8 @@ public:

50 SessionRole,

51 HasMessagesRole,

52 ImagePathRole,

53− BackgroundPathRole

53+ BackgroundPathRole,

54+ UidRole

54 };

55 };

55

56

56 int rowCount(const QModelIndex &parent) const override;

57 int rowCount(const QModelIndex &parent) const override;

plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed+5−3

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

1/*

3 *

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

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

@@ -26,6 +26,7 @@

26#include <QDir>

27#include <QSettings>

28#include <QStringList>

29+#include <unistd.h>

29

30

30namespace QLightDM

31namespace QLightDM

31{

32{

@@ -37,6 +38,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

37{

38{

38 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");

39 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");

39 QString currentUser = g_get_user_name();

40 QString currentUser = g_get_user_name();

41+ uid_t currentUid = getuid();

40

42

41 if (demoFile.exists()) {

43 if (demoFile.exists()) {

42 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);

44 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);

@@ -46,10 +48,10 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

46 Q_FOREACH(const QString &user, users)

48 Q_FOREACH(const QString &user, users)

47 {

49 {

48 QString name = settings.value(user + "/name", user).toString();

50 QString name = settings.value(user + "/name", user).toString();

49− entries.append({user, name, 0, 0, false, false, 0, 0});

51+ entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});

50 }

52 }

51 } else {

53 } else {

52− entries.append({currentUser, 0, 0, 0, false, false, 0, 0});

54+ entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});

53

55

54 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,

56 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,

55 this, [this](const QString &user) {

57 this, [this](const QString &user) {

plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed+2−1

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

1/*

3 *

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

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

@@ -40,6 +40,7 @@ public:

40 bool has_messages;

41 QString session;

42 QString infographic;

43+ uid_t uid;

43};

44};

44

45

45class UsersModelPrivate : public QObject

46class UsersModelPrivate : public QObject

plugins/LightDM/IntegratedLightDM/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module LightDM.IntegratedLightDM

2+plugin IntegratedLightDM-qml

3+typeinfo IntegratedLightDM.qmltypes

plugins/LightDM/SessionsModel.cppnew file+122

@@ -0,0 +1,122 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#include "SessionsModel.h"

19+#include <QtCore/QFile>

20+#include <QtCore/QSortFilterProxyModel>

21+

22+QHash<int, QByteArray> SessionsModel::roleNames() const

23+{

24+ return m_roleNames;

25+}

26+

27+int SessionsModel::rowCount(const QModelIndex& parent) const

28+{

29+ return m_model->rowCount(parent);

30+}

31+

32+QList<QUrl> SessionsModel::iconSearchDirectories() const

33+{

34+ return m_iconSearchDirectories;

35+}

36+

37+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)

38+{

39+ // QML gives us a url with file:// prepended which breaks QFile::exists()

40+ // so convert the url to a local file

41+ QList<QUrl> localList = {};

42+ Q_FOREACH(const QUrl& searchDirectory, searchDirectories)

43+ {

44+ localList.append(searchDirectory.toLocalFile());

45+ }

46+ m_iconSearchDirectories = localList;

47+ Q_EMIT iconSearchDirectoriesChanged();

48+}

49+

50+QUrl SessionsModel::iconUrl(const QString sessionName) const

51+{

52+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)

53+ {

54+ // This is an established icon naming convention

55+ QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

56+ "/custom_" + sessionName + "_badge.png";

57+ QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

58+ "/" + sessionName + "_badge.png";

59+

60+ QFile customIconFile(customIconUrl);

61+ QFile iconFile(iconUrl);

62+ if (customIconFile.exists()) {

63+ return QUrl(customIconUrl);

64+ } else if (iconFile.exists()) {

65+ return QUrl(iconUrl);

66+ } else{

67+ // Search the legacy way

68+ QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";

69+ if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {

70+ path += "ubuntu_badge.png";

71+ } else if(

72+ sessionName == "gnome-classic" ||

73+ sessionName == "gnome-flashback-compiz" ||

74+ sessionName == "gnome-flashback-metacity" ||

75+ sessionName == "gnome-shell" ||

76+ sessionName == "gnome-wayland" ||

77+ sessionName == "gnome"

78+ ){

79+ path += "gnome_badge.png";

80+ } else if (sessionName == "plasma") {

81+ path += "kde_badge.png";

82+ } else if (sessionName == "xterm") {

83+ path += "recovery_console_badge.png";

84+ } else if (sessionName == "remote-login") {

85+ path += "remote_login_help.png";

86+ }

87+

88+ if (QFile(path).exists()) {

89+ return path;

90+ }

91+ }

92+ }

93+

94+ // FIXME make this smarter

95+ return QUrl("./graphics/session_icons/unknown_badge.png");

96+}

97+

98+QVariant SessionsModel::data(const QModelIndex& index, int role) const

99+{

100+ switch (role) {

101+ case SessionsModel::IconRole:

102+ return iconUrl(m_model->data(index, Qt::DisplayRole).toString());

103+ default:

104+ return m_model->data(index, role);

105+ }

106+}

107+

108+SessionsModel::SessionsModel(QObject* parent)

109+ : UnitySortFilterProxyModelQML(parent)

110+{

111+ // Add a custom IconRole that isn't in either of the lightdm implementations

112+ m_model = new QLightDM::SessionsModel(this);

113+ m_roleNames = m_model->roleNames();

114+ m_roleNames[IconRole] = "icon_url";

115+

116+ setModel(m_model);

117+ setSourceModel(m_model);

118+ setSortCaseSensitivity(Qt::CaseInsensitive);

119+ setSortLocaleAware(true);

120+ setSortRole(Qt::DisplayRole);

121+ sort(0);

122+}

plugins/LightDM/SessionsModel.hnew file+68

@@ -0,0 +1,68 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ *

16+ */

17+

18+#ifndef UNITY_SESSIONSMODEL_H

19+#define UNITY_SESSIONSMODEL_H

20+

21+#include <unitysortfilterproxymodelqml.h>

22+#include <QLightDM/SessionsModel>

23+#include <QtCore/QHash>

24+#include <QtCore/QObject>

25+#include <QtCore/QUrl>

26+

27+class SessionsModel : public UnitySortFilterProxyModelQML

28+{

29+ Q_OBJECT

30+

31+ Q_ENUMS(SessionModelRoles)

32+

33+ Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories

34+ WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)

35+Q_SIGNALS:

36+ void iconSearchDirectoriesChanged();

37+

38+public:

39+ enum SessionModelRoles {

40+ /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,

41+ * the _first_ value of this enum MUST be the _last_ value of

42+ * QLightDM::SessionsModel::SessionModelRoles and consquently, this must

43+ * also match the last value in the corresponding enum of the integrated lib

44+ */

45+ TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,

46+ IconRole

47+ };

48+

49+ explicit SessionsModel(QObject* parent=nullptr);

50+

51+ QHash<int, QByteArray> roleNames() const override;

52+ int rowCount(const QModelIndex& parent) const override;

53+ QVariant data(const QModelIndex& index, int role) const override;

54+ QList<QUrl> iconSearchDirectories() const;

55+ Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;

56+

57+ void setIconSearchDirectories(const QList<QUrl> searchDirectories);

58+private:

59+ QLightDM::SessionsModel* m_model;

60+ QHash<int, QByteArray> m_roleNames;

61+ QList<QUrl> m_iconSearchDirectories{

62+ QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),

63+ QUrl("/usr/local/share/unity-greeter"),

64+ QUrl("/usr/share/unity-greeter/")};

65+

66+};

67+

68+#endif // UNITY_SESSIONSMODEL_H

plugins/IntegratedLightDM/UsersModel.cpp → plugins/LightDM/UsersModel.cpprenamed

The content is the same.

plugins/IntegratedLightDM/UsersModel.h → plugins/LightDM/UsersModel.hrenamed

The content is the same.

plugins/IntegratedLightDM/plugin.cpp → plugins/LightDM/plugin.cpprenamed+26−4

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

1/*

3 *

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

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

@@ -19,9 +19,11 @@

19#include "DBusGreeter.h"

20#include "DBusGreeterList.h"

21#include "Greeter.h"

22+#include "SessionsModel.h"

22#include "UsersModel.h"

23#include "UsersModel.h"

23#include <libusermetricsoutput/ColorTheme.h>

24#include <libusermetricsoutput/ColorTheme.h>

24#include <libusermetricsoutput/UserMetrics.h>

25#include <libusermetricsoutput/UserMetrics.h>

26+#include <QLightDM/SessionsModel>

25#include <QLightDM/UsersModel>

27#include <QLightDM/UsersModel>

26

28

27#include <QAbstractItemModel>

29#include <QAbstractItemModel>

@@ -40,6 +42,13 @@ static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

40 return greeter;

42 return greeter;

41}

43}

42

44

45+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

46+{

47+ Q_UNUSED(engine)

48+ Q_UNUSED(scriptEngine)

49+ return new SessionsModel();

50+}

51+

43static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

52static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

44{

53{

45 Q_UNUSED(engine)

54 Q_UNUSED(engine)

@@ -54,16 +63,29 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine

54 return UserMetricsOutput::UserMetrics::getInstance();

63 return UserMetricsOutput::UserMetrics::getInstance();

55}

64}

56

65

57−void IntegratedLightDMPlugin::registerTypes(const char *uri)

66+void PLUGIN_CLASSNAME::registerTypes(const char *uri)

58{

67{

59 qmlRegisterType<QAbstractItemModel>();

68 qmlRegisterType<QAbstractItemModel>();

60 qmlRegisterType<UserMetricsOutput::ColorTheme>();

69 qmlRegisterType<UserMetricsOutput::ColorTheme>();

61

70

71+#if defined INTEGRATED_LIGHTDM

62− Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));

72+ Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));

73+ qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

74+#elif defined FULL_LIGHTDM

75+ Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));

76+ qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);

77+#else

78+ #error No library defined in LightDM plugin

79+#endif

80+

63 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

81 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

64 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

82 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

65− qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

83+

84+ qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

85+ qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

86+

66 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

87 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

67 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

88 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

89+

68 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

90 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

69}

91}

plugins/IntegratedLightDM/plugin.h → plugins/LightDM/plugin.hrenamed+5−5

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

1/*

3 *

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

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

@@ -15,13 +15,13 @@

15 *

16 */

17

18−#ifndef INTEGRATED_LIGHTDM_PLUGIN_H

18+#ifndef LIGHTDM_PLUGIN_H

19−#define INTEGRATED_LIGHTDM_PLUGIN_H

19+#define LIGHTDM_PLUGIN_H

20

21#include <QtQml/QQmlEngine>

22#include <QtQml/QQmlExtensionPlugin>

23

24−class IntegratedLightDMPlugin : public QQmlExtensionPlugin

24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin

25{

26 Q_OBJECT

27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

@@ -30,4 +30,4 @@ public:

30 void registerTypes(const char *uri) override;

31};

32

33−#endif /* INTEGRATED_LIGHTDM_PLUGIN_H */

33+#endif /* LIGHTDM_PLUGIN_H */

plugins/IntegratedLightDM/qmldir → plugins/LightDM/qmldirrenamed

The content is the same.

plugins/Lights/CMakeLists.txt+1

@@ -2,6 +2,7 @@ pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

3

4include_directories(

5+ SYSTEM

5 ${ANDROID_HEADERS_INCLUDE_DIRS}

6 ${ANDROID_HEADERS_INCLUDE_DIRS}

6)

7)

7

8

plugins/Lights/Lights.qmltypesdeleted−45

@@ -1,45 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Lights 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Lights"

12− prototype: "QObject"

13− exports: ["Lights/Lights 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "State"

19− values: {

20− "Off": 0,

21− "On": 1

22− }

23− }

24− Property { name: "state"; type: "State" }

25− Property { name: "color"; type: "QColor" }

26− Property { name: "onMillisec"; type: "int" }

27− Property { name: "offMillisec"; type: "int" }

28− Signal {

29− name: "stateChanged"

30− Parameter { name: "newState"; type: "State" }

31− }

32− Signal {

33− name: "colorChanged"

34− Parameter { name: "color"; type: "QColor" }

35− }

36− Signal {

37− name: "onMillisecChanged"

38− Parameter { name: "onMs"; type: "int" }

39− }

40− Signal {

41− name: "offMillisecChanged"

42− Parameter { name: "offMs"; type: "int" }

43− }

44− }

45−}

plugins/Lights/android-hardware.h−4

@@ -15,9 +15,5 @@

15 *

16 */

17

18−// The purpose of this header wrapper is just to avoid having warnings being reported on

19−// code from external header files, as we can't do anything about them.

20−#pragma GCC system_header

21−

22#include <hardware/hardware.h>

18#include <hardware/hardware.h>

23#include <hardware/lights.h>

19#include <hardware/lights.h>

plugins/Powerd/Powerd.qmltypesdeleted−39

@@ -1,39 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Powerd 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Powerd"

12− prototype: "QObject"

13− exports: ["Powerd/Powerd 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "DisplayStateChangeReason"

19− values: {

20− "Unknown": 0,

21− "Inactivity": 1,

22− "PowerKey": 2,

23− "Proximity": 3

24− }

25− }

26− Enum {

27− name: "Status"

28− values: {

29− "Off": 0,

30− "On": 1

31− }

32− }

33− Property { name: "status"; type: "Status"; isReadonly: true }

34− Signal {

35− name: "statusChanged"

36− Parameter { name: "reason"; type: "DisplayStateChangeReason" }

37− }

38− }

39−}

plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SessionBroadcast"

12− prototype: "QObject"

13− exports: ["SessionBroadcast/SessionBroadcast 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Signal { name: "showHome" }

18− }

19−}

plugins/UInput/UInput.qmltypesdeleted−44

@@ -1,44 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable UInput 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "UInput"

12− prototype: "QObject"

13− exports: ["UInput/UInput 0.1"]

14− exportMetaObjectRevisions: [0]

15− Enum {

16− name: "Button"

17− values: {

18− "ButtonLeft": 0,

19− "ButtonRight": 1,

20− "ButtonMiddle": 2

21− }

22− }

23− Method { name: "createMouse" }

24− Method { name: "removeMouse" }

25− Method {

26− name: "moveMouse"

27− Parameter { name: "dx"; type: "int" }

28− Parameter { name: "dy"; type: "int" }

29− }

30− Method {

31− name: "pressMouse"

32− Parameter { name: "button"; type: "Button" }

33− }

34− Method {

35− name: "releaseMouse"

36− Parameter { name: "button"; type: "Button" }

37− }

38− Method {

39− name: "scrollMouse"

40− Parameter { name: "dh"; type: "int" }

41− Parameter { name: "dv"; type: "int" }

42− }

43− }

44−}

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt−1

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

1include_directories(

2 ${CMAKE_CURRENT_SOURCE_DIR}

3 ${CMAKE_CURRENT_BINARY_DIR}

4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

5)

4)

6

5

7set(DOWNLOADDAEMONLISTENER_SOURCES

6set(DOWNLOADDAEMONLISTENER_SOURCES

plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60

@@ -1,60 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "DownloadTracker"

12− prototype: "QObject"

13− exports: ["Ubuntu.DownloadDaemonListener/DownloadTracker 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "service"; type: "string" }

16− Property { name: "dbusPath"; type: "string" }

17− Property { name: "serviceReady"; type: "bool"; isReadonly: true }

18− Signal {

19− name: "serviceChanged"

20− Parameter { name: "service"; type: "string" }

21− }

22− Signal {

23− name: "dbusPathChanged"

24− Parameter { name: "dbusPath"; type: "string" }

25− }

26− Signal {

27− name: "serviceReadyChanged"

28− Parameter { name: "serviceReady"; type: "bool" }

29− }

30− Signal {

31− name: "canceled"

32− Parameter { name: "success"; type: "bool" }

33− }

34− Signal {

35− name: "error"

36− Parameter { name: "error"; type: "string" }

37− }

38− Signal {

39− name: "finished"

40− Parameter { name: "path"; type: "string" }

41− }

42− Signal {

43− name: "paused"

44− Parameter { name: "success"; type: "bool" }

45− }

46− Signal {

47− name: "progress"

48− Parameter { name: "received"; type: "qulonglong" }

49− Parameter { name: "total"; type: "qulonglong" }

50− }

51− Signal {

52− name: "resumed"

53− Parameter { name: "success"; type: "bool" }

54− }

55− Signal {

56− name: "started"

57− Parameter { name: "success"; type: "bool" }

58− }

59− }

60−}

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+1−1

@@ -21,7 +21,7 @@

21#include "AxisVelocityCalculator.h"

22#include <QtCore/QElapsedTimer>

23

24−using namespace UbuntuGestures;

24+UG_USE_NAMESPACE

25

26AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)

27 : AxisVelocityCalculator(SharedTimeSource(new RealTimeSource), parent)

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+4−4

@@ -24,7 +24,7 @@

24#include "UbuntuGesturesQmlGlobal.h"

25#include <stdint.h>

26#include <QtCore/QObject>

27−#include <TimeSource>

27+#include <UbuntuGestures/private/timesource_p.h>

28

29/*

30 Estimates the current velocity of a finger based on recent movement along an axis

@@ -68,7 +68,7 @@ public:

68 /*

69 Constructor that takes a TimeSource

70 */

71− AxisVelocityCalculator(const UbuntuGestures::SharedTimeSource &timeSource, QObject *parent = 0);

71+ AxisVelocityCalculator(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource, QObject *parent = 0);

72

73 virtual ~AxisVelocityCalculator();

74

@@ -90,7 +90,7 @@ public:

90 /*

91 Replaces the TimeSource with the given one. Useful for testing purposes.

92 */

93− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);

93+ void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);

94

95 /*

96 The minimum amount of samples needed for a velocity calculation.

@@ -138,7 +138,7 @@ private:

138 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */

139 int m_samplesWrite; /* index where the next sample will be written */

140

141− UbuntuGestures::SharedTimeSource m_timeSource;

141+ UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource;

142

143 qreal m_trackedPosition;

144};

plugins/Ubuntu/Gestures/CMakeLists.txt+6−1

@@ -24,7 +24,11 @@ qt5_use_modules(UbuntuGesturesQml Core Quick)

24# So that Foo.cpp can #include "Foo.moc"

25include_directories(${CMAKE_CURRENT_BINARY_DIR})

26

27+include_directories(

28+ SYSTEM

27−include_directories(${UBUNTUGESTURES_INCLUDE_DIRS})

29+ ${UBUNTUGESTURES_INCLUDE_DIRS}

30+ ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

31+)

28

32

29# There's no cmake var for v8 include path :-/ so create one

33# There's no cmake var for v8 include path :-/ so create one

30LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

34LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

@@ -32,6 +36,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

32

36

33# DANGER! DANGER! Using Qt's private API!

37# DANGER! DANGER! Using Qt's private API!

34include_directories(

38include_directories(

39+ SYSTEM

35 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

40 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

36 ${Qt5Quick_INCLUDE_DIRS}

41 ${Qt5Quick_INCLUDE_DIRS}

37 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

42 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

plugins/Ubuntu/Gestures/Gestures.qmltypesdeleted−77

@@ -1,77 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AxisVelocityCalculator"

12− prototype: "QObject"

13− exports: ["Ubuntu.Gestures/AxisVelocityCalculator 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "trackedPosition"; type: "double" }

16− Signal {

17− name: "trackedPositionChanged"

18− Parameter { name: "value"; type: "double" }

19− }

20− Method { name: "calculate"; type: "double" }

21− Method { name: "reset" }

22− }

23− Component {

24− name: "Direction"

25− prototype: "QObject"

26− exports: ["Ubuntu.Gestures/Direction 0.1"]

27− isCreatable: false

28− isSingleton: true

29− exportMetaObjectRevisions: [0]

30− Enum {

31− name: "Type"

32− values: {

33− "Rightwards": 0,

34− "Leftwards": 1,

35− "Downwards": 2,

36− "Upwards": 3,

37− "Horizontal": 4,

38− "Vertical": 5

39− }

40− }

41− Method {

42− name: "isHorizontal"

43− type: "bool"

44− Parameter { name: "type"; type: "Direction::Type" }

45− }

46− Method {

47− name: "isVertical"

48− type: "bool"

49− Parameter { name: "type"; type: "Direction::Type" }

50− }

51− Method {

52− name: "isPositive"

53− type: "bool"

54− Parameter { name: "type"; type: "Direction::Type" }

55− }

56− }

57− Component {

58− name: "PressedOutsideNotifier"

59− defaultProperty: "data"

60− prototype: "QQuickItem"

61− exports: ["Ubuntu.Gestures/PressedOutsideNotifier 0.1"]

62− exportMetaObjectRevisions: [0]

63− Signal { name: "pressedOutside" }

64− }

65− Component {

66− name: "TouchGate"

67− defaultProperty: "data"

68− prototype: "QQuickItem"

69− exports: ["Ubuntu.Gestures/TouchGate 0.1"]

70− exportMetaObjectRevisions: [0]

71− Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }

72− Signal {

73− name: "targetItemChanged"

74− Parameter { name: "item"; type: "QQuickItem"; isPointer: true }

75− }

76− }

77−}

plugins/Ubuntu/Gestures/TouchDispatcher.cpp+1−5

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

19#include <QGuiApplication>

20#include <QScopedPointer>

21#include <QStyleHints>

22−

23−#pragma GCC diagnostic push

24−#pragma GCC diagnostic ignored "-pedantic"

25#include <private/qquickitem_p.h>

22#include <private/qquickitem_p.h>

26−#pragma GCC diagnostic pop

27

23

28#define TOUCHDISPATCHER_DEBUG 0

24#define TOUCHDISPATCHER_DEBUG 0

29

25

@@ -225,7 +221,7 @@ void TouchDispatcher::dispatchAsMouse(

225 QEvent::Type eventType;

221 QEvent::Type eventType;

226 if (touchMouse->state() == Qt::TouchPointPressed) {

222 if (touchMouse->state() == Qt::TouchPointPressed) {

227 eventType = QEvent::MouseButtonPress;

223 eventType = QEvent::MouseButtonPress;

228− } if (touchMouse->state() == Qt::TouchPointReleased) {

224+ } else if (touchMouse->state() == Qt::TouchPointReleased) {

229 eventType = QEvent::MouseButtonRelease;

225 eventType = QEvent::MouseButtonRelease;

230 m_touchMouseId = -1;

226 m_touchMouseId = -1;

231 } else {

227 } else {

plugins/Ubuntu/Gestures/TouchGate.cpp+6−4

@@ -20,16 +20,18 @@

20#include <QDebug>

21#include <QQuickWindow>

22

23−#include <TouchOwnershipEvent>

23+#include <UbuntuGestures/private/touchownershipevent_p.h>

24−#include <TouchRegistry>

24+#include <UbuntuGestures/private/touchregistry_p.h>

25

26#if TOUCHGATE_DEBUG

27#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params

28−#include <DebugHelpers.h>

28+#include <UbuntuGestures/private/debughelpers_p.h>

29#else // TOUCHGATE_DEBUG

30#define ugDebug(params) ((void)0)

31#endif // TOUCHGATE_DEBUG

32

33+UG_USE_NAMESPACE

34+

33TouchGate::TouchGate(QQuickItem *parent)

35TouchGate::TouchGate(QQuickItem *parent)

34 : QQuickItem(parent)

36 : QQuickItem(parent)

35{

37{

@@ -40,7 +42,7 @@ TouchGate::TouchGate(QQuickItem *parent)

40bool TouchGate::event(QEvent *e)

42bool TouchGate::event(QEvent *e)

41{

43{

42 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

44 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

43− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));

45+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(e));

44 return true;

46 return true;

45 } else {

47 } else {

46 return QQuickItem::event(e);

48 return QQuickItem::event(e);

plugins/Ubuntu/Gestures/TouchGate.h+3−2

@@ -19,6 +19,7 @@

19

20#include "UbuntuGesturesQmlGlobal.h"

21#include "TouchDispatcher.h"

22+#include <UbuntuGestures/ubuntugesturesglobal.h>

22

23

23#include <QQuickItem>

24#include <QQuickItem>

24#include <QList>

25#include <QList>

@@ -26,7 +27,7 @@

26

27

27#define TOUCHGATE_DEBUG 0

28#define TOUCHGATE_DEBUG 0

28

29

29−class TouchOwnershipEvent;

30+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)

30

31

31/*

32/*

32 Blocks the passage of events until ownership over the related touch points is granted.

33 Blocks the passage of events until ownership over the related touch points is granted.

@@ -82,7 +83,7 @@ private:

82 ulong timestamp;

83 ulong timestamp;

83 };

84 };

84

85

85− void touchOwnershipEvent(TouchOwnershipEvent *event);

86+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);

86 bool isTouchPointOwned(int touchId) const;

87 bool isTouchPointOwned(int touchId) const;

87 void storeTouchEvent(QTouchDevice *device,

88 void storeTouchEvent(QTouchDevice *device,

88 Qt::KeyboardModifiers modifiers,

89 Qt::KeyboardModifiers modifiers,

plugins/Ubuntu/Gestures/TouchGestureArea.cpp+16−16

@@ -16,9 +16,9 @@

16

17#include "TouchGestureArea.h"

18

19−#include <UbuntuGestures/TouchOwnershipEvent>

19+#include <UbuntuGestures/private/touchownershipevent_p.h>

20−#include <UbuntuGestures/TouchRegistry>

20+#include <UbuntuGestures/private/touchregistry_p.h>

21−#include <UbuntuGestures/UnownedTouchEvent>

21+#include <UbuntuGestures/private/unownedtouchevent_p.h>

22// #include "TouchRegistry.h"

23// #include "UnownedTouchEvent.h"

24

@@ -26,6 +26,8 @@

26#include <QStyleHints>

27#include <private/qquickwindow_p.h>

28

29+UG_USE_NAMESPACE

30+

29#define TOUCHGESTUREAREA_DEBUG 0

31#define TOUCHGESTUREAREA_DEBUG 0

30

32

31// TODO - understand more about why we lose touch event releases.

33// TODO - understand more about why we lose touch event releases.

@@ -135,7 +137,7 @@ TouchGestureArea::TouchGestureArea(QQuickItem* parent)

135 , m_recognitionPeriod(50)

137 , m_recognitionPeriod(50)

136 , m_releaseRejectPeriod(100)

138 , m_releaseRejectPeriod(100)

137{

139{

138− setRecognitionTimer(new UbuntuGestures::Timer(this));

140+ setRecognitionTimer(new Timer(this));

139 m_recognitionTimer->setInterval(m_recognitionPeriod);

141 m_recognitionTimer->setInterval(m_recognitionPeriod);

140 m_recognitionTimer->setSingleShot(true);

142 m_recognitionTimer->setSingleShot(true);

141}

143}

@@ -153,10 +155,10 @@ bool TouchGestureArea::event(QEvent *event)

153{

155{

154 // Process unowned touch events (handles update/release for incomplete gestures)

156 // Process unowned touch events (handles update/release for incomplete gestures)

155 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

157 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

156− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));

158+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(event));

157 return true;

159 return true;

158 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {

160 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {

159− unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());

161+ unownedTouchEvent(static_cast<UnownedTouchEvent*>(event)->touchEvent());

160 return true;

162 return true;

161 }

163 }

162

164

@@ -375,7 +377,7 @@ void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *even

375 }

377 }

376 }

378 }

377

379

378− if (m_candidateTouches.count() == 0) {

380+ if (m_candidateTouches.isEmpty()) {

379 setInternalStatus(InternalStatus::WaitingForTouch);

381 setInternalStatus(InternalStatus::WaitingForTouch);

380 }

382 }

381}

383}

@@ -439,7 +441,7 @@ void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)

439 }

441 }

440 }

442 }

441

443

442− if (m_watchedTouches.count() == 0) {

444+ if (m_watchedTouches.isEmpty()) {

443 setInternalStatus(InternalStatus::WaitingForTouch);

445 setInternalStatus(InternalStatus::WaitingForTouch);

444 }

446 }

445}

447}

@@ -527,7 +529,7 @@ void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)

527 if (updateable) {

529 if (updateable) {

528 if (!dragging() && m_status == InternalStatus::Recognized) {

530 if (!dragging() && m_status == InternalStatus::Recognized) {

529 bool allWantDrag = !m_liveTouchPoints.isEmpty();

531 bool allWantDrag = !m_liveTouchPoints.isEmpty();

530− Q_FOREACH(auto point, m_liveTouchPoints) {

532+ Q_FOREACH(const auto &point, m_liveTouchPoints) {

531 allWantDrag &= point->dragging();

533 allWantDrag &= point->dragging();

532 }

534 }

533 // only dragging if all points are dragging.

535 // only dragging if all points are dragging.

@@ -608,7 +610,7 @@ void TouchGestureArea::setInternalStatus(uint newStatus)

608 }

610 }

609}

611}

610

612

611−void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)

613+void TouchGestureArea::setRecognitionTimer(AbstractTimer *timer)

612{

614{

613 int interval = 0;

615 int interval = 0;

614 bool timerWasRunning = false;

616 bool timerWasRunning = false;

@@ -646,11 +648,9 @@ bool TouchGestureArea::dragging() const

646QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()

648QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()

647{

649{

648 return QQmlListProperty<GestureTouchPoint>(this,

650 return QQmlListProperty<GestureTouchPoint>(this,

649− 0,

650− nullptr,

651+ nullptr,

651− TouchGestureArea::touchPoint_count,

652+ TouchGestureArea::touchPoint_count,

652− TouchGestureArea::touchPoint_at,

653+ TouchGestureArea::touchPoint_at);

653− 0);

654}

655

656int TouchGestureArea::minimumTouchPoints() const

@@ -721,7 +721,7 @@ void TouchGestureArea::rejectGesture()

721 }

722 m_candidateTouches.clear();

723

724− if (m_watchedTouches.count() == 0) {

724+ if (m_watchedTouches.isEmpty()) {

725 setInternalStatus(InternalStatus::WaitingForTouch);

726 } else {

727 setInternalStatus(InternalStatus::Rejected);

plugins/Ubuntu/Gestures/TouchGestureArea.h+14−13

@@ -21,10 +21,11 @@

21

22#include <QQuickItem>

23

24−#include <UbuntuGestures/Timer>

24+#include <UbuntuGestures/ubuntugesturesglobal.h>

25+#include <UbuntuGestures/private/timer_p.h>

25

26

26−class TouchOwnershipEvent;

27+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)

27−class UnownedTouchEvent;

28+UG_FORWARD_DECLARE_CLASS(UnownedTouchEvent)

28

29

29class GestureTouchPoint : public QObject

30class GestureTouchPoint : public QObject

30{

31{

@@ -105,8 +106,8 @@ private:

105/*

106/*

106 An area that detects multi-finger gestures.

107 An area that detects multi-finger gestures.

107

108

108− We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.

109+ We can use this to detect gestures constrained by a minimum and/or maximum number of touch points.

109− This components uses the touch registry to apply for ownership of touch points.

110+ This component uses the touch registry to apply for ownership of touch points.

110 This way we can use the component in conjuntion with the directional drag area to compete for ownwership

111 This way we can use the component in conjuntion with the directional drag area to compete for ownwership

111 or gestures; unlike the MultiPointTouchArea.

112 or gestures; unlike the MultiPointTouchArea.

112 */

113 */

@@ -136,12 +137,12 @@ public:

136 Recognized,

137 Recognized,

137 Rejected

138 Rejected

138 };

139 };

139− TouchGestureArea(QQuickItem* parent = NULL);

140+ TouchGestureArea(QQuickItem* parent = nullptr);

140 ~TouchGestureArea();

141 ~TouchGestureArea();

141

142

142 bool event(QEvent *e) override;

143 bool event(QEvent *e) override;

143

144

144− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);

145+ void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);

145

146

146 int status() const;

147 int status() const;

147 bool dragging() const;

148 bool dragging() const;

@@ -164,10 +165,10 @@ Q_SIGNALS:

164

165

165 void touchPointsUpdated();

166 void touchPointsUpdated();

166 void draggingChanged(bool dragging);

167 void draggingChanged(bool dragging);

167− void minimumTouchPointsChanged(bool value);

168+ void minimumTouchPointsChanged(int value);

168− void maximumTouchPointsChanged(bool value);

169+ void maximumTouchPointsChanged(int value);

169− void recognitionPeriodChanged(bool value);

170+ void recognitionPeriodChanged(int value);

170− void releaseRejectPeriodChanged(bool value);

171+ void releaseRejectPeriodChanged(int value);

171

172

172 void pressed(const QList<QObject*>& points);

173 void pressed(const QList<QObject*>& points);

173 void released(const QList<QObject*>& points);

174 void released(const QList<QObject*>& points);

@@ -194,7 +195,7 @@ private:

194 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);

195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);

195 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);

196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);

196

197

197− void touchOwnershipEvent(TouchOwnershipEvent *event);

198+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);

198 void updateTouchPoints(QTouchEvent *event);

199 void updateTouchPoints(QTouchEvent *event);

199

200

200 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);

201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);

@@ -209,7 +210,7 @@ private:

209 uint m_status;

210 uint m_status;

210 QSet<int> m_candidateTouches;

211 QSet<int> m_candidateTouches;

211 QSet<int> m_watchedTouches;

212 QSet<int> m_watchedTouches;

212− UbuntuGestures::AbstractTimer *m_recognitionTimer;

213+ UG_PREPEND_NAMESPACE(AbstractTimer) *m_recognitionTimer;

213

214

214 bool m_dragging;

215 bool m_dragging;

215 QHash<int, GestureTouchPoint*> m_liveTouchPoints;

216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;

plugins/Ubuntu/Payments/Payments.qmltypesdeleted−43

@@ -1,43 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.Payments 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Payments"

12− prototype: "QObject"

13− exports: ["Ubuntu.Payments/Payments 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "currency"; type: "string" }

16− Property { name: "price"; type: "double" }

17− Property { name: "storeItemId"; type: "string" }

18− Property { name: "formattedPrice"; type: "string"; isReadonly: true }

19− Signal {

20− name: "currencyChanged"

21− Parameter { name: "currency"; type: "string" }

22− }

23− Signal {

24− name: "priceChanged"

25− Parameter { name: "price"; type: "double" }

26− }

27− Signal {

28− name: "storeItemIdChanged"

29− Parameter { name: "store_item_id"; type: "string" }

30− }

31− Signal {

32− name: "formattedPriceChanged"

33− Parameter { name: "formatted_price"; type: "string" }

34− }

35− Signal {

36− name: "purchaseError"

37− Parameter { name: "error"; type: "string" }

38− }

39− Signal { name: "purchaseCompleted" }

40− Signal { name: "purchaseCancelled" }

41− Method { name: "start" }

42− }

43−}

plugins/Ubuntu/SystemImage/CMakeLists.txt+5

@@ -1,3 +1,7 @@

1+include_directories(

2+ ${GLIB_INCLUDE_DIRS}

3+)

4+

1set(SYSTEMIMAGE_SOURCES

5set(SYSTEMIMAGE_SOURCES

2 plugin.cpp

6 plugin.cpp

3 SystemImage.cpp

7 SystemImage.cpp

@@ -6,5 +10,6 @@ set(SYSTEMIMAGE_SOURCES

6add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

10add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

7

11

8qt5_use_modules(SystemImage Qml DBus Core)

12qt5_use_modules(SystemImage Qml DBus Core)

13+target_link_libraries(SystemImage ${GLIB_LIBRARIES})

9

14

10add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

15add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

plugins/Ubuntu/SystemImage/SystemImage.cpp+127−5

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

1/*

3 *

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

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

@@ -14,20 +14,142 @@

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

15 */

16

17−#include "SystemImage.h"

18#include <QDBusConnection>

17#include <QDBusConnection>

19#include <QDBusPendingCall>

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

20

34

21SystemImage::SystemImage(QObject *parent)

35SystemImage::SystemImage(QObject *parent)

22 : QObject(parent)

36 : QObject(parent)

23{

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

24}

66}

25

67

26void SystemImage::factoryReset()

68void SystemImage::factoryReset()

27{

69{

28− const QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("com.canonical.SystemImage"),

70+ const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

29− QStringLiteral("/Service"),

30− QStringLiteral("com.canonical.SystemImage"),

31 QStringLiteral("FactoryReset"));

71 QStringLiteral("FactoryReset"));

32 QDBusConnection::systemBus().asyncCall(msg);

72 QDBusConnection::systemBus().asyncCall(msg);

33}

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.h+52−2

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

1/*

3 *

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

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

@@ -18,17 +18,67 @@

18#define SYSTEMIMAGE_H

19

20#include <QObject>

21+#include <QLoggingCategory>

22+

23+Q_DECLARE_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN)

21

24

22class SystemImage : public QObject

25class SystemImage : public QObject

23{

26{

24 Q_OBJECT

27 Q_OBJECT

25 Q_DISABLE_COPY(SystemImage)

28 Q_DISABLE_COPY(SystemImage)

26

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+

27public:

37public:

28− explicit SystemImage(QObject *parent = 0);

38+ explicit SystemImage(QObject *parent = nullptr);

29 ~SystemImage() = default;

39 ~SystemImage() = default;

30

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

31 Q_INVOKABLE void factoryReset();

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;

32};

82};

33

83

34#endif // SYSTEMIMAGE_H

84#endif // SYSTEMIMAGE_H

plugins/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SystemImage"

12− prototype: "QObject"

13− exports: ["Ubuntu.SystemImage/SystemImage 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Method { name: "factoryReset" }

18− }

19−}

plugins/Ubuntu/SystemImage/plugin.cpp+3−9

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

1/*

3 *

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

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

@@ -19,16 +19,10 @@

19

20#include <QtQml>

21

22−static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

23−{

24− Q_UNUSED(engine)

25− Q_UNUSED(scriptEngine)

26− return new SystemImage();

27−}

28−

29void BackendPlugin::registerTypes(const char *uri)

22void BackendPlugin::registerTypes(const char *uri)

30{

23{

31 Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));

24 Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));

32

25

33− qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage", service_provider);

26+ qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage",

27+ [](QQmlEngine*, QJSEngine*) -> QObject* { return new SystemImage; });

34}

28}

plugins/Ubuntu/SystemImage/plugin.h+1−1

@@ -22,7 +22,7 @@

22class BackendPlugin : public QQmlExtensionPlugin

23{

24 Q_OBJECT

25− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

25+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)

26

27public:

28 void registerTypes(const char *uri) override;

plugins/Unity/Connectivity/Connectivity.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Connectivity"

12− prototype: "QObject"

13− exports: ["Unity.Connectivity/Connectivity 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Method { name: "unlockAllModems" }

18− }

19−}

plugins/Unity/DashCommunicator/DashCommunicator.qmltypesdeleted−47

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

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "DashCommunicator"

12− prototype: "QThread"

13− exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14− exportMetaObjectRevisions: [0]

15− Method {

16− name: "setCurrentScope"

17− Parameter { name: "index"; type: "int" }

18− Parameter { name: "animate"; type: "bool" }

19− Parameter { name: "isSwipe"; type: "bool" }

20− }

21− }

22− Component {

23− name: "DashCommunicatorService"

24− prototype: "QObject"

25− exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

26− exportMetaObjectRevisions: [0]

27− Signal {

28− name: "setCurrentScopeRequested"

29− Parameter { name: "index"; type: "int" }

30− Parameter { name: "animate"; type: "bool" }

31− Parameter { name: "isSwipe"; type: "bool" }

32− }

33− }

34− Component {

35− name: "QThread"

36− prototype: "QObject"

37− Signal { name: "started" }

38− Signal { name: "finished" }

39− Method {

40− name: "start"

41− Parameter { type: "Priority" }

42− }

43− Method { name: "start" }

44− Method { name: "terminate" }

45− Method { name: "quit" }

46− }

47−}

plugins/Unity/Indicators/CMakeLists.txt+4

@@ -6,6 +6,10 @@ find_package(Qt5Quick REQUIRED)

6include_directories(

7 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_CURRENT_BINARY_DIR}

9+)

10+

11+include_directories(

12+ SYSTEM

9 ${GLIB_INCLUDE_DIRS}

13 ${GLIB_INCLUDE_DIRS}

10 ${GIO_INCLUDE_DIRS}

14 ${GIO_INCLUDE_DIRS}

11 ${QMENUMODEL_INCLUDE_DIRS}

15 ${QMENUMODEL_INCLUDE_DIRS}

plugins/Unity/Indicators/Indicators.qmltypesdeleted−264

@@ -1,264 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "ActionRootState"

12− prototype: "RootStateObject"

13− exports: ["Unity.Indicators/ActionRootState 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }

16− Property { name: "actionName"; type: "string" }

17− }

18− Component {

19− name: "ActionState"

20− prototype: "QObject"

21− exports: ["Unity.Indicators/ActionState 0.1"]

22− isCreatable: false

23− exportMetaObjectRevisions: [0]

24− Enum {

25− name: "ActionStates"

26− values: {

27− "Label": 0,

28− "IconSource": 1,

29− "AccessableName": 2,

30− "Visible": 3

31− }

32− }

33− }

34− Component {

35− name: "FlatMenuProxyModelRole"

36− prototype: "QObject"

37− exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]

38− isCreatable: false

39− exportMetaObjectRevisions: [0]

40− Enum {

41− name: "Roles"

42− values: {

43− "Action": 1,

44− "Label": 2,

45− "Extra": 3,

46− "Depth": 4,

47− "hasSection": 5,

48− "hasSubMenu": 6

49− }

50− }

51− }

52− Component {

53− name: "IndicatorsManager"

54− prototype: "QObject"

55− exports: ["Unity.Indicators/IndicatorsManager 0.1"]

56− exportMetaObjectRevisions: [0]

57− Property { name: "loaded"; type: "bool"; isReadonly: true }

58− Property { name: "profile"; type: "string" }

59− Signal {

60− name: "loadedChanged"

61− Parameter { type: "bool" }

62− }

63− Signal {

64− name: "profileChanged"

65− Parameter { type: "string" }

66− }

67− Signal {

68− name: "indicatorLoaded"

69− Parameter { name: "indicator_name"; type: "string" }

70− }

71− Signal {

72− name: "indicatorAboutToBeUnloaded"

73− Parameter { name: "indicator_name"; type: "string" }

74− }

75− Method { name: "load" }

76− Method { name: "unload" }

77− }

78− Component {

79− name: "IndicatorsModel"

80− prototype: "QAbstractListModel"

81− exports: ["Unity.Indicators/IndicatorsModel 0.1"]

82− exportMetaObjectRevisions: [0]

83− Property { name: "count"; type: "int"; isReadonly: true }

84− Property { name: "profile"; type: "string" }

85− Signal {

86− name: "indicatorDataChanged"

87− Parameter { name: "data"; type: "QVariant" }

88− }

89− Method { name: "load" }

90− Method { name: "unload" }

91− Method {

92− name: "data"

93− type: "QVariant"

94− Parameter { name: "row"; type: "int" }

95− Parameter { name: "role"; type: "int" }

96− }

97− }

98− Component {

99− name: "IndicatorsModelRole"

100− prototype: "QObject"

101− exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]

102− isCreatable: false

103− exportMetaObjectRevisions: [0]

104− Enum {

105− name: "Roles"

106− values: {

107− "Identifier": 0,

108− "Position": 1,

109− "IndicatorProperties": 2

110− }

111− }

112− }

113− Component {

114− name: "MenuContentActivator"

115− prototype: "QObject"

116− exports: ["Unity.Indicators/MenuContentActivator 0.1"]

117− exportMetaObjectRevisions: [0]

118− Property { name: "baseIndex"; type: "int" }

119− Property { name: "running"; type: "bool" }

120− Property { name: "count"; type: "int" }

121− Property { name: "content"; type: "MenuContentState"; isList: true; isReadonly: true }

122− Signal {

123− name: "baseIndexChanged"

124− Parameter { name: "baseIndex"; type: "int" }

125− }

126− Signal {

127− name: "deltaChanged"

128− Parameter { name: "delta"; type: "int" }

129− }

130− Signal {

131− name: "runningChanged"

132− Parameter { name: "running"; type: "bool" }

133− }

134− Signal {

135− name: "countChanged"

136− Parameter { name: "count"; type: "int" }

137− }

138− Method { name: "restart" }

139− Method { name: "stop" }

140− Method { name: "clear" }

141− Method {

142− name: "isMenuContentActive"

143− type: "bool"

144− Parameter { name: "index"; type: "int" }

145− }

146− }

147− Component {

148− name: "MenuContentState"

149− prototype: "QObject"

150− exports: ["Unity.Indicators/MenuContentState 0.1"]

151− isCreatable: false

152− exportMetaObjectRevisions: [0]

153− Property { name: "active"; type: "bool"; isReadonly: true }

154− }

155− Component {

156− name: "ModelActionRootState"

157− prototype: "RootStateObject"

158− exports: ["Unity.Indicators/ModelActionRootState 0.1"]

159− exportMetaObjectRevisions: [0]

160− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

161− Signal { name: "indexChanged" }

162− }

163− Component {

164− name: "ModelPrinter"

165− prototype: "QObject"

166− exports: ["Unity.Indicators/ModelPrinter 0.1"]

167− exportMetaObjectRevisions: [0]

168− Property { name: "model"; type: "UnityMenuModel"; isPointer: true }

169− Property { name: "text"; type: "string"; isReadonly: true }

170− Method { name: "text"; type: "string" }

171− }

172− Component {

173− name: "NetworkActionState"

174− prototype: "QObject"

175− exports: ["Unity.Indicators/NetworkActionState 0.1"]

176− isCreatable: false

177− exportMetaObjectRevisions: [0]

178− Enum {

179− name: "NetworkActionStates"

180− values: {

181− "Connection": 1,

182− "SignalStrength": 2

183− }

184− }

185− }

186− Component {

187− name: "NetworkConnection"

188− prototype: "QObject"

189− exports: ["Unity.Indicators/NetworkConnection 0.1"]

190− isCreatable: false

191− exportMetaObjectRevisions: [0]

192− Enum {

193− name: "NetworkConnectionStates"

194− values: {

195− "Initial": 0,

196− "Activating": 1,

197− "Activated": 2,

198− "Deactivating": 3

199− }

200− }

201− }

202− Component {

203− name: "RootStateObject"

204− prototype: "QObject"

205− Property { name: "valid"; type: "bool"; isReadonly: true }

206− Property { name: "title"; type: "string"; isReadonly: true }

207− Property { name: "leftLabel"; type: "string"; isReadonly: true }

208− Property { name: "rightLabel"; type: "string"; isReadonly: true }

209− Property { name: "icons"; type: "QStringList"; isReadonly: true }

210− Property { name: "accessibleName"; type: "string"; isReadonly: true }

211− Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }

212− Signal { name: "updated" }

213− }

214− Component {

215− name: "SharedUnityMenuModel"

216− prototype: "QObject"

217− exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]

218− exportMetaObjectRevisions: [0]

219− Property { name: "busName"; type: "QByteArray" }

220− Property { name: "menuObjectPath"; type: "QByteArray" }

221− Property { name: "actions"; type: "QVariantMap" }

222− Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }

223− }

224− Component {

225− name: "UnityMenuModelCache"

226− prototype: "QObject"

227− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]

228− isCreatable: false

229− isSingleton: true

230− exportMetaObjectRevisions: [0]

231− Method {

232− name: "contains"

233− type: "bool"

234− Parameter { name: "path"; type: "QByteArray" }

235− }

236− }

237− Component {

238− name: "UnityMenuModelStack"

239− prototype: "QObject"

240− exports: ["Unity.Indicators/UnityMenuModelStack 0.1"]

241− exportMetaObjectRevisions: [0]

242− Property { name: "head"; type: "UnityMenuModel"; isPointer: true }

243− Property { name: "tail"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }

244− Property { name: "count"; type: "int"; isReadonly: true }

245− Signal {

246− name: "headChanged"

247− Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }

248− }

249− Signal {

250− name: "tailChanged"

251− Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }

252− }

253− Signal {

254− name: "countChanged"

255− Parameter { name: "count"; type: "int" }

256− }

257− Method {

258− name: "push"

259− Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }

260− Parameter { name: "menuIndex"; type: "int" }

261− }

262− Method { name: "pop"; type: "UnityMenuModel*" }

263− }

264−}

plugins/Unity/Indicators/actionrootstate.cpp+1−1

@@ -44,7 +44,7 @@ void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)

44 connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });

45 connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });

46 connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });

47− connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });

47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](const QVariant&) { updateActionState(); });

48

49 connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });

50 }

plugins/Unity/Indicators/indicatorsmanager.cpp+4−6

@@ -114,10 +114,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)

114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);

115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();

116

117− if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {

118− return; // convergence: skip this indicator until it works in Mir

119− }

120−

121 auto iter = m_indicatorsData.constFind(name);

117 auto iter = m_indicatorsData.constFind(name);

122 if (iter != m_indicatorsData.constEnd())

118 if (iter != m_indicatorsData.constEnd())

123 {

119 {

@@ -285,13 +281,15 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

285

281

286 // convergence:

282 // convergence:

287 // 1) enable session indicator

283 // 1) enable session indicator

284+ // 2) enable keyboard indicator

288− // 2) on a PC, switch the battery/power indicator to desktop mode,

285+ // 3) on a PC, switch the battery/power indicator to desktop mode,

289 // can't control brightness for now and phone-on-desktop broken (FIXME)

286 // can't control brightness for now and phone-on-desktop broken (FIXME)

290 //

287 //

291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

288 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

292 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

289 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

290+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")

293 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {

291 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {

294− new_indicator->setProfile(QStringLiteral("desktop"));

292+ new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));

295 } else {

293 } else {

296 new_indicator->setProfile(m_profile);

294 new_indicator->setProfile(m_profile);

297 }

295 }

plugins/Unity/InputInfo/InputInfo.qmltypesdeleted−71

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

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "QDeclarativeInputDeviceModel"

12− prototype: "QAbstractListModel"

13− exports: ["Unity.InputInfo/InputDeviceModel 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "deviceFilter"; type: "QInputDevice::InputType" }

16− Property { name: "count"; type: "int"; isReadonly: true }

17− Signal {

18− name: "deviceAdded"

19− Parameter { name: "devicePath"; type: "string" }

20− }

21− Signal {

22− name: "deviceRemoved"

23− Parameter { name: "devicePath"; type: "string" }

24− }

25− Signal {

26− name: "deviceFilterChanged"

27− Parameter { name: "filter"; type: "QInputDevice::InputType" }

28− }

29− Method { name: "updateDeviceList" }

30− Method {

31− name: "indexOf"

32− type: "int"

33− Parameter { name: "devicePath"; type: "string" }

34− }

35− Method {

36− name: "get"

37− type: "QInputDevice*"

38− Parameter { name: "index"; type: "int" }

39− }

40− }

41− Component {

42− name: "QInputDevice"

43− prototype: "QObject"

44− exports: ["Unity.InputInfo/InputInfo 0.1"]

45− exportMetaObjectRevisions: [0]

46− Enum {

47− name: "InputType"

48− values: {

49− "Unknown": 0,

50− "Button": 1,

51− "Mouse": 2,

52− "TouchPad": 4,

53− "TouchScreen": 8,

54− "Keyboard": 16,

55− "Switch": 32

56− }

57− }

58− Enum {

59− name: "InputTypeFlags"

60− values: {

61− "Unknown": 0,

62− "Button": 1,

63− "Mouse": 2,

64− "TouchPad": 4,

65− "TouchScreen": 8,

66− "Keyboard": 16,

67− "Switch": 32

68− }

69− }

70− }

71−}

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+7−2

@@ -44,6 +44,7 @@

44#include <libudev.h>

45#include <libevdev/libevdev.h>

46#include <fcntl.h>

47+#include <unistd.h>

47#include <QDebug>

48#include <QDebug>

48#include <QSocketNotifier>

49#include <QSocketNotifier>

49#include <QTimer>

50#include <QTimer>

@@ -52,6 +53,7 @@

52QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :

53QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :

53 QObject(parent),

54 QObject(parent),

54 currentFilter(QInputDevice::Unknown),

55 currentFilter(QInputDevice::Unknown),

56+ udevMonitor(0),

55 udevice(0)

57 udevice(0)

56{

58{

57 QTimer::singleShot(250,this,SLOT(init()));

59 QTimer::singleShot(250,this,SLOT(init()));

@@ -83,9 +85,9 @@ void QInputDeviceManagerPrivate::init()

83 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());

85 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());

84

86

85 udev_monitor_enable_receiving(udevMonitor);

87 udev_monitor_enable_receiving(udevMonitor);

86− notifierFd = udev_monitor_get_fd(udevMonitor);

88+ int notifierFd = udev_monitor_get_fd(udevMonitor);

87

89

88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

89 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));

91 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));

90

92

91 udev_enumerate_scan_devices(enumerate);

93 udev_enumerate_scan_devices(enumerate);

@@ -168,6 +170,7 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

168 rc = libevdev_new_from_fd(fd, &dev);

170 rc = libevdev_new_from_fd(fd, &dev);

169 if (rc < 0) {

171 if (rc < 0) {

170 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";

172 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";

173+ close(fd);

171 return Q_NULLPTR;

174 return Q_NULLPTR;

172 }

175 }

173

176

@@ -195,6 +198,8 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

195 }

198 }

196 }

199 }

197

200

201+ libevdev_free(dev);

202+ close(fd);

198 return inputDevice;

203 return inputDevice;

199}

204}

200

205

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2

@@ -83,8 +83,6 @@ private:

83

84 QInputDevice *addDevice(const QString &path);

85 void removeDevice(const QString &path);

86− QSocketNotifier *notifier;

87− int notifierFd;

88 struct udev_monitor *udevMonitor;

86 struct udev_monitor *udevMonitor;

89 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);

87 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);

90 struct udev *udevice;

88 struct udev *udevice;

plugins/Unity/Launcher/CMakeLists.txt+3−1

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

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3

4add_definitions(-DSM_BUSNAME=systemBus)

@@ -23,6 +23,8 @@ set(QMLLAUNCHERPLUGIN_SRC

23 asadapter.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

25 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

26+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

27+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

26 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

28 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

27 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

29 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

28 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

30 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

plugins/Unity/Launcher/Launcher.qmltypesdeleted−182

@@ -1,182 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'