aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lumina-desktop/lumina-desktop.pro86
-rw-r--r--lumina-desktop/panel-plugins/LPPlugin.h2
-rw-r--r--lumina-desktop/panel-plugins/NewPP.h5
-rw-r--r--lumina-desktop/panel-plugins/line/LLine.h40
-rw-r--r--lumina-desktop/panel-plugins/panel-plugins.pri49
5 files changed, 138 insertions, 44 deletions
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index 43f32721..923d4b73 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -38,25 +38,25 @@ 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 \
+# 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 \
@@ -83,26 +83,26 @@ 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/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 \
@@ -117,12 +117,14 @@ HEADERS += Globals.h \
FORMS += SystemWindow.ui \
BootSplash.ui \
- panel-plugins/userbutton/UserWidget.ui \
- panel-plugins/systemdashboard/SysMenuQuick.ui \
- panel-plugins/systemstart/StartMenu.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
+include(panel-plugins/panel-plugins.pri)
+
RESOURCES+= Lumina-DE.qrc
INCLUDEPATH += ../libLumina $$PREFIX/include
diff --git a/lumina-desktop/panel-plugins/LPPlugin.h b/lumina-desktop/panel-plugins/LPPlugin.h
index beff3bf6..995c8742 100644
--- a/lumina-desktop/panel-plugins/LPPlugin.h
+++ b/lumina-desktop/panel-plugins/LPPlugin.h
@@ -1,6 +1,6 @@
//===========================================
// Lumina-DE source code
-// Copyright (c) 2014, Ken Moore
+// Copyright (c) 2014-2015, Ken Moore
// Available under the 3-clause BSD license
// See the LICENSE file for full details
//===========================================
diff --git a/lumina-desktop/panel-plugins/NewPP.h b/lumina-desktop/panel-plugins/NewPP.h
index f43f8803..50bf2232 100644
--- a/lumina-desktop/panel-plugins/NewPP.h
+++ b/lumina-desktop/panel-plugins/NewPP.h
@@ -1,6 +1,6 @@
//===========================================
// Lumina-DE source code
-// Copyright (c) 2014, Ken Moore
+// Copyright (c) 2014-2015, Ken Moore
// Available under the 3-clause BSD license
// See the LICENSE file for full details
//===========================================
@@ -16,6 +16,7 @@
#include "userbutton/LUserButton.h"
#include "desktopbar/LDeskBar.h"
#include "spacer/LSpacer.h"
+#include "line/LLine.h"
#include "clock/LClock.h"
#include "battery/LBattery.h"
#include "desktopswitcher/LDesktopSwitcher.h"
@@ -40,6 +41,8 @@ public:
plug = new LDeskBarPlugin(parent, plugin, horizontal);
}else if(plugin.startsWith("spacer---")){
plug = new LSpacerPlugin(parent, plugin, horizontal);
+ }else if(plugin.startsWith("line---")){
+ plug = new LLinePlugin(parent, plugin, horizontal);
}else if(plugin.startsWith("taskmanager")){
//This one can be "taskmanager[-nogroups]---"
plug = new LTaskManagerPlugin(parent, plugin, horizontal);
diff --git a/lumina-desktop/panel-plugins/line/LLine.h b/lumina-desktop/panel-plugins/line/LLine.h
new file mode 100644
index 00000000..94de486e
--- /dev/null
+++ b/lumina-desktop/panel-plugins/line/LLine.h
@@ -0,0 +1,40 @@
+//===========================================
+// Lumina-DE source code
+// Copyright (c) 2015, Ken Moore
+// Available under the 3-clause BSD license
+// See the LICENSE file for full details
+//===========================================
+// This class is a generic line separator for the panel
+//===========================================
+#ifndef _LUMINA_DESKTOP_PANEL_PLUGIN_LINE_H
+#define _LUMINA_DESKTOP_PANEL_PLUGIN_LINE_H
+
+#include "../LPPlugin.h"
+#include <QFrame>
+
+class LLinePlugin : public LPPlugin{
+ Q_OBJECT
+private:
+ QFrame *line;
+
+public:
+ LLinePlugin(QWidget *parent=0, QString id="spacer", bool horizontal=true) : LPPlugin(parent, id, horizontal){
+ line = new QFrame(this);
+ line->setObjectName("LuminaPanelLine");
+ this->layout()->addWidget(line);
+ OrientationChange();
+ }
+ ~LLinePlugin(){}
+
+public slots:
+ void OrientationChange(){
+ if(this->layout()->direction()==QBoxLayout::LeftToRight){ //horizontal
+ line->setFrameShape(QFrame::VLine);
+ }else{ //vertical
+ line->setFrameShape(QFrame::HLine);
+ }
+ }
+};
+
+
+#endif \ No newline at end of file
diff --git a/lumina-desktop/panel-plugins/panel-plugins.pri b/lumina-desktop/panel-plugins/panel-plugins.pri
new file mode 100644
index 00000000..afa7dbe2
--- /dev/null
+++ b/lumina-desktop/panel-plugins/panel-plugins.pri
@@ -0,0 +1,49 @@
+#Lumina Desktop Panel Plugin files
+
+SOURCES += $$PWD/userbutton/LUserButton.cpp \
+ $$PWD/userbutton/UserWidget.cpp \
+ $$PWD/userbutton/UserItemWidget.cpp \
+ $$PWD/desktopbar/LDeskBar.cpp \
+ $$PWD/taskmanager/LTaskManagerPlugin.cpp \
+ $$PWD/taskmanager/LTaskButton.cpp \
+ $$PWD/systemtray/LSysTray.cpp \
+ $$PWD/systemtray/TrayIcon.cpp \
+ $$PWD/clock/LClock.cpp \
+ $$PWD/battery/LBattery.cpp \
+ $$PWD/desktopswitcher/LDesktopSwitcher.cpp \
+ $$PWD/systemdashboard/LSysDashboard.cpp \
+ $$PWD/systemdashboard/SysMenuQuick.cpp \
+ $$PWD/showdesktop/LHomeButton.cpp \
+ $$PWD/appmenu/LAppMenuPlugin.cpp \
+ $$PWD/applauncher/AppLaunchButton.cpp \
+ $$PWD/systemstart/LStartButton.cpp \
+ $$PWD/systemstart/StartMenu.cpp \
+ $$PWD/systemstart/ItemWidget.cpp
+
+HEADERS += $$PWD/userbutton/LUserButton.h \
+ $$PWD/userbutton/UserWidget.h \
+ $$PWD/userbutton/UserItemWidget.h \
+ $$PWD/desktopbar/LDeskBar.h \
+ $$PWD/systemtray/LSysTray.h \
+ $$PWD/systemtray/TrayIcon.h \
+ $$PWD/spacer/LSpacer.h \
+ $$PWD/line/LLine.h \
+ $$PWD/clock/LClock.h \
+ $$PWD/battery/LBattery.h \
+ $$PWD/desktopswitcher/LDesktopSwitcher.h \
+ $$PWD/taskmanager/LTaskManagerPlugin.h \
+ $$PWD/taskmanager/LTaskButton.h \
+ $$PWD/systemdashboard/LSysDashboard.h \
+ $$PWD/systemdashboard/SysMenuQuick.h \
+ $$PWD/showdesktop/LHomeButton.h \
+ $$PWD/appmenu/LAppMenuPlugin.h \
+ $$PWD/applauncher/AppLaunchButton.h \
+ $$PWD/systemstart/LStartButton.h \
+ $$PWD/systemstart/StartMenu.h \
+ $$PWD/systemstart/ItemWidget.h
+# $$PWD/quickcontainer/QuickPPlugin.h
+
+FORMS += $$PWD/userbutton/UserWidget.ui \
+ $$PWD/systemdashboard/SysMenuQuick.ui \
+ $$PWD/systemstart/StartMenu.ui
+ \ No newline at end of file
bgstack15