Merge remote-tracking branch 'origin/master'

4 files changed, 13 insertions, 7 deletions

diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index 93318b0f..777affd1 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -191,7 +191,10 @@ void LSession::CleanupSession(){
   int vol = LOS::audioVolume();
   if(vol>=0){ sessionsettings->setValue("last_session_state/audio_volume", vol); }
   bool playaudio = sessionsettings->value("PlayLogoutAudio",true).toBool();
-  if( playaudio ){ playAudioFile(LOS::LuminaShare()+"Logout.ogg"); }
+  if( playaudio ){
+      QString sfile = sessionsettings->value("audiofiles/logout", LOS::LuminaShare()+"Logout.ogg").toString();
+      playAudioFile(sfile);
+  }
   //Stop the background system tray (detaching/closing apps as necessary)
   stopSystemTray(!cleansession);
   //Now perform any other cleanup
@@ -296,7 +299,8 @@ void LSession::launchStartupApps(){
 
   //Now play the login music since we are finished
   if(sessionsettings->value("PlayStartupAudio",true).toBool()){
-    LSession::playAudioFile(LOS::LuminaShare()+"Login.ogg");
+     QString sfile = sessionsettings->value("audiofiles/login", LOS::LuminaShare()+"Login.ogg").toString();
+     playAudioFile(sfile);
   }
   qDebug() << "[DESKTOP INIT FINISHED]";
 }
diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp
index 1b0e5e4d..6017cad7 100644
--- a/src-qt5/core/lumina-desktop/main.cpp
+++ b/src-qt5/core/lumina-desktop/main.cpp
@@ -72,8 +72,8 @@ int main(int argc, char ** argv)
     LXDG::setEnvironmentVars();
     setenv("DESKTOP_SESSION","Lumina",1);
     setenv("XDG_CURRENT_DESKTOP","Lumina",1);
-    unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default...
-    //setenv("QT_QPA_PLATFORMTHEME", "lthemeengine");
+    //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default...
+    setenv("QT_QPA_PLATFORMTHEME", "lthemeengine", 1);
     unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //causes pixel-specific scaling issues with the desktop - turn this on after-the-fact for other apps
     //Startup the session
     LSession a(argc, argv);
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 5e9d7a7f..be5b8488 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp
@@ -78,8 +78,10 @@ void LBattery::updateBattery(bool force){
     }
     if(icon<iconOld && icon==0){
       //Play some audio warning chime when 
-      LSession::handle()->playAudioFile(LOS::LuminaShare()+"low-battery.ogg");
-    }
+      QString sfile = LSession::handle()->sessionSettings()->value("audiofiles/batterylow", LOS::LuminaShare()+"low-battery.ogg").toString();
+      LSession::handle()->playAudioFile(sfile);
+      }
+
     if(icon==0){ label->setStyleSheet("QLabel{ background: red;}"); }
     else if(icon==14 && charge>98){ label->setStyleSheet("QLabel{ background: green;}"); }
     else{ label->setStyleSheet("QLabel{ background: transparent;}"); }
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp
index bdf9b27e..db661841 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp
@@ -102,7 +102,7 @@ void LClock::updateTime(bool adjustformat){
         lwid = metrics.width(lines[i]);
         if(lwid>wid){ wid = lwid; }
       }
-     this->setMinimumWidth( wid - (4*metrics.width("O")) );
+     this->setMinimumWidth(wid);
      this->setMaximumWidth(wid + (4*metrics.width("O")));
     }else{
       //vertical layout