Merge lp:~nick-dedekind/ubuntu-ui-toolkit/menus into lp:ubuntu-ui-toolkit

[Nick Dedekind]

API for MenuBar, Menus, MenuItem & MenuSeparator

[lp:~nick-dedekind/ubuntu-ui-toolkit/menus]

1323. By Timo Jyrinki on 2016-05-25

Rebuild for arm64 gles switch.

1324. By Timo Jyrinki on 2016-05-26

no "-gles" in changelog package name

1325. By Albert Astals Cid on 2016-05-27

OTA12-2016-05-20

1326. By CI Train Bot Account on 2016-05-27

Releasing 1.3.1984+16.10.20160527.2

1327. By Zoltan Balogh on 2016-06-01

OTA12-2016-06-01

1328. By CI Train Bot Account on 2016-06-01

Releasing 1.3.1988+16.10.20160601

1329. By CI Train Bot Account on 2016-06-07

Resync trunk.

1330. By Nick Dedekind on 2016-06-07

merged actionList

1331. By Nick Dedekind on 2016-06-07

members accessors to functions

1332. By Nick Dedekind on 2016-06-07

Menu API

1333. By Nick Dedekind on 2016-06-07

merged with actionList

1334. By Nick Dedekind on 2016-06-07

new components.api

1335. By Nick Dedekind on 2016-06-08

fix platform abstraction

1336. By Nick Dedekind on 2016-06-08

better dynamicness

1337. By Nick Dedekind on 2016-06-08

updated api

1338. By Nick Dedekind on 2016-06-08

removed debug

1339. By Nick Dedekind on 2016-06-08

removed attached properties

1340. By Nick Dedekind on 2016-06-08

better removal

1341. By Nick Dedekind on 2016-06-09

activate state

1342. By Nick Dedekind on 2016-06-15

enable fix

1343. By Nick Dedekind on 2016-06-20

added MenuGroup::at

1344. By Nick Dedekind on 2016-06-20

simplified insert

1345. By Nick Dedekind on 2016-06-20

Added menu unit tests

1346. By Nick Dedekind on 2016-06-20

updated menu tests

1347. By Nick Dedekind on 2016-06-20

updated menu tests

1348. By Nick Dedekind on 2016-06-20

updated menu tests

1349. By Nick Dedekind on 2016-06-20

removed distfile from pro

1350. By Nick Dedekind on 2016-06-21

merged exclusiveGroup

1351. By Nick Dedekind on 2016-06-24

merged with staging

1352. By Nick Dedekind on 2016-06-24

merged parent

1353. By Nick Dedekind on 2016-06-24

fixed namespace

1354. By Nick Dedekind on 2016-07-18

merged with trunk

1355. By Nick Dedekind on 2016-07-18

removed uc prefix

1356. By Nick Dedekind on 2016-07-18

moved menus to Labs

1357. By Nick Dedekind on 2016-08-22

merged parent

1358. By Nick Dedekind on 2016-08-25

merged staging

1359. By Nick Dedekind on 2016-08-25

fixed broken build

Unmerged revisions

1359. By Nick Dedekind on 2016-08-25

fixed broken build

=== modified file 'components.api'
--- components.api	2016-05-20 17:33:56 +0000
+++ components.api	2016-06-07 14:25:30 +0000
@@ -12,6 +12,7 @@
 Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
     property string description
     property bool enabled
+    property ExclusiveGroup exclusiveGroup 1.3
     property string iconName
     property url iconSource
     property Component itemHint
@@ -19,9 +20,11 @@
     signal triggered(var value)
     function trigger(var value)
     function trigger()
+    function setState(var )
     property string name
     property Type parameterType
     property var shortcut 1.3
+    property var state 1.3
     property string text
     property bool visible
 Ubuntu.Components.Action.Type: Enum
@@ -54,12 +57,12 @@
     function trigger(var value)
     function trigger()
     property string text
-Ubuntu.Components.ActionList 1.0 0.1: QtObject
-    property list<Action> actions
-    default property list<Action> children
-Ubuntu.Components.ActionList 1.3: QtObject
-    property list<Action> actions
-    default property list<Action> children
+Ubuntu.Components.ActionList 1.0 0.1 UCActionList: QtObject
+    default property list<Action> actions
+    signal added(Action action)
+    signal removed(Action action)
+    function addAction(Action action)
+    function removeAction(Action action)
 Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
     default property list<Action> actions
     readonly property ActionContext globalContext
@@ -456,6 +459,8 @@
     property bool showDivider
     readonly property string swipingState
     readonly property bool waitingConfirmationForRemoval
+Ubuntu.Components.ExclusiveGroup 1.3 UCExclusiveGroup: ActionList
+    readonly property Action selected
 Ubuntu.Components.ListItems.Expandable 1.0 0.1: Empty
     property bool collapseOnClick
     property double collapsedHeight
@@ -656,6 +661,22 @@
     function double lerp(double delta, double from, double to)
     function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
     function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
+Ubuntu.Components.Menu 1.3 UCMenu: Action
+    default property list<QtObject> data
+    function show(Qt.point pt)
+    function dismiss()
+    function appendObject(QtObject obj)
+    function insertObject(int index, QtObject obj)
+    function removeObject(QtObject obj)
+Ubuntu.Components.MenuBar 1.3 UCMenuBar: QtObject
+    default property list<Menu> menus
+    function appendMenu(Menu menu)
+    function insertMenu(int index, Menu menu)
+    function removeMenu(Menu menu)
+Ubuntu.Components.MenuGroup 1.3 UCMenuGroup: ActionList
+Ubuntu.Components.Menus 1.3: QtObject
+    readonly property MenuBar menuBar
+    readonly property Menu parentMenu
 Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
     property color color
     property var data
 
=== removed file 'src/Ubuntu/Components/1.2/ActionList.qml'
--- src/Ubuntu/Components/1.2/ActionList.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.2/ActionList.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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
-
-/*!
-    \qmltype ActionList
-    \inqmlmodule Ubuntu.Components
-    \ingroup ubuntu
-    \brief List of \l Action items
-*/
-
-QtObject {
-    id: list
-    // internal objects using nested elements,
-    // which isn't allowed by QtObject; this fix makes this possible
-    /*!
-      Default property to allow adding of children.
-      \qmlproperty list<Action> children
-      \default
-      */
-    default property alias children: list.actions
-
-    /*!
-      List of already defined actions when not defining them as children of the ActionList.
-      Note that when you set this property, the children of the ActionList will be ignored,
-      so do not set the list and define children.
-
-      The advantage of setting actions over using the children is that the same
-      \l Action items can be used in several sets of actions.
-      */
-    property list<Action> actions
-}
 
=== removed file 'src/Ubuntu/Components/1.3/ActionList.qml'
--- src/Ubuntu/Components/1.3/ActionList.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/ActionList.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +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
-
-/*!
-    \qmltype ActionList
-    \inqmlmodule Ubuntu.Components
-    \ingroup ubuntu
-    \brief List of \l Action items
-*/
-
-QtObject {
-    id: list
-    // internal objects using nested elements,
-    // which isn't allowed by QtObject; this fix makes this possible
-    /*!
-      Default property to allow adding of children.
-      \qmlproperty list<Action> children
-      \default
-      */
-    default property alias children: list.actions
-
-    /*!
-      List of already defined actions when not defining them as children of the ActionList.
-      Note that when you set this property, the children of the ActionList will be ignored,
-      so do not set the list and define children.
-
-      The advantage of setting actions over using the children is that the same
-      \l Action items can be used in several sets of actions.
-      */
-    property list<Action> actions
-}
 
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2016-02-16 11:39:32 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-06-07 14:25:30 +0000
@@ -25,7 +25,6 @@
 
 #1.2
 QML_FILES += 1.2/AbstractButton.qml \
-             1.2/ActionList.qml \
              1.2/ActivityIndicator.qml \
              1.2/AnimatedItem.qml \
              1.2/AppHeader.qml \
@@ -78,7 +77,6 @@
 
 #1.3
 QML_FILES += 1.3/ActionBar.qml \
-             1.3/ActionList.qml \
              1.3/ActivityIndicator.qml \
 	     1.3/AdaptivePageLayout.qml \
              1.3/AnimatedItem.qml \
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-06-07 14:25:30 +0000
@@ -78,9 +78,13 @@
 #include "ucpagetreenode.h"
 #include "ucmainviewbase.h"
 #include "ucperformancemonitor.h"
+#include "ucmenu.h"
+#include "ucmenubar.h"
 #include "privates/frame.h"
 #include "privates/ucpagewrapper.h"
 #include "privates/appheaderbase.h"
+#include "ucactionlist.h"
+#include "ucexclusivegroup.h"
 
 // From UbuntuGestures
 #include "private/ucswipearea_p.h"
@@ -173,6 +177,7 @@
     qmlRegisterSimpleSingletonType<UCHaptics>(uri, major, minor, "Haptics");
     qmlRegisterSimpleSingletonType<UCMathUtils>(uri, major, minor, "MathUtils");
     qmlRegisterSimpleSingletonType<UbuntuToolkit::ColorUtils>(uri, major, minor, "ColorUtils");
+    qmlRegisterType<UCActionList>(uri, major, minor, "ActionList");
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
@@ -235,6 +240,11 @@
     qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
     qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
     qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
+    qmlRegisterType<UCMenu>(uri, 1, 3, "Menu");
+    qmlRegisterType<UCMenuBar>(uri, 1, 3, "MenuBar");
+    qmlRegisterUncreatableType<UCMenuAttached>(uri, 1, 3, "Menus", "Not instantiable");
+    qmlRegisterType<UCMenuGroup>(uri, 1, 3, "MenuGroup");
+    qmlRegisterType<UCExclusiveGroup>(uri, 1, 3, "ExclusiveGroup");
 }
 
 void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-04-01 05:30:24 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-06-07 14:25:30 +0000
@@ -3,7 +3,7 @@
     PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
 }
 
-QT *= core-private qml qml-private quick quick-private gui-private dbus svg UbuntuGestures UbuntuGestures_private UbuntuToolkit
+QT *= core-private qml qml-private quick quick-private gui-private dbus svg platformsupport-private UbuntuGestures UbuntuGestures_private UbuntuToolkit
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT += v8-private
@@ -117,7 +117,13 @@
     $$PWD/privates/ucpagewrapperincubator_p.h \
     $$PWD/privates/appheaderbase.h \
     $$PWD/label_p.h \
-    $$PWD/ucbottomedgeregion_p.h
+    $$PWD/ucbottomedgeregion_p.h \
+    $$PWD/ucactionlist.h \
+    $$PWD/ucmenu.h \
+    $$PWD/ucmenu_p.h \
+    $$PWD/ucmenubar.h \
+    $$PWD/ucmenubar_p.h \
+    $$PWD/ucexclusivegroup.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -194,7 +200,11 @@
     $$PWD/privates/frame.cpp \
     $$PWD/privates/ucpagewrapper.cpp \
     $$PWD/privates/ucpagewrapperincubator.cpp \
-    $$PWD/privates/appheaderbase.cpp
+    $$PWD/privates/appheaderbase.cpp \
+    $$PWD/ucactionlist.cpp \
+    $$PWD/ucmenu.cpp \
+    $$PWD/ucmenubar.cpp \
+    $$PWD/ucexclusivegroup.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
 
=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2016-06-07 14:25:30 +0000
@@ -17,6 +17,7 @@
 #include "ucaction.h"
 #include "quickutils.h"
 #include "ucactioncontext.h"
+#include "ucexclusivegroup.h"
 
 #include <QtDebug>
 #include <QtQml/QQmlInfo>
@@ -248,43 +249,6 @@
  * \endqml
  */
 
-/*!
- * \qmlproperty enum Action::parameterType
- * Type of the parameter passed to \l trigger and \l triggered.
- * Type is an enumeration:
- * \list
- *  \li \b Action.None: No paramater. (default)
- *  \li \b Action.String: String parameter.
- *  \li \b Action.Integer: Integer parameter.
- *  \li \b Action.Bool: Boolean parameter.
- *  \li \b Action.Real: Single precision floating point parameter.
- *  \li \b Action.Object: The parameter is an object.
- * \endlist
- * \qml
- * Action {
- *     id: action
- *     parameterType: Action.String
- *     onTriggered: {
- *         // value arguments now contain strings
- *         console.log(value);
- *     }
- *     Component.onCompleted: action.trigger("Hello World")
- * }
- * \endqml
- */
-
-/*!
- * \qmlproperty bool Action::enabled
- * If set to false the action can not be triggered. Components visualizing the
- * action migth either hide the action or make it insensitive. However visibility
- * can be controlled separately using the \l visible property.
- */
-
-/*!
- * \qmlproperty bool Action::visible
- * Specifies whether the action is visible to the user. Defaults to true.
- */
-
 UCAction::UCAction(QObject *parent)
     : QObject(parent)
     , m_itemHint(Q_NULLPTR)
@@ -293,12 +257,15 @@
     , m_enabled(true)
     , m_visible(true)
     , m_published(false)
+    , m_exclusiveGroup(Q_NULLPTR)
 {
     generateName();
     // FIXME: we need QInputDeviceInfo to detect the keyboard attechment
     // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
     connect(QuickUtils::instance(), &QuickUtils::keyboardAttachedChanged,
             this, &UCAction::onKeyboardAttached);
+
+    connect(this, &UCAction::triggered, this, &UCAction::setState);
 }
 
 UCAction::~UCAction()
@@ -434,6 +401,100 @@
     Q_EMIT shortcutChanged();
 }
 
