Merge lp:~zsombi/ubuntu-ui-toolkit/cppActionItem into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

ActionItem moved to C++.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1614
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2139/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/867/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/869/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/866/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2139/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Looks pretty good to me and seems as closely ported as possible.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1616
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2140/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/868
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/870
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/870/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/867

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2140/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1052/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/360
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/359
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/359/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/359

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

The component is flaky, the ActionSelectionPopover is not showing random actions, common text input tests fail on popover. Needs a bit more love.

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/cppActionItem]

1617. By Zsombor Egri on 2015-08-19

fixing text, iconName getters to return proper values when not having custom values

1618. By Zsombor Egri on 2015-08-19

update visible and enabled when action changes, connect text, iconSource and iconName property change signals to action to keep the value changes in sync

1619. By Zsombor Egri on 2015-08-19

random icon and text disappearance in Popups caused by a stupid mistake - unititialized member

[Zsombor Egri (zsombi)]

Good to go now, all the needed functionality is there.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1619
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/872
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/869

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2142/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-08-12 15:22:59 +0000
+++ components.api	2015-08-19 06:57:12 +0000
@@ -43,14 +43,8 @@
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
-    property string text
-Ubuntu.Components.ActionItem 1.3: StyledItem
-    property Action action
-    property string iconName
-    property url iconSource
-    signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ActionList 1.0 0.1: QtObject
     readonly property Action actions
@@ -1232,14 +1226,16 @@
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ToolbarButton 1.3: StyledItem
     property Action action
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ToolbarItems 1.0 0.1: Item
     property Item back

=== removed file 'src/Ubuntu/Components/1.2/ActionItem.qml'
--- src/Ubuntu/Components/1.2/ActionItem.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ActionItem.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.2
-
-/*!
-    \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A visual representation of an Action. The API of ActionItem is a
-        copy of the API of \l Action, with additional properties to define
-        visual aspects of the ActionItem.
-
-        If \l action is set, the values of the other properties will by default
-        be identical to the \l Action's property values. Setting the other properties
-        will override the properties copied from the \l Action.
-
-        See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
-        in a toolbar.
-*/
-StyledItem {
-    id: actionItem
-
-    /*!
-      The \l Action associated with this ActionItem. If action is set,
-      the values of the Action properties are copied to the values of
-      the ActionItem properties.
-     */
-    property Action action: null
-
-    visible: action ? action.visible : true
-    enabled: action ? action.enabled : true
-
-    /*!
-      The title of the actionItem.
-      Default value: action.text
-     */
-    property string text: action ? action.text : ""
-
-    /*!
-      The image associated with the actionItem.
-      Default value: action.iconSource.
-
-      This is the URL of any image file
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
-
-    /*!
-      The icon associated with the actionItem in the suru icon theme.
-      Default value: action.iconName.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/suru
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property string iconName: action ? action.iconName : ""
-
-    /*!
-      Called when the actionItem is triggered.
-     */
-    signal triggered(var value)
-
-    /*!
-      If \l action is set, this will trigger it.
-    */
-    onTriggered: if (action) action.trigger(value)
-
-    /*!
-      Trigger this action item if it is enabled.
-     */
-    function trigger(value) {
-        var passingValue = value ? value : null
-        if (actionItem.enabled) actionItem.triggered(passingValue);
-    }
-}

=== modified file 'src/Ubuntu/Components/1.2/TextField.qml'
--- src/Ubuntu/Components/1.2/TextField.qml	2015-05-01 19:38:57 +0000
+++ src/Ubuntu/Components/1.2/TextField.qml	2015-08-19 06:57:12 +0000
@@ -99,7 +99,7 @@
     \note During text selection all interactive parent Flickables are turned off.
 */
 
