[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace/mart/AppletAttached] plasma/generic/applets/systemtray/plugin: get rid of plasmoidint
From: Marco Martin <notmart () gmail ! com>
Date: 2014-02-03 10:27:01
Message-ID: E1WAGk1-00065f-QL () scm ! kde ! org
[Download RAW message or body]
Git commit 2cbd9f068f789241b20d5f513843becaaf26485b by Marco Martin.
Committed on 03/02/2014 at 10:26.
Pushed by mart into branch 'mart/AppletAttached'.
get rid of plasmoidinterface.cpp
M +0 -1 plasma/generic/applets/systemtray/plugin/CMakeLists.txt
M +0 -1 plasma/generic/applets/systemtray/plugin/host.cpp
D +0 -982 plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.cpp
D +0 -370 plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.h
M +0 -1 plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidprotocol.cpp
M +0 -1 plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
http://commits.kde.org/kde-workspace/2cbd9f068f789241b20d5f513843becaaf26485b
diff --git a/plasma/generic/applets/systemtray/plugin/CMakeLists.txt \
b/plasma/generic/applets/systemtray/plugin/CMakeLists.txt index 431ee05..dfe1dcf \
100644
--- a/plasma/generic/applets/systemtray/plugin/CMakeLists.txt
+++ b/plasma/generic/applets/systemtray/plugin/CMakeLists.txt
@@ -10,7 +10,6 @@ set(systemtrayplugin_SRCS
protocols/plasmoid/plasmoidtask.cpp
protocols/plasmoid/plasmoidprotocol.cpp
- protocols/plasmoid/plasmoidinterface.cpp
)
add_library(systemtrayplugin SHARED ${systemtrayplugin_SRCS})
diff --git a/plasma/generic/applets/systemtray/plugin/host.cpp \
b/plasma/generic/applets/systemtray/plugin/host.cpp index d518f89..fde9c51 100644
--- a/plasma/generic/applets/systemtray/plugin/host.cpp
+++ b/plasma/generic/applets/systemtray/plugin/host.cpp
@@ -23,7 +23,6 @@
#include "manager.h"
#include "task.h"
#include "debug.h"
-#include "protocols/plasmoid/plasmoidinterface.h"
#include <klocalizedstring.h>
diff --git a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.cpp \
b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.cpp \
deleted file mode 100644 index f748e65..0000000
--- a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.cpp
+++ /dev/null
@@ -1,982 +0,0 @@
-/*
- * Copyright 2008-2013 Aaron Seigo <aseigo@kde.org>
- * Copyright 2010-2013 Marco Martin <mart@kde.org>
- * Copyright 2013 Sebastian Kügler <sebas@kde.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2, 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 Library 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 "plasmoidinterface.h"
-#include "debug.h"
-
-#include <QAction>
-#include <QDir>
-#include <QFile>
-#include <QIcon>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQmlExpression>
-#include <QQmlProperty>
-#include <QQmlComponent>
-#include <QSignalMapper>
-#include <QTimer>
-
-#include <KActionCollection>
-#include <QLoggingCategory>
-#include <KGlobalSettings>
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KLocalizedString>
-
-#include <Plasma/Plasma>
-#include <Plasma/PackageStructure>
-#include <Plasma/Applet>
-#include <Plasma/Corona>
-#include <Plasma/Package>
-#include <Plasma/PluginLoader>
-
-#include <kdeclarative/configpropertymap.h>
-#include <kdeclarative/qmlobject.h>
-
-#include <PlasmaQuick/PackageUrlInterceptor>
-
-Q_DECLARE_METATYPE(PlasmoidInterface*)
-
-#define DEFAULTITEMSIZE 22
-
-PlasmoidInterface::PlasmoidInterface(const QString &plugin, const QString \
&systrayPackageRoot, QQuickItem *parent)
- : QQuickItem(parent),
-// m_actionSignals(0),
- m_backgroundHints(Plasma::Types::StandardBackground),
- m_status(Plasma::Types::ActiveStatus),
- m_location(Plasma::Types::BottomEdge),
- m_qmlObject(0),
- m_defaultRepresentation(0),
- m_busy(false),
- m_expanded(false),
- m_plugin(plugin),
- m_systrayPackageRoot(systrayPackageRoot),
- m_pluginInfo(KPluginInfo()),
- m_isUserConfiguring(false)
-{
- qmlRegisterType<PlasmoidInterface>();
-// qmlRegisterType<QAction>();
-
-// connect(this, &PlasmoidInterface::configNeedsSaving,
-// applet(), &Plasma::Applet::configNeedsSaving);
-// connect(applet(), &Plasma::Applet::immutabilityChanged,
-// this, &PlasmoidInterface::immutableChanged);
-// connect(applet(), &Plasma::Applet::userConfiguringChanged,
-// this, &PlasmoidInterface::userConfiguringChanged);
-//
-// connect(applet(), &Plasma::Applet::statusChanged,
-// this, &PlasmoidInterface::statusChanged);
-//
-// connect(m_appletScriptEngine, &DeclarativeAppletScript::formFactorChanged,
-// this, &PlasmoidInterface::formFactorChanged);
-// connect(m_appletScriptEngine, &DeclarativeAppletScript::locationChanged,
-// this, &PlasmoidInterface::locationChanged);
-// connect(m_appletScriptEngine, &DeclarativeAppletScript::contextChanged,
-// this, &PlasmoidInterface::contextChanged);
-//
-// if (applet()->containment()) {
-// connect(applet()->containment(), &Plasma::Containment::screenChanged,
-// this, &ContainmentInterface::screenChanged);
-// }
-//
-// m_qmlObject = new QmlObject(this);
-// m_qmlObject->setInitializationDelayed(true);
-
- init();
-}
-
-PlasmoidInterface::~PlasmoidInterface()
-{
- qCDebug(SYSTEMTRAY) << "!!! Plasmoid is gone";
-}
-
-
-
-QQuickItem* PlasmoidInterface::defaultRepresentation()
-{
- if (!m_expanded) {
- return 0;
- }
- return m_defaultRepresentation;
-}
-
-KPluginInfo PlasmoidInterface::pluginInfo() const
-{
- return m_pluginInfo;
-}
-
-
-void PlasmoidInterface::init()
-{
- if (m_qmlObject && m_qmlObject->rootObject()) {
- return;
- }
- qCDebug(SYSTEMTRAY) << "INIT" << m_plugin;
- // Set up the runtime: security, url-based schemes, etc
- m_qmlObject = new KDeclarative::QmlObject(parent());
- //qCDebug(SYSTEMTRAY) << " rootitem: " << rootItem->objectName();
- m_qmlObject->setInitializationDelayed(true);
-
-
- // Load the package
- Plasma::Package pkg = \
Plasma::PluginLoader::self()->loadPackage("Plasma/Applet");
- pkg.setPath(m_plugin);
-
- QQmlEngine *engine = m_qmlObject->engine();
-
- //Hook generic url resolution to the applet package as well
- PackageUrlInterceptor *interceptor = new PackageUrlInterceptor(engine, pkg);
- interceptor->addAllowedPath(m_systrayPackageRoot);
- engine->setUrlInterceptor(interceptor);
-
- QVariantHash initialProperties;
- initialProperties["width"] = DEFAULTITEMSIZE;
- initialProperties["height"] = DEFAULTITEMSIZE;
-
- const QString mainScript = pkg.filePath("mainscript");
- m_qmlObject->setSource(QUrl::fromLocalFile(mainScript));
-
- KPluginInfo i = pkg.metadata();
- if (!i.isValid()) {
- qCDebug(SYSTEMTRAY) << (i18n("Error: Can't find plugin metadata: %1", \
m_plugin));
- m_qmlObject->completeInitialization(initialProperties);
- return;
- }
- m_pluginInfo = i;
-
- if (!m_qmlObject->engine() || !m_qmlObject->engine()->rootContext() || \
!m_qmlObject->engine()->rootContext()->isValid() || \
m_qmlObject->mainComponent()->isError()) {
- QString reason;
- foreach (QQmlError error, m_qmlObject->mainComponent()->errors()) {
- reason += error.toString()+'\n';
- qCDebug(SYSTEMTRAY) << error.toString();
- }
- reason = i18n("Error loading QML file: %1", reason);
- const QUrl appletError = \
QUrl::fromLocalFile(m_systrayPackageRoot+QStringLiteral("/contents/ui/CompactApplet.qml"));
-
- m_qmlObject->setSource(appletError);
- m_qmlObject->completeInitialization();
-
- //even the error message QML may fail
- if (m_qmlObject->mainComponent()->isError()) {
- return;
- } else {
- m_qmlObject->rootObject()->setProperty("reason", reason);
- }
-
- //m_appletScriptEngine->setLaunchErrorMessage(reason);
- qCDebug(SYSTEMTRAY) << "ERROR: " << reason;
- }
-
- m_qmlObject->engine()->rootContext()->setContextProperty("plasmoid", this);
-
- //initialize size, so an useless resize less
- //QVariantHash initialProperties;
- //initialProperties["width"] = width();
- //initialProperties["height"] = height();
- m_qmlObject->completeInitialization(initialProperties);
-
- //m_qmlObject->rootObject()->setParent(rootItem);
- //m_taskItem->setProperty("parent", QVariant::fromValue(rootItem));
- //qCDebug(SYSTEMTRAY) << " ST2 Parent object : " << parent()->objectName() << \
parent();
- qCDebug(SYSTEMTRAY) << " ST2 Plasmoidobject: " << m_qmlObject->rootObject();
- if (!m_qmlObject->rootObject()) {
- qCDebug(SYSTEMTRAY) << " PROBLEM!";
- foreach (QQmlError error, m_qmlObject->mainComponent()->errors()) {
- //reason += error.toString()+'\n';
- qCDebug(SYSTEMTRAY) << " ERROR: " << error.toString();
- }
-
- }
-
-// m_configuration = new ConfigPropertyMap(applet()->configScheme(), this);
-
- //use our own custom network access manager that will access Plasma packages and \
to manage security (i.e. deny access to remote stuff when the proper extension isn't \
enabled
-// QQmlEngine *engine = m_qmlObject->engine();
-// QQmlNetworkAccessManagerFactory *factory = \
engine->networkAccessManagerFactory();
-// engine->setNetworkAccessManagerFactory(0);
-// delete factory;
-// engine->setNetworkAccessManagerFactory(new \
PackageAccessManagerFactory(m_appletScriptEngine->package()));
-//
-// //Hook generic url resolution to the applet package as well
-// //TODO: same thing will have to be done for every qqmlengine: \
PackageUrlInterceptor is material for plasmaquick?
-// engine->setUrlInterceptor(new PackageUrlInterceptor(engine, \
m_appletScriptEngine->package()));
-//
-// m_qmlObject->setSource(QUrl::fromLocalFile(m_appletScriptEngine->mainScript()));
-//
-// if (!m_qmlObject->engine() || !m_qmlObject->engine()->rootContext() || \
!m_qmlObject->engine()->rootContext()->isValid() || \
m_qmlObject->mainComponent()->isError()) {
-// QString reason;
-// foreach (QQmlError error, m_qmlObject->mainComponent()->errors()) {
-// reason += error.toString()+'\n';
-// }
-// reason = i18n("Error loading QML file: %1", reason);
-//
-// m_qmlObject->setSource(QUrl::fromLocalFile(applet()->containment()->corona()->package().filePath("appleterror")));
-// m_qmlObject->completeInitialization();
-//
-//
-// //even the error message QML may fail
-// if (m_qmlObject->mainComponent()->isError()) {
-// return;
-// } else {
-// m_qmlObject->rootObject()->setProperty("reason", reason);
-// }
-//
-// m_appletScriptEngine->setLaunchErrorMessage(reason);
-// }
-//
-//
-// m_qmlObject->engine()->rootContext()->setContextProperty("plasmoid", this);
-//
-// //initialize size, so an useless resize less
-// QVariantHash initialProperties;
-// initialProperties["width"] = width();
-// initialProperties["height"] = height();
-// m_qmlObject->completeInitialization(initialProperties);
-//
-// qCDebug(SYSTEMTRAY) << "Graphic object created:" << applet() << \
applet()->property("graphicObject");
-//
-// //Create the ToolBox
-// Plasma::Containment *pc = qobject_cast<Plasma::Containment *>(applet());
-// if (pc && !qobject_cast<Plasma::Applet *>(pc->parent())) {
-// KConfigGroup defaults;
-// if (pc->containmentType() == Plasma::Types::DesktopContainment) {
-// defaults = \
KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), \
"Desktop");
-// } else if (pc->containmentType() == Plasma::Types::PanelContainment) {
-// defaults = \
KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), \
"Panel");
-// }
-//
-// Plasma::Package pkg = \
Plasma::PluginLoader::self()->loadPackage("Plasma/Generic");
-// if (defaults.isValid()) {
-// pkg.setPath(defaults.readEntry("ToolBox", "org.kde.desktoptoolbox"));
-// } else {
-// pkg.setPath("org.kde.desktoptoolbox");
-// }
-//
-// if (pkg.isValid()) {
-// QObject *toolBoxObject = \
m_qmlObject->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")));
-//
-// QObject *containmentGraphicObject = m_qmlObject->rootObject();
-//
-// if (containmentGraphicObject && toolBoxObject) {
-// toolBoxObject->setProperty("parent", \
QVariant::fromValue(containmentGraphicObject));
-//
-// containmentGraphicObject->setProperty("toolBox", \
QVariant::fromValue(toolBoxObject));
-// } else {
-// delete toolBoxObject;
-// }
-// qCDebug(SYSTEMTRAY) << "Loaded toolbox package" << pkg.path();
-// } else {
-// qWarning() << "Could not load toolbox package." << pkg.path();
-// }
-// }
-//
- //set parent, both as object hyerarchy and visually
- if (m_qmlObject->rootObject()) {
- m_qmlObject->rootObject()->setProperty("parent", QVariant::fromValue(this));
-
- //set anchors
- QQmlExpression expr(m_qmlObject->engine()->rootContext(), \
m_qmlObject->rootObject(), "parent");
- QQmlProperty prop(m_qmlObject->rootObject(), "anchors.fill");
- prop.write(expr.evaluate());
- }
- geometryChanged(QRectF(), QRectF(x(), y(), width(), height()));
-// emit busyChanged();
-//
-// applet()->updateConstraints(Plasma::Types::UiReadyConstraint);
- createCompactRepresentation();
-}
-
-Plasma::Types::FormFactor PlasmoidInterface::formFactor() const
-{
- return Plasma::Types::Horizontal;
-}
-
-Plasma::Types::Location PlasmoidInterface::location() const
-{
- return m_location;
-}
-
-void PlasmoidInterface::setLocation(Plasma::Types::Location loc)
-{
- if (m_location != loc) {
- m_location = loc;
- emit locationChanged();
- }
-}
-
-QString PlasmoidInterface::currentActivity() const
-{
- return QString("CurrentActivity");
-}
-
-QObject* PlasmoidInterface::configuration() const
-{
- return m_configuration;
-}
-
-uint PlasmoidInterface::id() const
-{
- return 1337; // FIXME
-}
-
-QString PlasmoidInterface::icon() const
-{
- return m_icon;
-}
-
-void PlasmoidInterface::setIcon(const QString &icon)
-{
- if (m_icon == icon) {
- return;
- }
-
- m_icon = icon;
- emit iconChanged();
-}
-
-QString PlasmoidInterface::title() const
-{
- return m_title;
-}
-
-void PlasmoidInterface::setTitle(const QString &title)
-{
- if (m_title == title) {
- return;
- }
-
- m_title = title;
- emit titleChanged();
-}
-
-bool PlasmoidInterface::isBusy() const
-{
- return !m_qmlObject->rootObject() || m_busy;
-}
-
-void PlasmoidInterface::setBusy(bool busy)
-{
- if (m_busy == busy) {
- return;
- }
-
- m_busy = busy;
- emit busyChanged();
-}
-
-bool PlasmoidInterface::isExpanded() const
-{
- return m_expanded;
-}
-
-void PlasmoidInterface::setCollapsed()
-{
- m_expanded = false;
-}
-
-
-void PlasmoidInterface::setExpanded(bool expanded)
-{
- //if there is no compact representation it means it's always expanded
- //Containnments are always expanded
- if (!m_compactUiObject) {
- return;
- }
- if (m_expanded != expanded) {
- m_expanded = expanded;
- QTimer::singleShot(500, this, SLOT(hideDefaultRepresenation()));
- //qCDebug(SYSTEMTRAY) << "ST2P PI expandedItem (visible):" << m_plugin << \
expanded;
- emit expandedChanged();
- emit defaultRepresentationChanged();
- }
-}
-
-void PlasmoidInterface::hideDefaultRepresenation()
-{
- if (m_defaultRepresentation) {
- m_defaultRepresentation->setProperty("visible", m_expanded);
- }
-}
-
-Plasma::Types::BackgroundHints PlasmoidInterface::backgroundHints() const
-{
- return m_backgroundHints;
-}
-
-void PlasmoidInterface::setBackgroundHints(Plasma::Types::BackgroundHints hint)
-{
- if (m_backgroundHints == hint) {
- return;
- }
-
- m_backgroundHints = hint;
- emit backgroundHintsChanged();
-}
-
-void PlasmoidInterface::setConfigurationRequired(bool needsConfiguring, const \
QString &reason)
-{
- //m_appletScriptEngine->setConfigurationRequired(needsConfiguring, reason);
-}
-
-QString PlasmoidInterface::activeConfig() const
-{
- return m_currentConfig.isEmpty() ? "main"+id() : m_currentConfig;
-}
-
-void PlasmoidInterface::setActiveConfig(const QString &name)
-{
- if (name == "main") {
- m_currentConfig.clear();
- return;
- }
-
- Plasma::ConfigLoader *loader = m_configs.value(name, 0);
-
- if (!loader) {
- //QString path = m_appletScriptEngine->filePath("config", name + ".xml"); // \
FIXME
- QString path;
-
- if (path.isEmpty()) {
- qCDebug(SYSTEMTRAY) << "Path is empty.";
- return;
- }
-
- QFile f(path);
-// KConfigGroup cg = applet()->config();
-// loader = new Plasma::ConfigLoader(&cg, &f, this);
-// m_configs.insert(name, loader);
- }
-
- m_currentConfig = name;
-}
-
-void PlasmoidInterface::writeConfig(const QString &entry, const QVariant &value)
-{
- Plasma::ConfigLoader *config = 0;
- if (m_currentConfig.isEmpty()) {
- //config = applet()->configScheme();
- } else {
- config = m_configs.value(m_currentConfig, 0);
- }
-
- if (config) {
- KConfigSkeletonItem *item = config->findItemByName(entry);
- if (item) {
- item->setProperty(value);
- config->blockSignals(true);
- config->writeConfig();
- config->blockSignals(false);
- //m_appletScriptEngine->configNeedsSaving();
- }
- } else
- qWarning() << "Couldn't find a configuration entry";
-}
-
-QVariant PlasmoidInterface::readConfig(const QString &entry) const
-{
- Plasma::ConfigLoader *config = 0;
- QVariant result;
-
- if (m_currentConfig.isEmpty()) {
- //config = applet()->configScheme();
- } else {
- config = m_configs.value(m_currentConfig, 0);
- }
-
- if (config) {
- result = config->property(entry);
- }
-
- return result;
-}
-
-// QString PlasmoidInterface::file(const QString &fileType)
-// {
-// return m_appletScriptEngine->filePath(fileType, QString());
-// }
-//
-// QString PlasmoidInterface::file(const QString &fileType, const QString &filePath)
-// {
-// return m_appletScriptEngine->filePath(fileType, filePath);
-// }
-//
-// QList<QAction*> PlasmoidInterface::contextualActions() const
-// {
-// QList<QAction*> actions;
-// Plasma::Applet *a = applet();
-// if (a->failedToLaunch()) {
-// return actions;
-// }
-//
-// foreach (const QString &name, m_actions) {
-// QAction *action = a->actions()->action(name);
-//
-// if (action) {
-// actions << action;
-// }
-// }
-//
-// return actions;
-// }
-//
-// void PlasmoidInterface::setActionSeparator(const QString &name)
-// {
-// Plasma::Applet *a = applet();
-// QAction *action = a->actions()->action(name);
-//
-// if (action) {
-// action->setSeparator(true);
-// } else {
-// action = new QAction(this);
-// action->setSeparator(true);
-// a->actions()->addAction(name, action);
-// m_actions.append(name);
-// }
-// }
-//
-// void PlasmoidInterface::setAction(const QString &name, const QString &text, const \
QString &icon, const QString &shortcut)
-// {
-// Plasma::Applet *a = applet();
-// QAction *action = a->actions()->action(name);
-//
-// if (action) {
-// action->setText(text);
-// } else {
-// action = new QAction(text, this);
-// a->actions()->addAction(name, action);
-//
-// Q_ASSERT(!m_actions.contains(name));
-// m_actions.append(name);
-//
-// if (!m_actionSignals) {
-// m_actionSignals = new QSignalMapper(this);
-// connect(m_actionSignals, SIGNAL(mapped(QString)),
-// m_appletScriptEngine, SLOT(executeAction(QString)));
-// }
-//
-// connect(action, SIGNAL(triggered()), m_actionSignals, SLOT(map()));
-// m_actionSignals->setMapping(action, name);
-// }
-//
-// if (!icon.isEmpty()) {
-// action->setIcon(QIcon::fromTheme(icon));
-// }
-//
-// if (!shortcut.isEmpty()) {
-// action->setShortcut(shortcut);
-// }
-//
-// action->setObjectName(name);
-// }
-//
-// void PlasmoidInterface::removeAction(const QString &name)
-// {
-// Plasma::Applet *a = applet();
-// QAction *action = a->actions()->action(name);
-//
-// if (action) {
-// if (m_actionSignals) {
-// m_actionSignals->removeMappings(action);
-// }
-//
-// delete action;
-// }
-//
-// m_actions.removeAll(name);
-// }
-//
-// QAction *PlasmoidInterface::action(QString name) const
-// {
-// return applet()->actions()->action(name);
-// }
-
-bool PlasmoidInterface::immutable() const
-{
- //return m_immutability != Plasma::Types::Mutable; // FIXME
- return false;
-}
-
-bool PlasmoidInterface::userConfiguring() const
-{
- return m_isUserConfiguring;
-}
-
-int PlasmoidInterface::apiVersion() const
-{
- const QString constraint("[X-Plasma-API] == 'declarative' and 'Applet' in \
[X-Plasma-ComponentTypes]");
- KService::List offers = KServiceTypeTrader::self()->query("Plasma/ScriptEngine", \
constraint);
- if (offers.isEmpty()) {
- return -1;
- }
-
- return offers.first()->property("X-KDE-PluginInfo-Version", \
QVariant::Int).toInt();
-}
-
-bool PlasmoidInterface::fillWidth() const
-{
- if (!m_qmlObject->rootObject()) {
- return false;
- }
-
-
- QVariant prop;
-
- if (m_compactUiObject) {
- prop = m_compactUiObject.data()->property("fillWidth");
- } else {
- //prop = m_qmlObject->rootObject()->property("fillWidth"); // FIXME
- }
-
- if (prop.isValid() && prop.canConvert<bool>()) {
- return prop.toBool();
- } else {
- return false;
- }
-}
-
-bool PlasmoidInterface::fillHeight() const
-{
- if (!m_qmlObject->rootObject()) {
- return false;
- }
-
-
- QVariant prop;
-
- if (m_compactUiObject) {
- prop = m_compactUiObject.data()->property("fillHeight");
- } else {
- prop = m_qmlObject->rootObject()->property("fillHeight");
- }
-
- if (prop.isValid() && prop.canConvert<bool>()) {
- return prop.toBool();
- } else {
- return false;
- }
-}
-
-//private api, just an helper
-qreal PlasmoidInterface::readGraphicsObjectSizeHint(const char *hint) const
-{
- if (!m_qmlObject->rootObject()) {
- return -1;
- }
-
-
- QVariant prop;
-
- if (m_compactUiObject) {
- prop = m_compactUiObject.data()->property(hint);
- } else {
- prop = m_qmlObject->rootObject()->property(hint);
- }
-
- if (prop.isValid() && prop.canConvert<qreal>()) {
- return prop.toReal();
- } else {
- return -1;
- }
-}
-
-qreal PlasmoidInterface::minimumWidth() const
-{
- return readGraphicsObjectSizeHint("minimumWidth");
-}
-
-qreal PlasmoidInterface::minimumHeight() const
-{
- return readGraphicsObjectSizeHint("minimumHeight");
-}
-
-qreal PlasmoidInterface::maximumWidth() const
-{
- return readGraphicsObjectSizeHint("maximumWidth");
-}
-
-qreal PlasmoidInterface::maximumHeight() const
-{
- return readGraphicsObjectSizeHint("maximumHeight");
-}
-
-void PlasmoidInterface::setAssociatedApplication(const QString &string)
-{
- //applet()->setAssociatedApplication(string);
-}
-
-QString PlasmoidInterface::associatedApplication() const
-{
- return QString();
-// return applet()->associatedApplication();
-}
-
-void PlasmoidInterface::setStatus(const Plasma::Types::ItemStatus &status)
-{
- if (m_status != status) {
- m_status = status;
- emit statusChanged();
- }
-}
-
-Plasma::Types::ItemStatus PlasmoidInterface::status() const
-{
- return m_status;
-}
-
-int PlasmoidInterface::screen() const
-{
-// if (applet()->containment()) {
-// return applet()->containment()->screen();
-// }
-//
- return -1;
-}
-
-// QString PlasmoidInterface::downloadPath(const QString &file)
-// {
-// const QString downloadDir = \
QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/Plasma/" + \
applet()->pluginInfo().pluginName() + '/';
-//
-// if (!QFile::exists(downloadDir)) {
-// QDir dir(QChar('/'));
-// dir.mkpath(downloadDir);
-// }
-//
-// return downloadDir;
-// }
-//
-// QStringList PlasmoidInterface::downloadedFiles() const
-// {
-// const QString downloadDir = \
QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/Plasma/" + \
applet()->pluginInfo().pluginName() + '/';
-// QDir dir(downloadDir);
-// return dir.entryList(QDir::Files | QDir::NoSymLinks | QDir::Readable);
-// }
-//
-void PlasmoidInterface::geometryChanged(const QRectF &newGeometry, const QRectF \
&oldGeometry)
-{
- Q_UNUSED(oldGeometry)
-
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void PlasmoidInterface::createCompactRepresentation()
-{
- //init();
-
- //Read the minimum width of the full representation, not our own, since we could \
be in collapsed mode
- QSizeF minHint(-1, -1);
- if (m_qmlObject->rootObject()->property("minimumWidth").canConvert<qreal>()) {
- minHint.setWidth(m_qmlObject->rootObject()->property("minimumWidth").toReal());
- }
-
- if (m_qmlObject->rootObject()->property("minimumHeight").canConvert<qreal>()) {
- minHint.setHeight(m_qmlObject->rootObject()->property("minimumHeight").toReal());
- }
-
- //Create the icon
-
- m_expanded = false;
-
- //we are already an icon: nothing to do
- if (m_compactUiObject) {
- return;
- }
-
-// //Plasma::PackageStructure* structure = new Plasma::PackageStructure;
-// //Plasma::Package package(structure);
-// Plasma::Package package = \
Plasma::PluginLoader::self()->loadPackage("Plasma/Applet");
-// //package.setPath(path);
-// package.setPath("org.kde.plasma.systemtray");
-//
-// qCDebug(SYSTEMTRAY) << "ST2 PackagePathQml: " << package.path();
-// qCDebug(SYSTEMTRAY) << "ST2 PackagePathQml mainScript: " << \
package.filePath("mainScript");
-//
-// const QString _p = package.path();
-// if (_p.isEmpty()) {
-// // show AppletError somehow. This should of course never happen \
though
-// }
-// /* const QUrl compactQml = \
QUrl::fromLocalFile("/home/sebas/kf5/src/plasma-framework/src/shell/qmlpackages/desktop/contents/applet/CompactApplet.qml"); \
// FIXME
-// const QUrl defaultCompactQml = \
QUrl::fromLocalFile("/home/sebas/kf5/src/plasma-framework/src/shell/qmlpackages/desktop/contents/applet/DefaultCompactRepresentation.qml"); \
// */
-// const QUrl compactQml = \
QUrl::fromLocalFile(_p+"contents/ui/CompactApplet.qml");
-// const QUrl defaultCompactQml = \
QUrl::fromLocalFile(_p+"contents/ui/DefaultCompactRepresentation.qml");
-
- const QUrl compactQml = \
QUrl::fromLocalFile(m_systrayPackageRoot+QStringLiteral("/contents/ui/CompactApplet.qml"));
- const QUrl defaultQml = \
QUrl::fromLocalFile(m_systrayPackageRoot+QStringLiteral("/contents/ui/DefaultCompactRepresentation.qml"));
- m_compactUiObject = m_qmlObject->createObjectFromSource(compactQml);
-
-
- // m_compactUiObject = \
m_qmlObject->createObjectFromSource(QUrl::fromLocalFile(applet()->containment()->corona()->package().filePath("compactapplet")));
-
- qCDebug(SYSTEMTRAY) << "ST2 compactQml: " << compactQml;
- qCDebug(SYSTEMTRAY) << "ST2 defaultcompactQml: " << defaultQml;
-
- QObject *compactRepresentation = 0;
-
- //build the icon representation
- if (m_compactUiObject) {
- QQmlComponent *compactComponent = \
m_qmlObject->rootObject()->property("compactRepresentation").value<QQmlComponent \
*>();
-
- if (compactComponent) {
- compactRepresentation = \
compactComponent->create(compactComponent->creationContext());
- } else {
- //compactRepresentation = \
m_qmlObject->createObjectFromSource(QUrl::fromLocalFile(applet()->containment()->corona()->package().filePath("defaultcompactrepresentation")));
- compactRepresentation = m_qmlObject->createObjectFromSource(defaultQml);
- }
-
- if (compactRepresentation && compactComponent) {
- compactComponent->setParent(compactRepresentation);
- } else {
- delete compactComponent;
- }
- }
-
- if (m_compactUiObject && compactRepresentation) {
- //put compactRepresentation in the icon place
- compactRepresentation->setProperty("parent", \
QVariant::fromValue(m_compactUiObject.data()));
- m_compactUiObject.data()->setProperty("compactRepresentation", \
QVariant::fromValue(compactRepresentation));
-
- //replace the full applet with the collapsed view
- m_compactUiObject.data()->setProperty("visible", true);
- m_compactUiObject.data()->setProperty("parent", QVariant::fromValue(this));
-
- {
- //set anchors
- QQmlExpression expr(m_qmlObject->engine()->rootContext(), \
m_compactUiObject.data(), "parent");
- QQmlProperty prop(m_compactUiObject.data(), "anchors.fill");
- prop.write(expr.evaluate());
- }
-
- m_qmlObject->rootObject()->setProperty("parent", \
QVariant::fromValue(m_compactUiObject.data()));
-
-
- {
- //reset all the anchors
- QQmlExpression expr(m_qmlObject->engine()->rootContext(), \
m_qmlObject->rootObject(), \
"anchors.fill=undefined;anchors.left=undefined;anchors.right=undefined;anchors.top=undefined;anchors.bottom=undefined;");
- expr.evaluate();
- }
-
-// KConfigGroup cg = applet()->config();
-// cg = KConfigGroup(&cg, "PopupApplet");
-// int width = cg.readEntry("DialogWidth", 0);
-// int height = cg.readEntry("DialogHeight", 0);
-//
-// m_qmlObject->rootObject()->setProperty("width", width);
-// m_qmlObject->rootObject()->setProperty("height", height);
- m_qmlObject->rootObject()->setProperty("width", 400); // FIXME: dynamic \
sizing
- m_qmlObject->rootObject()->setProperty("height", 300);
-
- m_compactUiObject.data()->setProperty("applet", \
QVariant::fromValue(m_qmlObject->rootObject()));
-
- m_defaultRepresentation = \
qobject_cast<QQuickItem*>(m_qmlObject->rootObject());
- m_defaultRepresentation->setProperty("visible", m_expanded);
- m_defaultRepresentation->setProperty("y", 48);
-
- qCDebug(SYSTEMTRAY) << "ST2P defaultRepresentation" << \
m_defaultRepresentation;
-// QQmlExpression expr(m_qmlObject->engine()->rootContext(), \
m_qmlObject->rootObject(), "y");
-// QQmlProperty prop(m_qmlObject->rootObject(), "48");
-// prop.write(expr.evaluate());
- //emit defaultRepresentationChanged();
-
- //hook m_compactUiObject size hints to this size hint
- //Here we have to use the old connect syntax, because we don't have access \
to the class type
- if (m_qmlObject->rootObject()) {
- disconnect(m_qmlObject->rootObject(), 0, this, 0);
- }
-
- //resize of the root object means popup resize when iconified
- connect(m_qmlObject->rootObject(), SIGNAL(widthChanged()),
- this, SLOT(updatePopupSize()));
- connect(m_qmlObject->rootObject(), SIGNAL(heightChanged()),
- this, SLOT(updatePopupSize()));
-
- if (m_compactUiObject.data()->property("minimumWidth").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(minimumWidthChanged()),
- this, SIGNAL(minimumWidthChanged()));
- }
- if (m_compactUiObject.data()->property("minimumHeight").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(minimumHeightChanged()),
- this, SIGNAL(minimumHeightChanged()));
- }
-
- if (m_compactUiObject.data()->property("maximumWidth").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(maximumWidthChanged()),
- this, SIGNAL(maximumWidthChanged()));
- }
- if (m_compactUiObject.data()->property("maximumHeight").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(maximumHeightChanged()),
- this, SIGNAL(maximumHeightChanged()));
- }
-
- if (m_compactUiObject.data()->property("implicitWidth").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(implicitWidthChanged()),
- this, SLOT(updateImplicitWidth()));
- }
- if (m_compactUiObject.data()->property("implicitHeight").isValid()) {
- connect(m_compactUiObject.data(), SIGNAL(implicitHeightChanged()),
- this, SLOT(updateImplicitHeight()));
- }
-
- emit fillWidthChanged();
- emit fillHeightChanged();
- emit minimumWidthChanged();
- emit minimumHeightChanged();
- emit maximumWidthChanged();
- emit maximumHeightChanged();
- emit defaultRepresentationChanged();
- }
-
- emit expandedChanged();
-}
-
-void PlasmoidInterface::updateImplicitWidth()
-{
- setImplicitWidth(readGraphicsObjectSizeHint("implicitWidth"));
-}
-
-void PlasmoidInterface::updateImplicitHeight()
-{
- setImplicitHeight(readGraphicsObjectSizeHint("implicitHeight"));
-}
-
-void PlasmoidInterface::updatePopupSize()
-{
-// KConfigGroup cg = applet()->config();
-// cg = KConfigGroup(&cg, "PopupApplet");
-// cg.writeEntry("DialogWidth", \
m_qmlObject->rootObject()->property("width").toInt());
-// cg.writeEntry("DialogHeight", \
m_qmlObject->rootObject()->property("height").toInt());
-}
-
-void PlasmoidInterface::itemChange(ItemChange change, const ItemChangeData &value)
-{
- if (change == QQuickItem::ItemSceneChange) {
- //we have a window: create the
- if (value.window && !m_qmlObject->rootObject()) {
- init();
- }
- }
- QQuickItem::itemChange(change, value);
-}
-
-KDeclarative::QmlObject *PlasmoidInterface::qmlObject()
-{
- return m_qmlObject;
-}
-
-#include "moc_plasmoidinterface.cpp"
diff --git a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.h \
b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.h \
deleted file mode 100644 index 2362513..0000000
--- a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidinterface.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright 2008 Chani Armitage <chani@kde.org>
- * Copyright 2008, 2009 Aaron Seigo <aseigo@kde.org>
- * Copyright 2010 Marco Martin <mart@kde.org>
- * Copyright 2013 Sebastian Kügler <sebas@kde.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2, 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 Library 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 APPLETINTERFACE_H
-#define APPLETINTERFACE_H
-
-#include <QQuickItem>
-#include <QtScript/QScriptValue>
-#include <QQuickView>
-
-#include <Plasma/Applet>
-#include <Plasma/Theme>
-
-class QAction;
-class QmlAppletScript;
-class QSignalMapper;
-class QSizeF;
-
-class ConfigView;
-
-namespace KDeclarative {
- class QmlObject;
- class ConfigPropertyMap;
-}
-
-namespace Plasma
-{
- class ConfigLoader;
-} // namespace Plasma
-
-class PlasmoidInterface : public QQuickItem
-{
- Q_OBJECT
-
- /**
- * The QML root object defined in the applet main.qml will be direct child of an \
AppletInterface instance
- */
-
- /**
- * Version of the QML2 script engine
- */
- Q_PROPERTY(int apiVersion READ apiVersion CONSTANT)
-
- /**
- * User friendly title for the plasmoid: it's the localized applet name by \
default
- */
- Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-
- /**
- * Icon to represent the plasmoid
- */
- Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconChanged)
-
- /**
- * Applet id: is unique in the whole Plasma session and will never change across \
restarts
- */
- Q_PROPERTY(uint id READ id CONSTANT)
-
- /**
- * FormFactor for the plasmoid
- */
- Q_PROPERTY(Plasma::Types::FormFactor formFactor READ formFactor NOTIFY \
formFactorChanged)
-
- /**
- * Location for the plasmoid
- */
- Q_PROPERTY(Plasma::Types::Location location READ location NOTIFY \
locationChanged)
-
- /**
- * Current activity name the plasmoid is in
- */
- Q_PROPERTY(QString currentActivity READ currentActivity NOTIFY contextChanged)
-
- /**
- * Configuration object: each config key will be a writable property of this \
object. property bindings work.
- */
- Q_PROPERTY(QObject* configuration READ configuration CONSTANT)
-
- /**
- * FIXME-API: do we still want this?
- * current active configuration
- */
- Q_PROPERTY(QString activeConfig WRITE setActiveConfig READ activeConfig)
-
- /**
- * When true the plasmoid is busy. The containment may graphically indicate that \
drawing for instance a spinner busy widget over it
- */
- Q_PROPERTY(bool busy WRITE setBusy READ isBusy NOTIFY busyChanged)
-
- /**
- * True when the applet is showing its full representation. either as the main \
only view, or in a popup.
- * Setting it will open or close the popup if the plasmoid is iconified, however \
it won't have effect if the applet is open
- */
- Q_PROPERTY(bool expanded WRITE setExpanded READ isExpanded NOTIFY \
expandedChanged)
-
- /**
- * How the applet wants its background to be drawn. The containment may chose to \
ignore this hint.
- */
- Q_PROPERTY(Plasma::Types::BackgroundHints backgroundHints WRITE \
setBackgroundHints READ backgroundHints NOTIFY \
backgroundHintsChanged)
-
- /**
- * The immutability state of the Corona. the plasmoid implementation should \
avoid allowing "dangerous" modifications from the user when in an \
immutable mode
- */
- Q_PROPERTY(bool immutable READ immutable NOTIFY immutableChanged)
-
- /**
- * True when the user is configuring, for instance when the configuration dialog \
is open.
- */
- Q_PROPERTY(bool userConfiguring READ userConfiguring NOTIFY \
userConfiguringChanged)
-
- /**
- * Status of the plasmoid: useful to instruct the shell if this plasmoid is \
requesting attention, if is accepting input, or if is in an idle, \
inactive state
- */
- Q_PROPERTY(Plasma::Types::ItemStatus status READ status WRITE setStatus NOTIFY \
statusChanged)
-
- /**
- * Sets the associated application of this plasmoid, if the plasmoid is \
representing the "compact" view for some application or for some \
document type.
- * TODO: a way to set associated application urls.
- */
- Q_PROPERTY(QString associatedApplication WRITE setAssociatedApplication READ \
associatedApplication)
-
- // TODO: This was moved up from ContainmentInterface because it is required by \
the
- // Task Manager applet (for "Show only tasks from this screen") and no Qt API \
exposes
- // screen numbering. An alternate solution that doesn't extend the applet \
interface
- // would be preferrable if found.
- //Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
-
- //Size hints. Note that the containments may chose to not respect them.
- Q_PROPERTY(qreal minimumWidth READ minimumWidth NOTIFY minimumWidthChanged)
- Q_PROPERTY(qreal minimumHeight READ minimumHeight NOTIFY minimumHeightChanged)
- Q_PROPERTY(qreal maximumWidth READ maximumWidth NOTIFY maximumWidthChanged)
- Q_PROPERTY(qreal maximumHeight READ maximumHeight NOTIFY maximumHeightChanged)
-
- Q_PROPERTY(QQuickItem* defaultRepresentation READ defaultRepresentation NOTIFY \
defaultRepresentationChanged)
-
- /**
- * If the plasmoid is in a linear layout, such as a panel, it indicates to take \
as much horizontal space as possible
- */
- Q_PROPERTY(bool fillWidth READ fillWidth NOTIFY fillWidthChanged)
-
- /**
- * If the plasmoid is in a linear layout, such as a panel, it indicates to take \
as much vertical space as possible
- */
- Q_PROPERTY(bool fillHeight READ fillHeight NOTIFY fillHeightChanged)
-
-public:
- PlasmoidInterface(const QString &plugin, const QString &systrayPackageRoot, \
QQuickItem *parent = 0);
- ~PlasmoidInterface();
-
- KPluginInfo pluginInfo() const;
-
-// //API not intended for the QML part
- KDeclarative::QmlObject *qmlObject();
-//
-// QList<QAction*> contextualActions() const;
-//
-// inline Plasma::Applet *applet() const { return \
m_appletScriptEngine->applet(); }
-
-//QML API-------------------------------------------------------------------
-
- /**
- * Set this to true if the plasmoid needs to be configured in order to work. The \
containment will display reason as a message to ask the user to \
configure.
- * @param needsConfiguring If the plasmoid needs configuration
- * @param reason The user readable (and localized) reason the plasmoid needs
- */
- Q_INVOKABLE void setConfigurationRequired(bool needsConfiguring, const QString \
&reason = QString());
-
-// Q_INVOKABLE void setActionSeparator(const QString &name);
-// Q_INVOKABLE void setAction(const QString &name, const QString &text,
-// const QString &icon = QString(), const QString \
&shortcut = QString());
-//
-// Q_INVOKABLE void removeAction(const QString &name);
-//
-// Q_INVOKABLE QAction *action(QString name) const;
-//
-// /**
-// * FIXME: remove?
-// * Retrieve the path of a file from the Plasmoid package
-// * @param fileName the package-recognized name, such as "mainscript"
-// * @returns the full absolute path of the file, if found, an empty string if \
not
-// */
-// Q_INVOKABLE QString file(const QString &fileName);
-
- /**
- * FIXME: remove?
- * Retrieve the path of a file from the Plasmoid package
- * @param fileType the type supported from the package, such as "ui", "config" \
or "image"
- * @param filePath the name of the file, such as "foo.qml" or "bar.png"
- * @returns the full absolute path of the file, if found, an empty string if not
- */
-// Q_INVOKABLE QString file(const QString &fileType, const QString &filePath);
-
- /**
- * @returns A path where is safe to write on disk downloaded files
- */
-// Q_INVOKABLE QString downloadPath(const QString &file);
-
- /**
- * @returns The list of files that have been downloaded
- */
-// Q_INVOKABLE QStringList downloadedFiles() const;
-
- /**
- * FIXME: remove?
- * Read a value from the configuration
- * DEPRECATED: use plasmoid.configuration instead
- */
- Q_INVOKABLE QVariant readConfig(const QString &entry) const;
-
- /**
- * FIXME: remove?
- * Write a value in the configuration
- * DEPRECATED: use plasmoid.configuration instead
- */
- Q_INVOKABLE void writeConfig(const QString &entry, const QVariant &value);
-
-
-//PROPERTY ACCESSORS-------------------------------------------------------------------
- QString icon() const;
- void setIcon(const QString &icon);
-
- QString title() const;
- void setTitle(const QString &title);
-
- uint id() const;
-
- Plasma::Types::FormFactor formFactor() const;
-
- Plasma::Types::Location location() const;
- void setLocation(Plasma::Types::Location loc);
-
- QString currentActivity() const;
-
- QObject* configuration() const;
-
- bool isBusy() const;
- void setBusy(bool busy);
-
- bool isExpanded() const;
- void setExpanded(bool expanded);
- void setCollapsed();
-
- QQuickItem* defaultRepresentation();
-
- Plasma::Types::BackgroundHints backgroundHints() const;
- void setBackgroundHints(Plasma::Types::BackgroundHints hint);
-
- void setAssociatedApplication(const QString &string);
- QString associatedApplication() const;
-
- void setStatus(const Plasma::Types::ItemStatus &status);
- Plasma::Types::ItemStatus status() const;
-
- int screen() const;
-
- QString activeConfig() const;
- void setActiveConfig(const QString &name);
-
- bool immutable() const;
- bool userConfiguring() const;
- int apiVersion() const;
-
- bool fillWidth() const;
- bool fillHeight() const;
- qreal minimumWidth() const;
- qreal minimumHeight() const;
- qreal maximumWidth() const;
- qreal maximumHeight() const;
-
-Q_SIGNALS:
- /**
- * somebody else, usually the containment sent some data to the applet
- * @param mimetype the mime type of the data such as text/plain
- * @param data either the actual data or an URL representing it
- */
-// void externalData(const QString &mimetype, const QVariant &data);
-
-// void releaseVisualFocus();
- void configNeedsSaving();
-
-//PROPERTY change notifiers--------------
- void iconChanged();
- void titleChanged();
- void formFactorChanged();
- void locationChanged();
- void contextChanged();
- void immutableChanged();
- void statusChanged();
- void backgroundHintsChanged();
- void busyChanged();
- void expandedChanged();
- void screenChanged();
- void defaultRepresentationChanged();
-
- void minimumWidthChanged();
- void minimumHeightChanged();
- void maximumWidthChanged();
- void maximumHeightChanged();
- void fillWidthChanged();
- void fillHeightChanged();
- void userConfiguringChanged();
-
-protected:
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
- void itemChange(ItemChange change, const ItemChangeData &value);
-
-// DeclarativeAppletScript *m_appletScriptEngine;
-
-protected Q_SLOTS:
- virtual void init();
-
-private Q_SLOTS:
- void createCompactRepresentation();
- void updatePopupSize();
- void hideDefaultRepresenation();
- void updateImplicitWidth();
- void updateImplicitHeight();
-
-private:
- //Helper for minimumWidth etc.
- qreal readGraphicsObjectSizeHint(const char *hint) const;
-
- QStringList m_actions;
- //QSignalMapper *m_actionSignals;
- QString m_currentConfig;
- QMap<QString, Plasma::ConfigLoader*> m_configs;
-
-
- KDeclarative::ConfigPropertyMap *m_configuration;
-
-//UI-specific members ------------------
- KDeclarative::QmlObject *m_qmlObject;
- QWeakPointer<QObject> m_compactUiObject;
- QQuickItem* m_defaultRepresentation;
-
- Plasma::Types::BackgroundHints m_backgroundHints;
- Plasma::Types::ImmutabilityType m_immutability;
- Plasma::Types::ItemStatus m_status;
- Plasma::Types::Location m_location;
- bool m_busy : 1;
- bool m_expanded : 1;
- QString m_icon;
- QString m_title;
- QString m_plugin;
- const QString m_systrayPackageRoot;
- KPluginInfo m_pluginInfo;
- bool m_isUserConfiguring;
- friend class ContainmentInterface;
-};
-
-#endif
diff --git a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidprotocol.cpp \
b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidprotocol.cpp \
index 1cc5919..caaecb9 100644
--- a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidprotocol.cpp
+++ b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidprotocol.cpp
@@ -19,7 +19,6 @@
#include "plasmoidtask.h"
#include "plasmoidprotocol.h"
-#include "plasmoidinterface.h"
#include "debug.h"
diff --git a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp \
b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp index \
eab7482..bdf52eb 100644
--- a/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
+++ b/plasma/generic/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
@@ -19,7 +19,6 @@
#include "plasmoidtask.h"
#include "plasmoidprotocol.h"
-#include "plasmoidinterface.h"
#include "../../host.h"
#include "debug.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic