Changeset ac1552

Timestamp:

08/13/09 19:57:32 (4 years ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '668dd99ac278cfd419d67879b141678facea630a')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

691237fa8abff4f7260c14fc3a01346facd6653f

Parents:

ee5ec861334568fcceabfa5ea2c40f2b447bbbd8

git-author:

Micke Prag <micke.prag@telldus.se>2009-08-13 17:57:32+00:00

git-committer:

Micke Prag <micke.prag@telldus.se>2009-08-13 17:57:32+00:00

Message:

Rewrote the systray plugin, this one is now fully configurable from script

Location:

telldus-gui/Plugins/Systray

Files:

• systrayobject.cpp (modified) (1 diff)
• systrayobject.h (modified) (3 diffs)
• systrayplugin.cpp (modified) (1 diff)

telldus-gui/Plugins/Systray/systrayobject.cpp

@@ -1 +1 @@
 #include "systrayobject.h"
 #include <QApplication>
+#include <QDebug>
 
-SystrayObject::SystrayObject( QObject * parent )
-                : QObject(parent),
-                icon( new SystrayIcon )
+class SystrayObjectPrivate {
+public:
+//      SystrayIcon *icon;
+        QSystemTrayIcon *i;
+        QAction *menu;
+        QList<QAction *> menuItems;
+        QScriptEngine *engine;
+};
+
+SystrayObject::SystrayObject( QScriptEngine *engine, QObject * parent )
+                : QObject(parent)
 {
-        connect(icon, SIGNAL(showEventMessage(QString,QString,QString)), qApp, SIGNAL(showMessage(QString,QString,QString)));
-        connect(icon, SIGNAL(triggered()), this, SIGNAL(triggered()));
+        d = new SystrayObjectPrivate;
+        d->engine = engine;
+        //d->icon = new SystrayIcon();
+        d->menu = new QAction(0);
+        d->menu->setMenu( new QMenu() );
+        
+        d->i = new QSystemTrayIcon();
+        d->i->setIcon(QIcon(":/images/TelldusCenter_128.png"));
+        d->i->setContextMenu(d->menu->menu());
+        d->i->show();
+        
+        //connect(d->icon, SIGNAL(showEventMessage(QString,QString,QString)), qApp, SIGNAL(showMessage(QString,QString,QString)));
+        connect(d->i, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(activated(QSystemTrayIcon::ActivationReason)));
 }
 
 SystrayObject::~SystrayObject() {
+        delete d->i;
+        delete d->menu;
+        delete d;
+}
+
+int SystrayObject::addMenuItem( const QString &name, int parent ) {
+        QMenu *menu = parentMenu(parent);
+        if (!menu) {
+                return -1;
+        }
+        QAction *item = menu->addAction( name );
+        int index = d->menuItems.count();
+        d->menuItems.append( item );
+        return index;
+}
+
+void SystrayObject::addSeparator( int parent ) {
+        QMenu *menu = parentMenu(parent);
+        if (!menu) {
+                return;
+        }
+        menu->addSeparator();
+}
+
+QScriptValue SystrayObject::menuItem( int id ) {
+        QScriptValue value = d->engine->newQObject(menuAction(id));
+        return value;
 }
 
 void SystrayObject::showMessage ( const QString & title, const QString & message, QSystemTrayIcon::MessageIcon i, int millisecondsTimeoutHint ) {
-        icon->showMessage( title, message, i, millisecondsTimeoutHint );
+        d->i->showMessage( title, message, i, millisecondsTimeoutHint );
 }
+
+void SystrayObject::activated( QSystemTrayIcon::ActivationReason reason ) {
+#if !defined(Q_WS_MAC)
+        if (reason == QSystemTrayIcon::Trigger) {
+                emit triggered();
+        }
+#endif
+}
+
+QAction *SystrayObject::menuAction( int index ) {
+        QAction *parentItem;
+        if (index < 0) {
+                return d->menu;
+        }
+        return d->menuItems.at(index);
+}
+
+QMenu *SystrayObject::parentMenu( int parentIndex ) {
+        QAction *parentItem = menuAction( parentIndex );
+        if (!parentItem) {
+                return 0;
+        }
+        QMenu *menu = parentItem->menu();
+        if (!menu) {
+                menu = new QMenu();
+                parentItem->setMenu(menu);
+        }
+        return menu;
+}

telldus-gui/Plugins/Systray/systrayobject.h

@@ -3 +3 @@
 
 #include <QObject>
+#include <QScriptEngine>
 #include "systrayicon.h"
 
+class SystrayObjectPrivate;
 
 class SystrayObject : public QObject
@@ -10 +12 @@
         Q_OBJECT
 public:
-        SystrayObject( QObject * parent = 0 );
+        SystrayObject( QScriptEngine *engine, QObject * parent = 0 );
         virtual ~SystrayObject();
 
@@ -17 +19 @@
 
 public slots:
+        int addMenuItem( const QString &name, int parent = -1 );
+        void addSeparator( int parent = -1 );
+        QScriptValue menuItem( int id );
+        
         void showMessage ( const QString & title, const QString & message, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int millisecondsTimeoutHint = 10000 );
 
+private slots:
+        void activated( QSystemTrayIcon::ActivationReason reason );
+
 private:
-        SystrayIcon *icon;
+        QAction *menuAction( int index );
+        QMenu *parentMenu( int parentIndex );
+        SystrayObjectPrivate *d;
 };
 

telldus-gui/Plugins/Systray/systrayplugin.cpp

@@ -22 +22 @@
 void SystrayPlugin::initialize ( const QString & key, QScriptEngine * engine ) {
         if (key == "com.telldus.systray") {
-                d->icon = new SystrayObject(this);
+                d->icon = new SystrayObject(engine, this);
 
                 QScriptValue value = engine->newQObject(d->icon);