Removed odd battery icons for visibility

Odizinne · Aug 20, 2024 · ebee6cf · ebee6cf
1 parent ec6a9d5
commit ebee6cf
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 20 deletions.
diff --git a/src/Resources/icons/battery-010-dark.png b/src/Resources/icons/battery-010-dark.png
diff --git a/src/Resources/icons/battery-010-light.png b/src/Resources/icons/battery-010-light.png
diff --git a/src/Resources/icons/battery-020-dark.png b/src/Resources/icons/battery-020-dark.png
diff --git a/src/Resources/icons/battery-020-light.png b/src/Resources/icons/battery-020-light.png
diff --git a/src/Resources/icons/battery-030-dark.png b/src/Resources/icons/battery-030-dark.png
diff --git a/src/Resources/icons/battery-030-light.png b/src/Resources/icons/battery-030-light.png
diff --git a/src/Resources/icons/battery-040-dark.png b/src/Resources/icons/battery-040-dark.png
diff --git a/src/Resources/icons/battery-040-light.png b/src/Resources/icons/battery-040-light.png
diff --git a/src/Resources/icons/battery-050-dark.png b/src/Resources/icons/battery-050-dark.png
diff --git a/src/Resources/icons/battery-050-light.png b/src/Resources/icons/battery-050-light.png
diff --git a/src/Resources/icons/battery-070-dark.png b/src/Resources/icons/battery-070-dark.png
diff --git a/src/Resources/icons/battery-070-light.png b/src/Resources/icons/battery-070-light.png
diff --git a/src/Resources/icons/battery-090-dark.png b/src/Resources/icons/battery-090-dark.png
diff --git a/src/Resources/icons/battery-090-light.png b/src/Resources/icons/battery-090-light.png
diff --git a/src/Resources/resources.qrc b/src/Resources/resources.qrc
@@ -1,26 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/battery-010-dark.png</file>
         <file>icons/battery-020-dark.png</file>
-        <file>icons/battery-030-dark.png</file>
         <file>icons/battery-040-dark.png</file>
-        <file>icons/battery-050-dark.png</file>
         <file>icons/battery-060-dark.png</file>
-        <file>icons/battery-070-dark.png</file>
         <file>icons/battery-080-dark.png</file>
-        <file>icons/battery-090-dark.png</file>
         <file>icons/battery-100-dark.png</file>
         <file>icons/battery-100-charging-dark.png</file>
         <file>icons/battery-missing-dark.png</file>
-        <file>icons/battery-010-light.png</file>
         <file>icons/battery-020-light.png</file>
-        <file>icons/battery-030-light.png</file>
         <file>icons/battery-040-light.png</file>
-        <file>icons/battery-050-light.png</file>
         <file>icons/battery-060-light.png</file>
-        <file>icons/battery-070-light.png</file>
         <file>icons/battery-080-light.png</file>
-        <file>icons/battery-090-light.png</file>
         <file>icons/battery-100-light.png</file>
         <file>icons/battery-100-charging-light.png</file>
         <file>icons/battery-missing-light.png</file>

diff --git a/src/Utils/utils.cpp b/src/Utils/utils.cpp
@@ -42,16 +42,11 @@ QString getBatteryIcon(int batteryLevel, bool charging, bool missing, int themeI
     } else if (charging) {
         iconName = "battery-100-charging-" + theme;
     } else {
-        if (batteryLevel >= 90) iconName = "battery-100-" + theme;
-        else if (batteryLevel >= 80) iconName = "battery-090-" + theme;
-        else if (batteryLevel >= 70) iconName = "battery-080-" + theme;
-        else if (batteryLevel >= 60) iconName = "battery-070-" + theme;
-        else if (batteryLevel >= 50) iconName = "battery-060-" + theme;
-        else if (batteryLevel >= 40) iconName = "battery-050-" + theme;
-        else if (batteryLevel >= 30) iconName = "battery-040-" + theme;
-        else if (batteryLevel >= 20) iconName = "battery-030-" + theme;
-        else if (batteryLevel >= 10) iconName = "battery-020-" + theme;
-        else iconName = "battery-010-" + theme;
+        if (batteryLevel >= 80) iconName = "battery-100-" + theme;
+        else if (batteryLevel >= 60) iconName = "battery-080-" + theme;
+        else if (batteryLevel >= 40) iconName = "battery-060-" + theme;
+        else if (batteryLevel >= 20) iconName = "battery-040-" + theme;
+        else if (batteryLevel >= 0) iconName = "battery-020-" + theme;
     }
 
     QString iconPath;