kvkbd: port to KStatusNotifierItem

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kvkbd/CMakeLists.txt

@@ -10,7 +10,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
 add_subdirectory( src )
-add_subdirectory( pics )
 add_subdirectory( colors )
 add_subdirectory( themes )
 

kvkbd/pics/CMakeLists.txt

@@ -1 +0,0 @@
-install( FILES tray.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/kvkbd/pics)

kvkbd/src/kbdtray.cpp

@@ -20,41 +20,12 @@
 
 #include "kbdtray.h"
 
-#include <KAction>
+KbdTray::KbdTray(QWidget* parent)
-#include <KToggleAction>
+    : KStatusNotifierItem(parent)
-#include <KToggleAction>
-#include <KLocalizedString>
-#include <KIconLoader>
-#include <KHelpMenu>
-#include <KFontDialog>
-#include <KUniqueApplication>
-
-// TODO: find a way to hide the widget before asking for quit
-KbdTray::KbdTray(QWidget* parent) : KSystemTrayIcon(parent)
 {
-    setObjectName("KvkbdTray");
+    setTitle("Kvkbd");
-    setIcon(UserIcon("tray"));
+    setIconByName("input-keyboard");
-
-    QAction *titleAction = contextMenuTitle();
-    titleAction->setText("Kvkbd");
-
-    connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(activationHandler(QSystemTrayIcon::ActivationReason)));
 
+    connect(this, SIGNAL(activateRequested(bool,QPoint)), this, SIGNAL(requestVisibility()));
 }
 
-KbdTray::~KbdTray()
-{
-
-}
-
-QMenu* KbdTray::getContextMenu()
-{
-    return this->contextMenu();
-
-}
-void KbdTray::activationHandler(QSystemTrayIcon::ActivationReason reason)
-{
-    if (reason == QSystemTrayIcon::Trigger) {
-        emit requestVisibility();
-    }
-}

kvkbd/src/kbdtray.h

@@ -19,27 +19,17 @@
 #ifndef KBDTRAY_H
 #define KBDTRAY_H
 
-#include <KSystemTrayIcon>
+#include <QWidget>
-#include <QMenu>
+#include <KStatusNotifierItem>
-#include <QSystemTrayIcon>
-#include <QFont>
 
-class KbdTray : public KSystemTrayIcon
+class KbdTray : public KStatusNotifierItem
 {
     Q_OBJECT
-    
 public:
-    explicit KbdTray(QWidget* parent = 0);
+    explicit KbdTray(QWidget *parent = nullptr);
-    ~KbdTray();
-    QMenu* getContextMenu();
 
-public slots:
+Q_SIGNALS:
-    void activationHandler(QSystemTrayIcon::ActivationReason reason);
-    
-    
-signals:
     void requestVisibility();
-    
 };
 
 

kvkbd/src/kvkbdapp.cpp

@@ -37,6 +37,7 @@
 #include <KHelpMenu>
 #include <KFontDialog>
 #include <KCmdLineArgs>
+#include <KMenu>
 
 #include <iostream>
 
@@ -86,7 +87,7 @@ KvkbdApp::KvkbdApp(bool loginhelper) : KUniqueApplication(), is_login(loginhelpe
     connect(themeLoader, SIGNAL(partLoaded(MainWidget*, int, int)), this, SLOT(partLoaded(MainWidget*, int, int)));
     connect(themeLoader, SIGNAL(buttonLoaded(VButton*)), this, SLOT(buttonLoaded(VButton*)));
 
-    QMenu *cmenu = tray->contextMenu();
+    KMenu *cmenu = tray->contextMenu();
 
     KAction *chooseFontAction = new KAction(KIcon("preferences-desktop-font"), i18nc("@action:inmenu", "Choose Font..."), this);
     connect(chooseFontAction, SIGNAL(triggered(bool)), this, SLOT(chooseFont()) );
@@ -200,7 +201,7 @@ KvkbdApp::KvkbdApp(bool loginhelper) : KUniqueApplication(), is_login(loginhelpe
             widget->showMinimized();
         }
         widget->setWindowTitle("kvkbd");
-        tray->show();
+        tray->setStatus(KStatusNotifierItem::Active);
     } else {
         QTimer *timer = new QTimer(this);
         timer->setInterval(1000);

kvkbd/src/main.cpp

@@ -66,6 +66,7 @@ void findLoginWindow()
 
 int main(int argc, char **argv)
 {
+    setenv("KSNI_NO_DBUSMENU", "1", 1);
 
     KAboutData about("kvkbd", 0, ki18n("Kvkbd"), version, ki18n(description),
                      KAboutData::License_LGPL_V3, ki18n("(C) 2007-2014 The Kvkbd Developers"));