diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt index 0e79159be..b1cb97e73 100644 --- a/panels/dock/CMakeLists.txt +++ b/panels/dock/CMakeLists.txt @@ -99,7 +99,6 @@ add_subdirectory(multitaskview) find_package(DdeControlCenter) -add_subdirectory(searchitem) #add_subdirectory(appruntimeitem) # dock qml element(include Dock.xx defines and DockCompositor) diff --git a/panels/dock/searchitem/CMakeLists.txt b/panels/dock/searchitem/CMakeLists.txt deleted file mode 100644 index 938b08784..000000000 --- a/panels/dock/searchitem/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd. -# -# SPDX-License-Identifier: GPL-3.0-or-later - -add_library(dock-searchitem SHARED - searchitem.cpp - searchitem.h - ../dockiteminfo.cpp - ../dockiteminfo.h -) - -target_include_directories(dock-searchitem PRIVATE - "${CMAKE_CURRENT_BINARY_DIR}/../" - "../" -) - -target_link_libraries(dock-searchitem PRIVATE - dde-shell-frame -) - -ds_install_package(PACKAGE org.deepin.ds.dock.searchitem TARGET dock-searchitem) -ds_handle_package_translation(PACKAGE org.deepin.ds.dock.searchitem) - -install(FILES "package/icons/search.dci" DESTINATION share/dde-dock/icons/dcc-setting RENAME dcc-search.dci) diff --git a/panels/dock/searchitem/package/icons/dde-grand-search.dci b/panels/dock/searchitem/package/icons/dde-grand-search.dci deleted file mode 100644 index 268cae2c2..000000000 Binary files a/panels/dock/searchitem/package/icons/dde-grand-search.dci and /dev/null differ diff --git a/panels/dock/searchitem/package/icons/search.dci b/panels/dock/searchitem/package/icons/search.dci deleted file mode 100644 index 1260e326b..000000000 Binary files a/panels/dock/searchitem/package/icons/search.dci and /dev/null differ diff --git a/panels/dock/searchitem/package/metadata.json b/panels/dock/searchitem/package/metadata.json deleted file mode 100644 index d242f8502..000000000 --- a/panels/dock/searchitem/package/metadata.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Plugin": { - "Version": "1.0", - "Id": "org.deepin.ds.dock.searchitem", - "Url": "searchitem.qml", - "Parent": "org.deepin.ds.dock" - } -} diff --git a/panels/dock/searchitem/package/searchitem.qml b/panels/dock/searchitem/package/searchitem.qml deleted file mode 100644 index 16bac5ef1..000000000 --- a/panels/dock/searchitem/package/searchitem.qml +++ /dev/null @@ -1,88 +0,0 @@ -// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -import org.deepin.ds 1.0 -import org.deepin.dtk 1.0 as D -import org.deepin.ds.dock 1.0 - -import Qt.labs.platform 1.1 as LP - -AppletItem { - property bool useColumnLayout: Panel.position % 2 - property int dockOrder: Panel.itemAlignment === Dock.CenterAlignment ? 5 : 14 - property bool shouldVisible: Applet.visible - // 1:4 the distance between app : dock height; get width/height≈0.8 - implicitWidth: useColumnLayout ? Panel.rootObject.dockSize : Panel.rootObject.dockItemMaxSize * 0.8 - implicitHeight: useColumnLayout ? Panel.rootObject.dockItemMaxSize * 0.8 : Panel.rootObject.dockSize - - PanelToolTip { - id: toolTip - text: qsTr("GrandSearch") - toolTipX: DockPanelPositioner.x - toolTipY: DockPanelPositioner.y - } - - D.DciIcon { - id: icon - anchors.centerIn: parent - name: "dde-grand-search" - scale: Panel.rootObject.dockItemMaxSize * 9 / 14 / Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE - // 9:14 (iconSize/dockHeight) - sourceSize: Qt.size(Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE, Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE) - Timer { - id: toolTipShowTimer - interval: 50 - onTriggered: { - var point = Applet.rootObject.mapToItem(null, Applet.rootObject.width / 2, Applet.rootObject.height / 2) - toolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, toolTip.width, toolTip.height) - toolTip.open() - } - } - TapHandler { - acceptedButtons: Qt.LeftButton - onTapped: { - Applet.toggleGrandSearch() - toolTip.close() - } - } - HoverHandler { - onHoveredChanged: { - if (hovered) { - toolTipShowTimer.start() - } else { - if (toolTipShowTimer.running) { - toolTipShowTimer.stop() - } - - toolTip.close() - } - } - } - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.RightButton - onClicked: { - platformMenuLoader.active = true - platformMenuLoader.item.open() - } - } - } - - Loader { - id: platformMenuLoader - active: false - sourceComponent: LP.Menu { - id: platformMenu - LP.MenuItem { - text: qsTr("SearchConfig") - onTriggered: { - Applet.toggleGrandSearchConfig() - } - } - } - } -} diff --git a/panels/dock/searchitem/searchitem.cpp b/panels/dock/searchitem/searchitem.cpp deleted file mode 100644 index b50a12806..000000000 --- a/panels/dock/searchitem/searchitem.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - -#include "searchitem.h" -#include "../constants.h" -#include "applet.h" -#include "pluginfactory.h" - -#include -#include -#include - -#include -#include -#include - -DGUI_USE_NAMESPACE -namespace dock -{ - -const QString grandSearchService = "com.deepin.dde.GrandSearch"; -const QString grandSearchPath = "/com/deepin/dde/GrandSearch"; -const QString grandSearchInterface = "com.deepin.dde.GrandSearch"; -static DDBusSender searchDbus() -{ - return DDBusSender().service(grandSearchService).path(grandSearchPath).interface(grandSearchInterface); -} - -SearchItem::SearchItem(QObject *parent) - : DApplet(parent) - , m_visible(true) - , m_grandSearchVisible(false) -{ -} - -void SearchItem::toggleGrandSearch() -{ - searchDbus().method("SetVisible").arg(true).call(); -} - -void SearchItem::toggleGrandSearchConfig() -{ - QProcess::startDetached("dde-grand-search", QStringList() << "--setting"); -} - -DockItemInfo SearchItem::dockItemInfo() -{ - DockItemInfo info; - info.name = "search"; - info.displayName = tr("GrandSearch"); - info.itemKey = "search"; - info.settingKey = "search"; - info.visible = m_visible; - info.dccIcon = DCCIconPath + "search.svg"; - return info; -} - -void SearchItem::setVisible(bool visible) -{ - if (m_visible != visible) { - m_visible = visible; - - Q_EMIT visibleChanged(visible); - } -} - -void SearchItem::onGrandSearchVisibleChanged(bool visible) -{ - if (m_grandSearchVisible != visible) { - m_grandSearchVisible = visible; - - Q_EMIT grandSearchVisibleChanged(visible); - } -} - -D_APPLET_CLASS(SearchItem) -} - -#include "searchitem.moc" diff --git a/panels/dock/searchitem/searchitem.h b/panels/dock/searchitem/searchitem.h deleted file mode 100644 index 4602d0de9..000000000 --- a/panels/dock/searchitem/searchitem.h +++ /dev/null @@ -1,58 +0,0 @@ -// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - -#pragma once - -#include "../dockiteminfo.h" -#include "applet.h" -#include "dsglobal.h" - -#include - -class QDBusMessage; -namespace dock -{ - -class SearchItem : public DS_NAMESPACE::DApplet -{ - Q_OBJECT - Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged) - Q_PROPERTY(bool grandSearchVisible READ grandSearchVisible NOTIFY grandSearchVisibleChanged) -public: - explicit SearchItem(QObject *parent = nullptr); - - Q_INVOKABLE void toggleGrandSearch(); - Q_INVOKABLE void toggleGrandSearchConfig(); - - Q_INVOKABLE DockItemInfo dockItemInfo(); - - inline bool visible() const - { - return m_visible; - } - Q_INVOKABLE void setVisible(bool visible); - - Q_INVOKABLE bool grandSearchVisible() const - { - return m_grandSearchVisible; - } - - bool load() override - { - return QGuiApplication::platformName() != QStringLiteral("wayland"); - } - -Q_SIGNALS: - void visibleChanged(bool); - void grandSearchVisibleChanged(bool); - -private slots: - void onGrandSearchVisibleChanged(bool); - -private: - bool m_visible; - bool m_grandSearchVisible; -}; - -} diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_az.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_az.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_az.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_bo.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_bo.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_bo.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ca.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ca.ts deleted file mode 100644 index 643b85ee8..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ca.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Cerca grossa - - - - searchitem - - - GrandSearch - Cerca grossa - - - - SearchConfig - Cerca de configuració - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de.ts deleted file mode 100644 index 28887710c..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Große Suche - - - - searchitem - - - GrandSearch - Große Suche - - - - SearchConfig - - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de_DE.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de_DE.ts deleted file mode 100644 index f65c20b85..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_de_DE.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Große Suche - - - - searchitem - - - GrandSearch - Große Suche - - - - SearchConfig - Such-Einstellungen - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_es.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_es.ts deleted file mode 100644 index a0d243c19..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_es.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Gran búsqueda - - - - searchitem - - - GrandSearch - Gran búsqueda - - - - SearchConfig - Configuración de Búsqueda - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fi.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fi.ts deleted file mode 100644 index 9b7b7c098..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fi.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Haku - - - - searchitem - - - GrandSearch - Haku - - - - SearchConfig - Hakuasetukset - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fr.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fr.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_fr.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_hu.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_hu.ts deleted file mode 100644 index 90c458e0e..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_hu.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Részletes keresés - - - - searchitem - - - GrandSearch - Részletes keresés - - - - SearchConfig - Keresési beállítások - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_it.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_it.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_it.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ja.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ja.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ja.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ko.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ko.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ko.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nb_NO.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nb_NO.ts deleted file mode 100644 index 72cba8a42..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nb_NO.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - - - - - searchitem - - - GrandSearch - - - - - SearchConfig - - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nl.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nl.ts deleted file mode 100644 index 50bf65c07..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_nl.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Globaal zoeken - - - - searchitem - - - GrandSearch - Globaal zoeken - - - - SearchConfig - Zoekinstellingen - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pl.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pl.ts deleted file mode 100644 index 602e8bf70..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pl.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Wyszukiwarka - - - - searchitem - - - GrandSearch - Wyszukiwarka - - - - SearchConfig - SearchConfig - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pt_BR.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pt_BR.ts deleted file mode 100644 index 2ea6c144f..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_pt_BR.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - Pesquisa instantânea - - - - searchitem - - - GrandSearch - Pesquisa instantânea - - - - SearchConfig - Configurações de pesquisa - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ru.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ru.ts deleted file mode 100644 index 597dd5a93..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_ru.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - GrandSearch - - - - searchitem - - - GrandSearch - GrandSearch - - - - SearchConfig - НастройкиПоиска - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_uk.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_uk.ts deleted file mode 100644 index 5e046a273..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_uk.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - ГрандПошук - - - - searchitem - - - GrandSearch - ГрандПошук - - - - SearchConfig - Налаштування пошуку - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_CN.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_CN.ts deleted file mode 100644 index e4c163495..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_CN.ts +++ /dev/null @@ -1,23 +0,0 @@ - - - dock::SearchItem - - - GrandSearch - 全局搜索 - - - - searchitem - - - GrandSearch - 全局搜索 - - - - SearchConfig - 搜索配置 - - - \ No newline at end of file diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_HK.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_HK.ts deleted file mode 100644 index 49d876746..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_HK.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - 全局搜索 - - - - searchitem - - - GrandSearch - 全局搜索 - - - - SearchConfig - 搜尋配置 - - - diff --git a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_TW.ts b/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_TW.ts deleted file mode 100644 index 0609844f1..000000000 --- a/panels/dock/searchitem/translations/org.deepin.ds.dock.searchitem_zh_TW.ts +++ /dev/null @@ -1,25 +0,0 @@ - - - - - dock::SearchItem - - - GrandSearch - 全局搜索 - - - - searchitem - - - GrandSearch - 全局搜索 - - - - SearchConfig - 搜尋配置 - - -