diff options
author | Ken Moore <ken@ixsystems.com> | 2016-11-10 14:00:16 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2016-11-10 14:00:16 -0500 |
commit | 9553d3929dc5b32c80c23fc426da09ed80c36ed3 (patch) | |
tree | ded71dd6fdc8c088364da967a34e86e6f631bb02 /src-qt5/core/lumina-desktop | |
parent | Add pass-through for context menu requests on many desktop plugins. (diff) | |
download | lumina-9553d3929dc5b32c80c23fc426da09ed80c36ed3.tar.gz lumina-9553d3929dc5b32c80c23fc426da09ed80c36ed3.tar.bz2 lumina-9553d3929dc5b32c80c23fc426da09ed80c36ed3.zip |
Add a new panel plugin:
"audioplayer": This is panel-based implementation of the desktop plugin with the same name. Allows the user to load/play audio files directly from the desktop session without loading any external applications.
Diffstat (limited to 'src-qt5/core/lumina-desktop')
-rw-r--r-- | src-qt5/core/lumina-desktop/Globals.h | 15 | ||||
-rw-r--r-- | src-qt5/core/lumina-desktop/panel-plugins/NewPP.h | 4 | ||||
-rw-r--r-- | src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri | 13 |
3 files changed, 22 insertions, 10 deletions
diff --git a/src-qt5/core/lumina-desktop/Globals.h b/src-qt5/core/lumina-desktop/Globals.h index 14dfd93f..3df48741 100644 --- a/src-qt5/core/lumina-desktop/Globals.h +++ b/src-qt5/core/lumina-desktop/Globals.h @@ -8,17 +8,20 @@ #define _LUMINA_DESKTOP_GLOBALS_H #include <LUtils.h> +#include <LuminaXDG.h> +#include <LuminaOS.h> #include <LDesktopUtils.h> -//#include "../global.h" + +#include <QWidgetAction> +#include <QMenu> +#include <QString> +#include <QIcon> +#include <QWidget> +#include <QAction> #include <unistd.h> #include <stdio.h> -/*#ifdef __linux - // Needed for BUFSIZ - #include <stdio.h> -#endif // #ifdef __linux*/ - class Lumina{ public: enum STATES {NONE, VISIBLE, INVISIBLE, ACTIVE, NOTIFICATION, NOSHOW}; diff --git a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h index 2641ad79..e811beeb 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h @@ -26,9 +26,11 @@ #include "appmenu/LAppMenuPlugin.h" #include "applauncher/AppLaunchButton.h" #include "systemstart/LStartButton.h" +#include "audioplayer/LPAudioPlayer.h" //#include "quickcontainer/QuickPPlugin.h" #include "systemtray/LSysTray.h" //must be last due to X11 compile issues + class NewPP{ public: static LPPlugin* createPlugin(QString plugin, QWidget* parent = 0, bool horizontal = true){ @@ -60,6 +62,8 @@ public: plug = new LAppMenuPlugin(parent, plugin, horizontal); }else if(plugin.startsWith("systemstart---")){ plug = new LStartButtonPlugin(parent, plugin, horizontal); + }else if(plugin.startsWith("audioplayer---")){ + plug = new LPAudioPlayer(parent, plugin, horizontal); }else if(plugin.section("---",0,0).section("::",0,0)=="applauncher"){ plug = new AppLaunchButtonPlugin(parent, plugin, horizontal); //}else if( plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri index afa7dbe2..284d1700 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri +++ b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri @@ -18,7 +18,9 @@ SOURCES += $$PWD/userbutton/LUserButton.cpp \ $$PWD/applauncher/AppLaunchButton.cpp \ $$PWD/systemstart/LStartButton.cpp \ $$PWD/systemstart/StartMenu.cpp \ - $$PWD/systemstart/ItemWidget.cpp + $$PWD/systemstart/ItemWidget.cpp \ + $$PWD/audioplayer/LPAudioPlayer.cpp \ + $$PWD/audioplayer/PPlayerWidget.cpp HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/userbutton/UserWidget.h \ @@ -40,10 +42,13 @@ HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/applauncher/AppLaunchButton.h \ $$PWD/systemstart/LStartButton.h \ $$PWD/systemstart/StartMenu.h \ - $$PWD/systemstart/ItemWidget.h + $$PWD/systemstart/ItemWidget.h \ + $$PWD/audioplayer/LPAudioPlayer.h \ + $$PWD/audioplayer/PPlayerWidget.h # $$PWD/quickcontainer/QuickPPlugin.h FORMS += $$PWD/userbutton/UserWidget.ui \ $$PWD/systemdashboard/SysMenuQuick.ui \ - $$PWD/systemstart/StartMenu.ui -
\ No newline at end of file + $$PWD/systemstart/StartMenu.ui \ + $$PWD/audioplayer/PPlayerWidget.ui + |