+/*!
+ * \qmlproperty bool Action::visible
+ * Specifies whether the action is visible to the user. Defaults to true.
+ */
+void UCAction::setVisible(bool visible)
+{
+    if (m_visible == visible) {
+        return;
+    }
+    m_visible = visible;
+    Q_EMIT visibleChanged();
+}
+
+/*!
+ * \qmlproperty bool Action::enabled
+ * If set to false the action can not be triggered. Components visualizing the
+ * action migth either hide the action or make it insensitive. However visibility
+ * can be controlled separately using the \l visible property.
+ */
+void UCAction::setEnabled(bool enabled)
+{
+    if (m_enabled == enabled) {
+        return;
+    }
+    m_enabled = enabled;
+    Q_EMIT enabledChanged();
+
+}
+
+/*!
+ * \qmlproperty enum Action::parameterType
+ * Type of the parameter passed to \l trigger and \l triggered.
+ * Type is an enumeration:
+ * \list
+ *  \li \b Action.None: No paramater. (default)
+ *  \li \b Action.String: String parameter.
+ *  \li \b Action.Integer: Integer parameter.
+ *  \li \b Action.Bool: Boolean parameter.
+ *  \li \b Action.Real: Single precision floating point parameter.
+ *  \li \b Action.Object: The parameter is an object.
+ * \endlist
+ * \qml
+ * Action {
+ *     id: action
+ *     parameterType: Action.String
+ *     onTriggered: {
+ *         // value arguments now contain strings
+ *         console.log(value);
+ *     }
+ *     Component.onCompleted: action.trigger("Hello World")
+ * }
+ * \endqml
+ */
+void UCAction::setParameterType(UCAction::Type type)
+{
+    if (m_parameterType == type) {
+        return;
+    }
+    m_parameterType = type;
+    Q_EMIT parameterTypeChanged();
+}
+
+void UCAction::setState(const QVariant &state)
+{
+    if (m_state == state) {
+        return;
+    }
+    m_state = state;
+    Q_EMIT stateChanged();
+}
+
+UCExclusiveGroup *UCAction::exclusiveGroup() const
+{
+    return m_exclusiveGroup;
+}
+
+void UCAction::setExclusiveGroup(UCExclusiveGroup *exclusiveGroup)
+{
+    if (m_exclusiveGroup == exclusiveGroup) {
+        return;
+    }
+
+    if (m_exclusiveGroup) {
+        m_exclusiveGroup->removeAction(this);
+    }
+
+    m_exclusiveGroup = exclusiveGroup;
+
+    if (m_exclusiveGroup) {
+        m_exclusiveGroup->addAction(this);
+    }
+    Q_EMIT exclusiveGroupChanged();
+}
+
 bool UCAction::event(QEvent *event)
 {
     if (event->type() != QEvent::Shortcut)
@@ -473,6 +534,11 @@
     if (!m_enabled) {
         return;
     }
+
+    if (m_exclusiveGroup && !m_exclusiveGroup->checkValidTrigger(this, value)) {
+        return;
+    }
+
     if (!isValidType(value.type())) {
         Q_EMIT triggered(QVariant());
     } else {
 
=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2016-06-07 14:25:30 +0000
@@ -49,7 +49,7 @@
 
 class QQmlComponent;
 class QQuickItem;
-class UCActionAttached;
+class UCExclusiveGroup;
 class UCAction : public QObject
 {
     Q_OBJECT
@@ -58,19 +58,21 @@
     Q_ENUMS(Type)
     Q_PROPERTY(QString name MEMBER m_name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
-    Q_PROPERTY(QString iconName MEMBER m_iconName WRITE setIconName NOTIFY iconNameChanged)
+    Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged)
     Q_PROPERTY(QString description MEMBER m_description NOTIFY descriptionChanged)
     Q_PROPERTY(QString keywords MEMBER m_keywords NOTIFY keywordsChanged)
-    Q_PROPERTY(bool enabled MEMBER m_enabled NOTIFY enabledChanged)
-    Q_PROPERTY(Type parameterType MEMBER m_parameterType NOTIFY parameterTypeChanged)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(Type parameterType READ parameterType WRITE setParameterType NOTIFY parameterTypeChanged)
+    Q_PROPERTY(QVariant state READ state WRITE setState NOTIFY stateChanged REVISION 1)
+    Q_PROPERTY(UCExclusiveGroup* exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged REVISION 1)
 
     // Toolkit Actions API
-    Q_PROPERTY(QUrl iconSource MEMBER m_iconSource WRITE setIconSource NOTIFY iconSourceChanged)
-    Q_PROPERTY(bool visible MEMBER m_visible NOTIFY visibleChanged)
+    Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged)
+    Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(QQmlComponent *itemHint MEMBER m_itemHint WRITE setItemHint)
 
     // QtQuickControls.Action
-    Q_PROPERTY(QVariant shortcut MEMBER m_shortcut WRITE setShortcut RESET resetShortcut NOTIFY shortcutChanged REVISION 1)
+    Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut RESET resetShortcut NOTIFY shortcutChanged REVISION 1)
 public:
     enum Type {
         None,
@@ -104,11 +106,24 @@
     QString text();
     void setText(const QString &text);
     void resetText();
+    QString iconName() const { return m_iconName; }
     void setIconName(const QString &name);
+    QUrl iconSource() const { return m_iconSource; }
     void setIconSource(const QUrl &url);
     void setItemHint(QQmlComponent *);
+    QVariant shortcut() const { return m_shortcut; }
     void setShortcut(const QVariant&);
     void resetShortcut();
+    bool visible() const { return m_visible; }
+    void setVisible(bool visible);
+    void setEnabled(bool enabled);
+
+    void setParameterType(Type type);
+    Type parameterType() const { return m_parameterType; }
+    QVariant state() const { return m_state; }
+
+    UCExclusiveGroup *exclusiveGroup() const;
+    void setExclusiveGroup(UCExclusiveGroup *exclusiveGroup);
 
 Q_SIGNALS:
     void nameChanged();
@@ -121,10 +136,13 @@
     void iconSourceChanged();
     void visibleChanged();
     void shortcutChanged();
+    void stateChanged();
+    void exclusiveGroupChanged();
     void triggered(const QVariant &value);
 
 public Q_SLOTS:
     void trigger(const QVariant &value = QVariant());
+    void setState(const QVariant&);
 
 private:
     QPODVector<QQuickItem*, 4> m_owningItems;
@@ -142,6 +160,8 @@
     bool m_enabled:1;
     bool m_visible:1;
     bool m_published:1;
+    UCExclusiveGroup *m_exclusiveGroup;
+    QVariant m_state;
 
     friend class UCActionContext;
     friend class UCActionItem;
 
=== added file 'src/Ubuntu/Components/plugin/ucactionlist.cpp'
--- src/Ubuntu/Components/plugin/ucactionlist.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionlist.cpp	2016-06-07 14:25:30 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 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 "ucactionlist.h"
+#include "ucaction.h"
+
+/*!
+ * \qmltype ActionList
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief List of \l Action items
+ */
+UCActionList::UCActionList(QObject *parent)
+    : QObject(parent)
+{
+}
+
+/*!
+ * \qmlmethod ActionList::addAction(Action action)
+ * \deprecated
+ * Adds an Action to the context programatically.
+ */
+void UCActionList::addAction(UCAction *action)
+{
+    if (m_actions.contains(action)) {
+        return;
+    }
+    m_actions.append(action);
+    Q_EMIT added(action);
+}
+
+/*!
+ * \qmlmethod ActionList::removeAction(Action action)
+ * \deprecated
+ * Removes an action from the context programatically.
+ */
+void UCActionList::removeAction(UCAction *action)
+{
+    if (!action) {
+        return;
+    }
+    if (m_actions.removeOne(action)) {
+        Q_EMIT removed(action);
+    }
+}
+
+/*!
+
+ * \qmlproperty list<Action> ActionContext::actions
+ * \default
+ * List of Actions in this ActionContext
+ * Note that when you set this property, the children of the ActionList will be ignored,
+ * so do not set the list and define children.
+ *
+ * The advantage of setting actions over using the children is that the same
+ * \l Action items can be used in several sets of actions.
+ */
+QQmlListProperty<UCAction> UCActionList::actions()
+{
+    return QQmlListProperty<UCAction>(this, 0, UCActionList::append, UCActionList::count, 0, UCActionList::clear);
+}
+
+const QList<UCAction*> &UCActionList::list() const
+{
+    return m_actions;
+}
+
+void UCActionList::append(QQmlListProperty<UCAction> *list, UCAction *action)
+{
+    UCActionList *actionList = qobject_cast<UCActionList*>(list->object);
+    if (actionList) {
+        actionList->addAction(action);
+    }
+}
+
+void UCActionList::clear(QQmlListProperty<UCAction> *list)
+{
+    UCActionList *actionList = qobject_cast<UCActionList*>(list->object);
+    if (actionList) {
+        actionList->m_actions.clear();
+    }
+}
+
+int UCActionList::count(QQmlListProperty<UCAction> *list)
+{
+    UCActionList *actionList = qobject_cast<UCActionList*>(list->object);
+    if (actionList) {
+        return actionList->m_actions.count();
+    }
+    return 0;
+}
 
=== added file 'src/Ubuntu/Components/plugin/ucactionlist.h'
--- src/Ubuntu/Components/plugin/ucactionlist.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionlist.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 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 UCACTIONLIST_H
+#define UCACTIONLIST_H
+
+#include <QObject>
+#include <QtQml/QQmlListProperty>
+
+class UCAction;
+
+class UCActionList : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions)
+    Q_CLASSINFO("DefaultProperty", "actions")
+public:
+    explicit UCActionList(QObject *parent = 0);
+
+    QQmlListProperty<UCAction> actions();
+
+    const QList<UCAction*> &list() const;
+
+public Q_SLOTS:
+    void addAction(UCAction *action);
+    void removeAction(UCAction *action);
+
+Q_SIGNALS:
+    void added(UCAction *action);
+    void removed(UCAction *action);
+
+protected:
+    QList<UCAction*> m_actions;
+
+    static void append(QQmlListProperty<UCAction> *list, UCAction *action);
+    static void clear(QQmlListProperty<UCAction> *list);
+    static int count(QQmlListProperty<UCAction> *list);
+};
+
+#endif // UCACTIONLIST_H
 
