diff options
Diffstat (limited to 'src-qt5/core/lumina-desktop')
-rw-r--r-- | src-qt5/core/lumina-desktop/Insight-FileManager.png | bin | 2829 -> 0 bytes | |||
-rw-r--r-- | src-qt5/core/lumina-desktop/LSession.cpp | 15 | ||||
-rw-r--r-- | src-qt5/core/lumina-desktop/Lumina-DE.desktop | 4 | ||||
-rw-r--r-- | src-qt5/core/lumina-desktop/WMProcess.cpp | 8 | ||||
-rw-r--r-- | src-qt5/core/lumina-desktop/WMProcess.h | 3 |
5 files changed, 14 insertions, 16 deletions
diff --git a/src-qt5/core/lumina-desktop/Insight-FileManager.png b/src-qt5/core/lumina-desktop/Insight-FileManager.png Binary files differdeleted file mode 100644 index 46cfaad7..00000000 --- a/src-qt5/core/lumina-desktop/Insight-FileManager.png +++ /dev/null diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index d4146e77..869ef183 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -376,7 +376,12 @@ void LSession::checkUserFiles(){ //internal version conversion examples: // [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] QString OVS = sessionsettings->value("DesktopVersion","0").toString(); //Old Version String - int oldversion = VersionStringToNumber(OVS); + bool changed = LUtils::checkUserFiles(OVS); + if(changed){ + //Save the current version of the session to the settings file (for next time) + sessionsettings->setValue("DesktopVersion", this->applicationVersion()); + } + /*int oldversion = VersionStringToNumber(OVS); int nversion = VersionStringToNumber(this->applicationVersion()); bool newversion = ( oldversion < VersionStringToNumber(this->applicationVersion()) ); //increasing version number bool newrelease = ( OVS.contains("-devel", Qt::CaseInsensitive) && this->applicationVersion().contains("-release", Qt::CaseInsensitive) ); //Moving from devel to release @@ -442,12 +447,6 @@ void LSession::checkUserFiles(){ dset = QDir::homePath()+"/.lumina/LuminaDE/lumina-open.conf"; if(!QFile::exists(dset)){ firstrun = true; - /*if(QFile::exists(LOS::LuminaShare()+"defaultapps.conf")){ - if( QFile::copy(LOS::LuminaShare()+"defaultapps.conf", dset) ){ - QFile::setPermissions(dset, QFile::ReadUser | QFile::WriteUser | QFile::ReadOwner | QFile::WriteOwner); - } - }*/ - } //Check the fluxbox configuration files dset = QDir::homePath()+"/.lumina/"; @@ -473,7 +472,7 @@ void LSession::checkUserFiles(){ //Save the current version of the session to the settings file (for next time) if(newversion || newrelease){ sessionsettings->setValue("DesktopVersion", this->applicationVersion()); - } + }*/ } void LSession::refreshWindowManager(){ diff --git a/src-qt5/core/lumina-desktop/Lumina-DE.desktop b/src-qt5/core/lumina-desktop/Lumina-DE.desktop index f83c6a7c..7d87f93a 100644 --- a/src-qt5/core/lumina-desktop/Lumina-DE.desktop +++ b/src-qt5/core/lumina-desktop/Lumina-DE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Exec=Lumina-DE -TryExec=Lumina-DE +Exec=start-lumina-desktop +TryExec=start-lumina-desktop Icon=Lumina-DE Type=Application Name=Lumina diff --git a/src-qt5/core/lumina-desktop/WMProcess.cpp b/src-qt5/core/lumina-desktop/WMProcess.cpp index a2a4933f..29dff542 100644 --- a/src-qt5/core/lumina-desktop/WMProcess.cpp +++ b/src-qt5/core/lumina-desktop/WMProcess.cpp @@ -13,7 +13,7 @@ WMProcess::WMProcess() : QProcess(){ QString log = QDir::homePath()+"/.lumina/logs/wm.log"; if(QFile::exists(log)){ QFile::remove(log); } this->setStandardOutputFile(log); - ssaver = new QProcess(0); + //ssaver = new QProcess(0); inShutdown = false; } @@ -28,17 +28,17 @@ void WMProcess::startWM(){ inShutdown = false; QString cmd = setupWM(); if(!isRunning()){this->start(cmd); } - if(ssaver->state() == QProcess::NotRunning \ + /*if(ssaver->state() == QProcess::NotRunning \ && LSession::handle()->sessionSettings()->value("WindowManager", "fluxbox").toString() != "lumina-wm"){ ssaver->start("xscreensaver -no-splash"); - } + }*/ } void WMProcess::stopWM(){ if(isRunning()){ inShutdown = true; //QProcess::startDetached("fluxbox-remote closeallwindows"); - ssaver->kill(); + //ssaver->kill(); this->kill(); if(!this->waitForFinished(10000)){ this->terminate(); }; }else{ diff --git a/src-qt5/core/lumina-desktop/WMProcess.h b/src-qt5/core/lumina-desktop/WMProcess.h index ff1b3963..b2909ee0 100644 --- a/src-qt5/core/lumina-desktop/WMProcess.h +++ b/src-qt5/core/lumina-desktop/WMProcess.h @@ -34,7 +34,7 @@ private: bool isRunning(); QString setupWM(); void cleanupConfig(); - QProcess *ssaver; + //QProcess *ssaver; private slots: void processFinished(int exitcode, QProcess::ExitStatus status); @@ -44,4 +44,3 @@ signals: }; #endif - |