Differential D5242 Diff 13009 plasma-windowed/plasmawindowedview.cpp

Changeset View

Standalone View

View Options

plasma-windowed/plasmawindowedview.cpp

Show All 26 Lines
27#include <QMenu> 27​#include <QMenu>
28#include <QQmlEngine> 28​#include <QQmlEngine>
29#include <QQmlContext> 29​#include <QQmlContext>
30#include <QQmlProperty> 30​#include <QQmlProperty>
31 31​
32#include <KActionCollection> 32​#include <KActionCollection>
33#include <KStatusNotifierItem> 33​#include <KStatusNotifierItem>
34#include <KIconLoader> 34​#include <KIconLoader>
35​#include <KLocalizedString>
35 36​
36#include <Plasma/Package> 37​#include <Plasma/Package>
37 38​
38 39​
39PlasmaWindowedView::PlasmaWindowedView(QWindow *parent) 40​PlasmaWindowedView::PlasmaWindowedView(QWindow *parent)
40 : QQuickView(parent), 41​ : QQuickView(parent),
41 m_applet(0), 42​ m_applet(0),
42 m_statusNotifier(0), 43​ m_statusNotifier(0),
Show All 18 Lines
61void PlasmaWindowedView::setApplet(Plasma::Applet *applet) 62​void PlasmaWindowedView::setApplet(Plasma::Applet *applet)
62{ 63​{
63 m_applet = applet; 64​ m_applet = applet;
64 if (!applet) { 65​ if (!applet) {
65 return; 66​ return;
66 } 67​ }
67 68​
68 m_appletInterface = applet->property("_plasma_graphicObject").value<QQuickItem *>(); 69​ m_appletInterface = applet->property("_plasma_graphicObject").value<QQuickItem *>();
70​
69 if (!m_appletInterface) { 71​ if (!m_appletInterface) {
70 return; 72​ return;
71 } 73​ }
72 74​
73 m_appletInterface->setParentItem(m_rootObject); 75​ m_appletInterface->setParentItem(m_rootObject);
74 m_rootObject->setProperty("appletInterface", QVariant::fromValue(m_appletInterface.data())); 76​ m_rootObject->setProperty("appletInterface", QVariant::fromValue(m_appletInterface.data()));
75 m_appletInterface->setVisible(true); 77​ m_appletInterface->setVisible(true);
76 setTitle(applet->title()); 78​ setTitle(applet->title());
Show All 27 Lines
104 } 106​ }
105 minimumWidthChanged(); 107​ minimumWidthChanged();
106 minimumHeightChanged(); 108​ minimumHeightChanged();
107 QObject::connect(applet->containment(), &Plasma::Containment::configureRequested, 109​ QObject::connect(applet->containment(), &Plasma::Containment::configureRequested,
108 this, &PlasmaWindowedView::showConfigurationInterface); 110​ this, &PlasmaWindowedView::showConfigurationInterface);
109 111​
110 Q_ASSERT(!m_statusNotifier); 112​ Q_ASSERT(!m_statusNotifier);
111 if (m_withStatusNotifier) { 113​ if (m_withStatusNotifier) {
112 m_statusNotifier = new KStatusNotifierItem(this); 114​ m_statusNotifier = new KStatusNotifierItem(applet->pluginMetaData().pluginId(), this);
113 115​
114 updateSniIcon(); 116​ updateSniIcon();
115 connect(applet, &Plasma::Applet::iconChanged, this, &PlasmaWindowedView::updateSniIcon); 117​ connect(applet, &Plasma::Applet::iconChanged, this, &PlasmaWindowedView::updateSniIcon);
116 118​
117 updateSniTitle(); 119​ updateSniTitle();
118 connect(applet, &Plasma::Applet::titleChanged, this, &PlasmaWindowedView::updateSniTitle); 120​ connect(applet, &Plasma::Applet::titleChanged, this, &PlasmaWindowedView::updateSniTitle);
119 121​
120 updateSniStatus(); 122​ updateSniStatus();
121 connect(applet, &Plasma::Applet::statusChanged, this, &PlasmaWindowedView::updateSniStatus); 123​ connect(applet, &Plasma::Applet::statusChanged, this, &PlasmaWindowedView::updateSniStatus);
122 124​
123 connect(m_statusNotifier, &KStatusNotifierItem::activateRequested, this, [this](bool active, const QPoint& /*pos*/){ 125​ //set up actions
124 setVisible(active); 126​ for (auto a : applet->contextualActions()) {
125 if (active) { 127​ m_statusNotifier->contextMenu()->addAction(a);
128​ }
129​ QAction *closeAction = new QAction(QIcon::fromTheme(QStringLiteral("window-close")), i18n("Close %1", applet->title()), this);
130​ connect(closeAction, &QAction::triggered, this, [this]() {
131​ m_statusNotifier->deleteLater();
132​ close();
133​ });
134​ m_statusNotifier->contextMenu()->addAction(closeAction);
135​
136​ connect(m_statusNotifier.data(), &KStatusNotifierItem::activateRequested, this, [this](bool active, const QPoint& /*pos*/){
137​ if (isVisible() && isActive()) {
138​ hide();
139​ } else {
140​ show();
126 raise(); 141​ raise();
127 } 142​ }
128 }); 143​ });
144​ auto syncStatus = [this]() {
145​ switch(m_applet->status()) {
146​ case Plasma::Types::AcceptingInputStatus:
147​ case Plasma::Types::RequiresAttentionStatus:
148​ case Plasma::Types::NeedsAttentionStatus:
149​ m_statusNotifier->setStatus(KStatusNotifierItem::NeedsAttention);
150​ break;
151​ case Plasma::Types::ActiveStatus:
152​ m_statusNotifier->setStatus(KStatusNotifierItem::Active);
153​ break;
154​ default:
155​ m_statusNotifier->setStatus(KStatusNotifierItem::Passive);
156​ }
157​ };
158​ connect(applet, &Plasma::Applet::statusChanged, this, syncStatus);
159​ syncStatus();
129 } 160​ }
130} 161​}
131 162​
132void PlasmaWindowedView::resizeEvent(QResizeEvent *ev) 163​void PlasmaWindowedView::resizeEvent(QResizeEvent *ev)
133{ 164​{
134 if (!m_applet) { 165​ if (!m_applet) {
135 return; 166​ return;
136 } 167​ }
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s)186{
181 212​
182 menu.exec(ev->globalPos()); 213​ menu.exec(ev->globalPos());
183 ev->setAccepted(true); 214​ ev->setAccepted(true);
184} 215​}
185 216​
186void PlasmaWindowedView::keyPressEvent(QKeyEvent *ev) 217​void PlasmaWindowedView::keyPressEvent(QKeyEvent *ev)
187{ 218​{
188 if (ev->matches(QKeySequence::Quit)) { 219​ if (ev->matches(QKeySequence::Quit)) {
220​ m_statusNotifier->deleteLater();
apolUnsubmitted
Done

m_statusNotifier should be a QPointer?

apol: `m_statusNotifier` should be a `QPointer`?
189 close(); 221​ close();
190 } 222​ }
191 QQuickView::keyReleaseEvent(ev); 223​ QQuickView::keyReleaseEvent(ev);
192} 224​}
193 225​
194void PlasmaWindowedView::moveEvent(QMoveEvent *ev) 226​void PlasmaWindowedView::moveEvent(QMoveEvent *ev)
195{ 227​{
196 Q_UNUSED(ev) 228​ Q_UNUSED(ev)
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines