ccf5215 · unity8 · git.iko.soy

CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -57,7 +57,7 @@ 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=16)

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

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)

debian/control+2−2

@@ -32,7 +32,7 @@ Build-Depends: cmake,

32 libubuntugestures5-dev,

33 libubuntugestures5-private-dev,

34 libudev-dev,

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

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

36 libusermetricsoutput1-dev,

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

38 libx11-dev[!armhf],

@@ -135,7 +135,7 @@ Depends: qml-module-qtquick-layouts,

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,

137 ubuntu-thumbnailer-impl-0,

138− unity-application-impl-16,

138+ unity-application-impl-17,

139 unity-notifications-impl-3,

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

141 unity-scopes-impl-12,

plugins/Cursor/CMakeLists.txt+2−1

@@ -8,8 +8,9 @@ include_directories(

8

9set(QMLPLUGIN_SRC

10 plugin.cpp

11− MousePointer.cpp

11+ CursorImageInfo.cpp

12 CursorImageProvider.cpp

13+ MousePointer.cpp

13 # We need to run moc on this header

14 # We need to run moc on this header

14 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

15 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

15 )

16 )

plugins/Cursor/Cursor.qml+21−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,14 +15,30 @@

15 */

16

17import QtQuick 2.4

18−import Cursor 1.0 // For MousePointer

18+import Cursor 1.1

19

20MousePointer {

21 id: mousePointer

22

23− Image {

23+ CursorImageInfo {

24− x: -mousePointer.hotspotX

24+ id: imageInfo

25− y: -mousePointer.hotspotY

25+ themeName: mousePointer.themeName

26+ cursorName: mousePointer.cursorName

27+ }

28+

29+ AnimatedSprite {

30+ x: -imageInfo.hotspot.x

31+ y: -imageInfo.hotspot.y

26 source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName

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

33+

34+ interpolate: false

35+

36+ width: imageInfo.frameWidth

37+ height: imageInfo.frameHeight

38+

39+ frameCount: imageInfo.frameCount

40+ frameDuration: imageInfo.frameDuration

41+ frameWidth: imageInfo.frameWidth

42+ frameHeight: imageInfo.frameHeight

27 }

43 }

28}

44}

plugins/Cursor/Cursor.qmltypesdeleted−78

@@ -1,78 +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 Cursor 1.0 plugins'

8−

9−Module {

10− Component {

11− name: "MirMousePointerInterface"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− Property { name: "cursorName"; type: "string"; isReadonly: true }

15− Property { name: "themeName"; type: "string"; isReadonly: true }

16− Property { name: "hotspotX"; type: "double"; isReadonly: true }

17− Property { name: "hotspotY"; type: "double"; isReadonly: true }

18− Signal {

19− name: "cursorNameChanged"

20− Parameter { name: "name"; type: "string" }

21− }

22− Signal {

23− name: "themeNameChanged"

24− Parameter { name: "name"; type: "string" }

25− }

26− Signal {

27− name: "hotspotXChanged"

28− Parameter { name: "value"; type: "double" }

29− }

30− Signal {

31− name: "hotspotYChanged"

32− Parameter { name: "value"; type: "double" }

33− }

34− Method {

35− name: "handleMouseEvent"

36− Parameter { name: "timestamp"; type: "ulong" }

37− Parameter { name: "movement"; type: "QPointF" }

38− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

39− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

40− }

41− Method {

42− name: "handleWheelEvent"

43− Parameter { name: "timestamp"; type: "ulong" }

44− Parameter { name: "angleDelta"; type: "QPoint" }

45− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

46− }

47− }

48− Component {

49− name: "MousePointer"

50− defaultProperty: "data"

51− prototype: "MirMousePointerInterface"

52− exports: ["Cursor/MousePointer 1.0"]

53− exportMetaObjectRevisions: [0]

54− Signal {

55− name: "pushedLeftBoundary"

56− Parameter { name: "amount"; type: "double" }

57− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

58− }

59− Signal {

60− name: "pushedRightBoundary"

61− Parameter { name: "amount"; type: "double" }

62− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

63− }

64− Method {

65− name: "handleMouseEvent"

66− Parameter { name: "timestamp"; type: "ulong" }

67− Parameter { name: "movement"; type: "QPointF" }

68− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

69− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

70− }

71− Method {

72− name: "handleWheelEvent"

73− Parameter { name: "timestamp"; type: "ulong" }

74− Parameter { name: "angleDelta"; type: "QPoint" }

75− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

76− }

77− }

78−}

