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

[Zsombor Egri]

New Popup component.

Unmerged revisions

1800. By Zsombor Egri on 2016-01-11

prereq sync

1799. By Zsombor Egri on 2016-01-08

attachItem to accept UCThemingExtensions

1798. By Zsombor Egri on 2016-01-07

Popup added

=== modified file 'components.api'
--- components.api	2015-12-19 10:06:24 +0000
+++ components.api	2016-01-11 10:15:15 +0000
@@ -935,6 +935,17 @@
     function var show()
     function var hide()
     property Item pointerTarget
+Ubuntu.Components.Popup 1.3 UCPopup: Window
+    property Item caller
+    property bool hasPointer
+    signal aboutToOpen()
+    signal opened()
+    signal aboutToClose()
+    signal closed()
+    function open()
+    function close()
+    property PopupPositioning positioning
+    property string styleName
 Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
     property Item dismissArea
     property PropertyAnimation fadingAnimation
@@ -947,6 +958,12 @@
     property bool grabDismissAreaEvents
     function var show()
     function var hide()
+Ubuntu.Components.PopupPosition 1.3 UCPopupPosition: QtObject
+    property Qt.Alignment align
+    property QPointF distanceFromCaller
+    property double pointerOffset
+Ubuntu.Components.PopupPositioning 1.3 UCPopupPositioning: QtObject
+    property list<PopupPosition> positions
 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
     property bool indeterminate
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-10 16:39:45 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2016-01-11 10:15:15 +0000
@@ -118,6 +118,7 @@
                 target: bottomEdge
                 onCommitStarted: loader.asynchronous = false
                 onCommitCompleted: loader.asynchronous = true
+                onStatusChanged: print("BottomEdge.status", bottomEdge.status)
             }
         }
     }
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-01-11 10:15:14 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-01-11 10:15:15 +0000
@@ -76,6 +76,7 @@
 #include "ucbottomedgeregion.h"
 #include "ucbottomedgestyle.h"
 #include "ucpagetreenode.h"
+#include "ucpopup.h"
 
 // From UbuntuGestures
 #include "private/ucswipearea_p.h"
@@ -263,6 +264,9 @@
     qmlRegisterType<UCBottomEdge>(uri, 1, 3, "BottomEdge");
     qmlRegisterType<UCBottomEdgeRegion>(uri, 1, 3, "BottomEdgeRegion");
     qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
+    qmlRegisterType<UCPopup>(uri, 1, 3, "Popup");
+    qmlRegisterType<UCPopupPositioning>(uri, 1, 3, "PopupPositioning");
+    qmlRegisterType<UCPopupPosition>(uri, 1, 3, "PopupPosition");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-12-17 15:23:26 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-01-11 10:15:15 +0000
@@ -106,7 +106,8 @@
     $$PWD/ucbottomedgestyle.h \
     $$PWD/ucbottomedgeregion.h \
     $$PWD/ucpagetreenode.h \
-    $$PWD/ucpagetreenode_p.h
+    $$PWD/ucpagetreenode_p.h \
+    $$PWD/ucpopup.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -176,7 +177,8 @@
     $$PWD/ucbottomedge.cpp \
     $$PWD/ucbottomedgestyle.cpp \
     $$PWD/ucbottomedgeregion.cpp \
-    $$PWD/ucpagetreenode.cpp
+    $$PWD/ucpagetreenode.cpp \
+    $$PWD/ucpopup.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
 
