From 99c036a212ce3ebb8245becf2ae5c85d443c899e Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Sat, 12 Apr 2008 15:23:15 +0000
Subject: [PATCH] make package and mainScript part of ScriptEngine

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=796106
---
 scripting/runnerscript.cpp | 19 +++++++++++++++++--
 scripting/runnerscript.h   | 13 +++++++++++++
 scripting/scriptengine.cpp | 10 ++++++++++
 scripting/scriptengine.h   | 15 ++++++++++++++-
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/scripting/runnerscript.cpp b/scripting/runnerscript.cpp
index d52909130..4afb76592 100644
--- a/scripting/runnerscript.cpp
+++ b/scripting/runnerscript.cpp
@@ -17,9 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "runnerscript.h"
+#include "plasma/scripting/runnerscript.h"
 
-#include "abstractrunner.h"
+#include "plasma/abstractrunner.h"
+#include "plasma/package.h"
 
 namespace Plasma
 {
@@ -62,6 +63,20 @@ void RunnerScript::exec(const Plasma::SearchContext *search, const Plasma::Searc
     Q_UNUSED(action)
 }
 
+const Package* RunnerScript::package() const
+{
+    return 0;
+}
+
+QString RunnerScript::mainScript() const
+{
+    if (!package()) {
+        return QString();
+    } else {
+        return package()->filePath("mainscript");
+    }
+}
+
 } // Plasma namespace
 
 #include "runnerscript.moc"
diff --git a/scripting/runnerscript.h b/scripting/runnerscript.h
index bed8fea87..0447aa915 100644
--- a/scripting/runnerscript.h
+++ b/scripting/runnerscript.h
@@ -70,6 +70,19 @@ public:
      */
     virtual void exec(const Plasma::SearchContext *search, const Plasma::SearchMatch *action);
 
+protected Q_SLOTS:
+    /**
+     * @return absolute path to the main script file for this plasmoid
+     */
+    QString mainScript() const;
+
+    /**
+     * @return the Package associated with this plasmoid which can
+     *         be used to request resources, such as images and
+     *         interface files.
+     */
+    const Package* package() const;
+
 private:
     class Private;
     Private * const d;
diff --git a/scripting/scriptengine.cpp b/scripting/scriptengine.cpp
index c99cfbbcb..9ea10679c 100644
--- a/scripting/scriptengine.cpp
+++ b/scripting/scriptengine.cpp
@@ -51,6 +51,16 @@ bool ScriptEngine::init()
     return true;
 }
 
+const Package* ScriptEngine::package() const
+{
+    return 0;
+}
+
+QString ScriptEngine::mainScript() const
+{
+    return QString();
+}
+
 QStringList knownLanguages(ComponentTypes types)
 {
     QString constraintTemplate = "'%1' in [X-Plasma-ComponentTypes]";
diff --git a/scripting/scriptengine.h b/scripting/scriptengine.h
index c7caf0662..bac99ad81 100644
--- a/scripting/scriptengine.h
+++ b/scripting/scriptengine.h
@@ -70,8 +70,21 @@ public:
      */
     virtual bool init();
 
+protected Q_SLOTS:
+    /**
+     * @return absolute path to the main script file for this plasmoid
+     */
+    virtual QString mainScript() const;
+
+    /**
+     * @return the Package associated with this plasmoid which can
+     *         be used to request resources, such as images and
+     *         interface files.
+     */
+    virtual const Package* package() const;
+
 private:
-    class Private;
+        class Private;
     Private * const d;
 };