=== added file 'src/Ubuntu/Components/plugin/ucexclusivegroup.cpp'
--- src/Ubuntu/Components/plugin/ucexclusivegroup.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucexclusivegroup.cpp	2016-06-07 14:25:30 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2016 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 "ucexclusivegroup.h"
+#include "ucaction.h"
+
+UCExclusiveGroup::UCExclusiveGroup(QObject *parent)
+    : UCActionList(parent)
+    , m_entranceGuard(false)
+{
+    connect(this, &UCActionList::added, this, &UCExclusiveGroup::onActionAdded);
+    connect(this, &UCActionList::removed, this, &UCExclusiveGroup::onActionRemoved);
+}
+
+void UCExclusiveGroup::onActionAdded(UCAction *action)
+{
+    action->setExclusiveGroup(this);
+    connect(action, &UCAction::stateChanged, this, [this, action]() { stateChanged(action); });
+}
+
+void UCExclusiveGroup::onActionRemoved(UCAction *action)
+{
+    action->setExclusiveGroup(nullptr);
+    disconnect(action, &UCAction::stateChanged, this, 0);
+}
+
+void UCExclusiveGroup::stateChanged(UCAction* action)
+{
+    if (m_entranceGuard) return;
+    m_entranceGuard = true;
+
+    if (action->state().type() != QVariant::Bool) {
+        m_entranceGuard = false;
+        return;
+    }
+
+    Q_FOREACH(UCAction* fromList, list()) {
+        if (fromList->parameterType() != UCAction::Bool) {
+            continue;
+        }
+
+        if (fromList != action && fromList->state().toBool() == true) {
+            fromList->trigger(false);
+        }
+    }
+
+    if (action->state().toBool() == true) {
+        setSelected(action);
+    } else {
+        setSelected(nullptr);
+    }
+
+    m_entranceGuard = false;
+}
+
+void UCExclusiveGroup::setSelected(UCAction *action)
+{
+    if (m_selected != action) {
+        if (action) {
+            m_selected = action;
+        } else {
+            m_selected.clear();
+        }
+        Q_EMIT selectedChanged();
+    }
+}
+
+UCAction *UCExclusiveGroup::selected() const
+{
+    return m_selected;
+}
+
+bool UCExclusiveGroup::checkValidTrigger(UCAction *action, const QVariant &value)
+{
+    // deselect others.
+    if (value.type() == QVariant::Bool && value.toBool() == false) {
+
+        int trueCount = 0;
+        Q_FOREACH(UCAction* fromList, list()) {
+            if (fromList->parameterType() != UCAction::Bool ||
+                action == fromList) {
+                continue;
+            }
+            trueCount += fromList->state().toBool();
+        }
+
+        if (trueCount == 0) {
+            return false;
+        }
+    }
+    return true;
+}
 
=== added file 'src/Ubuntu/Components/plugin/ucexclusivegroup.h'
--- src/Ubuntu/Components/plugin/ucexclusivegroup.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucexclusivegroup.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 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 UCEXCLUSIVEGROUP_H
+#define UCEXCLUSIVEGROUP_H
+
+#include "ucactionlist.h"
+#include "ucaction.h"
+#include <QQmlParserStatus>
+
+class UCExclusiveGroup : public UCActionList
+{
+    Q_OBJECT
+    Q_PROPERTY(UCAction* selected READ selected NOTIFY selectedChanged)
+
+public:
+    explicit UCExclusiveGroup(QObject *parent = 0);
+
+    UCAction* selected() const;
+
+    bool checkValidTrigger(UCAction* action, const QVariant& value);
+
+Q_SIGNALS:
+    void selectedChanged();
+
+
+protected Q_SLOTS:
+    void onActionAdded(UCAction* action);
+    void onActionRemoved(UCAction* action);
+
+private:
+    void stateChanged(UCAction* action);
+    void setSelected(UCAction* action);
+
+    QPointer<UCAction> m_selected;
+    bool m_entranceGuard;
+};
+
+#endif // UCEXCLUSIVEGROUP_H
 