plugins/Cursor/CursorImageInfo.cppnew file+106

@@ -0,0 +1,106 @@

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 "CursorImageInfo.h"

18+

19+CursorImageInfo::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+}

26+

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

28+{

29+ if (cursorName != m_cursorName) {

30+ m_cursorName = cursorName;

31+ Q_EMIT cursorNameChanged();

32+ scheduleUpdate();

33+ }

34+}

35+

36+void CursorImageInfo::setThemeName(const QString &themeName)

37+{

38+ if (m_themeName != themeName) {

39+ m_themeName = themeName;

40+ Q_EMIT themeNameChanged();

41+ scheduleUpdate();

42+ }

43+}

44+

45+void CursorImageInfo::scheduleUpdate()

46+{

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

48+ m_updateTimer.start();

49+ }

50+}

51+

52+void CursorImageInfo::update()

53+{

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

55+

56+ Q_EMIT hotspotChanged();

57+ Q_EMIT frameWidthChanged();

58+ Q_EMIT frameHeightChanged();

59+ Q_EMIT frameCountChanged();

60+ Q_EMIT frameDurationChanged();

61+}

62+

63+QPoint CursorImageInfo::hotspot() const

64+{

65+ if (m_cursorImage) {

66+ return m_cursorImage->hotspot;

67+ } else {

68+ return QPoint();

69+ }

70+}

71+

72+qreal CursorImageInfo::frameWidth() const

73+{

74+ if (m_cursorImage) {

75+ return m_cursorImage->frameWidth;

76+ } else {

77+ return 0;

78+ }

79+}

80+

81+qreal CursorImageInfo::frameHeight() const

82+{

83+ if (m_cursorImage) {

84+ return m_cursorImage->frameHeight;

85+ } else {

86+ return 0;

87+ }

88+}

89+

90+int CursorImageInfo::frameCount() const

91+{

92+ if (m_cursorImage) {

93+ return m_cursorImage->frameCount;

94+ } else {

95+ return 0;

96+ }

97+}

98+

99+int CursorImageInfo::frameDuration() const

100+{

101+ if (m_cursorImage) {

102+ return m_cursorImage->frameDuration;

103+ } else {

104+ return 0;

105+ }

106+}

plugins/Cursor/CursorImageInfo.hnew file+76

@@ -0,0 +1,76 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

11+ * GNU General Public License for more details.

12+ *

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

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

15+ */

16+

17+#ifndef CURSOR_IMAGE_INFO_H

18+#define CURSOR_IMAGE_INFO_H

19+

20+#include "CursorImageProvider.h"

21+

22+#include <QObject>

23+#include <QString>

24+#include <QTimer>

25+

26+class CursorImageInfo : public QObject

27+{

28+ Q_OBJECT

29+

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

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

32+

33+ Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)

34+ Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)

35+ Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)

36+ Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)

37+ Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)

38+

39+public:

40+ CursorImageInfo(QObject *parent = nullptr);

41+

42+ QString themeName() const { return m_themeName; }

43+ void setThemeName(const QString &);

44+

45+ QString cursorName() const { return m_cursorName; }

46+ void setCursorName(const QString &);

47+

48+ QPoint hotspot() const;

49+ qreal frameWidth() const;

50+ qreal frameHeight() const;

51+ int frameCount() const;

52+ int frameDuration() const;

53+

54+Q_SIGNALS:

55+ void themeNameChanged();

56+ void cursorNameChanged();

57+ void hotspotChanged();

58+ void frameWidthChanged();

59+ void frameHeightChanged();

60+ void frameCountChanged();

61+ void frameDurationChanged();

62+

63+private Q_SLOTS:

64+ void update();

65+

66+private:

67+ void scheduleUpdate();

68+ QTimer m_updateTimer;

69+

70+ QString m_themeName;

71+ QString m_cursorName;

72+

73+ CursorImage *m_cursorImage{nullptr};

