Merge lp:~gerboland/unity-2d/dash-searchentry-cursor into lp:unity-2d

[Gerry Boland]

[dash] Have Cursor change to IBeamCursor when over SearchEntry box

[Michał Sawicz (saviq)]

It works!

review: Approve (functional)

[Albert Astals Cid (aacid)]

i don't think you need the Q_INVOKABLE (at least we don't have it for the other propertiy settings) and a Q_DISABLE_COPY won't hurt

I don't think anyone can claim copyright over what is basically a setCursor call, i'd just remove the copyright notice.

And as you said yourself add a manual test for it :-)

review: Needs Fixing

[lp:~gerboland/unity-2d/dash-searchentry-cursor]

939. By Gerry Boland on 2012-02-28

Remove useless Q_INVOKABLE

940. By Gerry Boland on 2012-02-28

Content trivial & since modified, CC licence not desired

941. By Gerry Boland on 2012-02-28

Add Q_DISABLE_COPY as recommended by Albert

942. By Gerry Boland on 2012-02-28

Add manual test

[Albert Astals Cid (aacid)]

Looks good :-)

review: Approve

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-02-20 17:16:55 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-02-28 12:03:18 +0000
@@ -41,6 +41,7 @@
 #include "plugin.h"
 #include "cacheeffect.h"
 #include "iconutilities.h"
+#include "cursorshapearea.h"
 #include "unity2dtr.h"
 #include "giodefaultapplication.h"
 
@@ -149,6 +150,8 @@
 
     qmlRegisterType<IconUtilities>(); // Register the type as non creatable
 
+    qmlRegisterType<CursorShapeArea>(uri, 0, 1, "CursorShapeArea");
+
     qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
 
     qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-02-28 10:30:30 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-02-28 12:03:18 +0000
@@ -38,6 +38,7 @@
     dragitemwithurl.cpp
     dropitem.cpp
     iconimageprovider.cpp
+    cursorshapearea.cpp
     listaggregatormodel.cpp
     launcheritem.cpp
     application.cpp

=== added file 'libunity-2d-private/src/cursorshapearea.cpp'
--- libunity-2d-private/src/cursorshapearea.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/cursorshapearea.cpp	2012-02-28 12:03:18 +0000
@@ -0,0 +1,43 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cursorshapearea.h"
+
+CursorShapeArea::CursorShapeArea(QDeclarativeItem *parent)
+:   QDeclarativeItem(parent)
+,   m_currentShape(Qt::ArrowCursor)
+{
+}
+
+Qt::CursorShape CursorShapeArea::cursorShape() const
+{
+  return cursor().shape();
+}
+
+void CursorShapeArea::setCursorShape(Qt::CursorShape cursorShape)
+{
+  if (m_currentShape == cursorShape)
+    return;
+
+  setCursor(cursorShape);
+  Q_EMIT cursorShapeChanged();
+
+  m_currentShape = cursorShape;
+}
+
+#include "cursorshapearea.moc"

=== added file 'libunity-2d-private/src/cursorshapearea.h'
--- libunity-2d-private/src/cursorshapearea.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/cursorshapearea.h	2012-02-28 12:03:18 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CURSORSHAPEAREA_H
+#define CURSORSHAPEAREA_H
+
+#include <QDeclarativeItem>
+
+class CursorShapeArea : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(Qt::CursorShape cursorShape READ cursorShape WRITE setCursorShape NOTIFY cursorShapeChanged)
+
+public:
+    explicit CursorShapeArea(QDeclarativeItem *parent = 0);
+
+    Qt::CursorShape cursorShape() const;
+    void setCursorShape(Qt::CursorShape cursorShape);
+
+private:
+    Q_DISABLE_COPY(CursorShapeArea)
+    Qt::CursorShape m_currentShape;
+
+Q_SIGNALS:
+    void cursorShapeChanged();
+};
+
+#endif // CURSORSHAPEAREA_H

=== modified file 'shell/common/SearchEntry.qml'
--- shell/common/SearchEntry.qml	2012-02-24 17:58:11 +0000
+++ shell/common/SearchEntry.qml	2012-02-28 12:03:18 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 1.1
 import Effects 1.0
+import Unity2d 1.0
 import "fontUtils.js" as FontUtils
 import "utils.js" as Utils
 
@@ -166,4 +167,9 @@
             }
         }
     }
+
+    CursorShapeArea {
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
+    }
 }

=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-02-07 18:53:20 +0000
+++ tests/manual-tests/dash.txt	2012-02-28 12:03:18 +0000
@@ -18,6 +18,13 @@
 
 ----
 
+ * Open Dash, hover mouse over Search Entry box
+
+--> The mouse cursor should change to the I-beam cursor over the Search box, and be standard
+    cursor elsewhere.
+
+----
+
   # Test case objectives:
   #   * Check that Super+s does not type s in the search line
   # Pre-conditions