Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contextMenu into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Unmerged revisions

1607. By Cris Dywan on 2015-08-26

Proper looks

1606. By Cris Dywan on 2015-08-25

Example context menu

1605. By Cris Dywan on 2015-08-24

Implement ContextMenu/ MenuGroup/ (internal) MenuItem

=== modified file 'components.api'
--- components.api	2015-12-19 10:06:24 +0000
+++ components.api	2016-01-07 10:05:16 +0000
@@ -303,7 +303,12 @@
     default property Component layout
     property string name
     property QQmlBinding when
+<<<<<<< TREE
 Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1 UPMCpuUsage: Item
+=======
+Ubuntu.Components.Popups.ContextMenu 1.3: Popover
+Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1: Item
+>>>>>>> MERGE-SOURCE
     readonly property UPMGraphModel graphModel
     property int period
     property int samplingInterval
@@ -614,6 +619,7 @@
     default property list<QtObject> contentsItem
 Ubuntu.Components.MainView 1.3: MainViewBase
     property bool automaticOrientation
+<<<<<<< TREE
     default property list<QtObject> contentsItem
 Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
     function double clamp(double x, double min, double max)
@@ -621,6 +627,16 @@
     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.MimeData 1.0 0.1 QQuickMimeData: QtObject
+=======
+    default readonly property QtObject contentsItem
+Ubuntu.Components.MathUtils 0.1 1.0 1.3
+Ubuntu.Components.Popups.MenuGroup 1.3: Column
+    readonly property QtObject actions
+    property Component delegate
+    property ContextMenu menu
+    property string text
+Ubuntu.Components.MimeData 1.0 0.1: QtObject
+>>>>>>> MERGE-SOURCE
     property color color
     property var data
     readonly property QStringList formats
@@ -935,6 +951,7 @@
     function var show()
     function var hide()
     property Item pointerTarget
+    property string styleName
 Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
     property Item dismissArea
     property PropertyAnimation fadingAnimation
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/ExampleContextMenu.qml'
--- examples/ubuntu-ui-toolkit-gallery/ExampleContextMenu.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ExampleContextMenu.qml	2016-01-07 10:05:16 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+ContextMenu {
+    MenuGroup {
+        Action {
+            text: i18n.tr("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.")
+            shortcut: 'Alt+P'
+        }
+        Action {
+            iconName: 'compose'
+            text: i18n.tr("Once upon a time there was a story nobody told.")
+            enabled: false
+            shortcut: 'Ctrl+Shift+T'
+        }
+    }
+    MenuGroup {
+        Action {
+            iconName: 'delete'
+            text: i18n.tr("Delete")
+            shortcut: 'Del'
+        }
+        MenuGroup {
+            text: i18n.tr("But wait, there's more")
+            Action {
+                text: i18n.tr("Send an email")
+                shortcut: 'Ctrl+C'
+                enabled: false
+            }
+            Action {
+                iconName: 'save-to'
+                text: i18n.tr("Save to file")
+                shortcut: 'Shift+S'
+            }
+        }
+        MenuGroup {
+            text: i18n.tr("Forever moar quoth the raven")
+            enabled: false
+        }
+    }
+}
+
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-09-28 12:26:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2016-01-07 10:05:16 +0000
@@ -49,9 +49,12 @@
             actions: [
                 Action {
                     iconName: "tick"
+                    text: i18n.tr('Check')
+                    enabled: false
                 },
                 Action {
                     iconName: "delete"
+                    text: i18n.tr('Delete')
                 }
             ]
         }
@@ -60,9 +63,12 @@
             actions: [
                 Action {
                     iconName: "edit"
+                    text: i18n.tr('Edit')
                 },
                 Action {
                     iconName: "save-to"
+                    text: i18n.tr('Save As')
+                    enabled: false
                 }
             ]
         }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Popover.qml'
--- examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-06-24 16:16:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Popover.qml	2016-01-07 10:05:16 +0000
@@ -27,6 +27,11 @@
             iconSource: "call_icon.png"
             onTriggered: PopupUtils.open(actionSelectionPopover)
             visible: true