74+};

75+

76+#endif // CURSOR_IMAGE_INFO_H

plugins/Cursor/CursorImageProvider.cpp+50−21

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

@@ -46,6 +46,9 @@ BuiltInCursorImage::BuiltInCursorImage()

46 qimage.fill(Qt::transparent);

47 QPainter imagePainter(&qimage);

48

49+ frameWidth = qimage.width();

50+ frameHeight = qimage.height();

51+

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

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

50 svgRenderer->render(&imagePainter);

53 svgRenderer->render(&imagePainter);

51 delete svgRenderer;

54 delete svgRenderer;

@@ -59,6 +62,8 @@ BlankCursorImage::BlankCursorImage()

59{

62{

60 qimage = QImage(1, 1, QImage::Format_ARGB32);

63 qimage = QImage(1, 1, QImage::Format_ARGB32);

61 qimage.fill(Qt::transparent);

64 qimage.fill(Qt::transparent);

65+ frameWidth = qimage.width();

66+ frameHeight = qimage.height();

62}

67}

63

68

64/////

69/////

@@ -69,40 +74,74 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)

69{

74{

70 qimage = cursor.pixmap().toImage();

75 qimage = cursor.pixmap().toImage();

71 hotspot = cursor.hotSpot();

76 hotspot = cursor.hotSpot();

77+ frameWidth = qimage.width();

78+ frameHeight = qimage.height();

72}

79}

73

80

74/////

81/////

75// XCursorImage

82// XCursorImage

76

83

77XCursorImage::XCursorImage(const QString &theme, const QString &file)

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

78− : xcursorImages(nullptr)

79{

85{

80 // TODO: Consider grid unit value

86 // TODO: Consider grid unit value

81 // Hardcoding to a medium size for now

87 // Hardcoding to a medium size for now

82 int preferredCursorHeightPx = 32;

88 int preferredCursorHeightPx = 32;

83

89

84− xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),

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

85 preferredCursorHeightPx);

91 preferredCursorHeightPx);

86− if (!xcursorImages) {

92+ if (!xcursorImages || xcursorImages->nimage == 0) {

87 return;

93 return;

88 }

94 }

89

95

90− // Just take the first one. It will have multiple images in case of an animated cursor.

96+ frameCount = xcursorImages->nimage;

91− // TODO: Support animated cursors

92− if ( xcursorImages->nimage > 0) {

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

94

97

95− qimage = QImage((uchar*)xcursorImage->pixels,

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

96− xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);

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

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

101+ frameWidth = xcursorImage->width;

102+ }

103+ if (frameHeight < (int)xcursorImage->height) {

104+ frameHeight = xcursorImage->height;

105+ }

106+ if (i == 0) {

107+ frameDuration = (int)xcursorImage->delay;

108+ } else {

109+ if (frameDuration != (int)xcursorImage->delay) {

110+ qWarning().nospace() << "CursorImageProvider: XCursorImage("<<theme<<","<<file<<") has"

111+ " varying delays in its animation. Animation won't look right.";

112+ }

113+ }

114+ }

97

115

116+ {

117+ // Assume that the hotspot position does not animate

118+ XcursorImage *xcursorImage = xcursorImages->images[0];

98 hotspot.setX(xcursorImage->xhot);

119 hotspot.setX(xcursorImage->xhot);

99 hotspot.setY(xcursorImage->yhot);

120 hotspot.setY(xcursorImage->yhot);

100 }

121 }

122+

123+ // Build the sprite as a single row of frames

124+ qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);

125+ qimage.fill(Qt::transparent);

126+

127+ {

128+ QPainter painter(&qimage);

129+

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

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

132+

133+ auto frameImage = QImage((uchar*)xcursorImage->pixels,

134+ xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);

135+

136+ painter.drawImage(QPoint(i*frameWidth, 0), frameImage);

137+ }

138+ }

139+

140+ XcursorImagesDestroy(xcursorImages);

101}

141}

102

142

103XCursorImage::~XCursorImage()

143XCursorImage::~XCursorImage()

104{

144{

105− XcursorImagesDestroy(xcursorImages);

106}

145}

107

146

108/////

147/////

