9 files changed, 85 insertions, 4 deletions
diff --git a/src-qt5/core-utils/lumina-config/globals.h b/src-qt5/core-utils/lumina-config/globals.h
index 18302125..11bfaeb3 100644
--- a/src-qt5/core-utils/lumina-config/globals.h
+++ b/src-qt5/core-utils/lumina-config/globals.h
@@ -12,6 +12,7 @@
 #include <QList>
 #include <QWidget>
 #include <QDesktopWidget>
+#include <QMainWindow>
 
 //Now the Lumina Library classes
 #include <LuminaXDG.h>
diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro
index 307cd765..4560036c 100644
--- a/src-qt5/core-utils/lumina-config/lumina-config.pro
+++ b/src-qt5/core-utils/lumina-config/lumina-config.pro
@@ -12,6 +12,7 @@ TEMPLATE = app
 
 SOURCES += main.cpp \
 	   mainUI.cpp \
+	   mainWindow.cpp \
 	   LPlugins.cpp \
 	   ColorDialog.cpp \
 	   ThemeDialog.cpp \
@@ -19,6 +20,7 @@ SOURCES += main.cpp \
 	   PanelWidget.cpp
 
 HEADERS  += mainUI.h \
+		mainWindow.h \
 		LPlugins.h \
 		KeyCatch.h \
 		AppDialog.h \
@@ -28,6 +30,7 @@ HEADERS  += mainUI.h \
 		PanelWidget.h
 
 FORMS    += mainUI.ui \
+		mainWindow.ui \
 		KeyCatch.ui \
 		AppDialog.ui \
 		ColorDialog.ui \
@@ -35,6 +38,7 @@ FORMS    += mainUI.ui \
 		GetPluginDialog.ui \
 		PanelWidget.ui
 
+include("pages/pages.pri")
 
 # RESOURCES+= lumina-config.qrc
 
diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp
index 12ba0cd1..a63e0fbe 100644
--- a/src-qt5/core-utils/lumina-config/main.cpp
+++ b/src-qt5/core-utils/lumina-config/main.cpp
@@ -5,6 +5,7 @@
 #include <QFile>
 
 #include "mainUI.h"
+#include "mainWindow.h"
 #include <LuminaOS.h>
 #include <LuminaUtils.h>
 #include <LuminaThemes.h>
@@ -19,6 +20,7 @@ int main(int argc, char ** argv)
     LuminaThemeEngine theme(&a);
 
     MainUI w;
+    //mainWindow w;
     QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) );
     QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
     w.show();
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp
new file mode 100644
index 00000000..aec92bf9
--- /dev/null
+++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp
@@ -0,0 +1,40 @@
+//===========================================
+//  Lumina Desktop Source Code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "mainWindow.h"
+#include "ui_mainWindow.h"
+#include "globals.h"
+
+//=============
+//      PUBLIC
+//=============
+mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){
+  ui->setupUi(this);
+
+}
+
+mainWindow::~mainWindow(){
+
+}
+
+//==============
+//  PUBLIC SLOTS
+//==============
+void mainWindow::slotSingleInstance(){
+
+}
+
+void mainWindow::setupIcons(){
+
+}
+
+//=============
+//      PRIVATE
+//=============
+
+//================
+//  PRIVATE SLOTS
+//================
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.h b/src-qt5/core-utils/lumina-config/mainWindow.h
new file mode 100644
index 00000000..a3dba53b
--- /dev/null
+++ b/src-qt5/core-utils/lumina-config/mainWindow.h
@@ -0,0 +1,31 @@
+//===========================================
+//  Lumina Desktop Source Code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#ifndef _LUMINA_CONFIG_MAIN_WINDOW_H
+#define _LUMINA_CONFIG_MAIN_WINDOW_H
+#include "globals.h"
+
+namespace Ui{
+	class mainWindow;
+};
+
+class mainWindow : public QMainWindow{
+	Q_OBJECT
+public:
+	mainWindow();
+	~mainWindow();
+
+public slots:
+	void slotSingleInstance();
+	void setupIcons();
+
+private:
+	Ui::mainWindow *ui;
+
+private slots:
+
+};
+#endif
diff --git a/src-qt5/core-utils/lumina-config/pages/PageWidget.h b/src-qt5/core-utils/lumina-config/pages/PageWidget.h
index 9eb7d847..ab81ba1b 100644
--- a/src-qt5/core-utils/lumina-config/pages/PageWidget.h
+++ b/src-qt5/core-utils/lumina-config/pages/PageWidget.h
@@ -43,11 +43,11 @@ public slots:
 	//User requested to save any pending changes
 	virtual void SaveSettings(){} 
 	virtual void LoadSettings(int){} //INPUT: Screen number (0+)
-	virtual void updateIcons();
+	virtual void updateIcons(){}
 
 	//Simplification function for widget connections
 	void settingChanged(){
-	  emit HasPendingChanged(true);
+	  emit HasPendingChanges(true);
 	}
 };
 
diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.h b/src-qt5/core-utils/lumina-config/pages/page_main.h
index cbdf1cbd..d5c5c8be 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_main.h
+++ b/src-qt5/core-utils/lumina-config/pages/page_main.h
@@ -7,6 +7,7 @@
 #ifndef _LUMINA_CONFIG_PAGE_MAIN_H
 #define _LUMINA_CONFIG_PAGE_MAIN_H
 #include "../globals.h"
+#include "PageWidget.h"
 
 namespace Ui{
 	class page_main;
diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri
index da68e6f0..2ebf2c46 100644
--- a/src-qt5/core-utils/lumina-config/pages/pages.pri
+++ b/src-qt5/core-utils/lumina-config/pages/pages.pri
@@ -1,5 +1,6 @@
 
 HEADERS	+= 	$${PWD}/getPage.h \
+		$${PWD}/PageWidget.h \
 		$${PWD}/page_main.h
 #		$${PWD}/page_autostart.h \
 #		$${PWD}/page_defaultapps.h \
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index be3c130e..36e96dd7 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -69,10 +69,11 @@ void LSession::start(){
   // FLUXBOX BUG BYPASS: if the ~/.fluxbox dir does not exist, it will ignore the given config file
   //if(!QFile::exists(QDir::homePath()+"/.fluxbox")){ QDir dir; dir.mkpath(QDir::homePath()+"/.fluxbox"); }
   //startProcess("wm", "fluxbox -rc "+QDir::homePath()+"/.lumina/fluxbox-init -no-slit -no-toolbar");
+  //Compositing manager
+  if(LUtils::isValidBinary("xcompmgr")){ startProcess("compositing","xcompmgr"); }
   //Desktop Next
   startProcess("runtime","lumina-desktop");
   //ScreenSaver
   if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); }
-  //Compositing manager
-  if(LUtils::isValidBinary("xcompmgr")){ startProcess("compositing","xcompmgr"); }
+
 }