Split up the desktop-plugin source files into a separate desktop-plugins.pri file as well. Also remove the "sample" desktop plugin from being included in the build.

3 files changed, 26 insertions, 65 deletions

diff --git a/lumina-desktop/desktop-plugins/NewDP.h b/lumina-desktop/desktop-plugins/NewDP.h
index b5881c4e..95494b91 100644
--- a/lumina-desktop/desktop-plugins/NewDP.h
+++ b/lumina-desktop/desktop-plugins/NewDP.h
@@ -13,7 +13,7 @@
 
 //List all the individual plugin includes here
 #include "LDPlugin.h"
-#include "SamplePlugin.h"
+//#include "SamplePlugin.h"
 #include "calendar/CalendarPlugin.h"
 #include "applauncher/AppLauncherPlugin.h"
 #include "desktopview/DesktopViewPlugin.h"
@@ -28,9 +28,10 @@ public:
 	static LDPlugin* createPlugin(QString plugin, QWidget* parent=0){
 	  //qDebug() << "Create Plugin:" << plugin;
 	  LDPlugin *plug = 0;
-	  if(plugin.section("---",0,0)=="sample"){
+	  /*if(plugin.section("---",0,0)=="sample"){
 	    plug = new SamplePlugin(parent, plugin);
-	  }else if(plugin.section("---",0,0)=="calendar"){
+	  }else */
+	  if(plugin.section("---",0,0)=="calendar"){
 	    plug = new CalendarPlugin(parent, plugin);
 	  }else if(plugin.section("---",0,0).section("::",0,0)=="applauncher"){
 	    //This plugin can be pre-initialized to a file path after the "::" delimiter
diff --git a/lumina-desktop/desktop-plugins/desktop-plugins.pri b/lumina-desktop/desktop-plugins/desktop-plugins.pri
new file mode 100644
index 00000000..4a008cca
--- /dev/null
+++ b/lumina-desktop/desktop-plugins/desktop-plugins.pri
@@ -0,0 +1,19 @@
+SOURCES += $$PWD/applauncher/AppLauncherPlugin.cpp \
+	$$PWD/desktopview/DesktopViewPlugin.cpp \
+	$$PWD/notepad/NotepadPlugin.cpp \
+	$$PWD/audioplayer/PlayerWidget.cpp \
+	$$PWD/systemmonitor/MonitorWidget.cpp
+#	$$PWD/messagecenter/MessageCenter.cpp
+
+HEADERS += $$PWD/calendar/CalendarPlugin.h \
+	$$PWD/applauncher/AppLauncherPlugin.h \
+	$$PWD/applauncher/OutlineToolButton.h \
+	$$PWD/desktopview/DesktopViewPlugin.h \
+	$$PWD/notepad/NotepadPlugin.h \
+	$$PWD/audioplayer/PlayerWidget.h \
+	$$PWD/systemmonitor/MonitorWidget.h \
+	$$PWD/quickcontainer/QuickDPlugin.h
+#	$$PWD/messagecenter/MessageCenter.h
+
+FORMS += $$PWD/audioplayer/PlayerWidget.ui \
+	$$PWD/systemmonitor/MonitorWidget.ui
\ No newline at end of file
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index 923d4b73..b917462a 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -38,32 +38,7 @@ SOURCES += main.cpp \
 	SettingsMenu.cpp \
 	SystemWindow.cpp \
 	BootSplash.cpp \
-#	panel-plugins/userbutton/LUserButton.cpp \
-#	panel-plugins/userbutton/UserWidget.cpp \
-#	panel-plugins/userbutton/UserItemWidget.cpp \
-#	panel-plugins/desktopbar/LDeskBar.cpp \
-#	panel-plugins/taskmanager/LTaskManagerPlugin.cpp \
-#	panel-plugins/taskmanager/LTaskButton.cpp \
-#	panel-plugins/systemtray/LSysTray.cpp \
-#	panel-plugins/systemtray/TrayIcon.cpp \
-#	panel-plugins/clock/LClock.cpp \
-#	panel-plugins/battery/LBattery.cpp \
-#	panel-plugins/desktopswitcher/LDesktopSwitcher.cpp \
-#	panel-plugins/systemdashboard/LSysDashboard.cpp \
-#	panel-plugins/systemdashboard/SysMenuQuick.cpp \
-#	panel-plugins/showdesktop/LHomeButton.cpp \
-#	panel-plugins/appmenu/LAppMenuPlugin.cpp \
-#	panel-plugins/applauncher/AppLaunchButton.cpp \
-#	panel-plugins/systemstart/LStartButton.cpp \
-#	panel-plugins/systemstart/StartMenu.cpp \
-#	panel-plugins/systemstart/ItemWidget.cpp \
 	desktop-plugins/LDPlugin.cpp \
-	desktop-plugins/applauncher/AppLauncherPlugin.cpp \
-	desktop-plugins/desktopview/DesktopViewPlugin.cpp \
-	desktop-plugins/notepad/NotepadPlugin.cpp \
-	desktop-plugins/audioplayer/PlayerWidget.cpp \
-	desktop-plugins/systemmonitor/MonitorWidget.cpp
-#	desktop-plugins/messagecenter/MessageCenter.cpp
 
 
 HEADERS  += Globals.h \
@@ -83,47 +58,13 @@ HEADERS  += Globals.h \
 	panel-plugins/LTBWidget.h \
 	desktop-plugins/LDPlugin.h \
 	desktop-plugins/NewDP.h \
-#	panel-plugins/userbutton/LUserButton.h \
-#	panel-plugins/userbutton/UserWidget.h \
-#	panel-plugins/userbutton/UserItemWidget.h \
-#	panel-plugins/desktopbar/LDeskBar.h \
-#	panel-plugins/systemtray/LSysTray.h \
-#	panel-plugins/systemtray/TrayIcon.h \
-#	panel-plugins/spacer/LSpacer.h \
-#	panel-plugins/clock/LClock.h \
-#	panel-plugins/battery/LBattery.h \
-#	panel-plugins/desktopswitcher/LDesktopSwitcher.h \
-#	panel-plugins/taskmanager/LTaskManagerPlugin.h \
-#	panel-plugins/taskmanager/LTaskButton.h \
-#	panel-plugins/systemdashboard/LSysDashboard.h \
-#	panel-plugins/systemdashboard/SysMenuQuick.h \
-#	panel-plugins/showdesktop/LHomeButton.h \
-#	panel-plugins/appmenu/LAppMenuPlugin.h \
-#	panel-plugins/applauncher/AppLaunchButton.h \
-#	panel-plugins/systemstart/LStartButton.h \
-#	panel-plugins/systemstart/StartMenu.h \
-#	panel-plugins/systemstart/ItemWidget.h \
-#	panel-plugins/quickcontainer/QuickPPlugin.h \
-	desktop-plugins/SamplePlugin.h \
-	desktop-plugins/calendar/CalendarPlugin.h \
-	desktop-plugins/applauncher/AppLauncherPlugin.h \
-	desktop-plugins/applauncher/OutlineToolButton.h \
-	desktop-plugins/desktopview/DesktopViewPlugin.h \
-	desktop-plugins/notepad/NotepadPlugin.h \
-	desktop-plugins/audioplayer/PlayerWidget.h \
-	desktop-plugins/systemmonitor/MonitorWidget.h \
-	desktop-plugins/quickcontainer/QuickDPlugin.h
-#	desktop-plugins/messagecenter/MessageCenter.h
 
 FORMS    += SystemWindow.ui \
-	BootSplash.ui \
-#	panel-plugins/userbutton/UserWidget.ui \
-#	panel-plugins/systemdashboard/SysMenuQuick.ui \
-#	panel-plugins/systemstart/StartMenu.ui \
-	desktop-plugins/audioplayer/PlayerWidget.ui \
-	desktop-plugins/systemmonitor/MonitorWidget.ui
+	BootSplash.ui 
 
+#Now include all the files for the various plugins
 include(panel-plugins/panel-plugins.pri)
+include(desktop-plugins/desktop-plugins.pri)
 
 RESOURCES+= Lumina-DE.qrc