Merge lp:~mzanetti/unity-api/launcher-quicklist-add-hasAction into lp:unity-api

[Michael Zanetti]

Add a role, clickable to quicklistModel which determines if the entry can be clicked or not.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/unity-api-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/66

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/108/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/unity-api/launcher-quicklist-add-hasAction]

83. By Michael Zanetti on 2013-08-19

HasAction -> Clickable

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
--- include/unity/shell/launcher/QuickListModelInterface.h	2013-07-08 16:39:41 +0000
+++ include/unity/shell/launcher/QuickListModelInterface.h	2013-08-19 13:29:37 +0000
@@ -37,6 +37,7 @@
   * The model has the following roles:
   * - RoleLabel (label): The text entry in the QuickList menu (QString).
   * - RoleIcon (icon): The icon to be shown for this entry (QString).
+  * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
   */
 class UNITY_API QuickListModelInterface: public QAbstractListModel
 {
@@ -47,6 +48,7 @@
     explicit QuickListModelInterface(QObject *parent = 0) : QAbstractListModel(parent) {
         m_roleNames.insert(RoleLabel, "label");
         m_roleNames.insert(RoleIcon, "icon");
+        m_roleNames.insert(RoleClickable, "clickable");
     }
     /// @endcond
 public:
@@ -57,7 +59,8 @@
      */
     enum Roles {
         RoleLabel,
-        RoleIcon
+        RoleIcon,
+        RoleClickable
     };
 
     /// @cond

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2013-07-04 17:17:46 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2013-08-19 13:29:37 +0000
@@ -35,6 +35,8 @@
         return QLatin1String("test menu entry ") + QString::number(index.row());
     case RoleIcon:
         return QLatin1String("copy.png");
+    case RoleClickable:
+        return true;
     }
     return QVariant();
 }

=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2013-07-08 16:41:21 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2013-08-19 13:29:37 +0000
@@ -147,6 +147,7 @@
             return [
                 { tag: "Model.roles[label]", role: "label", type: "string" },
                 { tag: "Model.roles[icon]", role: "icon", type: "string" },
+                { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
             ];
         }