Changeset ade4b4

Timestamp:

08/13/09 20:09:30 (4 years ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '033cf796174446f5fff5bbfad1cbf1e4af35c0d8')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

598af8df363c6b909a9c7d0dd6ed1dcf2cb00eca

Parents:

1669f25ab05c4732d31667b48afb4023d553b239

git-author:

Micke Prag <micke.prag@telldus.se>2009-08-13 18:09:30+00:00

git-committer:

Micke Prag <micke.prag@telldus.se>2009-08-13 18:09:30+00:00

Message:

Converted the Device-plugin to be a scriptplugin instead of a native TelldusCenter-plugin

Location:

telldus-gui/Plugins/Devices

Files:

• CMakeLists.txt (modified) (2 diffs)
• devicesplugin.cpp (modified) (1 diff)
• devicesplugin.h (modified) (1 diff)

telldus-gui/Plugins/Devices/CMakeLists.txt

@@ +1 @@
+SET(QT_USE_QTSCRIPT TRUE)
+
 SET( Plugin_NAME "Devices" )
 
@@ -19 +21 @@
 )
 
+INCLUDE_DIRECTORIES(
+        ${TELLDUSCORE_INCLUDE_DIR}
+)
+
+
 INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

telldus-gui/Plugins/Devices/devicesplugin.cpp

@@ -2 +2 @@
 #include <QLabel>
 #include <QApplication>
+#include <QScriptEngine>
 #include "devicesplugin.h"
 
 #include "../../TelldusGui/telldusgui.h"
+#include "../../TelldusCenter/tellduscenterapplication.h"
 
-QIcon DevicesPlugin::iconForPage( const QString &page ) const {
-        return QIcon(":/images/devices.png");
+DevicesPlugin::DevicesPlugin( QObject * parent )
+        :QScriptExtensionPlugin( parent )
+{
 }
 
-QString DevicesPlugin::pluginName() const {
-        return "Devices";
+DevicesPlugin::~DevicesPlugin() {
 }
 
-QWidget *DevicesPlugin::widget( const QString &page, QWidget *parent ) const {
-        QWidget *deviceWidget = tdDeviceWidget(parent);
-        connect(deviceWidget, SIGNAL(showMessage(const QString &, const QString &, const QString &)), qApp, SIGNAL(showMessage(const QString &, const QString &, const QString &)));
-        connect(deviceWidget, SIGNAL(eventTriggered(const QString &, const QString &)), qApp, SLOT(eventTriggered(const QString &, const QString &)));
-        return deviceWidget;
+void DevicesPlugin::initialize ( const QString & key, QScriptEngine * engine ) {
+        if (key == "com.telldus.gui") {
+                qDebug() << "TelldusGui initiating";
+                TelldusCenterApplication *app = TelldusCenterApplication::instance();
+                
+                QWidget *deviceWidget = tdDeviceWidget(0);
+                connect(deviceWidget, SIGNAL(showMessage(const QString &, const QString &, const QString &)), qApp, SIGNAL(showMessage(const QString &, const QString &, const QString &)));
+                connect(deviceWidget, SIGNAL(eventTriggered(const QString &, const QString &)), qApp, SLOT(eventTriggered(const QString &, const QString &)));
+
+                QScriptValue value = engine->newQObject(deviceWidget);
+                engine->globalObject().property("com").property("telldus").setProperty("gui", value);
+
+                app->addWidget("devices.default", QIcon(":/images/devices.png"), deviceWidget);
+        }
 }
 
-QStringList DevicesPlugin::widgets() const {
-        return QStringList() << "devices.default";
+QStringList DevicesPlugin::keys () const {
+        return QStringList() << "com.telldus.gui";
 }
 
 Q_EXPORT_PLUGIN2(DevicesInterface, DevicesPlugin)
+
+

telldus-gui/Plugins/Devices/devicesplugin.h

@@ -2 +2 @@
 #define DEVICESPLUGIN_H
 
-#include <QtCore/QObject>
-#include <QIcon>
-#include "../../TelldusCenter/tellduscenterplugin.h"
+#include <QScriptExtensionPlugin>
 
-class DevicesPlugin : public QObject, public TelldusCenterPlugin
-{
-        Q_OBJECT
-        Q_INTERFACES(TelldusCenterPlugin)
+class DevicesPlugin : public QScriptExtensionPlugin {
 public:
-        virtual QIcon iconForPage( const QString &page ) const;
-        virtual QString pluginName() const;
+        DevicesPlugin ( QObject * parent = 0 );
+        ~DevicesPlugin ();
 
-        virtual QWidget *widget( const QString &page, QWidget *parent ) const;
-        virtual QStringList widgets() const;
+        virtual void initialize ( const QString & key, QScriptEngine * engine );
+        virtual QStringList keys () const;
 
 };