89ee15b · unity8 · git.iko.soy

git.iko.soy/unity8

Merge from trunk

commit89ee15b06afc642e8b6a63effe23e839d597b1dd authorMichael Terry <michael.terry@canonical.com> dateMon 20 Jun 2016, 13:50 (10 years ago) parent592550c e9a27e4

294 files changed+23332−13124

compare with xenial

unifiedsplit

CMakeLists.txt+1−1

@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)

5757find_package(Qt5Concurrent 5.4 REQUIRED)

5858find_package(Qt5Sql 5.4 REQUIRED)

5959

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

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

6161pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

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

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

data/unity8.conf+12−2

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

44emits indicator-services-start

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

77stop on desktop-end

99kill timeout 120

@@ -50,9 +50,19 @@ pre-start script

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

5151 # reduces lag seen in apps:

5252 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

5363end script

5464

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

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

5666

5767post-start script

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

debian/changelog+86

@@ -1,3 +1,89 @@

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

3+ [ Michael Terry ]

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

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

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

7+ edges. (LP: #1565103)

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

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

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

11+ #1582987)

12+

13+ [ Albert Astals Cid ]

14+ * Improve dash plugin mock

15+ * Stabilize PreviewExpandableTest::test_all_widgets_height

16+ * Workaround QTBUG-53460

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

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

19+ cards

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

21+ * Turn if if else into if elseif else

22+ * Fix leaks in QInputDeviceManagerPrivate::addDevice

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

24+ * initialize udevMonitor

25+ * Make notifier and notifierFd function local variables

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

27+ sectionDelegate

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

29+ * Minor coverity fixes

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

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

32+

33+ [ Alexandros Frantzis ]

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

35+ #1570922)

36+

37+ [ Andrea Cimitan ]

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

39+ #1588335)

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

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

42+ #1589060)

43+

44+ [ Daniel d'Andrada ]

45+ * Clean up debug leftovers

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

47+ * Fix SpreadDelegate rotation animations

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

49+ generated

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

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

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

53+

54+ [ Josh Arenson ]

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

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

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

58+

59+ [ Lukáš Tinkl ]

60+ * Implement keyboard shortcuts info panel

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

62+ (LP: #1489020)

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

64+ #1588633)

65+

66+ [ Michael Zanetti ]

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

68+ number of surfaces

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

70+ #1586621)

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

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

73+

74+ [ Stephen M. Webb ]

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

76+ #1376715)

77+

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

79+

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

81+

82+ [ Pawel Stolowski ]

83+ * Added apparmor profile for unity8-dash.

84+

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

86+

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

288

389 [ Albert Astals Cid ]

debian/control+2−1

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

55Build-Depends: cmake,

66 dbus-test-runner,

77 debhelper (>= 9),

8+ dh-apparmor,

89 doxyqml,

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

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

@@ -33,7 +34,7 @@ Build-Depends: cmake,

3334 libubuntugestures5-dev,

3435 libubuntugestures5-private-dev,

3536 libudev-dev,

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

37+ libunity-api-dev (>= 7.115),

3738 libusermetricsoutput1-dev,

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

3940 libx11-dev[!armhf],

debian/rules+4

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

2929 cd $(CURDIR)

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

3131

32+override_dh_installdeb:

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

34+ dh_installdeb

35+

3236# use private lib directories

3337override_dh_makeshlibs:

3438 dh_makeshlibs -Nunity8-private -Nunity8-tests

debian/unity8.install+1

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

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

12var/lib/unity8/version

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

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

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

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

1+# vim:syntax=apparmor

3+#include <tunables/global>

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.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/Cursor/CursorImageInfo.cpp+2−12

@@ -19,17 +19,14 @@

1919CursorImageInfo::CursorImageInfo(QObject *parent)

2020 : QObject(parent)

2121{

22− m_updateTimer.setInterval(0);

23− m_updateTimer.setSingleShot(true);

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

2522}

2623

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

2825{

2926 if (cursorName != m_cursorName) {

3027 m_cursorName = cursorName;

28+ update();

3129 Q_EMIT cursorNameChanged();

32− scheduleUpdate();

3330 }

3431}

3532

@@ -37,15 +34,8 @@ void CursorImageInfo::setThemeName(const QString &themeName)

3734{

3835 if (m_themeName != themeName) {

3936 m_themeName = themeName;

37+ update();

4038 Q_EMIT themeNameChanged();

41− scheduleUpdate();

42− }

43−}

44−

45−void CursorImageInfo::scheduleUpdate()

46−{

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

48− m_updateTimer.start();

4939 }

5040}

5141

plugins/Cursor/CursorImageInfo.h−4

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

2121

2222#include <QObject>

2323#include <QString>

24−#include <QTimer>

2524

2625class CursorImageInfo : public QObject

2726{

@@ -64,9 +63,6 @@ private Q_SLOTS:

6463 void update();

6564

6665private:

67− void scheduleUpdate();

68− QTimer m_updateTimer;

69−

7066 QString m_themeName;

7167 QString m_cursorName;

7268

plugins/Cursor/CursorImageProvider.cpp+1−1

@@ -300,7 +300,7 @@ CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, co

300300{

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

302302 return &m_blankCursorImage;

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

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

304304 return m_customCursorImage.data();

305305 } else {

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

plugins/Cursor/MousePointer.cpp+8−3

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

11/*

33 *

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

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

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

4343 Q_EMIT mouseMoved();

4444 }

4545

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

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+

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

4752 if (newX < 0) {

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

4954 newX = 0;

@@ -53,7 +58,7 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse

5358 }

5459 setX(newX);

5560

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

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

5762 if (newY < 0) {

5863 newY = 0;

5964 } else if (newY > parentItem()->height()) {

plugins/Cursor/MousePointer.h+4−1

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

11/*

33 *

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

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

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

6161 QPointer<QScreen> m_registeredScreen;

6262 QString m_cursorName;

6363 QString m_themeName;

64+

65+ // Accumulated, unapplied, mouse movement.

66+ QPointF m_accumulatedMovement;

6467};

6568

6669#endif // MOUSEPOINTER_H

plugins/Dash/CardCreator.js+86−51

@@ -69,7 +69,8 @@ var kArtUbuntuShapeCode = 'UbuntuShape { \n\

6969 }';

7070

7171var kArtProportionalShapeCode = 'ProportionalShape { \n\

72− anchors.fill: parent; \n\

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

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

7374 source: artImage; \n\

7475 aspect: UbuntuShape.DropShadow; \n\

7576 }';

@@ -78,52 +79,83 @@ var kArtProportionalShapeCode = 'ProportionalShape { \n\

7879// %2 is used as image width

7980// %3 is used as image height

8081// %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

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

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

85−// %9 is used as image fallback

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

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

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

85+// %8 is used as image fallback

8686var kArtShapeHolderCode = 'Item { \n\

8787 id: artShapeHolder; \n\

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

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

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

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

9090 anchors { %1 } \n\

9191 Loader { \n\

9292 id: artShapeLoader; \n\

9393 objectName: "artShapeLoader"; \n\

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

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

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

9696 active: cardArt != ""; \n\

97− asynchronous: %6; \n\

97+ asynchronous: %5; \n\

9898 visible: status == Loader.Ready; \n\

9999 sourceComponent: Item { \n\

100100 id: artShape; \n\

101101 objectName: "artShape"; \n\

102102 visible: image.status == Image.Ready; \n\

103103 readonly property alias image: artImage; \n\

104− %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\

104+ %6 \n\

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

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

107+ CroppedImageMinimumSourceSize { \n\

108+ id: artImage; \n\

109+ objectName: "artImage"; \n\

110+ source: artShapeLoader.cardArt; \n\

111+ asynchronous: %5; \n\

112+ visible: %4; \n\

113+ width: %2; \n\

114+ height: %3; \n\

115+ %7 \n\

117116 } \n\

117+ } \n\

118+ } \n\

119+ }\n';

120+

121+// %1 is used as anchors of artShapeHolder

122+// %2 is used as image width

123+// %3 is used as image height

124+// %4 is whether the image should be visible

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

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

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

128+// %8 is used as image fallback

129+var kArtShapeHolderCodeCardToolCard = 'Item { \n\

130+ id: artShapeHolder; \n\

131+ height: artShapeLoader.height; \n\

132+ width: artShapeLoader.width; \n\

133+ anchors { %1 } \n\

134+ Loader { \n\

135+ id: artShapeLoader; \n\

136+ objectName: "artShapeLoader"; \n\

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

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

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

140+ asynchronous: %5; \n\

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

142+ sourceComponent: Item { \n\

143+ id: artShape; \n\

144+ objectName: "artShape"; \n\

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

146+ readonly property alias image: artImage; \n\

147+ %6 \n\

148+ width: image.status !== Image.Ready ? 0 : image.width; \n\

149+ height: image.status !== Image.Ready ? 0 : image.height; \n\

118150 CroppedImageMinimumSourceSize { \n\

119151 id: artImage; \n\

120152 objectName: "artImage"; \n\

121153 source: artShapeLoader.cardArt; \n\

122− asynchronous: %6; \n\

154+ asynchronous: %5; \n\

123155 visible: %4; \n\

124156 width: %2; \n\

125157 height: %3; \n\

126− %8 \n\

158+ %7 \n\

127159 } \n\

128160 } \n\

129161 } \n\

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

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

417449 property real fontScale: 1.0; \n\

418450 property var scopeStyle: null; \n\

419− %2\

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

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

422452 property bool showHeader: true; \n\

423453 implicitWidth: childrenRect.width; \n\

424454 enabled: %1; \n\

425455 \n'.arg(templateInteractive);

426456

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

457+ if (!isCardTool) {

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

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

460+ }

428461

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

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

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

483516 if (hasArt) {

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

485518

519+ var artShapeAspect;

520+ if (isCardTool) {

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

522+ if (isNaN(artShapeAspect)) {

523+ artShapeAspect = 1;

524+ }

525+ } else {

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

527+ }

528+

486529 var widthCode, heightCode;

487530 var artAnchors;

488531 if (isHorizontal) {

489532 artAnchors = 'left: parent.left';

490533 if (hasMascot || hasTitle) {

491− widthCode = 'height * artShape.aspect'

534+ widthCode = 'height * ' + artShapeAspect;

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

493536 } else {

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

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

496− widthCode = 'height * artShape.aspect'

539+ widthCode = 'height * ' + artShapeAspect

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

498541 }

499542 } else {

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

501544 widthCode = 'root.width'

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

545+ heightCode = 'width / ' + artShapeAspect;

503546 }

504547

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

506− if (isNaN(aspectRatio)) {

507− aspectRatio = 1;

508− }

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

510549 fallback = encodeURI(fallback);

511550 var fallbackStatusCode = "";

512551 var fallbackURICode = '""';

513552 if (fallback !== "") {

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

515− // which in kArtShapeHolderCode is %9

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

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

554+ // which in kArtShapeHolderCode is %8

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

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

518557 }

519558 var artShapeHolderShapeCode;

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

533572 } else {

534573 artShapeHolderShapeCode = "";

535574 }

536− code += kArtShapeHolderCode.arg(artAnchors)

537− .arg(widthCode)

538− .arg(heightCode)

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

540− .arg(aspectRatio)

541− .arg(asynchronous)

542− .arg(artShapeHolderShapeCode)

543− .arg(fallbackStatusCode)

544− .arg(fallbackURICode);

575+ var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;

576+ code += artShapeHolderCode.arg(artAnchors)

577+ .arg(widthCode)

578+ .arg(heightCode)

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

580+ .arg(asynchronous)

581+ .arg(artShapeHolderShapeCode)

582+ .arg(fallbackStatusCode)

583+ .arg(fallbackURICode);

545584 } else {

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

547586 }

@@ -864,10 +903,6 @@ function cardString(template, components, isCardTool, artShapeStyle) {

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

865904 }

866905

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

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

869−// var touchdownAnchors;

870−// =======

871906 if (hasSocialActions) {

872907 var socialAnchors;

873908 var socialTopAnchor;

plugins/Dash/CardCreatorCache.qml+1−1

@@ -29,7 +29,7 @@ QtObject {

2929

3030 var tString = JSON.stringify(template);

3131 var cString = JSON.stringify(components);

32− var allString = tString + cString + isCardTool;

32+ var allString = tString + cString + isCardTool + artShapeStyle;

3333 var component = cache[allString];

3434 if (component === undefined) {

3535 component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);

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/listviewwithpageheader.cpp+6−4

@@ -287,9 +287,11 @@ void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

287287 m_sectionDelegate = delegate;

288288

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

290− m_topSectionItem->setZ(3);

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

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

290+ if (m_topSectionItem) {

291+ m_topSectionItem->setZ(3);

292+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

293+ connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);

294+ }

293295

294296 // TODO create sections for existing items

295297

@@ -776,7 +778,7 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, b

776778 }

777779 m_sectionDelegate->completeCreate();

778780

779− if (watchGeometry) {

781+ if (watchGeometry && sectionItem) {

780782 QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

781783 }

782784

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)

22pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

44add_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

3232 m_countVisible(false),

3333 m_focused(false),

3434 m_alerting(false),

35+ m_surfaceCount(0),

3536 m_quickList(new QuickListModel(this))

3637{

3738 QuickListEntry nameAction;

@@ -179,6 +180,19 @@ void LauncherItem::setAlerting(bool alerting)

179180 }

180181}

181182

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+

182196unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

183197{

184198 return m_quickList;

plugins/Greeter/Unity/Launcher/launcheritem.h+3−1

@@ -42,6 +42,7 @@ public:

4242 bool countVisible() const override;

4343 bool focused() const override;

4444 bool alerting() const override;

45+ int surfaceCount() const override;

4546

4647 unity::shell::launcher::QuickListModelInterface *quickList() const override;

4748

@@ -56,7 +57,7 @@ private:

5657 void setCountVisible(bool countVisible);

5758 void setFocused(bool focused);

5859 void setAlerting(bool alerting);

59−

60+ void setSurfaceCount(int surfaceCount);

6061

6162private:

6263 QString m_appId;

@@ -70,6 +71,7 @@ private:

7071 bool m_countVisible;

7172 bool m_focused;

7273 bool m_alerting;

74+ int m_surfaceCount;

7375 QuickListModel *m_quickList;

7476

7577 friend class LauncherModel;

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−7

@@ -69,18 +69,13 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

6969 return item->focused();

7070 case RoleRunning:

7171 return item->running();

72+ case RoleSurfaceCount:

73+ return item->surfaceCount();

7274 }

7375

7476 return QVariant();

7577}

7678

77−void LauncherModel::setAlerting(const QString &appId, bool alerting)

78−{

79− Q_UNUSED(appId)

80− Q_UNUSED(alerting)

81− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";

82−}

83−

8479unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

8580{

8681 if (index < 0 || index >= m_list.count()) {

plugins/Greeter/Unity/Launcher/launchermodelas.h−1

@@ -41,7 +41,6 @@ public:

4141

4242 QVariant data(const QModelIndex &index, int role) const override;

4343

44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

4544 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

4645 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

4746 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

plugins/IntegratedLightDM/IntegratedLightDM.qmltypesdeleted−251

@@ -1,251 +0,0 @@

1−import QtQuick.tooling 1.1

2−

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

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

5−//

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

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

8−

9−Module {

10− Component {

11− name: "Greeter"

12− prototype: "QObject"

13− exports: ["LightDM/Greeter 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Property { name: "active"; type: "bool" }

18− Property { name: "authenticated"; type: "bool"; isReadonly: true }

19− Property { name: "authenticationUser"; type: "string"; isReadonly: true }

20− Property { name: "promptless"; type: "bool"; isReadonly: true }

21− Signal {

22− name: "showMessage"

23− Parameter { name: "text"; type: "string" }

24− Parameter { name: "isError"; type: "bool" }

25− }

26− Signal {

27− name: "showPrompt"

28− Parameter { name: "text"; type: "string" }

29− Parameter { name: "isSecret"; type: "bool" }

30− Parameter { name: "isDefaultPrompt"; type: "bool" }

31− }

32− Signal { name: "authenticationComplete" }

33− Signal {

34− name: "authenticationUserChanged"

35− Parameter { name: "user"; type: "string" }

36− }

37− Signal { name: "isActiveChanged" }

38− Signal { name: "isAuthenticatedChanged" }

39− Signal { name: "showGreeter" }

40− Signal { name: "hideGreeter" }

41− Signal {

42− name: "requestAuthenticationUser"

43− Parameter { name: "user"; type: "string" }

44− }

45− Method {

46− name: "authenticate"

47− Parameter { name: "username"; type: "string" }

48− }

49− Method { name: "authenticate" }

50− Method {

51− name: "respond"

52− Parameter { name: "response"; type: "string" }

53− }

54− Method {

55− name: "startSessionSync"

56− type: "bool"

57− Parameter { name: "session"; type: "string" }

58− }

59− Method { name: "startSessionSync"; type: "bool" }

60− Method {

61− name: "setIsActive"

62− Parameter { name: "isActive"; type: "bool" }

63− }

64− }

65− Component {

66− name: "QAbstractProxyModel"

67− prototype: "QAbstractItemModel"

68− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }

69− }

70− Component {

71− name: "QLightDM::UsersModel"

72− prototype: "QAbstractListModel"

73− exports: ["LightDM/UserRoles 0.1"]

74− isCreatable: false

75− exportMetaObjectRevisions: [0]

76− Enum {

77− name: "UserModelRoles"

78− values: {

79− "NameRole": 256,

80− "RealNameRole": 257,

81− "LoggedInRole": 258,

82− "BackgroundRole": 259,

83− "SessionRole": 260,

84− "HasMessagesRole": 261,

85− "ImagePathRole": 262,

86− "BackgroundPathRole": 263

87− }

88− }

89− }

90− Component {

91− name: "QSortFilterProxyModel"

92− prototype: "QAbstractProxyModel"

93− Property { name: "filterRegExp"; type: "QRegExp" }

94− Property { name: "filterKeyColumn"; type: "int" }

95− Property { name: "dynamicSortFilter"; type: "bool" }

96− Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }

97− Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }

98− Property { name: "isSortLocaleAware"; type: "bool" }

99− Property { name: "sortRole"; type: "int" }

100− Property { name: "filterRole"; type: "int" }

101− Method {

102− name: "setFilterRegExp"

103− Parameter { name: "pattern"; type: "string" }

104− }

105− Method {

106− name: "setFilterWildcard"

107− Parameter { name: "pattern"; type: "string" }

108− }

109− Method {

110− name: "setFilterFixedString"

111− Parameter { name: "pattern"; type: "string" }

112− }

113− Method { name: "clear" }

114− Method { name: "invalidate" }

115− }

116− Component {

117− name: "UnitySortFilterProxyModelQML"

118− prototype: "QSortFilterProxyModel"

119− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

120− Property { name: "totalCount"; type: "int"; isReadonly: true }

121− Property { name: "count"; type: "int"; isReadonly: true }

122− Property { name: "invertMatch"; type: "bool" }

123− Signal {

124− name: "invertMatchChanged"

125− Parameter { type: "bool" }

126− }

127− Method {

128− name: "get"

129− type: "QVariantMap"

130− Parameter { name: "row"; type: "int" }

131− }

132− Method {

133− name: "data"

134− type: "QVariant"

135− Parameter { name: "row"; type: "int" }

136− Parameter { name: "role"; type: "int" }

137− }

138− Method { name: "count"; type: "int" }

139− Method {

140− name: "findFirst"

141− type: "int"

142− Parameter { name: "role"; type: "int" }

143− Parameter { name: "value"; type: "QVariant" }

144− }

145− Method {

146− name: "mapRowToSource"

147− type: "int"

148− Parameter { name: "row"; type: "int" }

149− }

150− Method {

151− name: "mapFromSource"

152− type: "int"

153− Parameter { name: "row"; type: "int" }

154− }

155− Method {

156− name: "mapToSource"

157− type: "int"

158− Parameter { name: "row"; type: "int" }

159− }

160− }

161− Component {

162− name: "UserMetricsOutput::ColorTheme"

163− prototype: "QObject"

164− Property { name: "start"; type: "QColor"; isReadonly: true }

165− Property { name: "main"; type: "QColor"; isReadonly: true }

166− Property { name: "end"; type: "QColor"; isReadonly: true }

167− Signal {

168− name: "startChanged"

169− Parameter { name: "color"; type: "QColor" }

170− }

171− Signal {

172− name: "mainChanged"

173− Parameter { name: "color"; type: "QColor" }

174− }

175− Signal {

176− name: "endChanged"

177− Parameter { name: "color"; type: "QColor" }

178− }

179− }

180− Component {

181− name: "UserMetricsOutput::UserMetrics"

182− prototype: "QObject"

183− exports: ["LightDM/Infographic 0.1"]

184− isCreatable: false

185− isSingleton: true

186− exportMetaObjectRevisions: [0]

187− Property { name: "label"; type: "string"; isReadonly: true }

188− Property { name: "username"; type: "string" }

189− Property {

190− name: "firstColor"

191− type: "UserMetricsOutput::ColorTheme"

192− isReadonly: true

193− isPointer: true

194− }

195− Property {

196− name: "secondColor"

197− type: "UserMetricsOutput::ColorTheme"

198− isReadonly: true

199− isPointer: true

200− }

201− Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }

202− Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }

203− Property { name: "currentDay"; type: "int"; isReadonly: true }

204− Signal {

205− name: "labelChanged"

206− Parameter { name: "label"; type: "string" }

207− }

208− Signal {

209− name: "usernameChanged"

210− Parameter { name: "username"; type: "string" }

211− }

212− Signal {

213− name: "firstColorChanged"

214− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }

215− }

216− Signal {

217− name: "firstMonthChanged"

218− Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }

219− }

220− Signal {

221− name: "currentDayChanged"

222− Parameter { name: "currentDay"; type: "int" }

223− }

224− Signal {

225− name: "secondColorChanged"

226− Parameter { name: "color"; type: "ColorTheme"; isPointer: true }

227− }

228− Signal {

229− name: "secondMonthChanged"

230− Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }

231− }

232− Signal { name: "nextDataSource" }

233− Signal { name: "readyForDataChange" }

234− Signal { name: "dataAboutToAppear" }

235− Signal { name: "dataAppeared" }

236− Signal { name: "dataAboutToChange" }

237− Signal { name: "dataChanged" }

238− Signal { name: "dataAboutToDisappear" }

239− Signal { name: "dataDisappeared" }

240− Method { name: "nextDataSourceSlot" }

241− Method { name: "readyForDataChangeSlot" }

242− }

243− Component {

244− name: "UsersModel"

245− prototype: "UnitySortFilterProxyModelQML"

246− exports: ["LightDM/Users 0.1"]

247− isCreatable: false

248− isSingleton: true

249− exportMetaObjectRevisions: [0]

250− }

251−}

plugins/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/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/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/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−1

@@ -225,7 +225,7 @@ void TouchDispatcher::dispatchAsMouse(

225225 QEvent::Type eventType;

226226 if (touchMouse->state() == Qt::TouchPointPressed) {

227227 eventType = QEvent::MouseButtonPress;

228− } if (touchMouse->state() == Qt::TouchPointReleased) {

228+ } else if (touchMouse->state() == Qt::TouchPointReleased) {

229229 eventType = QEvent::MouseButtonRelease;

230230 m_touchMouseId = -1;

231231 } else {

plugins/Ubuntu/Gestures/TouchGestureArea.cpp+7−9

@@ -375,7 +375,7 @@ void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *even

375375 }

376376 }

377377

378− if (m_candidateTouches.count() == 0) {

378+ if (m_candidateTouches.isEmpty()) {

379379 setInternalStatus(InternalStatus::WaitingForTouch);

380380 }

381381}

@@ -439,7 +439,7 @@ void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)

439439 }

440440 }

441441

442− if (m_watchedTouches.count() == 0) {

442+ if (m_watchedTouches.isEmpty()) {

443443 setInternalStatus(InternalStatus::WaitingForTouch);

444444 }

445445}

@@ -527,7 +527,7 @@ void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)

527527 if (updateable) {

528528 if (!dragging() && m_status == InternalStatus::Recognized) {

529529 bool allWantDrag = !m_liveTouchPoints.isEmpty();

530− Q_FOREACH(auto point, m_liveTouchPoints) {

530+ Q_FOREACH(const auto &point, m_liveTouchPoints) {

531531 allWantDrag &= point->dragging();

532532 }

533533 // only dragging if all points are dragging.

@@ -646,11 +646,9 @@ bool TouchGestureArea::dragging() const

646646QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()

647647{

648648 return QQmlListProperty<GestureTouchPoint>(this,

649− 0,

650− nullptr,

651− TouchGestureArea::touchPoint_count,

652− TouchGestureArea::touchPoint_at,

653− 0);

649+ nullptr,

650+ TouchGestureArea::touchPoint_count,

651+ TouchGestureArea::touchPoint_at);

654652}

655653

656654int TouchGestureArea::minimumTouchPoints() const

@@ -721,7 +719,7 @@ void TouchGestureArea::rejectGesture()

721719 }

722720 m_candidateTouches.clear();

723721

724− if (m_watchedTouches.count() == 0) {

722+ if (m_watchedTouches.isEmpty()) {

725723 setInternalStatus(InternalStatus::WaitingForTouch);

726724 } else {

727725 setInternalStatus(InternalStatus::Rejected);

plugins/Ubuntu/Gestures/TouchGestureArea.h+7−7

@@ -105,8 +105,8 @@ private:

105105/*

106106 An area that detects multi-finger gestures.

107107

108− We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.

109− This components uses the touch registry to apply for ownership of touch points.

108+ We can use this to detect gestures constrained by a minimum and/or maximum number of touch points.

109+ This component uses the touch registry to apply for ownership of touch points.

110110 This way we can use the component in conjuntion with the directional drag area to compete for ownwership

111111 or gestures; unlike the MultiPointTouchArea.

112112 */

@@ -136,7 +136,7 @@ public:

136136 Recognized,

137137 Rejected

138138 };

139− TouchGestureArea(QQuickItem* parent = NULL);

139+ TouchGestureArea(QQuickItem* parent = nullptr);

140140 ~TouchGestureArea();

141141

142142 bool event(QEvent *e) override;

@@ -164,10 +164,10 @@ Q_SIGNALS:

164164

165165 void touchPointsUpdated();

166166 void draggingChanged(bool dragging);

167− void minimumTouchPointsChanged(bool value);

168− void maximumTouchPointsChanged(bool value);

169− void recognitionPeriodChanged(bool value);

170− void releaseRejectPeriodChanged(bool value);

167+ void minimumTouchPointsChanged(int value);

168+ void maximumTouchPointsChanged(int value);

169+ void recognitionPeriodChanged(int value);

170+ void releaseRejectPeriodChanged(int value);

171171

172172 void pressed(const QList<QObject*>& points);

173173 void released(const QList<QObject*>& points);

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/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/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/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/InputInfo/InputInfo.qmltypesdeleted−71

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

1−import QtQuick.tooling 1.1

2−

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

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

5−//

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

7−// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "QDeclarativeInputDeviceModel"

12− prototype: "QAbstractListModel"

13− exports: ["Unity.InputInfo/InputDeviceModel 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "deviceFilter"; type: "QInputDevice::InputType" }

16− Property { name: "count"; type: "int"; isReadonly: true }

17− Signal {

18− name: "deviceAdded"

19− Parameter { name: "devicePath"; type: "string" }

20− }

21− Signal {

22− name: "deviceRemoved"

23− Parameter { name: "devicePath"; type: "string" }

24− }

25− Signal {

26− name: "deviceFilterChanged"

27− Parameter { name: "filter"; type: "QInputDevice::InputType" }

28− }

29− Method { name: "updateDeviceList" }

30− Method {

31− name: "indexOf"

32− type: "int"

33− Parameter { name: "devicePath"; type: "string" }

34− }

35− Method {

36− name: "get"

37− type: "QInputDevice*"

38− Parameter { name: "index"; type: "int" }

39− }

40− }

41− Component {

42− name: "QInputDevice"

43− prototype: "QObject"

44− exports: ["Unity.InputInfo/InputInfo 0.1"]

45− exportMetaObjectRevisions: [0]

46− Enum {

47− name: "InputType"

48− values: {

49− "Unknown": 0,

50− "Button": 1,

51− "Mouse": 2,

52− "TouchPad": 4,

53− "TouchScreen": 8,

54− "Keyboard": 16,

55− "Switch": 32

56− }

57− }

58− Enum {

59− name: "InputTypeFlags"

60− values: {

61− "Unknown": 0,

62− "Button": 1,

63− "Mouse": 2,

64− "TouchPad": 4,

65− "TouchScreen": 8,

66− "Keyboard": 16,

67− "Switch": 32

68− }

69− }

70− }

71−}

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+7−2

@@ -44,6 +44,7 @@

4444#include <libudev.h>

4545#include <libevdev/libevdev.h>

4646#include <fcntl.h>

47+#include <unistd.h>

4748#include <QDebug>

4849#include <QSocketNotifier>

4950#include <QTimer>

@@ -52,6 +53,7 @@

5253QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :

5354 QObject(parent),

5455 currentFilter(QInputDevice::Unknown),

56+ udevMonitor(0),

5557 udevice(0)

5658{

5759 QTimer::singleShot(250,this,SLOT(init()));

@@ -83,9 +85,9 @@ void QInputDeviceManagerPrivate::init()

8385 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());

8486

8587 udev_monitor_enable_receiving(udevMonitor);

86− notifierFd = udev_monitor_get_fd(udevMonitor);

88+ int notifierFd = udev_monitor_get_fd(udevMonitor);

8789

88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

8991 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));

9092

9193 udev_enumerate_scan_devices(enumerate);

@@ -168,6 +170,7 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

168170 rc = libevdev_new_from_fd(fd, &dev);

169171 if (rc < 0) {

170172 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";

173+ close(fd);

171174 return Q_NULLPTR;

172175 }

173176

@@ -195,6 +198,8 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

195198 }

196199 }

197200

201+ libevdev_free(dev);

202+ close(fd);

198203 return inputDevice;

199204}

200205

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2

@@ -83,8 +83,6 @@ private:

8383

8484 QInputDevice *addDevice(const QString &path);

8585 void removeDevice(const QString &path);

86− QSocketNotifier *notifier;

87− int notifierFd;

8886 struct udev_monitor *udevMonitor;

8987 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);

9088 struct udev *udevice;

plugins/Unity/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)

22pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

44add_definitions(-DSM_BUSNAME=systemBus)

@@ -23,6 +23,8 @@ set(QMLLAUNCHERPLUGIN_SRC

2323 asadapter.cpp

2424 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

2525 ${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

2628 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

2729 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

2830 ${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'