aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/panel-plugins
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-04-14 16:27:02 -0400
committerKen Moore <ken@ixsystems.com>2017-04-14 16:27:02 -0400
commitd2d615358857079637024efe5e6cfef4460f4e6f (patch)
tree25a127d806d385c6bc4cc0011922a8be3f0022ee /src-qt5/core/lumina-desktop/panel-plugins
parentClean up the old files/dirs for the original icon theme ideas - no need for t... (diff)
downloadlumina-d2d615358857079637024efe5e6cfef4460f4e6f.tar.gz
lumina-d2d615358857079637024efe5e6cfef4460f4e6f.tar.bz2
lumina-d2d615358857079637024efe5e6cfef4460f4e6f.zip
Fix up the icons used for the battery notifications.
Diffstat (limited to 'src-qt5/core/lumina-desktop/panel-plugins')
-rw-r--r--src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp22
-rw-r--r--src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp8
2 files changed, 15 insertions, 15 deletions
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp
index ee379613..bdbdc42d 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp
@@ -43,37 +43,37 @@ void LBattery::updateBattery(bool force){
if (icon != iconOld || force) {
switch (icon) {
case 0:
- label->setPixmap( LXDG::findIcon("battery-caution", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-20","battery-caution").pixmap(label->size()) );
break;
case 1:
- label->setPixmap( LXDG::findIcon("battery-040", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-40", "battery-040").pixmap(label->size()) );
break;
case 2:
- label->setPixmap( LXDG::findIcon("battery-060", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-60", "battery-060").pixmap(label->size()) );
break;
case 3:
- label->setPixmap( LXDG::findIcon("battery-080", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-80", "battery-080").pixmap(label->size()) );
break;
case 4:
- label->setPixmap( LXDG::findIcon("battery-100", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-100", "battery").pixmap(label->size()) );
break;
case 10:
- label->setPixmap( LXDG::findIcon("battery-charging-caution", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-charging-20", "battery-charging-caution").pixmap(label->size()) );
break;
case 11:
- label->setPixmap( LXDG::findIcon("battery-charging-040", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-charging-040", "battery-charging-040").pixmap(label->size()) );
break;
case 12:
- label->setPixmap( LXDG::findIcon("battery-charging-060", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-charging-060", "battery-charging-060").pixmap(label->size()) );
break;
case 13:
- label->setPixmap( LXDG::findIcon("battery-charging-080", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-charging-080", "battery-charging-080").pixmap(label->size()) );
break;
case 14:
- label->setPixmap( LXDG::findIcon("battery-charging", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-charging-100", "battery-charging").pixmap(label->size()) );
break;
default:
- label->setPixmap( LXDG::findIcon("battery-missing", "").pixmap(label->size()) );
+ label->setPixmap( LXDG::findIcon("battery-unknown", "battery-missing").pixmap(label->size()) );
break;
}
if(icon<iconOld && icon==0){
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
index d05ba22f..4e6055d6 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
@@ -489,10 +489,10 @@ void StartMenu::on_stackedWidget_currentChanged(int val){
//Battery available - update the status button
int charge = LOS::batteryCharge();
QString TT, ICON;
- if(charge<=5){ ICON="-caution"; }
- else if(charge<=20){ ICON="-040"; }
- else if(charge<=70){ ICON="-060"; }
- else if(charge<=90){ ICON="-080"; }
+ if(charge<=5){ ICON="-20"; }
+ else if(charge<=20){ ICON="-40"; }
+ else if(charge<=70){ ICON="-60"; }
+ else if(charge<=90){ ICON="-80"; }
else{ ICON="-100"; }
if(LOS::batteryIsCharging()){
if(charge>=80){ ICON.clear(); } //for charging, there is no suffix to the icon name over 80%
bgstack15