fix cherry-picking
This commit is contained in:
commit
75c9850719
@ -1,6 +1,6 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=LXQt Power Management
|
Name=Power Management
|
||||||
GenericName=Power Management Settings
|
GenericName=Power Management Settings
|
||||||
Comment=Various settings regarding Power Management like battery or idleness watcher
|
Comment=Various settings regarding Power Management like battery or idleness watcher
|
||||||
Exec=lxqt-config-powermanagement
|
Exec=lxqt-config-powermanagement
|
||||||
|
@ -96,6 +96,6 @@ QString BatteryHelper::typeToString(Solid::Battery::BatteryType type)
|
|||||||
return tr("Monitor battery");
|
return tr("Monitor battery");
|
||||||
case Solid::Battery::UnknownBattery:
|
case Solid::Battery::UnknownBattery:
|
||||||
default:
|
default:
|
||||||
return tr("Unkown battery");
|
return tr("Unknown battery");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ BatteryInfoFrame::BatteryInfoFrame(Solid::Battery *battery) :
|
|||||||
|
|
||||||
QString vendor = QString("%1 %2").arg(battery->recallVendor()).arg(battery->serial());
|
QString vendor = QString("%1 %2").arg(battery->recallVendor()).arg(battery->serial());
|
||||||
if (vendor.trimmed().isEmpty())
|
if (vendor.trimmed().isEmpty())
|
||||||
vendor = "Unkown";
|
vendor = "Unknown";
|
||||||
mUi->vendorValue->setText(vendor);
|
mUi->vendorValue->setText(vendor);
|
||||||
|
|
||||||
connect(mBattery, SIGNAL(energyChanged(double, const QString)), this, SLOT(onBatteryChanged()));
|
connect(mBattery, SIGNAL(energyChanged(double, const QString)), this, SLOT(onBatteryChanged()));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user