+        },
+        Action {
+            text: "Context menu"
+            iconName: "like"
+            onTriggered: PopupUtils.open(Qt.resolvedUrl('ExampleContextMenu.qml'), popoverWithFlickableButton)
         }
     ]
 
 
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-12-17 13:48:23 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-01-07 10:05:16 +0000
@@ -126,12 +126,16 @@
              1.3/UbuntuColors.qml \
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
+<<<<<<< TREE
              1.3/ListItemPopover.qml \
              1.3/PageColumn.qml \
              1.3/PageColumnsLayout.qml \
              1.3/ProgressionSlot.qml \
              1.3/ScrollView.qml \
              1.3/PageHeader.qml
+=======
+             1.3/BottomEdgeHint.qml
+>>>>>>> MERGE-SOURCE
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \
 
=== added file 'src/Ubuntu/Components/Popups/1.3/ContextMenu.qml'
--- src/Ubuntu/Components/Popups/1.3/ContextMenu.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Popups/1.3/ContextMenu.qml	2016-01-07 10:05:16 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Popover {
+    id: contextmenu
+    objectName: 'ContextMenu'
+    contentHeight: Math.max(column.childrenRect.height, units.gu(4))
+    contentWidth: Math.max(column.childrenRect.width, units.gu(4))
+
+    default property alias children: column.children
+
+    // FIXME: styleName: "ContextMenuForegroundStyle"
+    Column {
+        id: column
+        anchors {
+            left: parent.left
+            top: parent.top
+            right: parent.right
+        }
+    }
+
+    // Hide the arrow
+    Binding {
+        target: __foreground
+        property: "direction"
+        value: "none"
+    }
+}
 