=== added file 'src/Ubuntu/Components/plugin/ucpopup.cpp'
--- src/Ubuntu/Components/plugin/ucpopup.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucpopup.cpp	2016-01-11 10:15:15 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucpopup.h"
+
+UCPopupPosition::UCPopupPosition(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Qt::Alignment UCPopupPosition::align() const
+{
+    return m_align;
+}
+void UCPopupPosition::setAlign(Qt::Alignment align)
+{
+    if (m_align == align) {
+        return;
+    }
+    m_align = align;
+    Q_EMIT alignChanged();
+}
+
+QPointF UCPopupPosition::distanceFromCaller() const
+{
+    return m_distanceFromCaller;
+}
+void UCPopupPosition::setDistanceFromCaller(const QPointF &distance)
+{
+    if (m_distanceFromCaller == distance) {
+        return;
+    }
+    m_distanceFromCaller = distance;
+    Q_EMIT distanceFromCallerChanged();
+}
+
+qreal UCPopupPosition::pointerOffset() const
+{
+    return m_pointerOffset;
+}
+void UCPopupPosition::setPointerOffset(qreal offset)
+{
+    if (m_pointerOffset == offset) {
+        return;
+    }
+    m_pointerOffset = offset;
+    Q_EMIT pointerOffsetChanged();
+}
+
+
+UCPopupPositioning::UCPopupPositioning(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QList<UCPopupPosition*> UCPopupPositioning::positionsList()
+{
+    return m_positions;
+}
+
+QQmlListProperty<UCPopupPosition> UCPopupPositioning::positions()
+{
+    return QQmlListProperty<UCPopupPosition>(this, m_positions);
+}
+
+
+UCPopup::UCPopup(QWindow *parent)
+    : QQuickWindow(parent)
+{
+}
+UCPopup::UCPopup(QQuickRenderControl *renderControl)
+    : QQuickWindow(renderControl)
+{
+}
+
+QString UCPopup::styleName() const
+{
+    return m_styleName;
+}
+void UCPopup::setStyleName(const QString &name)
+{
+    if (m_styleName == name) {
+        return;
+    }
+    m_styleName = name;
+    Q_EMIT styleNameChanged();
+}
+
+UCPopupPositioning *UCPopup::positioning() const
+{
+    return m_positioning;
+}
+void UCPopup::setPositioning(UCPopupPositioning *positioning)
+{
+    if (m_positioning == positioning) {
+        return;
+    }
+    m_positioning = positioning;
+    Q_EMIT positioningChanged();
+}
+
+QQuickItem *UCPopup::caller() const
+{
+    return m_caller;
+}
+void UCPopup::setCaller(QQuickItem *caller)
+{
+    if (m_caller == caller) {
+        return;
+    }
+    m_caller = caller;
+    Q_EMIT callerChanged();
+}
+
+bool UCPopup::hasPointer() const
+{
+    return m_hasPointer;
+}
+void UCPopup::setHasPointer(bool hasPointer)
+{
+    if (m_hasPointer == hasPointer) {
+        return;
+    }
+    m_hasPointer = hasPointer;
+    Q_EMIT hasPointerChanged();
+}
+
+void UCPopup::open()
+{
+    setVisible(true);
+}
+
+void UCPopup::close()
+{
+    setVisible(false);
+}
+
+#include "moc_ucpopup.cpp"
 
=== added file 'src/Ubuntu/Components/plugin/ucpopup.h'
--- src/Ubuntu/Components/plugin/ucpopup.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucpopup.h	2016-01-11 10:15:15 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCPOPUP_H
+#define UCPOPUP_H
+
+#include <QtCore/QObject>
+#include <QtQuick/QQuickItem>
+#include <QtQml/QQmlListProperty>
+#include "ucthemingextension.h"
+
+class UCPopupPosition : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Qt::Alignment align READ align WRITE setAlign NOTIFY alignChanged FINAL)
+    Q_PROPERTY(QPointF distanceFromCaller READ distanceFromCaller WRITE setDistanceFromCaller NOTIFY distanceFromCallerChanged FINAL)
+    Q_PROPERTY(qreal pointerOffset READ pointerOffset WRITE setPointerOffset NOTIFY pointerOffsetChanged FINAL)
+public:
+    explicit UCPopupPosition(QObject *parent = 0);
+
+    Qt::Alignment align() const;
+    void setAlign(Qt::Alignment align);
+    QPointF distanceFromCaller() const;
+    void setDistanceFromCaller(const QPointF &distance);
+    qreal pointerOffset() const;
+    void setPointerOffset(qreal offset);
+
+
+Q_SIGNALS:
+    void alignChanged();
+    void distanceFromCallerChanged();
+    void pointerOffsetChanged();
+
+private:
+    QPointF m_distanceFromCaller;
+    qreal m_pointerOffset = -1;
+    Qt::Alignment m_align = 0;
+};
+
+class UCPopupPositioning : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QQmlListProperty<UCPopupPosition> positions READ positions)
+public:
+    explicit UCPopupPositioning(QObject *parent = 0);
+
+    QList<UCPopupPosition*> positionsList();
+    QQmlListProperty<UCPopupPosition> positions();
+
+private:
+    QList<UCPopupPosition*> m_positions;
+};
+
+// FIXME: when we move on Qt 5.5, make sure we derive from QQuickWindowQmlImpl!
+class UCPopup : public QQuickWindow//, public UCThemingExtension
+{
+    Q_OBJECT
+//    Q_INTERFACES(UCThemingExtension)
+//    Q_PROPERTY(UCTheme theme READ getTheme WRITE setTheme NOTIFY themeChanged FINAL)
+    Q_PROPERTY(QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged FINAL)
+    Q_PROPERTY(UCPopupPositioning *positioning READ positioning WRITE setPositioning NOTIFY positioningChanged FINAL)
+    Q_PROPERTY(QQuickItem *caller READ caller WRITE setCaller NOTIFY callerChanged FINAL)
+    Q_PROPERTY(bool hasPointer READ hasPointer WRITE setHasPointer NOTIFY hasPointerChanged FINAL)
+public:
+    UCPopup(QWindow *parent = 0);
+    explicit UCPopup(QQuickRenderControl *renderControl);
+
+    QString styleName() const;
+    void setStyleName(const QString &name);
+    UCPopupPositioning *positioning() const;
+    void setPositioning(UCPopupPositioning *positioning);
+    QQuickItem *caller() const;
+    void setCaller(QQuickItem *caller);
+    bool hasPointer() const;
+    void setHasPointer(bool hasPointer);
+
+protected:
+//    void preThemeChanged() override {}
+//    void postThemeChanged() override {}
+
+public Q_SLOTS:
+    void open();
+    void close();
+
+Q_SIGNALS:
+    void themeChanged();
+    void styleNameChanged();
+    void positioningChanged();
+    void callerChanged();
+    void hasPointerChanged();
+
+    void aboutToOpen();
+    void opened();
+    void aboutToClose();
+    void closed();
+
+private:
+    QString m_styleName;
+    UCPopupPositioning *m_positioning = nullptr;
+    QQuickItem *m_caller = nullptr;
+    bool m_hasPointer = true;
+};
+
+#endif // UCPOPUP_H
 
