Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 10:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kpowercontrol: update batteries actions on hot-plug events

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-21 07:50:54 +03:00
parent 1d57844823
commit a94d3a9292
2 changed files with 49 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
kpowercontrol/kpowercontrol.cpp
View file

@ -20,6 +20,7 @@
#include <solid/device.h>
#include <solid/battery.h>
#include <solid/devicenotifier.h>
#include <kactioncollection.h>
#include <kcomponentdata.h>
#include <klocale.h>
@ -136,9 +137,17 @@ KPowerControl::KPowerControl(QObject* parent)
}
}
setBattery(batteryudi);
m_menu->addSeparator();
}
m_menu->addSeparator();
connect(
Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(QString)),
this, SLOT(slotDeviceAdded(QString))
);
connect(
Solid::DeviceNotifier::instance(), SIGNAL(deviceRemoved(QString)),
this, SLOT(slotDeviceRemoved(QString))
);
m_helpmenu = new KHelpMenu(associatedWidget(), KGlobal::mainComponent().aboutData());
m_menu->addMenu(m_helpmenu->menu());
@ -191,8 +200,13 @@ void KPowerControl::setBattery(const QString &solidudi)
Solid::Device soliddevice(solidudi);
const Solid::Battery* solidbattery = soliddevice.as<Solid::Battery>();
if (!solidbattery) {
kWarning() << "Null battery device pointer";
if (!soliddevice.isValid() || !solidbattery) {
setIconByName("preferences-system-power-management");
setStatus(KStatusNotifierItem::Passive);
setToolTip(KIcon("preferences-system-power-management"), QString(), QString());
if (!solidbattery) {
kWarning() << "Null battery device pointer";
}
return;
}
@ -221,7 +235,7 @@ bool KPowerControl::isSelectedBattery(const QString &solidudi) const
const QString qactionobjectname = qaction->objectName();
if (qactionobjectname.startsWith(QLatin1String("battery_"))) {
const QString qactiondata = qaction->data().toString();
if (qactiondata == solidudi) {
if (qactiondata == solidudi && qaction->isChecked()) {
return true;
}
}
@ -231,7 +245,7 @@ bool KPowerControl::isSelectedBattery(const QString &solidudi) const
void KPowerControl::slotChargeStateChanged(const int newstate, const QString &solidudi)
{
qDebug() << Q_FUNC_INFO << newstate << solidudi << isSelectedBattery(solidudi);
// qDebug() << Q_FUNC_INFO << newstate << solidudi << isSelectedBattery(solidudi);
if (isSelectedBattery(solidudi)) {
setBattery(solidudi);
}
@ -239,7 +253,7 @@ void KPowerControl::slotChargeStateChanged(const int newstate, const QString &so
void KPowerControl::slotPowerSupplyStateChanged(const bool newstate, const QString &solidudi)
{
qDebug() << Q_FUNC_INFO << newstate << solidudi << isSelectedBattery(solidudi);
// qDebug() << Q_FUNC_INFO << newstate << solidudi << isSelectedBattery(solidudi);
if (isSelectedBattery(solidudi)) {
setBattery(solidudi);
}
@ -262,4 +276,28 @@ void KPowerControl::slotPlugStateChanged(const bool newstate, const QString &sol
}
}
}
}
}
void KPowerControl::slotDeviceAdded(const QString &solidudi)
{
// qDebug() << Q_FUNC_INFO << solidudi;
Solid::Device soliddevice(solidudi);
if (soliddevice.is<Solid::Battery>()) {
slotPlugStateChanged(true, solidudi);
}
}
void KPowerControl::slotDeviceRemoved(const QString &solidudi)
{
// qDebug() << Q_FUNC_INFO << solidudi;
foreach (QAction* qaction, actionCollection()->actions()) {
const QString qactionobjectname = qaction->objectName();
if (qactionobjectname.startsWith(QLatin1String("battery_"))) {
const QString qactiondata = qaction->data().toString();
if (qactiondata == solidudi) {
slotPlugStateChanged(false, solidudi);
break;
}
}
}
}

3
kpowercontrol/kpowercontrol.h
View file

@ -40,6 +40,9 @@ private Q_SLOTS:
void slotPowerSupplyStateChanged(const bool newstate, const QString &solidudi);
void slotPlugStateChanged(const bool newstate, const QString &solidudi);
void slotDeviceAdded(const QString &solidudi);
void slotDeviceRemoved(const QString &solidudi);
private:
void setBattery(const QString &solidudi);
bool isSelectedBattery(const QString &solidudi) const;