@@ -205,16 +244,6 @@ QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSiz

205 return cursorImage->qimage;

244 return cursorImage->qimage;

206}

245}

207

246

208−QPoint CursorImageProvider::hotspot(const QString &themeName, const QString &cursorName)

209−{

210− CursorImage *cursorImage = fetchCursor(themeName, cursorName);

211− if (cursorImage) {

212− return cursorImage->hotspot;

213− } else {

214− return QPoint(0,0);

215− }

216−}

217−

218CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)

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

219{

248{

220 QString themeName;

249 QString themeName;

plugins/Cursor/CursorImageProvider.h+12−4

@@ -31,15 +31,23 @@ public:

31 virtual ~CursorImage() {}

32

33 QImage qimage;

34+

35+ // TODO: consider if there's a need to animate the hotspot

36+ // ie, if there's a need to make it an array of points, one for each frame.

37+ // Maybe no single xcursor (or at least the ones we know of or use)

38+ // vary its hotspot position through its animation.

34 QPoint hotspot;

39 QPoint hotspot;

40+

41+ int frameWidth{0};

42+ int frameHeight{0};

43+ int frameCount{1};

44+ int frameDuration{40};

35};

45};

36

46

37class XCursorImage : public CursorImage {

47class XCursorImage : public CursorImage {

38public:

48public:

39 XCursorImage(const QString &theme, const QString &file);

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

40 virtual ~XCursorImage();

50 virtual ~XCursorImage();

41−

42− XcursorImages *xcursorImages;

43};

51};

44

52

45class BuiltInCursorImage : public CursorImage {

53class BuiltInCursorImage : public CursorImage {

@@ -68,16 +76,16 @@ public:

68

76

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

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

70

78

71− QPoint hotspot(const QString &themeName, const QString &cursorName);

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

72

80

73 void setCustomCursor(const QCursor &customCursor);

81 void setCustomCursor(const QCursor &customCursor);

74

82

75private:

83private:

76 CursorImage *fetchCursor(const QString &cursorThemeAndName);

84 CursorImage *fetchCursor(const QString &cursorThemeAndName);

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

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

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

79

86

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

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

88+ // TODO: discard old, unused, cursors

81 QMap<QString, QMap<QString, CursorImage*> > m_cursors;

89 QMap<QString, QMap<QString, CursorImage*> > m_cursors;

82

90

83 QScopedPointer<CursorImage> m_builtInCursorImage;

91 QScopedPointer<CursorImage> m_builtInCursorImage;

plugins/Cursor/MousePointer.cpp−19

@@ -29,10 +29,7 @@ MousePointer::MousePointer(QQuickItem *parent)

29 : MirMousePointerInterface(parent)

30 , m_cursorName(QStringLiteral("left_ptr"))

31 , m_themeName(QStringLiteral("default"))

32− , m_hotspotX(0)

33− , m_hotspotY(0)

34{

32{

35− updateHotspot();

36}

33}

37

34

38void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

35void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

@@ -139,22 +136,6 @@ void MousePointer::setCursorName(const QString &cursorName)

139 if (cursorName != m_cursorName) {

136 if (cursorName != m_cursorName) {

140 m_cursorName = cursorName;

137 m_cursorName = cursorName;

141 Q_EMIT cursorNameChanged(m_cursorName);

138 Q_EMIT cursorNameChanged(m_cursorName);

142− updateHotspot();

143− }

144−}

145−

146−void MousePointer::updateHotspot()

147−{

148− QPoint newHotspot = CursorImageProvider::instance()->hotspot(m_themeName, m_cursorName);

149−

150− if (m_hotspotX != newHotspot.x()) {

151− m_hotspotX = newHotspot.x();

152− Q_EMIT hotspotXChanged(m_hotspotX);

153− }

154−

155− if (m_hotspotY != newHotspot.y()) {

156− m_hotspotY = newHotspot.y();

157− Q_EMIT hotspotYChanged(m_hotspotY);

158 }

139 }

159}

140}

160

141

plugins/Cursor/MousePointer.h−6

@@ -36,9 +36,6 @@ public:

36 void setThemeName(const QString &themeName) override;

37 QString themeName() const override { return m_themeName; }

