Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag '5.1.0.14' into uos

Browse Source 
# Conflicts:
#	frame/window/mainwindow.cpp
#	plugins/network/item/wirelessitem.cpp
#	plugins/power/powerplugin.cpp
#	translations/dde-dock.ts
#	translations/dde-dock_ar.ts
#	translations/dde-dock_ca.ts
#	translations/dde-dock_cs.ts
#	translations/dde-dock_da.ts
#	translations/dde-dock_de.ts
#	translations/dde-dock_es.ts
#	translations/dde-dock_fi.ts
#	translations/dde-dock_fr.ts
#	translations/dde-dock_hr.ts
#	translations/dde-dock_hu.ts
#	translations/dde-dock_it.ts
#	translations/dde-dock_ko.ts
#	translations/dde-dock_lt.ts
#	translations/dde-dock_ms.ts
#	translations/dde-dock_pl.ts
#	translations/dde-dock_pt.ts
#	translations/dde-dock_pt_BR.ts
#	translations/dde-dock_ro.ts
#	translations/dde-dock_ru.ts
#	translations/dde-dock_si.ts
#	translations/dde-dock_sk.ts
#	translations/dde-dock_sq.ts
#	translations/dde-dock_sr.ts
#	translations/dde-dock_tr.ts
#	translations/dde-dock_uk.ts
#	translations/dde-dock_vi.ts
#	translations/dde-dock_zh_CN.ts
#	translations/dde-dock_zh_HK.ts
#	translations/dde-dock_zh_TW.ts
This commit is contained in:
范朋程 2020-06-10 13:31:20 +08:00
commit 903778bc83
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/power/powerplugin.cpp
View File

@ -26,6 +26,7 @@
#include <QGSettings>
#define PLUGIN_STATE_KEY "enable"
#define DELAYTIME (20 * 1000)
static QGSettings *GSettingsByApp()
{
@ -38,9 +39,12 @@ PowerPlugin::PowerPlugin(QObject *parent)
, m_pluginLoaded(false)
, m_showTimeToFull(true)
, m_tipsLabel(new TipsWidget)
, m_delayTimer(new QTimer(this))
{
m_tipsLabel->setVisible(false);
m_tipsLabel->setObjectName("power");
m_delayTimer->setInterval(DELAYTIME);
m_delayTimer->setSingleShot(true);
}
const QString PowerPlugin::pluginName() const
@ -189,7 +193,11 @@ void PowerPlugin::loadPlugin()
m_systemPowerInter->setSync(true);
connect(GSettingsByApp(), &QGSettings::changed, this, &PowerPlugin::onGSettingsChanged);
connect(m_systemPowerInter, &SystemPowerInter::BatteryStatusChanged, this, &PowerPlugin::refreshTipsData);
connect(m_systemPowerInter, &SystemPowerInter::BatteryStatusChanged, [&](uint value){
if (value == BatteryState::CHARGING)
m_delayTimer->start();
refreshTipsData();
});
connect(m_systemPowerInter, &SystemPowerInter::BatteryTimeToEmptyChanged, this, &PowerPlugin::refreshTipsData);
connect(m_systemPowerInter, &SystemPowerInter::BatteryTimeToFullChanged, this, &PowerPlugin::refreshTipsData);
@ -267,19 +275,23 @@ void PowerPlugin::refreshTipsData()
uint hour = time.toString("hh").toUInt();
uint min = time.toString("mm").toUInt();
QString tips;
if (timeToFull == 0) { // 电量已充満或电量计算中,剩余充满时间会返回0
if (m_delayTimer->isActive())
tips = tr("Capacity %1 ...").arg(value);
} else if (hour == 0) {
if (m_showTimeToFull)
tips = tr("Charging %1, %2 min until full").arg(value).arg(min);
else {
tips = tr("Charging %1").arg(value);
}
} else {
if (m_showTimeToFull)
tips = tr("Charging %1, %2 hr %3 min until full").arg(value).arg(hour).arg(min);
else {
tips = tr("Charging %1").arg(value);
else {
if(timeToFull == 0) { // 电量已充満或电量计算中,剩余充满时间会返回0
tips = tr("Capacity %1 ...").arg(value);
} else if (hour == 0) {
if(m_showTimeToFull)
tips = tr("Charging %1, %2 min until full").arg(value).arg(min);
else {
tips = tr("Charging %1").arg(value);
}
} else {
if(m_showTimeToFull)
tips = tr("Charging %1, %2 hr %3 min until full").arg(value).arg(hour).arg(min);
else {
tips = tr("Charging %1").arg(value);
}
}
}

1
plugins/power/powerplugin.h
View File

@ -83,6 +83,7 @@ private:
SystemPowerInter *m_systemPowerInter;
DBusPower *m_powerInter;
QTimer *m_delayTimer;
};
#endif // POWERPLUGIN_H