=== added file 'src/Ubuntu/Components/plugin/ucmenu.cpp'
--- src/Ubuntu/Components/plugin/ucmenu.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenu.cpp	2016-06-07 14:25:30 +0000
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2016 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 "ucmenu.h"
+#include "ucmenu_p.h"
+#include "ucmenubar.h"
+#include "ucaction.h"
+#include "ucactionlist.h"
+
+// Qt
+#include <QtGui/qpa/qplatformtheme.h>
+#include <QtGui/qpa/qplatformmenu.h>
+#include <QQuickItem>
+#include <private/qguiapplication_p.h>
+#include <private/qquickitem_p.h>
+#include <QPointer>
+
+
+Q_LOGGING_CATEGORY(ucMenu, "ubuntu.components.Menu", QtMsgType::QtWarningMsg)
+
+namespace {
+
+QWindow* findWindowForObject(QObject* object)
+{
+    QObject* window = object;
+    while (window && !window->isWindowType()) {
+        window = window->parent();
+        if (QQuickItem* item = qobject_cast<QQuickItem*>(window)) {
+            window = item->window();
+        }
+    }
+    return qobject_cast<QWindow*>(window);
+}
+
+}
+
+UCMenuPrivate::UCMenuPrivate(UCMenu *qq)
+    : q_ptr(qq)
+    , m_platformMenu(QGuiApplicationPrivate::platformTheme()->createPlatformMenu())
+{
+}
+
+UCMenuPrivate::~UCMenuPrivate()
+{
+    delete m_platformMenu;
+}
+
+void UCMenuPrivate::insertObject(int index, QObject *o)
+{
+    Q_Q(UCMenu);
+    if (!o) return;
+    qCInfo(ucMenu).nospace() << "UCMenu::insertObject(index="<< index << ", object=" << o << ")";
+
+    // If the menus contains lists, we need to alter the insertion index to account for them.
+    int actualIndex = 0;
+    for (int i = 0; i < index && i < m_data.count(); i++) {
+        QObject* data = m_data[i];
+        auto list = qobject_cast<UCActionList*>(data);
+        actualIndex += list ? list->list().count() : 1;
+
+        // menu group adds a separator item.
+        if (qobject_cast<UCMenuGroup*>(data)) {
+            actualIndex++;
+        }
+    }
+
+    QVector<QObject*>::iterator position = m_data.count() > index ? m_data.begin() + index : m_data.end();
+    m_data.insert(position, o);
+
+    QObjectList objects;
+    if (UCActionList* actionList = qobject_cast<UCActionList*>(o)) {
+        Q_FOREACH(UCAction* action, actionList->list()) {
+            qCInfo(ucMenu).nospace() << " UCMenu::insertObject(actionList=" << actionList << ", action=" << action << ")";
+            objects << action;
+        }
+        // menu group adds a separator item; so add self as well.
+        if (qobject_cast<UCMenuGroup*>(actionList)) {
+            objects << o;
+        }
+    } else {
+        objects << o;
+    }
+
+    Q_FOREACH(QObject* object, objects) {
+
+        UCMenuAttached *attached = qobject_cast<UCMenuAttached*>(qmlAttachedPropertiesObject<UCMenuAttached>(object));
+        if (attached) {
+            attached->setParentObject(q);
+        }
+
+        // add to platform
+        if (m_platformMenu) {
+            auto platformWrapper = new PlatformItemWrapper(object, q);
+            platformWrapper->insert(actualIndex++);
+            m_platformItems[object] = platformWrapper;
+
+            QObject::connect(object, &QObject::destroyed, q, [platformWrapper]() {
+                platformWrapper->remove();
+            });
+        }
+    }
+}
+
+void UCMenuPrivate::removeObject(QObject *o)
+{
+    Q_Q(UCMenu);
+    m_data.removeOne(o);
+    qCInfo(ucMenu).nospace() << "UCMenu::insertObject(" << o << ")";
+
+    QObjectList objects;
+    if (UCActionList* actionList = qobject_cast<UCActionList*>(o)) {
+        Q_FOREACH(UCAction* action, actionList->list()) {
+            objects << action;
+        }
+        if (qobject_cast<UCMenuGroup*>(actionList)) {
+            objects << o;
+        }
+    } else {
+        objects << o;
+    }
+
+    Q_FOREACH(QObject* object, objects) {
+        // remove from platform.
+        if (m_platformMenu && m_platformItems.contains(object)) {
+            m_platformItems[object]->remove();
+            m_platformItems.remove(object);
+        }
+    }
+}
+
+void UCMenuPrivate::_q_updateEnabled()
+{
+    Q_Q(UCMenu);
+
+    bool isEnabled = q->isEnabled();
+    if (m_platformMenu) { m_platformMenu->setEnabled(isEnabled); }
+}
+
+void UCMenuPrivate::_q_updateText()
+{
+    Q_Q(UCMenu);
+
+    QString text = q->text();
+    if (m_platformMenu) { m_platformMenu->setText(text); }
+}
+
+void UCMenuPrivate::_q_updateIcon()
+{
+    Q_Q(UCMenu);
+
+    QIcon icon;
+    if (!q->iconSource().isEmpty()) {
+        icon = QIcon(q->iconSource().path());
+    } else if (!q->iconName().isEmpty()) {
+        icon = QIcon::fromTheme(q->iconName());
+    }
+
+    if (m_platformMenu) { m_platformMenu->setIcon(icon); }
+}
+
+void UCMenuPrivate::_q_updateVisible()
+{
+    Q_Q(UCMenu);
+
+    bool visible = q->visible();
+    if (m_platformMenu) { m_platformMenu->setVisible(visible); }
+}
+
+void UCMenuPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o)
+{
+    UCMenu *q = qobject_cast<UCMenu *>(prop->object);
+    q->appendObject(o);
+}
+
+int UCMenuPrivate::data_count(QQmlListProperty<QObject> *prop)
+{
+    UCMenuPrivate *p = static_cast<UCMenuPrivate *>(prop->data);
+    return p->m_data.count();
+}
+
+QObject *UCMenuPrivate::data_at(QQmlListProperty<QObject> *prop, int index)
+{
+    UCMenuPrivate *p = static_cast<UCMenuPrivate *>(prop->data);
+    return p->m_data.value(index);
+}
+
+void UCMenuPrivate::data_clear(QQmlListProperty<QObject> *prop)
+{
+    UCMenuPrivate *p = static_cast<UCMenuPrivate *>(prop->data);
+    p->m_data.clear();
+}
+
+/*!
+ * \qmltype Menu
+ * \instantiates UCMenu
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief Menu defines a context menu or submenu structure of a MenuBar
+ *
+ * Example usage:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * Menu {
+ *     text: "&File"
+ *
+ *     MenuGroup {
+ *         Action {
+ *             text: "&New"
+ *             shortcut: "Ctrl+N"
+ *         }
+ *
+ *         Action {
+ *             text: "&Open"
+ *             shortcut: "Ctrl+O"
+ *         }
+ *     }
+ *
+ *     Menu {
+ *         text: "Recent Files"
+ *
+ *         ActionList {
+ *             Action { text: "1.txt" }
+ *             Action { text: "2.txt" }
+ *             Action { text: "3.txt" }
+ *         }
+ *     }
+ *
+ *     Action {
+ *         action: Action {
+ *             text: "E&xit"
+ *             shortcut: "Ctrl+X"
+ *         }
+ *     }
+ * }
+ * \endqml
+ */
+UCMenu::UCMenu(QObject *parent)
+    : UCAction(parent)
+    , d_ptr(new UCMenuPrivate(this))
+{
+    Q_D(UCMenu);
+
+    connect(this, SIGNAL(enabledChanged()), this, SLOT(_q_updateEnabled()));
+    connect(this, SIGNAL(textChanged()), this, SLOT(_q_updateText()));
+    connect(this, SIGNAL(iconNameChanged()), this, SLOT(_q_updateIcon()));
+    connect(this, SIGNAL(iconSourceChanged()), this, SLOT(_q_updateIcon()));
+    connect(this, SIGNAL(visibleChanged()), this, SLOT(_q_updateVisible()));
+}
+
+UCMenu::~UCMenu()
+{
+}
+
+/*!
+ * \qmlproperty list<Object> Menu::data
+ * \default
+ * List of objects representing menu items within the menu.
+ *
+ * Currently supports Menu, MenuItem, MenuSeparator & Item objects.
+ * \note Item object which do not support platformItem will not be exported for native menus.
+ */
+QQmlListProperty<QObject> UCMenu::data()
+{
+    Q_D(UCMenu);
+    return QQmlListProperty<QObject>(this, d,
+                                     &UCMenuPrivate::data_append,
+                                     &UCMenuPrivate::data_count,
+                                     &UCMenuPrivate::data_at,
+                                     &UCMenuPrivate::data_clear);
+}
+
+/*!
+ * \qmlmethod Menu::appendObject(object o)
+ * Add a object tto the menu
+ */
+void UCMenu::appendObject(QObject *o)
+{
+    Q_D(UCMenu);
+
+    insertObject(d->m_data.count(), o);
+}
+
+/*!
+ * \qmlmethod Menu::insertObject(int index, object o)
+ * Inserts an item at the index in the menu.
+ *
+ * Currently supports Menu, MenuItem, MenuSeparator & Item objects.
+ * \note Item object which do not support platformItem will not be exported for native menus.
+ */
+void UCMenu::insertObject(int index, QObject *o)
+{
+    Q_D(UCMenu);
+    d->insertObject(index, o);
+}
+
+/*!
+ * \qmlmethod Menu::removeObject(object o)
+ * Removes the item from the menu.
+ */
+void UCMenu::removeObject(QObject *o)
+{
+    Q_D(UCMenu);
+    qCInfo(ucMenu) << "UCMenu::removeObject" << o;
+
+    d->removeObject(o);
+}
+
+QPlatformMenu* UCMenu::platformMenu() const
+{
+    Q_D(const UCMenu);
+    return d->m_platformMenu;
+}
+
+/*!
+ * \qmlmethod Menu::show(point point)
+ * Show the menu popup at the given point
+ */
+void UCMenu::show(const QPoint &point)
+{
+    Q_D(UCMenu);
+    qCInfo(ucMenu, "UCMenu::popup(%s, point(%d,%d))", qPrintable(text()), point.x(), point.y());
+
+    if (d->m_platformMenu) {
+        d->m_platformMenu->showPopup(findWindowForObject(this), QRect(point, QSize()), nullptr);
+    }
+}
+
+/*!
+ * \qmlmethod Menu::dismiss()
+ * Dismiss and destroy the menu popup.
+ */
+void UCMenu::dismiss()
+{
+    Q_D(UCMenu);
+    qCInfo(ucMenu, "UCMenu::dismiss(%s)", qPrintable(text()));
+
+    if (d->m_platformMenu) {
+        d->m_platformMenu->dismiss();
+    }
+}
+
+/*!
+ * \qmltype Menus
+ * \instantiates UCMenuAttached
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \ingroup ubuntu
+ * \since Ubuntu.Components 1.3
+ * \brief A set of properties attached to the Menu.
+ *
+ */
+UCMenuAttached::UCMenuAttached(QObject *parent)
+    : QObject(parent)
+    , m_parentObject(nullptr)
+{
+}
+
+UCMenuAttached *UCMenuAttached::qmlAttachedProperties(QObject *o)
+{
+    return new UCMenuAttached(o);
+}
+
+void UCMenuAttached::setParentObject(QObject *o)
+{
+    if (m_parentObject != o) {
+        UCMenu* oldMenu = parentMenu();
+        UCMenuBar* oldBar = menuBar();
+
+        m_parentObject = o;
+
+        if (oldMenu != parentMenu()) Q_EMIT parentMenuChanged();
+        if (oldBar != menuBar()) Q_EMIT menuBarChanged();
+    }
+}
+
+/*!
+ * \qmlattachedproperty bool Menus::parentMenu
+ * The property returns the parent Menu of the object, or null if there is none.
+ */
+UCMenu *UCMenuAttached::parentMenu() const
+{
+    return qobject_cast<UCMenu*>(m_parentObject);
+}
+
+/*!
+ * \qmlattachedproperty bool Menus::menuBar
+ * The property returns the parent MenuBar of the object, or null if there is none.
+ */
+UCMenuBar *UCMenuAttached::menuBar() const
+{
+    return qobject_cast<UCMenuBar*>(m_parentObject);
+}
+
+
+PlatformItemWrapper::PlatformItemWrapper(QObject *target, UCMenu* menu)
+    : QObject(menu)
+    , m_target(target)
+    , m_menu(menu)
+    , m_platformItem(menu->platformMenu() ? menu->platformMenu()->createMenuItem() : Q_NULLPTR)
+{
+    connect(m_target, &QObject::destroyed, this, &QObject::deleteLater);
+
+    if (UCMenu* menu = qobject_cast<UCMenu*>(m_target)) {
+        if (m_platformItem) {
+            m_platformItem->setMenu(menu->platformMenu());
+        }
+
+        connect(menu, &UCMenu::visibleChanged, this, &PlatformItemWrapper::updateVisible);
+        connect(menu, &UCMenu::textChanged, this, &PlatformItemWrapper::updateText);
+        connect(menu, &UCMenu::enabledChanged, this, &PlatformItemWrapper::updateEnabled);
+        connect(menu, &UCMenu::iconSourceChanged, this, &PlatformItemWrapper::updateIcon);
+        connect(menu, &UCMenu::iconNameChanged, this, &PlatformItemWrapper::updateIcon);
+
+    } else if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+
+        connect(action, &UCAction::visibleChanged, this, &PlatformItemWrapper::updateVisible);
+        connect(action, &UCAction::textChanged, this, &PlatformItemWrapper::updateText);
+        connect(action, &UCAction::enabledChanged, this, &PlatformItemWrapper::updateEnabled);
+        connect(action, &UCAction::iconSourceChanged, this, &PlatformItemWrapper::updateIcon);
+        connect(action, &UCAction::iconNameChanged, this, &PlatformItemWrapper::updateIcon);
+        connect(action, &UCAction::shortcutChanged, this, &PlatformItemWrapper::updateShortcut);
+        connect(action, &UCAction::parameterTypeChanged, this, &PlatformItemWrapper::updateCheck);
+        connect(action, &UCAction::stateChanged, this, &PlatformItemWrapper::updateCheck);
+
+        if (m_platformItem) {
+            connect(m_platformItem, SIGNAL(activated()), action, SLOT(trigger()));
+        }
+
+    } else if (qobject_cast<UCActionList*>(m_target)) {
+        if (m_platformItem) {
+            m_platformItem->setIsSeparator(true);
+        }
+    }
+
+    syncPlatformItem();
+}
+
+void PlatformItemWrapper::insert(int index)
+{
+    auto platformMenu = m_menu->platformMenu();
+    if (!platformMenu) return;
+    if (!m_platformItem) return;
+
+    QPlatformMenuItem* before = platformMenu->menuItemAt(index);
+    platformMenu->insertMenuItem(m_platformItem, before);
+}
+
+void PlatformItemWrapper::remove()
+{
+    auto platformMenu = m_menu->platformMenu();
+    if (!platformMenu) return;
+    if (!m_platformItem) return;
+
+    platformMenu->removeMenuItem(m_platformItem);
+}
+
+void PlatformItemWrapper::updateVisible()
+{
+    if (!m_platformItem) return;
+
+    if (UCMenu* menu = qobject_cast<UCMenu*>(m_target)) {
+        m_platformItem->setVisible(menu->visible());
+        if (menu->platformMenu()) menu->platformMenu()->setVisible(menu->visible());
+    } else if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+        m_platformItem->setVisible(action->visible());
+    }
+}
+
+void PlatformItemWrapper::updateEnabled()
+{
+    if (!m_platformItem) return;
+
+    if (UCMenu* menu = qobject_cast<UCMenu*>(m_target)) {
+        m_platformItem->setEnabled(menu->isEnabled());
+        if (menu->platformMenu()) menu->platformMenu()->setEnabled(menu->isEnabled());
+    } else if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+        m_platformItem->setText(action->text());
+    }
+}
+
+void PlatformItemWrapper::updateText()
+{
+    if (!m_platformItem) return;
+
+    if (UCMenu* menu = qobject_cast<UCMenu*>(m_target)) {
+        m_platformItem->setText(menu->text());
+        if (menu->platformMenu()) menu->platformMenu()->setText(menu->text());
+    } else if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+        m_platformItem->setText(action->text());
+    }
+}
+
+void PlatformItemWrapper::updateIcon()
+{
+    if (!m_platformItem) return;
+
+    QIcon icon;
+    if (UCMenu* menu = qobject_cast<UCMenu*>(m_target)) {
+
+        if (!menu->iconSource().isEmpty()) {
+            icon = QIcon(menu->iconSource().path());
+        } else if (!menu->iconName().isEmpty()) {
+            icon = QIcon::fromTheme(menu->iconName());
+        }
+        if (menu->platformMenu()) menu->platformMenu()->setIcon(icon);
+
+    } else if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+
+        if (!action->iconSource().isEmpty()) {
+            icon = QIcon(action->iconSource().path());
+        } else if (!action->iconName().isEmpty()) {
+            icon = QIcon::fromTheme(action->iconName());
+        }
+    }
+    m_platformItem->setIcon(icon);
+}
+
+
+inline QKeySequence sequenceFromVariant(const QVariant& variant)
+{
+    if (variant.type() == QVariant::Int) {
+        return static_cast<QKeySequence::StandardKey>(variant.toInt());
+    }
+    if (variant.type() == QVariant::String) {
+        return QKeySequence::fromString(variant.toString());
+    }
+    return QKeySequence();
+}
+
+void PlatformItemWrapper::updateShortcut()
+{
+    if (!m_platformItem) return;
+
+    if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+        m_platformItem->setShortcut(sequenceFromVariant(action->shortcut()));
+    }
+}
+
+void PlatformItemWrapper::updateCheck()
+{
+    if (!m_platformItem) return;
+
+    if (UCAction* action = qobject_cast<UCAction*>(m_target)) {
+        bool checkable = action->parameterType() == UCAction::Bool;
+        m_platformItem->setCheckable(checkable);
+        m_platformItem->setChecked(checkable && action->state().toBool());
+    }
+}
+
+void PlatformItemWrapper::syncPlatformItem()
+{
+    updateVisible();
+    updateEnabled();
+    updateText();
+    updateIcon();
+    updateShortcut();
+    updateCheck();
+
+    if (m_menu->platformMenu() && m_platformItem) {
+        m_menu->platformMenu()->syncMenuItem(m_platformItem);
+    }
+}
+
+
+/*!
+ * \qmltype MenuGroup
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief List of \l Action items for a menu which adds a separator between logical groups of menus.
+ *
+ * Example usage:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * Menu {
+ *     text: "Edit"
+ *
+ *     MenuGroup {
+ *         Action { text: "Undo" }
+ *         Action { text: "Redo" }
+ *     }
+ *
+ *     MenuGroup {
+ *         Action { text: "Cut" }
+ *         Action { text: "Copy" }
+ *         Action { text: "Paste" }
+ *     }
+ *
+ *     MenuGroup {
+ *         Action { text: "Select All" }
+ *     }
+ * }
+ * \endqml
+ */
+UCMenuGroup::UCMenuGroup(QObject *parent)
+    : UCActionList(parent)
+{
+}
+
+#include "moc_ucmenu.cpp"
 
=== added file 'src/Ubuntu/Components/plugin/ucmenu.h'
--- src/Ubuntu/Components/plugin/ucmenu.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenu.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2016 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 UCMENU_H
+#define UCMENU_H
+
+#include <QQmlListProperty>
+#include <QUrl>
+#include <QLoggingCategory>
+#include <QPointer>
+#include <qqml.h>
+#include <QtQml/qqml.h>
+#include <private/qquickitemchangelistener_p.h>
+
+#include "ucaction.h"
+#include "ucactionlist.h"
+
+Q_DECLARE_LOGGING_CATEGORY(ucMenu);
+
+class QPlatformMenu;
+class QPlatformMenuItem;
+class QQuickItem;
+class UCMenuPrivate;
+class UCMenuAttached;
+class UCMenuBar;
+class UCAction;
+
+class UCMenu : public UCAction
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data FINAL)
+    Q_CLASSINFO("DefaultProperty", "data")
+
+public:
+    explicit UCMenu(QObject *parent = 0);
+    ~UCMenu();
+
+    QQmlListProperty<QObject> data();
+
+    Q_INVOKABLE void appendObject(QObject* obj);
+    Q_INVOKABLE void insertObject(int index, QObject* obj);
+    Q_INVOKABLE void removeObject(QObject* obj);
+
+    QPlatformMenu *platformMenu() const;
+
+public Q_SLOTS:
+    void show(const QPoint& pt);
+    void dismiss();
+
+private:
+    Q_DISABLE_COPY(UCMenu)
+    Q_DECLARE_PRIVATE(UCMenu)
+    QScopedPointer<UCMenuPrivate> d_ptr;
+
+    Q_PRIVATE_SLOT(d_func(), void _q_updateEnabled())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateText())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateIcon())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateVisible())
+};
+
+class UCMenuAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(UCMenu* parentMenu READ parentMenu NOTIFY parentMenuChanged)
+    Q_PROPERTY(UCMenuBar* menuBar READ menuBar NOTIFY parentMenuChanged)
+public:
+    explicit UCMenuAttached(QObject *parent);
+
+    static UCMenuAttached *qmlAttachedProperties(QObject *);
+
+    void setParentObject(QObject* o);
+
+    UCMenu *parentMenu() const;
+    UCMenuBar *menuBar() const;
+
+Q_SIGNALS:
+    void parentMenuChanged();
+    void menuBarChanged();
+
+private:
+    QPointer<QObject> m_parentObject;
+};
+QML_DECLARE_TYPEINFO(UCMenuAttached, QML_HAS_ATTACHED_PROPERTIES)
+
+
+class UCMenuGroup : public UCActionList
+{
+    Q_OBJECT
+public:
+    explicit UCMenuGroup(QObject *parent = 0);
+};
+
+#endif // UCMENU_H
 