=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2016-01-11 10:15:14 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-01-11 10:15:15 +0000
@@ -641,7 +641,7 @@
                      listener, &ContextPropertyChangeListener::updateContextProperty);
 }
 
-void UCTheme::attachItem(QQuickItem *item, bool attach)
+void UCTheme::attachItem(UCThemingExtension *item, bool attach)
 {
     if (attach) {
         m_attachedItems.append(item);
@@ -653,7 +653,7 @@
 void UCTheme::updateThemedItems()
 {
     for (int i = 0; i < m_attachedItems.count(); i++) {
-        UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(m_attachedItems[i]);
+        UCThemingExtension *extension = m_attachedItems[i];
         if (extension) {
             extension->itemThemeReloaded(this);
         }
 
=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2016-01-11 10:15:14 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2016-01-11 10:15:15 +0000
@@ -35,6 +35,7 @@
 class UCStyledItemBase;
 class QQmlAbstractBinding;
 class QQuickItem;
+class UCThemingExtension;
 class UCTheme : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
@@ -79,7 +80,7 @@
     // internal, used by the deprecated Theme.createStyledComponent()
     QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent, quint16 version = 0);
     static void createDefaultTheme(QQmlEngine* engine);
-    void attachItem(QQuickItem *item, bool attach);
+    void attachItem(UCThemingExtension *item, bool attach);
 
     // helper functions
     QColor getPaletteColor(const char *profile, const char *color);
@@ -160,7 +161,7 @@
     QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
     QList<ThemeRecord> m_themePaths;
     UCDefaultTheme m_defaultTheme;
-    QPODVector<QQuickItem*, 4> m_attachedItems;
+    QPODVector<UCThemingExtension*, 4> m_attachedItems;
     bool m_completed:1;
 
     friend class UCDeprecatedTheme;
 
=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
--- src/Ubuntu/Components/plugin/ucthemingextension.cpp	2016-01-11 10:15:14 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp	2016-01-11 10:15:15 +0000
@@ -159,7 +159,7 @@
 UCThemingExtension::~UCThemingExtension()
 {
     if (theme) {
-        theme->attachItem(themedItem, false);
+        theme->attachItem(this, false);
     }
 }
 
@@ -240,14 +240,14 @@
 
     // disconnect from the previous set
     if (theme) {
-        theme->attachItem(themedItem, false);
+        theme->attachItem(this, false);
     }
 
     theme = newTheme;
 
     // connect to the new set
     if (theme) {
-        theme->attachItem(themedItem, true);
+        theme->attachItem(this, true);
         // set the parent of the theme if custom
         setParentTheme();
     }