Merge pull request #2319 from rrrapha/battery-hide

Hide the battery widget when the status is unknown
mixxxdj · Oct 17, 2019 · 6bc55a5 · 6bc55a5
2 parents 14037e9 + d42c767
commit 6bc55a5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/res/skins/Deere/icon/ic_battery_unknown_48px.svg b/res/skins/Deere/icon/ic_battery_unknown_48px.svg
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
@@ -15,7 +15,6 @@
         <ObjectName>Battery</ObjectName>
         <Size>24,24</Size>
         <SizePolicy>f,f</SizePolicy>
-        <PixmapUnknown scalemode="STRETCH_ASPECT">icon/ic_battery_unknown_48px.svg</PixmapUnknown>
         <PixmapCharged scalemode="STRETCH_ASPECT">icon/ic_battery_charged_48px.svg</PixmapCharged>
         <NumberStates>8</NumberStates>
         <PixmapsCharging scalemode="STRETCH_ASPECT">icon/ic_battery_charging_%1_48px.svg</PixmapsCharging>

diff --git a/res/skins/Tango/graphics/batt/ic_battery_unknown.svg b/res/skins/Tango/graphics/batt/ic_battery_unknown.svg
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
@@ -283,7 +283,6 @@ Description:
             <ObjectName>Battery</ObjectName>
             <Size>24,24</Size>
             <SizePolicy>f,f</SizePolicy>
-            <PixmapUnknown scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_unknown.svg</PixmapUnknown>
             <PixmapCharged scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charged.svg</PixmapCharged>
             <NumberStates>8</NumberStates>
             <PixmapsCharging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charging_%1.svg</PixmapsCharging>

diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp
@@ -8,6 +8,7 @@
 WBattery::WBattery(QWidget* parent)
         : WWidget(parent),
           m_pBattery(Battery::getBattery(this)) {
+    setVisible(false);
     if (m_pBattery) {
         connect(m_pBattery.data(), SIGNAL(stateChanged()),
                 this, SLOT(update()));
@@ -23,14 +24,6 @@ void WBattery::setup(const QDomNode& node, const SkinContext& context) {
                   context.getScaleFactor());
     }
 
-    QDomElement unknownPath = context.selectElement(node, "PixmapUnknown");
-    if (!unknownPath.isNull()) {
-        setPixmap(&m_pPixmapUnknown,
-                  context.getPixmapSource(unknownPath),
-                  context.selectScaleMode(unknownPath, Paintable::TILE),
-                  context.getScaleFactor());
-    }
-
     QDomElement chargedPath = context.selectElement(node, "PixmapCharged");
     if (!chargedPath.isNull()) {
         setPixmap(&m_pPixmapCharged,
@@ -99,9 +92,8 @@ void WBattery::update() {
 
     if (chargingState != Battery::UNKNOWN) {
         setBaseTooltip(QString("%1\%").arg(dPercentage, 0, 'f', 0));
-    } else {
-        setBaseTooltip(tr("Battery status unknown."));
     }
+
     m_pCurrentPixmap.clear();
     switch (chargingState) {
         case Battery::CHARGING:
@@ -130,11 +122,10 @@ void WBattery::update() {
             m_pCurrentPixmap = m_pPixmapCharged;
             appendBaseTooltip("\n" + tr("Battery fully charged."));
             break;
-        case Battery::UNKNOWN:
         default:
-            m_pCurrentPixmap = m_pPixmapUnknown;
             break;
     }
+    setVisible(chargingState != Battery::UNKNOWN);
 
     // call parent's update() to show changes, this should call
     // QWidget::update()