diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-04-27 13:14:29 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-04-27 13:14:29 -0400 |
| commit | 8ec6c7715cdb629ba0ccb7c560c8e733e532b0b3 (patch) | |
| tree | 31bda08fa973935a95c87444f19ab5dc9dbe5216 /src-qt5/core/lumina-desktop | |
| parent | Get colors working with the new terminal. Of course this breaks the font weig... (diff) | |
| download | lumina-8ec6c7715cdb629ba0ccb7c560c8e733e532b0b3.tar.gz lumina-8ec6c7715cdb629ba0ccb7c560c8e733e532b0b3.tar.bz2 lumina-8ec6c7715cdb629ba0ccb7c560c8e733e532b0b3.zip | |
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.
Diffstat (limited to 'src-qt5/core/lumina-desktop')
| -rw-r--r-- | src-qt5/core/lumina-desktop/LSession.cpp | 6 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys | 2 |
2 files changed, 3 insertions, 5 deletions
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 |