diff --git a/images/logo.svg b/images/logo.svg new file mode 100644 index 0000000..0ae7ce8 --- /dev/null +++ b/images/logo.svg @@ -0,0 +1,26 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/qml.qrc b/qml.qrc index 769dded..3767ad6 100644 --- a/qml.qrc +++ b/qml.qrc @@ -110,5 +110,6 @@ images/light/notification-symbolic.svg images/dark/notification-new-symbolic.svg images/dark/notification-symbolic.svg + images/logo.svg diff --git a/qml/main.qml b/qml/main.qml index bbf8c04..6a75e75 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -106,7 +106,7 @@ Item { width: rootItem.iconSize height: rootItem.iconSize sourceSize: Qt.size(rootItem.iconSize, - rootItem.iconSize) + rootItem.iconSize) source: acticity.icon ? "image://icontheme/" + acticity.icon : "" visible: status === Image.Ready antialiasing: true diff --git a/src/activity.cpp b/src/activity.cpp index 32a7add..da41fc7 100644 --- a/src/activity.cpp +++ b/src/activity.cpp @@ -156,12 +156,22 @@ bool Activity::isAcceptableWindow(quint64 wid) void Activity::onActiveWindowChanged() { KWindowInfo info(KWindowSystem::activeWindow(), - NET::WMState | NET::WMVisibleName, + NET::WMState | NET::WMVisibleName | NET::WMWindowType, NET::WM2WindowClass); m_launchPad = (info.windowClassClass() == "cutefish-launcher"); emit launchPadChanged(); + if (NET::typeMatchesMask(info.windowType(NET::AllTypesMask), NET::DesktopMask)) { + m_title = tr("Desktop"); + m_icon = ""; + + emit titleChanged(); + emit iconChanged(); + + return; + } + if (!isAcceptableWindow(KWindowSystem::activeWindow()) || blockList.contains(info.windowClassClass())) { clearTitle(); diff --git a/translations/en_US.ts b/translations/en_US.ts index d17e121..a8d632e 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -1,33 +1,42 @@ + + Activity + + + Desktop + + + ControlCenter - + Wi-Fi - - + + + On - - - + + + Off - + Bluetooth - + Dark Mode @@ -35,7 +44,7 @@ main - + Close diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index a092554..4475ced 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -1,33 +1,42 @@ + + Activity + + + Desktop + 桌面 + + ControlCenter - + Wi-Fi 无线网络 - - + + + On 打开 - - - + + + Off 关闭 - + Bluetooth 蓝牙 - + Dark Mode 深色模式 @@ -35,7 +44,7 @@ main - + Close 关闭