move PlasmaAppletDialog into libplasma as PopupApplet

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=833658

CMakeLists.txt

@@ -44,7 +44,7 @@ set(plasma_LIB_SRCS
     panelsvg.cpp
     paneltoolbox.cpp
     plasma.cpp
-    plasma_export.h
+    popupapplet.cpp
     querymatch.cpp
     runnercontext.cpp
     runnermanager.cpp
@@ -135,6 +135,7 @@ set(plasma_LIB_INCLUDES
     panelsvg.h
     plasma.h
     plasma_export.h
+    popupapplet.h
     querymatch.h
     runnercontext.h
     runnermanager.h
@@ -217,6 +218,7 @@ includes/PackageStructure
 includes/PaintUtils
 includes/PanelSvg
 includes/Plasma
+includes/PopupApplet
 includes/PushButton
 includes/QueryMatch
 includes/RadioButton

includes/PopupApplet

@@ -0,0 +1 @@
+#include "../../plasma/popupapplet.h"

popupapplet.cpp

@@ -0,0 +1,201 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Montel Laurent <montel@kde.org>                 *
+ *                                                                         *
+ *   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; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA          *
+ ***************************************************************************/
+
+#include "popupapplet.h"
+
+#include <QGraphicsProxyWidget>
+#include <QGraphicsLinearLayout>
+#include <QVBoxLayout>
+
+#include <KIcon>
+#include <KIconLoader>
+
+#include <plasma/dialog.h>
+#include <plasma/widgets/icon.h>
+
+namespace Plasma
+{
+
+class PopupAppletPrivate
+{
+public:
+    PopupAppletPrivate(PopupApplet *applet)
+        : q(applet),
+          icon(0),
+          dialog(0),
+          layout(0),
+          proxy(0)
+    {
+    }
+
+    ~PopupAppletPrivate()
+    {
+        if (proxy) {
+            proxy->setWidget(0);
+        }
+
+        delete dialog;
+        delete icon;
+    }
+
+    void togglePopup();
+
+    PopupApplet *q;
+    Plasma::Icon *icon;
+    Plasma::Dialog *dialog;
+    QGraphicsLinearLayout *layout;
+    QGraphicsProxyWidget *proxy;
+};
+
+PopupApplet::PopupApplet(QObject *parent, const QVariantList &args)
+    : Plasma::Applet(parent, args),
+      d(new PopupAppletPrivate(this))
+{
+    int iconSize = IconSize(KIconLoader::Desktop);
+    resize(iconSize, iconSize);
+}
+
+PopupApplet::~PopupApplet()
+{
+    delete d;
+}
+
+void PopupApplet::setIcon(const QIcon &icon)
+{
+    if (!d->icon) {
+        d->icon = new Plasma::Icon(icon, QString(), this);
+    } else {
+        d->icon->setIcon(icon);
+    }
+}
+
+void PopupApplet::setIcon(const QString &iconName)
+{
+    if (!d->icon) {
+        d->icon = new Plasma::Icon(KIcon(iconName), QString(), this);
+    } else {
+        d->icon->setIcon(iconName);
+    }
+}
+
+QIcon PopupApplet::icon() const
+{
+    return d->icon->icon();
+}
+
+void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
+{
+    if (constraints & Plasma::StartupCompletedConstraint) {
+        if (!d->icon) {
+            d->icon = new Plasma::Icon(KIcon("icons"), QString(), this);
+        }
+
+        setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+        setMaximumSize(INT_MAX, INT_MAX);
+        d->layout = new QGraphicsLinearLayout(this);
+        d->layout->setContentsMargins(0, 0, 0, 0);
+        d->layout->setSpacing(0);
+        d->layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+        d->layout->setMaximumSize(INT_MAX, INT_MAX);
+        d->layout->setOrientation(Qt::Horizontal);
+        setLayout(d->layout);
+        connect(d->icon, SIGNAL(clicked()), this, SLOT(togglePopup()));
+    }
+
+    if (constraints & Plasma::FormFactorConstraint) {
+        d->layout->removeAt(0);
+        switch (formFactor()) {
+        case Plasma::Planar:
+        case Plasma::MediaCenter:
+            delete d->dialog;
+            d->dialog = 0;
+
+            setAspectRatioMode(Plasma::IgnoreAspectRatio);
+
+            if (!d->proxy) {
+                d->proxy = new QGraphicsProxyWidget(this);
+                d->proxy->setWidget(widget());
+                d->proxy->show();
+            }
+
+            d->layout->addItem(d->proxy);
+            setMinimumSize(widget() ? widget()->minimumSize() : QSizeF(300, 200));
+            break;
+
+        case Plasma::Horizontal:
+        case Plasma::Vertical:
+            setAspectRatioMode(Plasma::Square);
+
+            if (d->proxy) {
+                d->proxy->setWidget(0); // prevent it from deleting our widget!
+                delete d->proxy;
+                d->proxy = 0;
+            }
+
+            if (!d->dialog) {
+                d->dialog = new Plasma::Dialog();
+                d->dialog->setWindowFlags(Qt::Popup);
+                QVBoxLayout *l_layout = new QVBoxLayout(d->dialog);
+                l_layout->setSpacing(0);
+                l_layout->setMargin(0);
+                l_layout->addWidget(widget());
+                d->dialog->adjustSize();
+            }
+
+            d->layout->addItem(d->icon);
+            break;
+        }
+    }
+}
+
+void PopupApplet::showPopup()
+{
+    if (d->dialog && (formFactor() == Horizontal || formFactor() == Vertical)) {
+        d->dialog->move(popupPosition(d->dialog->sizeHint()));
+        d->dialog->show();
+    }
+}
+
+void PopupApplet::hidePopup()
+{
+    if (d->dialog && (formFactor() == Horizontal || formFactor() == Vertical)) {
+        d->dialog->hide();
+    }
+}
+
+void PopupAppletPrivate::togglePopup()
+{
+    if (!dialog) {
+        return;
+    }
+
+    if (dialog->isVisible()) {
+        dialog->hide();
+    } else {
+        dialog->move(q->popupPosition(dialog->sizeHint()));
+        dialog->show();
+    }
+
+    dialog->clearFocus();
+}
+
+} // Plasma namespace
+
+#include "popupapplet.moc"
+

popupapplet.h

@@ -0,0 +1,62 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Montel Laurent <montel@kde.org>                 *
+ *                                                                         *
+ *   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; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA          *
+ ***************************************************************************/
+
+#ifndef PLASMAAPPLETDIALOG_H
+#define PLASMAAPPLETDIALOG_H
+
+#include <plasma/applet.h>
+#include <plasma/plasma_export.h>
+
+class QGraphicsProxyWidget;
+class QGraphicsLinearLayout;
+
+namespace Plasma
+{
+
+class Dialog;
+class Icon;
+class PopupAppletPrivate;
+
+class PLASMA_EXPORT PopupApplet : public Plasma::Applet
+{
+    Q_OBJECT
+public:
+    PopupApplet(QObject *parent, const QVariantList &args);
+    ~PopupApplet();
+
+    void setIcon(const QIcon &icon);
+    void setIcon(const QString &iconName);
+    QIcon icon() const;
+
+    virtual QWidget *widget() = 0;
+
+protected:
+    void constraintsEvent(Plasma::Constraints constraints);
+    void showPopup();
+    void hidePopup();
+
+private:
+    Q_PRIVATE_SLOT(d, void togglePopup());
+    PopupAppletPrivate * const d;
+};
+
+} // Plasma namespace
+
+#endif /* PLASMAAPPLETDIALOG_H */
+