=== added file 'src/Ubuntu/Components/plugin/ucmenu_p.h'
--- src/Ubuntu/Components/plugin/ucmenu_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenu_p.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2016 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 UCMENU_P
+#define UCMENU_P
+
+#include <private/qquickitemchangelistener_p.h>
+#include "ucmenu.h"
+
+class QObject;
+class UCAction;
+class QQmlComponent;
+class UCMenu;
+class PlatformItemWrapper;
+
+class UCMenuPrivate
+{
+    Q_DECLARE_PUBLIC(UCMenu)
+public:
+    UCMenuPrivate(UCMenu *qq);
+    virtual ~UCMenuPrivate();
+
+    void insertObject(int index, QObject *obj);
+    void removeObject(QObject *obj);
+
+    void _q_updateEnabled();
+    void _q_updateText();
+    void _q_updateIcon();
+    void _q_updateVisible();
+
+    static void data_append(QQmlListProperty<QObject> *prop, QObject *o);
+    static int data_count(QQmlListProperty<QObject> *prop);
+    static QObject *data_at(QQmlListProperty<QObject> *prop, int index);
+    static void data_clear(QQmlListProperty<QObject> *prop);
+
+    UCMenu* q_ptr;
+    QPlatformMenu* m_platformMenu;
+    UCAction* m_action;
+
+    QHash<QObject*, PlatformItemWrapper*> m_platformItems;
+    QVector<QObject*> m_data;
+};
+
+class PlatformItemWrapper : public QObject
+{
+    Q_OBJECT
+public:
+    PlatformItemWrapper(QObject *target, UCMenu* menu);
+
+    void insert(int index);
+    void remove();
+
+public Q_SLOTS:
+    void updateVisible();
+    void updateEnabled();
+    void updateText();
+    void updateIcon();
+    void updateShortcut();
+    void updateCheck();
+
+private:
+    void syncPlatformItem();
+
+    QObject* m_target;
+    UCMenu* m_menu;
+    QPlatformMenuItem* m_platformItem;
+};
+
+#endif // UCMENU_P
 
