Unhook the stylesheet in the Lumina Theme Engine from the non-desktop applications. This prepares us to use a "real" Qt style plugin for application appearances instead of stylesheets for a few lumina-* apps.

3 files changed, 13 insertions, 11 deletions

diff --git a/src-qt5/core/libLumina/LuminaThemes.cpp b/src-qt5/core/libLumina/LuminaThemes.cpp
index 415b3acf..8024f4af 100644
--- a/src-qt5/core/libLumina/LuminaThemes.cpp
+++ b/src-qt5/core/libLumina/LuminaThemes.cpp
@@ -406,15 +406,18 @@ LuminaThemeEngine::LuminaThemeEngine(QApplication *app){
   QStringList current = LTHEME::currentSettings();
   theme = current[0]; colors=current[1]; icons=current[2]; font=current[3]; fontsize=current[4];
   cursors = LTHEME::currentCursor();
-  application->setStyleSheet( LTHEME::assembleStyleSheet(theme, colors, font, fontsize) );
-  //Make sure to prefer font antialiasing on the application
-  /*QFont tmp = application->font();
+  if(application->applicationFilePath().section("/",-1)=="Lumina-DE"){
+    application->setStyleSheet( LTHEME::assembleStyleSheet(theme, colors, font, fontsize) );
+  }else{
+    //Non-Desktop binary - only use alternate Qt methods (skip stylesheets)
+    QFont tmp = application->font();
     tmp.setStyleStrategy(QFont::PreferOutline);
     tmp.setFamily(font);
     tmp.setHintingPreference(QFont::PreferFullHinting);
     if(fontsize.endsWith("pt")){ tmp.setPointSize(fontsize.section("pt",0,0).toInt()); }
     else if(fontsize.endsWith("px")){ tmp.setPixelSize(fontsize.section("px",0,0).toInt()); }
-  application->setFont(tmp);*/
+    application->setFont(tmp);
+  }
   QIcon::setThemeName(icons); //make sure this sets set within this environment
   syncTimer = new QTimer(this);
     syncTimer->setSingleShot(true);
@@ -451,7 +454,9 @@ void LuminaThemeEngine::reloadFiles(){
   //Check the Theme file/settings
   if(lastcheck < QFileInfo(QDir::homePath()+"/.lumina/themesettings.cfg").lastModified().addSecs(1) ){
     QStringList current = LTHEME::currentSettings();
-    application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1], current[3], current[4]) );	
+    if(application->applicationFilePath().section("/",-1)=="Lumina-DE"){
+      application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1], current[3], current[4]) );	
+    }
     if(icons!=current[2]){
       QIcon::setThemeName(current[2]); //make sure this sets set within this environment
       emit updateIcons();
@@ -500,4 +505,3 @@ void LuminaThemeEngine::reloadFiles(){
   watcher->removePaths( QStringList() << theme << colors << QDir::homePath()+"/.icons/default/index.theme" << QDir::homePath()+"/.lumina/envsettings.conf");
   watcher->addPaths( QStringList() << theme << colors << QDir::homePath()+"/.icons/default/index.theme" << QDir::homePath()+"/.lumina/envsettings.conf");
 }
-
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index 869ef183..b1a4b55e 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -220,12 +220,11 @@ void LSession::CleanupSession(){
   }
   //Now wait a moment for things to close down before quitting
   if(playaudio){
-    //wait a max of 3 seconds for audio to finish
+    //wait a max of 5 seconds for audio to finish
     bool waitmore = true;
-    for(int i=0; i<60 && waitmore; i++){
+    for(int i=0; i<100 && waitmore; i++){
       usleep(50000); //50ms = 50000 us
       waitmore = (mediaObj->state()==QMediaPlayer::PlayingState);
-      //waitmore = !audioThread->wait(500);
       LSession::processEvents();
     }
     if(waitmore){ mediaObj->stop(); } //timed out
@@ -234,7 +233,6 @@ void LSession::CleanupSession(){
   }
   //Clean up the temporary flag
   if(QFile::exists("/tmp/.luminastopping")){ QFile::remove("/tmp/.luminastopping"); }
-  //if(audioThread!=0){ audioThread->exit(0); }
 }
 
 int LSession::VersionStringToNumber(QString version){
diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
index 821e463f..d2d3664f 100644
--- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
+++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
@@ -148,4 +148,4 @@ Mod4 Prior :Exec lumina-open -volumeup
 Mod4 Next :Exec lumina-open -volumedown
 Mod4 Home  :Exec lumina-open -brightnessup
 Mod4 End  :Exec lumina-open -brightnessdown
-
+F12 :Exec lumina-terminal -toggle