-ActionItem {
+Ubuntu.ActionItem {
     id: control
 
     implicitWidth: units.gu(25)

=== modified file 'src/Ubuntu/Components/1.2/TextInputPopover.qml'
--- src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-07-02 23:33:22 +0000
+++ src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-08-19 06:57:12 +0000
@@ -88,6 +88,7 @@
                   action.text so we can get the proper button by text, action being not
                   accessible. https://bugs.launchpad.net/autopilot/+bug/1334599
                   */
+                // FIXME: AbstractButton has text property, which is getting the action.text, so no need to override!
                 property string text: action.text
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)

=== modified file 'src/Ubuntu/Components/1.2/ToolbarButton.qml'
--- src/Ubuntu/Components/1.2/ToolbarButton.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ToolbarButton.qml	2015-08-19 06:57:12 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ToolbarButton

=== removed file 'src/Ubuntu/Components/1.3/ActionItem.qml'
--- src/Ubuntu/Components/1.3/ActionItem.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/ActionItem.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-/*!
-    \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A visual representation of an Action. The API of ActionItem is a
-        copy of the API of \l Action, with additional properties to define
-        visual aspects of the ActionItem.
-
-        If \l action is set, the values of the other properties will by default
-        be identical to the \l Action's property values. Setting the other properties
-        will override the properties copied from the \l Action.
-
-        See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
-        in a toolbar.
-*/
-StyledItem {
-    id: actionItem
-
-    /*!
-      The \l Action associated with this ActionItem. If action is set,
-      the values of the Action properties are copied to the values of
-      the ActionItem properties.
-     */
-    property Action action: null
-
-    visible: action ? action.visible : true
-    enabled: action ? action.enabled : true
-
-    /*!
-      The title of the actionItem.
-      Default value: action.text
-     */
-    property string text: action ? action.text : ""
-
-    /*!
-      The image associated with the actionItem.
-      Default value: action.iconSource.
-
-      This is the URL of any image file
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
-
-    /*!
-      The icon associated with the actionItem in the suru icon theme.
-      Default value: action.iconName.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/suru
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property string iconName: action ? action.iconName : ""
-
-    /*!
-      Called when the actionItem is triggered.
-     */
-    signal triggered(var value)
-
-    /*!
-      If \l action is set, this will trigger it.
-    */
-    onTriggered: if (action) action.trigger(value)
-
-    /*!
-      Trigger this action item if it is enabled.
-     */
-    function trigger(value) {
-        var passingValue = value ? value : null
-        if (actionItem.enabled) actionItem.triggered(passingValue);
-    }
-}

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-08-19 06:57:12 +0000
@@ -99,7 +99,7 @@
     \note During text selection all interactive parent Flickables are turned off.
 */
 
-ActionItem {
+Ubuntu.ActionItem {
     id: control
 
     implicitWidth: units.gu(25)

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-08-10 14:10:51 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-08-19 06:57:12 +0000
@@ -25,7 +25,6 @@
 
 #1.2
 QML_FILES += 1.2/AbstractButton.qml \
-             1.2/ActionItem.qml \
              1.2/ActionList.qml \
              1.2/ActivityIndicator.qml \
              1.2/AnimatedItem.qml \
@@ -83,7 +82,6 @@
 #1.3
 QML_FILES += 1.3/AbstractButton.qml \
              1.3/ActionBar.qml \
-             1.3/ActionItem.qml \
              1.3/ActionList.qml \
              1.3/ActivityIndicator.qml \
 	     1.3/AdaptivePageLayout.qml \

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-08-12 09:54:40 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-08-19 06:57:12 +0000
@@ -62,6 +62,7 @@
 #include "uclistitemstyle.h"
 #include "ucserviceproperties.h"
 #include "ucnamespace.h"
+#include "ucactionitem.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -174,6 +175,7 @@
     qmlRegisterSingletonType<UCUriHandler>(uri, major, minor, "UriHandler", registerUriHandler);
     qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
     qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
+    qmlRegisterType<UCActionItem>(uri, major, minor, "ActionItem");
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-08-12 09:54:40 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-08-19 06:57:12 +0000
@@ -80,7 +80,8 @@
     $$PWD/ucstylehints.h \
     $$PWD/livetimer.h \
     $$PWD/livetimer_p.h \
-    $$PWD/timeutils_p.h
+    $$PWD/timeutils_p.h \
+    $$PWD/ucactionitem.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -132,7 +133,8 @@
     $$PWD/ucdefaulttheme.cpp \
     $$PWD/ucstylehints.cpp \
     $$PWD/livetimer.cpp \
-    $$PWD/livetimer_p.cpp
+    $$PWD/livetimer_p.cpp \
+    $$PWD/ucactionitem.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-07-03 19:16:56 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2015-08-19 06:57:12 +0000
@@ -150,13 +150,12 @@
 
 UCAction::UCAction(QObject *parent)
     : QObject(parent)
+    , m_itemHint(Q_NULLPTR)
+    , m_parameterType(None)
     , m_factoryIconSource(true)
     , m_enabled(true)
     , m_visible(true)
     , m_published(false)
-    , m_itemHint(0)
-    , m_parameterType(None)
-    , m_shortcut(0)
 {
     generateName();
 }

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-07-07 13:57:50 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2015-08-19 06:57:12 +0000
@@ -77,21 +77,22 @@
     void trigger(const QVariant &value = QVariant());
 
 private:
-    bool m_factoryIconSource:1;
-    bool m_enabled:1;
-    bool m_visible:1;
-    bool m_published:1;
-    QQmlComponent *m_itemHint;
     QString m_name;
     QString m_text;
     QString m_iconName;
     QUrl m_iconSource;
     QString m_description;
     QString m_keywords;
+    QVariant m_shortcut;
+    QQmlComponent *m_itemHint;
     Type m_parameterType;
-    QVariant m_shortcut;
+    bool m_factoryIconSource:1;
+    bool m_enabled:1;
+    bool m_visible:1;
+    bool m_published:1;
 
     friend class UCActionContext;
+    friend class UCActionItem;
     friend class UCListItemPrivate;
     friend class UCListItemAttached;
     friend class UCListItemActionsPrivate;

=== added file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-19 06:57:12 +0000
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ucactionitem.h"
+#include "ucaction.h"
+
+/*!
+ * \qmltype ActionItem
+ * \instantiates UCActionItem
+ * \inqmlmodule Ubuntu.Components 1.1
+ * \ingroup ubuntu
+ * \brief A visual representation of an Action. The API of ActionItem is a
+ * copy of the API of \l Action, with additional properties to define
+ * visual aspects of the ActionItem.
+ *
+ * If \l action is set, the values of the other properties will by default
+ * be identical to the \l Action's property values. Setting the other properties
+ * will override the properties copied from the \l Action.
+ */
+
+/*!
+ * \qmlsignal ActionItem::triggered(var value)
+ * Called when the actionItem is triggered.
+ */
+UCActionItem::UCActionItem(QQuickItem *parent)
+    : UCStyledItemBase(parent)
+    , m_action(Q_NULLPTR)
+    , m_flags(0)
+{
+    connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+}
+
+void UCActionItem::_q_visibleChanged()
+{
+    m_flags |= CustomVisible;
+    disconnect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+}
+
+void UCActionItem::_q_enabledChanged()
+{
+    m_flags |= CustomEnabled;
+    disconnect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+}
+
+// update visible property
+void UCActionItem::_q_updateVisible()
+{
+    bool visible = m_action ? m_action->m_visible : true;
+    setVisible(visible);
+    // reset flag and reconnect signal handler disconnected by the
+    m_flags &= ~CustomVisible;
+    if (m_action) {
+        connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+    }
+}
+
+// update enabled property
+void UCActionItem::_q_updateEnabled()
+{
+    bool enabled = m_action ? m_action->m_enabled : true;
+    setEnabled(enabled);
+    // reset flag and reconnect signal handler disconnected by the
+    m_flags &= ~CustomEnabled;
+    if (m_action) {
+        connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+    }
+}
+
+void UCActionItem::updateProperties()
+{
+    if (!(m_flags & CustomText)) {
+        Q_EMIT textChanged();
+    }
+    if (!(m_flags & CustomIconSource)) {
+        Q_EMIT iconSourceChanged();
+    }
+    if (!(m_flags & CustomIconName)) {
+        Q_EMIT iconNameChanged();
+    }
+}
+
+void UCActionItem::attachAction(bool attach)
+{
+    if (attach) {
+        connect(this, &UCActionItem::triggered,
+                m_action, &UCAction::triggered, Qt::DirectConnection);
+        connect(m_action, &UCAction::visibleChanged,
+                this, &UCActionItem::_q_updateVisible, Qt::DirectConnection);
+        connect(m_action, &UCAction::enabledChanged,
+                this, &UCActionItem::_q_updateEnabled, Qt::DirectConnection);
+        if (!(m_flags & CustomText)) {
+            connect(m_action, &UCAction::textChanged,
+                    this, &UCActionItem::textChanged, Qt::DirectConnection);
+        }
+        if (!(m_flags & CustomIconSource)) {
+            connect(m_action, &UCAction::iconSourceChanged,
+                    this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
+        }
+        if (!(m_flags & CustomIconName)) {
+            connect(m_action, &UCAction::iconNameChanged,
+                    this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
+        }
+    } else {
+        disconnect(this, &UCActionItem::triggered,
+                   m_action, &UCAction::triggered);
+        disconnect(m_action, &UCAction::visibleChanged,
+                   this, &UCActionItem::_q_updateVisible);
+        disconnect(m_action, &UCAction::enabledChanged,
+                   this, &UCActionItem::_q_updateEnabled);
+        if (!(m_flags & CustomText)) {
+            disconnect(m_action, &UCAction::textChanged,
+                       this, &UCActionItem::textChanged);
+        }
+        if (!(m_flags & CustomIconSource)) {
+            disconnect(m_action, &UCAction::iconSourceChanged,
+                       this, &UCActionItem::iconSourceChanged);
+        }
+        if (!(m_flags & CustomIconName)) {
+            disconnect(m_action, &UCAction::iconNameChanged,
+                       this, &UCActionItem::iconNameChanged);
+        }
+    }
+}
+
+/*!
+ * \qmlproperty Action ActionItem::action
+ * The \l Action associated with this ActionItem. If action is set, the values
+ * of the \l Action properties are copied to the values of the ActionItem
+ * properties, unless those were previously overridden.
+ */
+void UCActionItem::setAction(UCAction *action)
+{
+    if (m_action == action) {
+        return;
+    }
+    if (m_action) {
+        attachAction(false);
+    }
+    m_action = action;
+    Q_EMIT actionChanged();
+
+    if (m_action) {
+        attachAction(true);
+    }
+    _q_updateVisible();
+    _q_updateEnabled();
+    updateProperties();
+}
+
+/*!
+ * \qmlproperty string ActionItem::text
+ * The title of the actionItem. Defaults to the \c action.text.
+ */
+QString UCActionItem::text()
+{
+    if (m_flags & CustomText) {
+        return m_text;
+    }
+    return m_action ? m_action->m_text : QString();
+}
+void UCActionItem::setText(const QString &text)
+{
+    if (m_text == text) {
+        return;
+    }
+    m_text = text;
+    if (m_action && !(m_flags & CustomText)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::textChanged,
+                   this, &UCActionItem::textChanged);
+    }
+    m_flags |= CustomText;
+    Q_EMIT textChanged();
+}
+void UCActionItem::resetText()
+{
+    m_text.clear();
+    m_flags &= ~CustomText;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::textChanged,
+                this, &UCActionItem::textChanged, Qt::DirectConnection);
+    }
+    Q_EMIT textChanged();
+}
+
+/*!
+ * \qmlproperty url ActionItem::iconSource
+ * The image associated with the ActionItem. Defaults to \c action.iconSource.
+ *
+ * This is the URL of any image file. If both iconSource and \l iconName are defined,
+ * \l iconName will be ignored.
+ */
+QUrl UCActionItem::iconSource()
+{
+    if (m_flags & CustomIconSource) {
+        return m_iconSource;
+    }
+    if (m_action) {
+        return m_action->m_iconSource;
+    }
+    return !iconName().isEmpty() ? QUrl(QString("image://theme/%1").arg(iconName())) : QUrl();
+}
+void UCActionItem::setIconSource(const QUrl &iconSource)
+{
+    if (m_iconSource == iconSource) {
+        return;
+    }
+    m_iconSource = iconSource;
+    if (m_action && !(m_flags & CustomIconSource)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::iconSourceChanged,
+                   this, &UCActionItem::iconSourceChanged);
+    }
+    m_flags |= CustomIconSource;
+    Q_EMIT iconSourceChanged();
+}
+void UCActionItem::resetIconSource()
+{
+    m_iconSource.clear();
+    m_flags &= ~CustomIconSource;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::iconSourceChanged,
+                this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
+    }
+    Q_EMIT iconSourceChanged();
+}
+
+/*!
+ * \qmlproperty string ActionItem::iconName
+ * The icon associated with the actionItem in the suru icon theme. Defaults to
+ * \c action.iconName.
+ *
+ * \note The complete list of icons available in Ubuntu is not published yet.
+ * For now please refer to the folders where the icon themes are installed:
+ * \list
+ *  \li Ubuntu Touch: \l file:/usr/share/icons/suru
+ *  \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+ * \endlist
+ * These 2 separate icon themes will be merged soon.
+ *
+ * If both \l iconSource and iconName are defined, iconName will be ignored.
+ */
+QString UCActionItem::iconName()
+{
+    if (m_flags & CustomIconName) {
+        return m_iconName;
+    }
+    return m_action ? m_action->m_iconName : QString();
+}
+void UCActionItem::setIconName(const QString &iconName)
+{
+    if (m_iconName == iconName) {
+        return;
+    }
+    m_iconName = iconName;
+    if (m_action && !(m_flags & CustomIconName)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::iconNameChanged,
+                   this, &UCActionItem::iconNameChanged);
+    }
+    m_flags |= CustomIconName;
+    Q_EMIT iconNameChanged();
+    // also sync iconSource if that is not a custom one or taken from action
+    if (!m_action || (m_flags & CustomIconSource)) {
+        Q_EMIT iconSourceChanged();
+    }
+}
+void UCActionItem::resetIconName()
+{
+    m_iconName.clear();
+    m_flags &= ~CustomIconName;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::iconNameChanged,
+                this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
+    }
+    Q_EMIT iconNameChanged();
+}
+
+/*!
+ * \qmlmethod void ActionItem::trigger(var value)
+ * Trigger this action item if it is enabled.
+ */
+void UCActionItem::trigger(const QVariant &value)
+{
+    if (isEnabled()) {
+        Q_EMIT triggered(value);
+    }
+}

