[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/runners/mediaplayer
From:       Ryan P. Bitanga <rjpbitanga () yahoo ! com>
Date:       2008-11-07 12:03:15
Message-ID: 1226059395.451691.16263.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 881070 by rbitanga:

Update the demo mediaplayer runner to compile with trunk


 M  +16 -14    mediaplayer.cpp  
 M  +1 -1      mediaplayer.h  
 M  +1 -1      plasma-runner-mediaplayer.desktop  


--- trunk/playground/base/plasma/runners/mediaplayer/mediaplayer.cpp #881069:881070
@@ -16,11 +16,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <QAction>
+
 #include <KDebug>
 #include <KIcon>
 
-#include <Plasma/QueryAction>
-#include <Plasma/QueryActionPool>
+//#include <Plasma/QueryAction>
 
 #include "mediaplayer.h"
 
@@ -41,10 +42,10 @@
 
 void MediaPlayerRunner::registerActions()
 {
-    Plasma::QueryAction *play = new Plasma::QueryAction("media-play", \
                KIcon("media-playback-start"), i18n("Play"), this);
-    Plasma::QueryAction *stop = new Plasma::QueryAction("media-stop", \
                KIcon("media-playback-stop"), i18n("Stop"), this);
-    Plasma::QueryAction *next = new Plasma::QueryAction("media-next", \
                KIcon("media-skip-forward"), i18n("Next Track"), this);
-    Plasma::QueryAction *prev = new Plasma::QueryAction("media-prev", \
KIcon("media-skip-backward"), i18n("Previous Track"), this); +    QAction *play = \
addAction("media-play", KIcon("media-playback-start"), i18n("Play")); +    QAction \
*stop = addAction("media-stop", KIcon("media-playback-stop"), i18n("Stop")); +    \
QAction *next = addAction("media-next", KIcon("media-skip-forward"), i18n("Next \
Track")); +    QAction *prev = addAction("media-prev", KIcon("media-skip-backward"), \
i18n("Previous Track"));  
     connect(play, SIGNAL(triggered(bool)), this, SLOT(play()));
     connect(stop, SIGNAL(triggered(bool)), this, SLOT(stop()));
@@ -70,22 +71,23 @@
 {
     Q_UNUSED(context)
 
-    if (match.currentAction()) {
-        match.currentAction()->trigger();
+    if (match.selectedAction()) {
+        match.selectedAction()->trigger();
+    } else {
+        play();
     }
 }
 
-QList<Plasma::QueryAction*> MediaPlayerRunner::actionsForMatch(const \
Plasma::QueryMatch &match) +QList<QAction*> MediaPlayerRunner::actionsForMatch(const \
Plasma::QueryMatch &match)  {
-    QList<Plasma::QueryAction*> ret;
+    QList<QAction*> ret;
     //Check if actions were already loaded
-    Plasma::QueryActionPool *pool = Plasma::QueryActionPool::self();
-    if (!pool->action("media-play")) {
+    if (!action("media-play")) {
         registerActions();
     }
 
-    ret << pool->action("media-play") << pool->action("media-stop")
-        << pool->action("media-prev") << pool->action("media-next");
+    ret << action("media-play") << action("media-stop")
+        << action("media-prev") << action("media-next");
 
     return ret;
 }
--- trunk/playground/base/plasma/runners/mediaplayer/mediaplayer.h #881069:881070
@@ -33,7 +33,7 @@
 
         void match(Plasma::RunnerContext &context);
         void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch \
                &match);
-        QList<Plasma::QueryAction*> actionsForMatch(const Plasma::QueryMatch \
&match); +        QList<QAction*> actionsForMatch(const Plasma::QueryMatch &match);
 
     public slots:
         void play();
--- trunk/playground/base/plasma/runners/mediaplayer/plasma-runner-mediaplayer.desktop \
#881069:881070 @@ -24,7 +24,7 @@
 Type=Service
 Icon=amarok
 X-KDE-Library=krunner_mediaplayer
-X-KDE-PluginInfo-Name=Media Player
+X-KDE-PluginInfo-Name=krunner_mediaplayer
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-License=LGPL
 X-KDE-PluginInfo-EnabledByDefault=true


[prev in list] [next in list] [prev in thread] [next in thread]