Changeset View
Changeset View
Standalone View
Standalone View
shell/standaloneappcorona.cpp
| Show All 15 Lines | |||||
| 16 | * GNU General Public License for more details. | 16 | * GNU General Public License for more details. | ||
| 17 | * | 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program. If not, see <http://www.gnu.org/licenses/> | 19 | * along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| 20 | */ | 20 | */ | ||
| 21 | 21 | | |||
| 22 | #include "standaloneappcorona.h" | 22 | #include "standaloneappcorona.h" | ||
| 23 | #include "desktopview.h" | 23 | #include "desktopview.h" | ||
| 24 | #include "activity.h" | | |||
| 25 | #include <QDebug> | 24 | #include <QDebug> | ||
| 26 | #include <QAction> | 25 | #include <QAction> | ||
| 27 | 26 | | |||
| 28 | #include <kactivities/consumer.h> | 27 | #include <kactivities/consumer.h> | ||
| 29 | #include <KActionCollection> | 28 | #include <KActionCollection> | ||
| 30 | #include <Plasma/PluginLoader> | 29 | #include <Plasma/PluginLoader> | ||
| 31 | 30 | | |||
| 32 | #include <KPackage/Package> | 31 | #include <KPackage/Package> | ||
| ▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Line(s) | 142 | { | |||
| 157 | } | 156 | } | ||
| 158 | 157 | | |||
| 159 | return containment; | 158 | return containment; | ||
| 160 | } | 159 | } | ||
| 161 | 160 | | |||
| 162 | void StandaloneAppCorona::activityAdded(const QString &id) | 161 | void StandaloneAppCorona::activityAdded(const QString &id) | ||
| 163 | { | 162 | { | ||
| 164 | //TODO more sanity checks | 163 | //TODO more sanity checks | ||
| 165 | if (m_activities.contains(id)) { | 164 | if (m_activityContainmentPlugins.contains(id)) { | ||
| 166 | qWarning() << "Activity added twice" << id; | 165 | qWarning() << "Activity added twice" << id; | ||
| 167 | return; | 166 | return; | ||
| 168 | } | 167 | } | ||
| 169 | 168 | | |||
| 170 | Activity *a = new Activity(id, this); | 169 | m_activityContainmentPlugins.insert(id, QString()); | ||
| 171 | m_activities.insert(id, a); | | |||
| 172 | } | 170 | } | ||
| 173 | 171 | | |||
| 174 | void StandaloneAppCorona::activityRemoved(const QString &id) | 172 | void StandaloneAppCorona::activityRemoved(const QString &id) | ||
| 175 | { | 173 | { | ||
| 176 | Activity *a = m_activities.take(id); | 174 | m_activityContainmentPlugins.remove(id); | ||
| 177 | a->deleteLater(); | | |||
| 178 | } | 175 | } | ||
| 179 | 176 | | |||
| 180 | void StandaloneAppCorona::currentActivityChanged(const QString &newActivity) | 177 | void StandaloneAppCorona::currentActivityChanged(const QString &newActivity) | ||
| 181 | { | 178 | { | ||
| 182 | //qDebug() << "Activity changed:" << newActivity; | 179 | //qDebug() << "Activity changed:" << newActivity; | ||
| 183 | 180 | | |||
| 184 | if (containments().isEmpty()) { | 181 | if (containments().isEmpty()) { | ||
| 185 | return; | 182 | return; | ||
| Show All 14 Lines | |||||
| 200 | 197 | | |||
| 201 | void StandaloneAppCorona::toggleWidgetExplorer() | 198 | void StandaloneAppCorona::toggleWidgetExplorer() | ||
| 202 | { | 199 | { | ||
| 203 | //The view QML has to provide something to display the widget explorer | 200 | //The view QML has to provide something to display the widget explorer | ||
| 204 | m_view->rootObject()->metaObject()->invokeMethod(m_view->rootObject(), "toggleWidgetExplorer", Q_ARG(QVariant, QVariant::fromValue(sender()))); | 201 | m_view->rootObject()->metaObject()->invokeMethod(m_view->rootObject(), "toggleWidgetExplorer", Q_ARG(QVariant, QVariant::fromValue(sender()))); | ||
| 205 | return; | 202 | return; | ||
| 206 | } | 203 | } | ||
| 207 | 204 | | |||
| 208 | void StandaloneAppCorona::insertActivity(const QString &id, Activity *activity) | 205 | void StandaloneAppCorona::insertActivity(const QString &id, const QString &plugin) | ||
| 209 | { | 206 | { | ||
| 210 | m_activities.insert(id, activity); | 207 | m_activityContainmentPlugins.insert(id, plugin); | ||
| 211 | Plasma::Containment *c = createContainmentForActivity(id, 0); | 208 | Plasma::Containment *c = createContainmentForActivity(id, 0); | ||
| 212 | if (c) { | 209 | if (c) { | ||
| 213 | c->config().writeEntry("lastScreen", 0); | 210 | c->config().writeEntry("lastScreen", 0); | ||
| 214 | } | 211 | } | ||
| 215 | } | 212 | } | ||
| 216 | 213 | | |||
| 217 | Plasma::Containment *StandaloneAppCorona::addPanel(const QString &plugin) | 214 | Plasma::Containment *StandaloneAppCorona::addPanel(const QString &plugin) | ||
| 218 | { | 215 | { | ||
| Show All 24 Lines | |||||