=== renamed file 'src/Ubuntu/Components/1.3/ListItemPopover.qml' => 'src/Ubuntu/Components/Popups/1.3/ListItemContextMenu.qml'
--- src/Ubuntu/Components/1.3/ListItemPopover.qml	2015-07-01 12:06:34 +0000
+++ src/Ubuntu/Components/Popups/1.3/ListItemContextMenu.qml	2016-01-07 10:05:16 +0000
@@ -18,53 +18,17 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 
-ActionSelectionPopover {
-    id: popover
+ContextMenu {
     objectName: 'listItemContextMenu'
-    contentWidth: units.gu(25)
-
-    delegate: ListItem {
-        contentItem.anchors {
-             leftMargin: units.gu(2)
-             rightMargin: units.gu(2)
-             topMargin: units.gu(0.5)
-             bottomMargin: units.gu(0.5)
-        }
-        divider.visible: action != actions[actions.length - 1]
-
-        Label {
-            anchors.verticalCenter: parent.verticalCenter
-            text: action.text
-            color: '#5D5D5D'
-        }
-
-        onClicked: popover.hide()
-    }
-
-    function mergeActions(to, from) {
-        if (from == null)
-            return;
-
-        var actions = from.actions;
-        for (var i in actions) {
-            var action = actions[i];
-            if (!action.text)
-                action.text = action.iconName;
-            to.push(actions[i]);
-        }
-    }
-
-    onCallerChanged: {
-        var all = [];
-        mergeActions(all, caller.leadingActions);
-        mergeActions(all, caller.trailingActions);
-        actions = all;
-    }
-
-    // Hide the arrow
-    Binding {
-        target: __foreground
-        property: "direction"
-        value: "none"
+    caller: ListItem {
+    }
+
+    MenuGroup {
+        objectName: 'leadingActions'
+        actions: caller.leadingActions ? caller.leadingActions.actions : []
+    }
+    MenuGroup {
+        objectName: 'trailingActions'
+        actions: caller.trailingActions ? caller.trailingActions.actions : []
     }
 }
 
=== added file 'src/Ubuntu/Components/Popups/1.3/MenuGroup.qml'
--- src/Ubuntu/Components/Popups/1.3/MenuGroup.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Popups/1.3/MenuGroup.qml	2016-01-07 10:05:16 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Column {
+    id: group
+    property ContextMenu menu
+    property list<QtObject> actions
+    default property alias children: group.actions
+    property Component delegate: MenuItem {
+        action: modelData.hasOwnProperty('shortcut') ? modelData : null
+        text: modelData.text
+        enabled: modelData.enabled
+        onClicked: contextmenu.hide() // FIXME
+        divider.visible: action == actions[group.actions.length - 1]
+    }
+    property string text
+
+    Loader {
+        property var modelData: Action {
+            text: group.text
+        }
+        active: group.text !== ''
+        sourceComponent: group.delegate
+    }
+
+    Repeater {
+        model: actions
+        delegate: group.delegate
+    }
+}
 
=== added file 'src/Ubuntu/Components/Popups/1.3/MenuItem.qml'
--- src/Ubuntu/Components/Popups/1.3/MenuItem.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Popups/1.3/MenuItem.qml	2016-01-07 10:05:16 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ListItem {
+    id: menuitem
+    contentItem.anchors {
+         leftMargin: units.gu(2)
+         rightMargin: units.gu(2)
+    }
+    width: row.spacing + units.gu(25) + hotkey.width + units.gu(4)
+    height: units.gu(4)
+
+    color: '#ffffff'
+    opacity: selected || hovered ? 0.08 : 1.0
+    Mouse.onEntered: hovered = true
+    Mouse.onExited: hovered = false
+    property bool hovered
+    property string text
+    enabled: action ? action.enabled : true
+
+    Row {
+        id: row
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: shortcut.left
+        spacing: units.gu(1)
+
+        Icon {
+            id: icon
+            name: action ? action.iconName : ''
+            width: visible ? units.gu(2) : 0
+            height: width
+            opacity: label.opacity
+            visible: name != ''
+        }
+
+        Label {
+            id: label
+            text: action ? action.text : menuitem.text
+            color: '#333333'
+            opacity: menuitem.enabled ? 1.0 : 0.3
+            elide: Text.ElideRight
+            width: units.gu(25) - icon.width
+        }
+    }
+
+    Row {
+        id: shortcut
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        opacity: label.opacity
+
+        Label {
+            id: hotkey
+            property string shortcut: action && action.shortcut ? action.shortcut : ''
+            text: hotkey.shortcut.replace('Ctrl+', '^').replace('Shift+', '⇧')
+            color: label.color
+            visible: shortcut != ''
+            width: units.gu(5)
+        }
+
+        Icon {
+            id: chevron
+            name: 'chevron'
+            width: units.gu(2)
+            height: width
+            visible: !action
+        }
+    }
+}
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-12-09 12:34:18 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2016-01-07 10:05:16 +0000
@@ -244,6 +244,7 @@
 
         styleName: "PopoverForegroundStyle"
     }
+    property alias styleName: foreground.styleName
 
     QtObject {
         id: pointer
 
=== modified file 'src/Ubuntu/Components/Popups/Popups.pro'
--- src/Ubuntu/Components/Popups/Popups.pro	2015-07-24 15:46:33 +0000
+++ src/Ubuntu/Components/Popups/Popups.pro	2016-01-07 10:05:16 +0000
@@ -11,9 +11,13 @@
              1.2/SheetBase.qml \
              1.3/ActionSelectionPopover.qml \
              1.3/ComposerSheet.qml \
+             1.3/ContextMenu.qml \
+             1.3/MenuGroup.qml \
+             1.3/MenuItem.qml \
              1.3/DefaultSheet.qml \
              1.3/Dialog.qml \
              1.3/internalPopupUtils.js \
+             1.3/ListItemContextMenu.qml \
              1.3/Popover.qml \
              1.3/PopupBase.qml \
              1.3/popupUtils.js \
 
=== modified file 'src/Ubuntu/Components/Popups/qmldir'
--- src/Ubuntu/Components/Popups/qmldir	2015-07-17 14:42:26 +0000
+++ src/Ubuntu/Components/Popups/qmldir	2016-01-07 10:05:16 +0000
@@ -23,6 +23,9 @@
 
 #################################################
 #version 1.3
+ContextMenu 1.3 1.3/ContextMenu.qml
+MenuGroup 1.3 1.3/MenuGroup.qml
+internal MenuItem 1.3/MenuItem.qml
 Dialog 1.3 1.3/Dialog.qml
 PopupBase 1.3 1.3/PopupBase.qml
 Popover 1.3 1.3/Popover.qml
 
=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ContextMenuForegroundStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ContextMenuForegroundStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ContextMenuForegroundStyle.qml	2016-01-07 10:05:16 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: contextMenuForegroundStyle
+
+    Image {
+        id: background
+        anchors.fill: parent
+        source: Qt.resolvedUrl("../artwork/[e-mail]")
+    }
+
+    function show() { }
+    function hide() { }
+    signal showCompleted()
+    signal hideCompleted()
+    onShowCompleted: styledItem.showCompleted()
+    onHideCompleted: styledItem.hideCompleted()
+    property Item contentItem: Item {
+        anchors.fill: parent
+        Connections {
+            target: styledItem
+            onShow: show()
+            onHide: hide()
+        }
+    }
+}
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-12-16 10:01:07 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-01-07 10:05:16 +0000
@@ -13,6 +13,7 @@
              artwork/[e-mail] \
              artwork/[e-mail] \
              artwork/[e-mail] \
+             artwork/[e-mail] \
              artwork/[e-mail] \
              artwork/[e-mail] \
              artwork/[e-mail] \
@@ -80,6 +81,7 @@
              1.3/ButtonStyle.qml \
              1.3/CheckBoxStyle.qml \
              1.3/ComboButtonStyle.qml \
+             1.3/ContextMenuForegroundStyle.qml \
              1.3/DatePickerStyle.qml \
              1.3/DialerHandStyle.qml \
              1.3/DialerStyle.qml \
 
=== added file 'src/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
 Binary files src/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and src/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2016-01-07 10:05:16 +0000 differ
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-12-15 15:58:54 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-01-07 10:05:16 +0000
@@ -1162,6 +1162,7 @@
 {
     if (event->button() != Qt::RightButton)
         return false;
+<<<<<<< TREE
     return leadingActions || trailingActions;
 }
 
@@ -1203,6 +1204,48 @@
             SLOT(_q_popoverClosed()), Qt::DirectConnection);
     }
     delete component;
+=======
+    return leadingActions() || trailingActions();
+}
+
+void UCListItem13::mousePressEvent(QMouseEvent *event)
+{
+    UCListItem::mousePressEvent(event);
+    if (shouldShowContextMenu(event)) {
+        Q_D(UCListItem);
+
+        // Highlight the Item while the menu is showing
+        d->setHighlighted(true);
+        // Reset the timer which otherwise is started with highlighting
+        d->pressAndHoldTimer.stop();
+
+        quint16 version(d->getTheme()->version());
+        QString versionString(QStringLiteral("%1.%2").arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version)));
+        QUrl url(UbuntuComponentsPlugin::pluginUrl().resolved("Popups/" + versionString + "/ListItemContextMenu.qml"));
+
+        // Open Popover
+        QQmlEngine* engine = qmlEngine(this);
+        QQmlComponent* component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, this);
+        if (component->isError()) {
+            qmlInfo(this) << component->errorString();
+        } else {
+            QQmlEngine::setContextForObject(component, qmlContext(this));
+            QQuickItem* item = static_cast<QQuickItem*>(component->create(qmlContext(this)));
+            item->setProperty("caller", QVariant::fromValue(this));
+            item->setParentItem(QuickUtils::instance().rootItem(this));
+            QMetaObject::invokeMethod(item, "show");
+            connect(item, &QQuickItem::visibleChanged, this,
+                &UCListItem13::popoverClosed, Qt::DirectConnection);
+        }
+        delete component;
+    }
+}
+
+void UCListItem13::popoverClosed()
+{
+    Q_D(UCListItem);
+    d->setHighlighted(false);
+>>>>>>> MERGE-SOURCE
 }
 
 // ungrabs any previously grabbed left mouse button event