Add activity info to item on the left

CMakeLists.txt

@@ -25,8 +25,8 @@ set(SRCS
     src/appearance.cpp
     src/volume.cpp
     src/processprovider.cpp
+    src/activity.cpp
 
-    src/systemtray/statusnotifieritemjob.cpp
     src/systemtray/statusnotifieritemsource.cpp
     src/systemtray/systemtraytypes.cpp
     src/systemtray/systemtraytypedefs.h

qml/main.qml

@@ -37,6 +37,24 @@ Item {
         anchors.rightMargin: Meui.Units.smallSpacing
         spacing: 0
 
+        StandardItem {
+            id: acticityItem
+            Layout.fillHeight: true
+
+            width: acticityLayout.implicitWidth + Meui.Units.largeSpacing
+
+            RowLayout {
+                id: acticityLayout
+                anchors.fill: parent
+                anchors.leftMargin: Meui.Units.smallSpacing
+                anchors.rightMargin: Meui.Units.smallSpacing
+
+                Label {
+                    text: acticity.title
+                }
+            }
+        }
+
         Item {
             Layout.fillWidth: true
         }

src/activity.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "activity.h"
+
+#include <QX11Info>
+#include <NETWM>
+#include <KWindowSystem>
+
+Activity::Activity(QObject *parent)
+    : QObject(parent)
+{
+    onActiveWindowChanged();
+
+    connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Activity::onActiveWindowChanged);
+    connect(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId)>(&KWindowSystem::windowChanged),
+            this, &Activity::onActiveWindowChanged);
+}
+
+QString Activity::title() const
+{
+    return m_title;
+}
+
+void Activity::close()
+{
+    NETRootInfo(QX11Info::connection(), NET::CloseWindow).closeWindowRequest(KWindowSystem::activeWindow());
+}
+
+void Activity::onActiveWindowChanged()
+{
+    KWindowInfo info(KWindowSystem::activeWindow(), NET::WMState | NET::WMVisibleName);
+
+    QString title = info.visibleName();
+    if (title != m_title) {
+        m_title = title;
+        emit titleChanged();
+    }
+}

src/activity.h

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 ACTIVITY_H
+#define ACTIVITY_H
+
+#include <QObject>
+
+class Activity : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+
+public:
+    explicit Activity(QObject *parent = nullptr);
+
+    QString title() const;
+
+    Q_INVOKABLE void close();
+
+private slots:
+    void onActiveWindowChanged();
+
+signals:
+    void titleChanged();
+
+private:
+    QString m_title;
+};
+
+#endif // ACTIVITY_H

src/appearance.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 CutefishOS Team.
  *
- * Author:     revenmartin <revenmartin@gmail.com>
+ * Author:     cutefishos <cutefishos@foxmail.com>
  *
  * 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

src/appearance.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 CutefishOS Team.
  *
- * Author:     revenmartin <revenmartin@gmail.com>
+ * Author:     cutefishos <cutefishos@foxmail.com>
  *
  * 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

src/battery.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "battery.h"
 
 static const QString s_sServer = "org.cutefish.Settings";

src/battery.h

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 BATTERY_H
 #define BATTERY_H
 

src/brightness.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 CutefishOS Team.
  *
- * Author:     revenmartin <revenmartin@gmail.com>
+ * Author:     cutefishos <cutefishos@foxmail.com>
  *
  * 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

src/brightness.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2021 CutefishOS Team.
  *
- * Author:     revenmartin <revenmartin@gmail.com>
+ * Author:     cutefishos <cutefishos@foxmail.com>
  *
  * 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

src/controlcenterdialog.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "controlcenterdialog.h"
 #include <KWindowSystem>
 

src/controlcenterdialog.h

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 CONTROLCENTERDIALOG_H
 #define CONTROLCENTERDIALOG_H
 

src/main.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 <QApplication>
 #include <QTranslator>
 #include <QLocale>

src/processprovider.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "processprovider.h"
 #include <QProcess>
 

src/processprovider.h

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 PROCESSPROVIDER_H
 #define PROCESSPROVIDER_H
 

src/statusbar.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "statusbar.h"
 #include "processprovider.h"
 
@@ -13,6 +32,7 @@
 
 StatusBar::StatusBar(QQuickView *parent)
     : QQuickView(parent)
+    , m_acticity(new Activity)
 {
     setFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
     setColor(Qt::transparent);
@@ -21,6 +41,7 @@ StatusBar::StatusBar(QQuickView *parent)
     KWindowSystem::setType(winId(), NET::Dock);
     KWindowEffects::slideWindow(winId(), KWindowEffects::TopEdge);
 
+    engine()->rootContext()->setContextProperty("acticity", m_acticity);
     engine()->rootContext()->setContextProperty("process", new ProcessProvider);
 
     setSource(QUrl(QStringLiteral("qrc:/qml/main.qml")));

src/statusbar.h

@@ -1,7 +1,27 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 STATUSBAR_H
 #define STATUSBAR_H
 
 #include <QQuickView>
+#include "activity.h"
 
 class StatusBar : public QQuickView
 {
@@ -12,6 +32,9 @@ public:
 
     void updateGeometry();
     void updateViewStruts();
+
+private:
+    Activity *m_acticity;
 };
 
 #endif // STATUSBAR_H

src/systemtray/statusnotifieritemjob.cpp

@@ -1,25 +0,0 @@
-#include "statusnotifieritemjob.h"
-
-StatusNotifierItemJob::StatusNotifierItemJob(StatusNotifierItemSource *source, QObject *parent)
-    : QObject(parent)
-    , m_source(source)
-{
-    // Queue connection, so that all 'deleteLater' are performed before we use updated menu.
-    connect(source, SIGNAL(contextMenuReady(QMenu *)), this, SLOT(contextMenuReady(QMenu *)), Qt::QueuedConnection);
-    connect(source, &StatusNotifierItemSource::activateResult, this, &StatusNotifierItemJob::activateCallback);
-}
-
-void StatusNotifierItemJob::start()
-{
-
-}
-
-void StatusNotifierItemJob::activateCallback(bool success)
-{
-
-}
-
-void StatusNotifierItemJob::contextMenuReady(QMenu *menu)
-{
-
-}

src/systemtray/statusnotifieritemjob.h

@@ -1,27 +0,0 @@
-#ifndef STATUSNOTIFIERITEMJOB_H
-#define STATUSNOTIFIERITEMJOB_H
-
-#include <QThread>
-#include <QMenu>
-
-#include "statusnotifieritemsource.h"
-
-class StatusNotifierItemJob : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit StatusNotifierItemJob(StatusNotifierItemSource *source, QObject *parent = nullptr);
-
-protected:
-    void start();
-
-private Q_SLOTS:
-    void activateCallback(bool success);
-    void contextMenuReady(QMenu *menu);
-
-private:
-    StatusNotifierItemSource *m_source;
-};
-
-#endif // STATUSNOTIFIERITEMJOB_H

src/volume.cpp

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 "volume.h"
 
 #include <QDBusConnection>

src/volume.h

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2021 CutefishOS Team.
+ *
+ * Author:     cutefishos <cutefishos@foxmail.com>
+ *
+ * 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
+ * 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 VOLUMEMANAGER_H
 #define VOLUMEMANAGER_H