=== added file 'src/Ubuntu/Components/plugin/ucmenubar.cpp'
--- src/Ubuntu/Components/plugin/ucmenubar.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenubar.cpp	2016-06-07 14:25:30 +0000
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2016 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 "ucmenubar.h"
+#include "ucmenubar_p.h"
+
+// Qt
+#include <QQuickItem>
+#include <QQuickWindow>
+#include <private/qguiapplication_p.h>
+#include <QtGui/qpa/qplatformtheme.h>
+#include <QtGui/qpa/qplatformmenu.h>
+
+UCMenuBarPrivate::UCMenuBarPrivate(UCMenuBar *qq)
+    : q_ptr(qq)
+{
+    m_platformBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar();
+}
+
+void UCMenuBarPrivate::insertMenu(int index, UCMenu* menu)
+{
+    Q_Q(UCMenuBar);
+    UCMenu* prevMenu = m_menus.count() > index ? m_menus[index] : nullptr;
+
+    m_menus.insert(index, menu);
+
+    UCMenuAttached *attached = qobject_cast<UCMenuAttached*>(qmlAttachedPropertiesObject<UCMenuAttached>(menu));
+    if (attached) {
+        attached->setParentObject(q);
+    }
+
+    if (m_platformBar && menu->platformMenu()) {
+        m_platformBar->insertMenu(menu->platformMenu(), prevMenu ? prevMenu->platformMenu() : nullptr);
+    }
+}
+
+void UCMenuBarPrivate::menu_append(QQmlListProperty<UCMenu> *prop, UCMenu *o)
+{
+    UCMenuBarPrivate *q = static_cast<UCMenuBarPrivate *>(prop->data);
+    // menubar is the menus parent
+    o->setParent(prop->object);
+    q->insertMenu(q->m_menus.count(), o);
+}
+
+int UCMenuBarPrivate::menu_count(QQmlListProperty<UCMenu> *prop)
+{
+    UCMenuBarPrivate *p = static_cast<UCMenuBarPrivate *>(prop->data);
+    return p->m_menus.count();
+}
+
+UCMenu *UCMenuBarPrivate::menu_at(QQmlListProperty<UCMenu> *prop, int index)
+{
+    UCMenuBarPrivate *p = static_cast<UCMenuBarPrivate *>(prop->data);
+    return p->m_menus.value(index);
+}
+
+void UCMenuBarPrivate::menu_clear(QQmlListProperty<UCMenu> *prop)
+{
+    UCMenuBarPrivate *p = static_cast<UCMenuBarPrivate *>(prop->data);
+    p->m_menus.clear();
+}
+
+/*!
+ * \qmltype MenuBar
+ * \instantiates UCMenuBar
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \ingroup ubuntu
+ * \brief MenuBar defines an application menu bar structure
+ *
+ * Example usage:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * MainView {
+ *     MenuBar {
+ *         Menu {
+ *             text: "_File"
+ *
+ *             MenuItem {
+ *                 text: "_New"
+ *                 shortcut: "Ctrl+N"
+ *             }
+ *
+ *             MenuItem {
+ *                 text: "_Open"
+ *                 shortcut: "Ctrl+O"
+ *             }
+ *
+ *             MenuSeparator {}
+ *
+ *             MenuItem {
+ *                 action: exitAction
+ *             }
+ *         }
+ *
+ *         Menu {
+ *             text: "_Edit"
+ *
+ *             MenuItem {
+ *                 text: "_Undo"
+ *                 iconSource: "image://theme/undo"
+ *             }
+ *         }
+ *         Menu {
+ *             text: "_Window"
+ *
+ *             MenuItem {
+ *                 text: "Fullscreen"
+ *                 checkable: true
+ *                 checked: false
+ *             }
+ *         }
+ *     }
+ *     Action {
+ *         id: boundAction
+ *         text: "E_xit"
+ *         onTriggered: {
+ *             Qt.quit();
+ *         }
+ *     }
+ * }
+ * \endqml
+ */
+UCMenuBar::UCMenuBar(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new UCMenuBarPrivate(this))
+{
+}
+
+UCMenuBar::~UCMenuBar()
+{
+}
+
+/*!
+  * \qmlmethod void MenuBar::appendMenu(Menu menu)
+  * Append a Menu to the MenuBar
+ */
+void UCMenuBar::appendMenu(UCMenu *menu)
+{
+    Q_D(UCMenuBar);
+    insertMenu(d->m_menus.count(), menu);
+}
+
+/*!
+  * \qmlmethod void MenuBar::insertMenu(int index, Menu menu)
+  * Insert a Menu to the MenuBar at the specified position
+ */
+void UCMenuBar::insertMenu(int index, UCMenu *menu)
+{
+    Q_D(UCMenuBar);
+    if (!menu) return;
+
+    d->insertMenu(index, menu);
+    Q_EMIT menusChanged();
+}
+
+/*!
+  * \qmlmethod void MenuBar::removeMenu(Menu menu)
+  * Remove a Menu from the MenuBar
+ */
+void UCMenuBar::removeMenu(UCMenu *menu)
+{
+    Q_D(UCMenuBar);
+    if (!menu) return;
+
+    if (d->m_menus.removeOne(menu)) {
+        Q_EMIT menusChanged();
+    }
+}
+/*!
+ * \qmlproperty list<Menu> MenuBar::menus
+ * \default
+ * List of Menus in this MenuBar.
+ */
+QQmlListProperty<UCMenu> UCMenuBar::menus()
+{
+    Q_D(UCMenuBar);
+    return QQmlListProperty<UCMenu>(this, d,
+                                     &UCMenuBarPrivate::menu_append,
+                                     &UCMenuBarPrivate::menu_count,
+                                     &UCMenuBarPrivate::menu_at,
+                                    &UCMenuBarPrivate::menu_clear);
+}
+
+QPlatformMenuBar *UCMenuBar::platformMenuBar() const
+{
+    Q_D(const UCMenuBar);
+    return d->m_platformBar;
+}
+
+void UCMenuBar::classBegin()
+{
+}
+
+void UCMenuBar::componentComplete()
+{
+    Q_D(UCMenuBar);
+
+    auto parentItem = qobject_cast<QQuickItem*>(parent());
+    if (parentItem && d->m_platformBar) {
+        d->m_platformBar->handleReparent(parentItem->window());
+    }
+}
+
+PlatformMenuWrapper::PlatformMenuWrapper(UCMenu *target, UCMenuBar* bar)
+    : QObject(bar)
+    , m_bar(bar)
+    , m_target(target)
+    , m_platformItem(target->platformMenu() ? target->platformMenu()->createMenuItem() : Q_NULLPTR)
+{
+    connect(m_target, &QObject::destroyed, this, &QObject::deleteLater);
+
+    connect(m_target, &UCMenu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
+    connect(m_target, &UCMenu::textChanged, this, &PlatformMenuWrapper::updateText);
+    connect(m_target, &UCMenu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
+    connect(m_target, &UCMenu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
+    connect(m_target, &UCMenu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
+
+    if (m_platformItem) {
+        m_platformItem->setMenu(target->platformMenu());
+    }
+    syncPlatformItem();
+}
+
+void PlatformMenuWrapper::insert(int index)
+{
+    Q_UNUSED(index);
+
+    auto platformBar = m_bar->platformMenuBar();
+    if (!platformBar) return;
+    auto platformMenu = m_target->platformMenu();
+    if (!platformMenu) return;
+
+    platformBar->insertMenu(platformMenu, Q_NULLPTR);
+}
+
+void PlatformMenuWrapper::remove()
+{
+    auto platformBar = m_bar->platformMenuBar();
+    if (!platformBar) return;
+    auto platformMenu = m_target->platformMenu();
+    if (!platformMenu) return;
+
+    platformBar->removeMenu(platformMenu);
+}
+
+void PlatformMenuWrapper::updateVisible()
+{
+    if (m_platformItem) m_platformItem->setVisible(m_target->visible());
+    if (m_target->platformMenu()) m_target->platformMenu()->setVisible(m_target->visible());
+}
+
+void PlatformMenuWrapper::updateEnabled()
+{
+    if (!m_platformItem) m_platformItem->setEnabled(m_target->isEnabled());
+    if (m_target->platformMenu()) m_target->platformMenu()->setEnabled(m_target->isEnabled());
+}
+
+void PlatformMenuWrapper::updateText()
+{
+    if (!m_platformItem) m_platformItem->setText(m_target->text());
+    if (m_target->platformMenu()) m_target->platformMenu()->setText(m_target->text());
+}
+
+void PlatformMenuWrapper::updateIcon()
+{
+    QIcon icon;
+    if (!m_target->iconSource().isEmpty()) {
+        icon = QIcon(m_target->iconSource().path());
+    } else if (!m_target->iconName().isEmpty()) {
+        icon = QIcon::fromTheme(m_target->iconName());
+    }
+    if (m_target->platformMenu()) m_target->platformMenu()->setIcon(icon);
+    if (!m_platformItem) m_platformItem->setIcon(icon);
+}
+
+void PlatformMenuWrapper::syncPlatformItem()
+{
+    updateVisible();
+    updateEnabled();
+    updateText();
+    updateIcon();
+}
+
+#include "moc_ucmenubar.cpp"
 
=== added file 'src/Ubuntu/Components/plugin/ucmenubar.h'
--- src/Ubuntu/Components/plugin/ucmenubar.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenubar.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 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 UCMENUBAR_H
+#define UCMENUBAR_H
+
+#include "ucmenu.h"
+
+#include <QQmlParserStatus>
+
+class UCMenuBarPrivate;
+class QPlatformMenuBar;
+
+class UCMenuBar : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+
+    Q_PROPERTY(QQmlListProperty<UCMenu> menus READ menus NOTIFY menusChanged FINAL)
+    Q_CLASSINFO("DefaultProperty", "menus")
+
+public:
+    explicit UCMenuBar(QObject *parent = 0);
+    ~UCMenuBar();
+
+    Q_INVOKABLE void appendMenu(UCMenu *menu);
+    Q_INVOKABLE void insertMenu(int index, UCMenu *menu);
+    Q_INVOKABLE void removeMenu(UCMenu *menu);
+
+    QQmlListProperty<UCMenu> menus();
+
+    QPlatformMenuBar *platformMenuBar() const;
+
+    void classBegin() Q_DECL_OVERRIDE;
+    void componentComplete() Q_DECL_OVERRIDE;
+
+Q_SIGNALS:
+    void menusChanged();
+
+private:
+    Q_DISABLE_COPY(UCMenuBar)
+    Q_DECLARE_PRIVATE(UCMenuBar)
+    QScopedPointer<UCMenuBarPrivate> d_ptr;
+};
+
+#endif // UCMENUBAR_H
 
=== added file 'src/Ubuntu/Components/plugin/ucmenubar_p.h'
--- src/Ubuntu/Components/plugin/ucmenubar_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucmenubar_p.h	2016-06-07 14:25:30 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016 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 UCMENUBAR_P
+#define UCMENUBAR_P
+
+#include "ucmenubar.h"
+
+class QPlatformMenuBar;
+
+class UCMenuBarPrivate : public QQuickItemChangeListener
+{
+    Q_DECLARE_PUBLIC(UCMenuBar)
+public:
+    UCMenuBarPrivate(UCMenuBar *qq);
+
+    void insertMenu(int index, UCMenu *menu);
+
+    static void menu_append(QQmlListProperty<UCMenu> *prop, UCMenu *o);
+    static int menu_count(QQmlListProperty<UCMenu> *prop);
+    static UCMenu *menu_at(QQmlListProperty<UCMenu> *prop, int index);
+    static void menu_clear(QQmlListProperty<UCMenu> *prop);
+
+    UCMenuBar* q_ptr;
+    QPlatformMenuBar* m_platformBar;
+    QVector<UCMenu*> m_menus;
+};
+
+class PlatformMenuWrapper : public QObject
+{
+    Q_OBJECT
+public:
+    PlatformMenuWrapper(UCMenu *target, UCMenuBar *bar);
+
+    void insert(int index);
+    void remove();
+
+public Q_SLOTS:
+    void updateVisible();
+    void updateEnabled();
+    void updateText();
+    void updateIcon();
+    void updateShortcut();
+
+private:
+    void syncPlatformItem();
+
+    UCMenuBar* m_bar;
+    UCMenu* m_target;
+    QPlatformMenuItem* m_platformItem;
+};
+
+#endif // UCMENUBAR_P
+
 
=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2016-02-16 11:39:32 +0000
+++ src/Ubuntu/Components/qmldir	2016-06-07 14:25:30 +0000
@@ -1,6 +1,5 @@
 module Ubuntu.Components
 plugin UbuntuComponents
-ActionList 0.1 1.2/ActionList.qml
 ToolbarItems 0.1 1.2/ToolbarItems.qml
 ToolbarButton 0.1 1.2/ToolbarButton.qml
 MainView 0.1 1.2/MainView.qml
@@ -40,7 +39,6 @@
 DateUtils 0.1 1.2/dateUtils.js
 
 #version 1.0
-ActionList 1.0 1.2/ActionList.qml
 ToolbarItems 1.0 1.2/ToolbarItems.qml
 ToolbarButton 1.0 1.2/ToolbarButton.qml
 MainView 1.0 1.2/MainView.qml
@@ -95,7 +93,6 @@
 #################################################
 #version 1.3
 ActionBar 1.3 1.3/ActionBar.qml
-ActionList 1.3 1.3/ActionList.qml
 AdaptivePageLayout 1.3 1.3/AdaptivePageLayout.qml
 PageColumnsLayout 1.3 1.3/PageColumnsLayout.qml
 PageColumn 1.3 1.3/PageColumn.qml