From f1519a4377b6e553ac4e5c9b307a839ee9f6179a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 17 Jan 2018 12:00:08 -0500 Subject: Add a failsafe setting into the 1.4.x lumina-desktop: Ensure that the lumina theme engine is always set in the session environment unless manually replaced/removed in the session settings. --- src-qt5/core/lumina-desktop/LSession.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src-qt5/core/lumina-desktop/LSession.cpp') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index dab30f01..111a17b6 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -346,6 +346,8 @@ void LSession::watcherChange(QString changed){ //qDebug() << "Set Qt5 theme engine: " << engine; if(engine.isEmpty()){ unsetenv("QT_QPA_PLATFORMTHEME"); } else{ setenv("QT_QPA_PLATFORMTHEME", engine.toUtf8().data(),1); } + }else{ + setenv("QT_QPA_PLATFORMTHEME", "lthemeengine",1); //ensure the lumina theme engine is always enabled } emit SessionConfigChanged(); }else if(changed.endsWith("desktopsettings.conf") ){ emit DesktopConfigChanged(); } -- cgit From 4455528cd9cd0b0594c3bcabf619a50e64e37832 Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 7 Feb 2018 14:37:49 -0500 Subject: add shell logout to Lumina --- src-qt5/core/lumina-desktop/LSession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-desktop/LSession.cpp') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 111a17b6..7eafcde7 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -272,7 +272,7 @@ void LSession::NewCommunication(QStringList list){ screensChanged(); }else if(list[i]=="--show-start"){ emit StartButtonActivated(); - } + }else if(list[i]=="--logout"){ QTimer::singleShot(1000, this, SLOT(StartLogout()));} } } -- cgit From dc18ed78126c752a6519d4827fb0b6d520aab08e Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 7 Feb 2018 14:41:07 -0500 Subject: Revert "add shell logout to Lumina" This reverts commit 4455528cd9cd0b0594c3bcabf619a50e64e37832. --- src-qt5/core/lumina-desktop/LSession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-desktop/LSession.cpp') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 7eafcde7..111a17b6 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -272,7 +272,7 @@ void LSession::NewCommunication(QStringList list){ screensChanged(); }else if(list[i]=="--show-start"){ emit StartButtonActivated(); - }else if(list[i]=="--logout"){ QTimer::singleShot(1000, this, SLOT(StartLogout()));} + } } } -- cgit From 5b63bc57c9e36ea69da2ace22a78680200b713ae Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 7 Feb 2018 14:45:58 -0500 Subject: redo shell logout to Lumina --- src-qt5/core/lumina-desktop/LSession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-desktop/LSession.cpp') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 111a17b6..7eafcde7 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -272,7 +272,7 @@ void LSession::NewCommunication(QStringList list){ screensChanged(); }else if(list[i]=="--show-start"){ emit StartButtonActivated(); - } + }else if(list[i]=="--logout"){ QTimer::singleShot(1000, this, SLOT(StartLogout()));} } } -- cgit From bac1b2939742ea275ac4b42cc881ad6cd4f16919 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 9 Feb 2018 14:16:31 -0500 Subject: Bump the minor version of Lumina to 1.4.2 This includes some larger changes to lumina-pdf, and some fixes for the 1.x session (battery chimes and such) --- src-qt5/core/lumina-desktop/LSession.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src-qt5/core/lumina-desktop/LSession.cpp') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 7eafcde7..c1f49fc3 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -29,6 +29,7 @@ XCBEventFilter *evFilter = 0; LIconCache *ICONS = 0; LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lumina-desktop"){ + xchange = false; if(this->isPrimaryProcess()){ connect(this, SIGNAL(InputsAvailable(QStringList)), this, SLOT(NewCommunication(QStringList)) ); this->setApplicationName("Lumina Desktop Environment"); -- cgit