38

39− qreal hotspotX() const override { return m_hotspotX; }

40− qreal hotspotY() const override { return m_hotspotY; }

41−

42 void setCustomCursor(const QCursor &) override;

39 void setCustomCursor(const QCursor &) override;

43

40

44public Q_SLOTS:

41public Q_SLOTS:

@@ -59,14 +56,11 @@ private Q_SLOTS:

59

56

60private:

57private:

61 void registerWindow(QWindow *window);

58 void registerWindow(QWindow *window);

62− void updateHotspot();

63

59

64 QPointer<QWindow> m_registeredWindow;

60 QPointer<QWindow> m_registeredWindow;

65 QPointer<QScreen> m_registeredScreen;

61 QPointer<QScreen> m_registeredScreen;

66 QString m_cursorName;

62 QString m_cursorName;

67 QString m_themeName;

63 QString m_themeName;

68− int m_hotspotX;

69− int m_hotspotY;

70};

64};

71

65

72#endif // MOUSEPOINTER_H

66#endif // MOUSEPOINTER_H

plugins/Cursor/plugin.cpp+4−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

@@ -22,13 +22,15 @@

22#include "plugin.h"

23

24// local

25+#include "CursorImageInfo.h"

25#include "CursorImageProvider.h"

26#include "CursorImageProvider.h"

26#include "MousePointer.h"

27#include "MousePointer.h"

27

28

28void CursorPlugin::registerTypes(const char *uri)

29void CursorPlugin::registerTypes(const char *uri)

29{

30{

30 Q_ASSERT(uri == QLatin1String("Cursor"));

31 Q_ASSERT(uri == QLatin1String("Cursor"));

32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");

31− qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");

33+ qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");

32}

34}

33

35

34void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

36void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/Cursor/qmldir+1−1

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

1module Cursor

2plugin Cursor-qml

3−Cursor 1.0 Cursor.qml

3+Cursor 1.1 Cursor.qml

qml/Shell.qml+1−1

@@ -41,7 +41,7 @@ import Unity.Notifications 1.0 as NotificationBackend

41import Unity.Session 0.1

42import Unity.DashCommunicator 0.1

43import Unity.Indicators 0.1 as Indicators

44−import Cursor 1.0

44+import Cursor 1.1

45import WindowManager 0.1

46

47

tests/mocks/Cursor/qmldir+1−1

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

1module Cursor

2−Cursor 1.0 Cursor.qml

2+Cursor 1.1 Cursor.qml

tests/plugins/CMakeLists.txt+2−1

@@ -1,8 +1,9 @@

1add_subdirectory(AccountsService)

2+add_subdirectory(Cursor)

3+add_subdirectory(Dash)

2add_subdirectory(GlobalShortcut)

4add_subdirectory(GlobalShortcut)

3add_subdirectory(Greeter)

5add_subdirectory(Greeter)

4add_subdirectory(IntegratedLightDM)

6add_subdirectory(IntegratedLightDM)

5−add_subdirectory(Dash)

6add_subdirectory(Ubuntu)

7add_subdirectory(Ubuntu)

7add_subdirectory(Unity)

8add_subdirectory(Unity)

8add_subdirectory(Utils)

9add_subdirectory(Utils)

tests/plugins/Cursor/CMakeLists.txtnew file+8

@@ -0,0 +1,8 @@

1+include(QmlTest)

2+

3+set(UNITY_IMPORT_PATHS

4+ ${CMAKE_BINARY_DIR}/tests/utils/modules

5+ ${UNITY_PLUGINPATH}

6+)

7+

8+add_manual_qml_test(. Cursor IMPORT_PATHS ${UNITY_IMPORT_PATHS})

tests/plugins/Cursor/TextEntry.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation.

7+ *

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

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

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

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

15+ */

16+

17+import QtQuick 2.4

18+

19+Column {

20+ property alias name: entryText.text

21+ property alias value: textInput.text

22+ Text { id: entryText }

23+ Rectangle {

24+ color: "white"

25+ width: parent.width - 20

26+ height: 40

27+ TextInput {

28+ id: textInput

29+ anchors.fill: parent

30+ verticalAlignment: TextInput.AlignVCenter

31+ selectByMouse: true

32+ }

33+ }

34+}

