Clean up how the lumina-desktop closes down:

Now it is run through a "CleanSession" function beforehand to try and safely close down any applications/trays. Als reduce the number of filesystem watchers: only have one in the session itself, which sends out a signal when the desktop settings config file changes (instead of a watcher in every desktop class).

1 files changed, 13 insertions, 28 deletions

diff --git a/lumina-desktop/SystemWindow.h b/lumina-desktop/SystemWindow.h
index 3be8642e..211de5fd 100644
--- a/lumina-desktop/SystemWindow.h
+++ b/lumina-desktop/SystemWindow.h
@@ -2,17 +2,17 @@
 #define _LUMINA_DESKTOP_SYSTEM_WINDOW_H
 
 #include <QDialog>
-#include <QCoreApplication>
-#include <QDesktopWidget>
-#include <QList>
-#include <QProcess>
+//#include <QCoreApplication>
+
+//#include <QList>
+//#include <QProcess>
 
 #include "ui_SystemWindow.h"
-#include "Globals.h"
+//#include "Globals.h"
 
-#include <LuminaXDG.h>
-#include <LuminaX11.h>
-#include <LuminaOS.h>
+//#include <LuminaXDG.h>
+//#include <LuminaX11.h>
+//#include <LuminaOS.h>
 
 
 
@@ -29,35 +29,20 @@ public:
 private:
 	Ui::SystemWindow *ui;
 
-	void closeAllWindows();
+	//void closeAllWindows();
 	
 private slots:
-	void sysLogout(){
-	  closeAllWindows();
-	  QCoreApplication::exit(0);
-	}
+	void sysLogout();
 	
-	void sysRestart(){
-	  closeAllWindows();
-	  LOS::systemRestart();
-	  QCoreApplication::exit(0);		
-	}
+	void sysRestart();
 	
-	void sysShutdown(){
-	  closeAllWindows();
-	  LOS::systemShutdown();
-	  QCoreApplication::exit(0);
-	}
+	void sysShutdown();
 	
 	void sysCancel(){
 	  this->close();
 	}
 	
-	void sysLock(){
-	  qDebug() << "Locking the desktop...";
-	  QProcess::startDetached("xscreensaver-command -lock");
-	  this->close();
-	}
+	void sysLock();
 };
 
 #endif
\ No newline at end of file