=== added file 'src/Ubuntu/Components/plugin/ucactionitem.h'
--- src/Ubuntu/Components/plugin/ucactionitem.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-19 06:57:12 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef UCACTIONITEM_H
+#define UCACTIONITEM_H
+
+#include "ucstyleditembase.h"
+
+class UCAction;
+class UCActionItem : public UCStyledItemBase
+{
+    Q_OBJECT
+    Q_PROPERTY(UCAction *action MEMBER m_action WRITE setAction NOTIFY actionChanged FINAL)
+    Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
+    Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource RESET resetIconSource NOTIFY iconSourceChanged)
+    Q_PROPERTY(QString iconName READ iconName WRITE setIconName RESET resetIconName NOTIFY iconNameChanged)
+public:
+    explicit UCActionItem(QQuickItem *parent = 0);
+
+    void setAction(UCAction *action);
+    QString text();
+    void setText(const QString &text);
+    void resetText();
+    QUrl iconSource();
+    void setIconSource(const QUrl &iconSource);
+    void resetIconSource();
+    QString iconName();
+    void setIconName(const QString &iconName);
+    void resetIconName();
+
+Q_SIGNALS:
+    void actionChanged();
+    void textChanged();
+    void iconSourceChanged();
+    void iconNameChanged();
+    void triggered(const QVariant &value);
+
+public Q_SLOTS:
+    void trigger(const QVariant &value = QVariant());
+
+protected Q_SLOTS:
+    void _q_visibleChanged();
+    void _q_enabledChanged();
+    void _q_updateVisible();
+    void _q_updateEnabled();
+
+protected:
+    enum {
+        CustomText = 0x01,
+        CustomIconSource = 0x02,
+        CustomIconName = 0x04,
+        CustomVisible = 0x40,
+        CustomEnabled = 0x80
+    };
+    QString m_text;
+    QString m_iconName;
+    QUrl m_iconSource;
+    UCAction *m_action;
+    quint8 m_flags;
+
+    void updateProperties();
+    void attachAction(bool attach);
+};
+
+#endif // UCACTIONITEM_H

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-08-10 14:27:35 +0000
+++ src/Ubuntu/Components/qmldir	2015-08-19 06:57:12 +0000
@@ -1,6 +1,5 @@
 module Ubuntu.Components
 plugin UbuntuComponents