tests/plugins/Cursor/tst_Cursor.qmlnew file+144

@@ -0,0 +1,144 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation.

7+ *

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

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

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

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

15+ */

16+

17+

18+import QtQuick 2.4

19+import Cursor 1.1

20+

21+Rectangle {

22+ id: root

23+ color: "blue"

24+ width: 400

25+ height: 600

26+

27+ property string themeName: "default"

28+ property string cursorName: "left_ptr"

29+

30+ CursorImageInfo {

31+ id: imageInfo

32+ themeName: root.themeName

33+ cursorName: root.cursorName

34+ }

35+

36+ Item {

37+ id: cursor

38+ x: (200 - animatedSprite.width) / 2

39+ y: (root.height - animatedSprite.height) / 2

40+

41+ AnimatedSprite {

42+ id: animatedSprite

43+

44+ x: -imageInfo.hotspot.x

45+ y: -imageInfo.hotspot.y

46+ source: "image://cursor/" + root.themeName + "/" + root.cursorName

47+

48+ interpolate: false

49+

50+ width: imageInfo.frameWidth

51+ height: imageInfo.frameHeight

52+

53+ frameCount: imageInfo.frameCount

54+ frameDuration: imageInfo.frameDuration

55+ frameWidth: imageInfo.frameWidth

56+ frameHeight: imageInfo.frameHeight

57+ }

58+ }

59+

60+ Rectangle {

61+ id: hotspotCrossH

62+ color: "red"

63+ width: 200

64+ height: 1

65+ anchors.top: cursor.top

66+ opacity: 0.6

67+ }

68+ Rectangle {

69+ id: hotspotCrossV

70+ color: "red"

71+ width: 1

72+ anchors.left: cursor.left

73+ anchors.top: parent.top

74+ anchors.bottom: parent.bottom

75+ opacity: 0.6

76+ }

77+ MouseArea {

78+ anchors.top: parent.top

79+ anchors.bottom: parent.bottom

80+ anchors.left: parent.left

81+ anchors.right: controls.left

82+ onClicked: {

83+ if (hotspotCrossH.visible) {

84+ hotspotCrossH.visible = false;

85+ hotspotCrossV.visible = false;

86+ } else {

87+ hotspotCrossH.visible = true;

88+ hotspotCrossV.visible = true;

89+ }

90+ }

91+ }

92+

93+ Rectangle {

94+ id: controls

95+ color: "lightgrey"

96+ anchors.right: parent.right

97+ anchors.top: parent.top

98+ anchors.bottom: parent.bottom

99+ width: root.width - 200

100+

101+ Column {

102+ anchors.fill: parent

103+ anchors.margins: 10

104+

105+ TextEntry { id: themeNameEntry; name: "themeName"; value: "default" }

106+

107+ Item {width: 10; height: 20}

108+

109+ TextEntry { id: cursorNameEntry; name: "cursorName"; value: "left_ptr" }

110+

111+ Item {width: 10; height: 40}

112+

113+ Rectangle {

114+ color: applyMouseArea.pressed ? "green" : "lightslategray"

115+ width: parent.width - 20

116+ height: 40

117+ Text { anchors.centerIn: parent; text: "Apply" }

118+ MouseArea {

119+ id: applyMouseArea

120+ anchors.fill: parent

121+ onClicked: {

122+ root.themeName = themeNameEntry.value;

123+ root.cursorName = cursorNameEntry.value;

124+ }

125+ }

126+ }

127+

128+ Item {width: 10; height: 10}

129+ Rectangle {

130+ color: "black"

131+ height: 2

132+ anchors.left: parent.left

133+ anchors.right: parent.right

134+ }

135+ Item {width: 10; height: 10}

136+

137+ Text { text: "frameWidth: " + imageInfo.frameWidth }

138+ Text { text: "frameHeight: " + imageInfo.frameHeight }

139+ Text { text: "frameCount: " + imageInfo.frameCount }

140+ Text { text: "frameDuration: " + imageInfo.frameDuration }

141+ Text { text: "currentFrame: " + animatedSprite.currentFrame }

142+ }

143+ }

144+}