1
commit 1481d1596bd2d2aea47bf52f5b6dcc82a02fb549
2
Author: Aaron J. Seigo <aseigo@kde.org>
3
Date: Wed Jan 12 00:05:13 2011 +0000
5
FEATURE: configurable default containment plugin name
7
svn path=/trunk/KDE/kdelibs/; revision=1213879
9
Index: kde4libs-4.6.3/plasma/corona.cpp
10
===================================================================
11
--- kde4libs-4.6.3.orig/plasma/corona.cpp 2011-05-27 21:50:21.000000000 +0200
12
+++ kde4libs-4.6.3/plasma/corona.cpp 2011-05-27 21:50:21.000000000 +0200
17
+void Corona::setDefaultContainmentPlugin(const QString &name)
19
+ // we could check if it is in:
20
+ // Containment::listContainments().contains(name) ||
21
+ // Containment::listContainments(QString(), KGlobal::mainComponent().componentName()).contains(name)
22
+ // but that seems like overkill
23
+ d->defaultContainmentPlugin = name;
26
+QString Corona::defaultContainmentPlugin() const
28
+ return d->defaultContainmentPlugin;
31
void Corona::saveLayout(const QString &configName) const
36
immutability(Mutable),
37
mimetype("text/x-plasmoidservicename"),
38
+ defaultContainmentPlugin("desktop"),
43
emit q->configSynced();
46
-Containment *CoronaPrivate::addContainment(const QString &name, const QVariantList &args,
47
- uint id, bool delayedInit)
48
+Containment *CoronaPrivate::addContainment(const QString &name, const QVariantList &args, uint id, bool delayedInit)
50
QString pluginName = name;
51
Containment *containment = 0;
54
if (pluginName.isEmpty() || pluginName == "default") {
55
// default to the desktop containment
56
- pluginName = "desktop";
57
+ pluginName = defaultContainmentPlugin;
60
bool loadingNull = pluginName == "null";
61
Index: kde4libs-4.6.3/plasma/corona.h
62
===================================================================
63
--- kde4libs-4.6.3.orig/plasma/corona.h 2011-04-01 15:56:18.000000000 +0200
64
+++ kde4libs-4.6.3/plasma/corona.h 2011-05-27 21:50:21.000000000 +0200
66
QString appletMimeType();
69
+ * @return the default containment plugin type
72
+ QString defaultContainmentPlugin() const;
75
* @return all containments on this Corona
77
QList<Containment*> containments() const;
80
void setPreferredToolBoxPlugin(const Containment::Type type, const QString &plugin);
83
+ * Sets the default containment plugin to try and load
86
+ void setDefaultContainmentPlugin(const QString &name);
88
//Reimplemented from QGraphicsScene
89
void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
90
void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
91
Index: kde4libs-4.6.3/plasma/private/corona_p.h
92
===================================================================
93
--- kde4libs-4.6.3.orig/plasma/private/corona_p.h 2011-05-27 21:50:21.000000000 +0200
94
+++ kde4libs-4.6.3/plasma/private/corona_p.h 2011-05-27 21:50:21.000000000 +0200
96
ImmutabilityType immutability;
99
+ QString defaultContainmentPlugin;
100
KSharedConfigPtr config;
101
QTimer configSyncTimer;
102
QList<Containment*> containments;