-ActionItem 0.1 1.2/ActionItem.qml
 ActionList 0.1 1.2/ActionList.qml
 ToolbarItems 0.1 1.2/ToolbarItems.qml
 ToolbarButton 0.1 1.2/ToolbarButton.qml
@@ -44,7 +43,6 @@
 DateUtils 0.1 1.2/dateUtils.js
 
 #version 1.0
-ActionItem 1.0 1.2/ActionItem.qml
 ActionList 1.0 1.2/ActionList.qml
 ToolbarItems 1.0 1.2/ToolbarItems.qml
 ToolbarButton 1.0 1.2/ToolbarButton.qml
@@ -105,7 +103,6 @@
 #################################################
 #version 1.3
 ActionBar 1.3 1.3/ActionBar.qml
-ActionItem 1.3 1.3/ActionItem.qml
 ActionList 1.3 1.3/ActionList.qml
 AdaptivePageLayout 1.3 1.3/AdaptivePageLayout.qml
 PageColumnsLayout 1.3 1.3/PageColumnsLayout.qml

=== modified file 'tests/unit/tst_components/tst_actionitem.qml'
--- tests/unit/tst_components/tst_actionitem.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_components/tst_actionitem.qml	2015-08-19 06:57:12 +0000
@@ -21,10 +21,22 @@
 TestCase {
      name: "ActionItemAPI"
 
+     SignalSpy {
+         id: triggerSpy
+         target: action1
+         signalName: "triggered"
+     }
+
      function initTestCase() {
          compare(item1.action, null, "action is null by default")
          compare(item1.text, "", "text is empty string set by default")
          compare(item1.iconSource, "", "iconSource is empty string by default")
+         compare(item1.iconName, "", "iconSource is empty string by default")
+     }
+
+     function cleanup() {
+         item1.action = null;
+         triggerSpy.clear();
      }
 
      function test_action() {
@@ -33,10 +45,8 @@
          compare(item1.action, action1, "Action can be set")
          compare(item1.text, action1.text, "text is automatically set to action text")
          compare(item1.iconSource, action1.iconSource, "iconSource is automatically set to action iconSource")
-         var numTriggers = action1.triggerCount
          item1.triggered(null)
-         compare(action1.triggerCount, numTriggers+1, "ActionItem triggered() triggers action")
-         item1.action = null
+         triggerSpy.wait(400);
      }
 
      // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
@@ -89,7 +99,5 @@
          id: action1
          text: "actionText"
          iconSource: "imageURL"
-         property int triggerCount: 0
-         onTriggered: triggerCount++
      }
 }