Added support for native KDE notifier icon.

src/kdenotifier.cpp

@@ -0,0 +1,25 @@
+/*
+ *  QCMA: Cross-platform content manager assistant for the PS Vita
+ *
+ *  Copyright (C) 2014  Codestation
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "kdenotifier.h"
+
+KDENotifier::KDENotifier(const QString &id, QObject *parent) :
+    KStatusNotifierItem(id, parent)
+{
+}

src/kdenotifier.h

@@ -0,0 +1,41 @@
+/*
+ *  QCMA: Cross-platform content manager assistant for the PS Vita
+ *
+ *  Copyright (C) 2014  Codestation
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KDENOTIFIER_H
+#define KDENOTIFIER_H
+
+#include <kstatusnotifieritem.h>
+#include <kmenu.h>
+
+class KDENotifier : public KStatusNotifierItem
+{
+    Q_OBJECT
+public:
+    explicit KDENotifier(const QString &id, QObject *parent = 0);
+
+signals:
+
+public slots:
+    // block left click because it shows the default widget
+    virtual void activate (const QPoint &pos=QPoint()) {
+        Q_UNUSED(pos);
+    }
+};
+
+#endif // KDENOTIFIER_H

src/mainwidget.cpp

@@ -34,6 +34,10 @@
 #include <QSettings>
 #include <QSpacerItem>
 
+#ifdef ENABLE_KDE_NOTIFIER
+#include <kmenu.h>
+#endif
+
 const QStringList MainWidget::path_list = QStringList() << "photoPath" << "musicPath" << "videoPath" << "appsPath" << "urlPath";
 
 bool sleptOnce = false;
@@ -79,10 +83,14 @@ void MainWidget::stopServer()
 
 void MainWidget::deviceDisconnect()
 {
+#ifndef ENABLE_KDE_NOTIFIER
 #ifndef Q_OS_WIN32
     trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_dc.png"));
 #else
     trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_16_dc.png"));
+#endif
+#else
+    notifierItem->setIconByPixmap(QIcon(":/main/resources/images/psv_icon_dc.png"));
 #endif
     qDebug("Icon changed - disconnected");
     setTrayTooltip(tr("Disconnected"));
@@ -91,10 +99,14 @@ void MainWidget::deviceDisconnect()
 
 void MainWidget::deviceConnected(QString message)
 {
+#ifndef ENABLE_KDE_NOTIFIER
 #ifndef Q_OS_WIN32
     trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon.png"));
 #else
     trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_16.png"));
+#endif
+#else
+    notifierItem->setIconByPixmap(QIcon(":/main/resources/images/psv_icon.png"));
 #endif
     qDebug("Icon changed - connected");
     setTrayTooltip(message);
@@ -121,7 +133,11 @@ void MainWidget::connectSignals()
 
 void MainWidget::setTrayTooltip(QString message)
 {
+#ifndef ENABLE_KDE_NOTIFIER
     trayIcon->setToolTip(message);
+#else
+    notifierItem->setToolTipSubTitle(message);
+#endif
 }
 
 void MainWidget::openManager()
@@ -175,7 +191,12 @@ void MainWidget::createTrayIcon()
     connect(about_qt, SIGNAL(triggered()), this, SLOT(showAboutQt()));
     connect(quit, SIGNAL(triggered()), this, SLOT(stopServer()));
 
+#ifndef ENABLE_KDE_NOTIFIER
     QMenu *trayIconMenu = new QMenu(this);
+#else
+    KMenu *trayIconMenu = new KMenu(this);
+#endif
+
     trayIconMenu->addAction(options);
     trayIconMenu->addAction(reload);
     trayIconMenu->addAction(backup);
@@ -185,6 +206,7 @@ void MainWidget::createTrayIcon()
     trayIconMenu->addSeparator();
     trayIconMenu->addAction(quit);
 
+#ifndef ENABLE_KDE_NOTIFIER
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
 #ifndef Q_OS_WIN32
@@ -193,8 +215,18 @@ void MainWidget::createTrayIcon()
     trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_16_dc.png"));
 #endif
     trayIcon->show();
-    // try to avoid the iconTray Qt bug
-    //Sleeper::sleep(1);
+#else
+    notifierItem = new KDENotifier("QcmaNotifier", this);
+    notifierItem->setContextMenu(trayIconMenu);
+    notifierItem->setTitle("Qcma");
+    notifierItem->setCategory(KStatusNotifierItem::ApplicationStatus);
+    notifierItem->setIconByPixmap(QIcon(":/main/resources/images/psv_icon_dc.png"));
+    notifierItem->setStatus(KStatusNotifierItem::Active);
+    notifierItem->setToolTipTitle(tr("Qcma status"));
+    notifierItem->setToolTipIconByPixmap(QIcon(":/main/resources/images/qcma.png"));
+    notifierItem->setToolTipSubTitle(tr("Disconnected"));
+    notifierItem->setStandardActionsEnabled(false);
+#endif
 }
 
 void MainWidget::receiveMessage(QString message)
@@ -206,12 +238,19 @@ void MainWidget::receiveMessage(QString message)
         sleptOnce = true;
     }
 
+#ifndef ENABLE_KDE_NOTIFIER
     if(trayIcon->isVisible()) {
         trayIcon->showMessage(tr("Information"), message);
     }
+#else
+    notifierItem->showMessage(tr("Qcma - Information"), message, "dialog-information", 3000);
+#endif
+
 }
 
 MainWidget::~MainWidget()
 {
+#ifndef ENABLE_KDE_NOTIFIER
     trayIcon->hide();
+#endif
 }

src/mainwidget.h

@@ -28,7 +28,11 @@
 
 #include <QAction>
 #include <QWidget>
+
 #include <QSystemTrayIcon>
+#ifdef ENABLE_KDE_NOTIFIER
+#include "kdenotifier.h"
+#endif
 
 #include <vitamtp.h>
 
@@ -60,7 +64,12 @@ private:
     QAction *backup;
     QAction *about;
     QAction *about_qt;
+
+#ifndef ENABLE_KDE_NOTIFIER
     QSystemTrayIcon *trayIcon;
+#else
+    KDENotifier *notifierItem;
+#endif
 
     const static QStringList path_list;