restore fashion mail card and real monitor stats

REUSE.toml

@@ -33,6 +33,12 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd."
 SPDX-License-Identifier = "GPL-3.0-or-later"
 
+[[annotations]]
+path = ["panels/dock/package/SpotlightGradient.png", "panels/dock/package/SpotlightGradient.svg"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd."
+SPDX-License-Identifier = "GPL-3.0-or-later"
+
 [[annotations]]
 path = ["**.qrc", "**/qmldir"]
 precedence = "aggregate"

panels/dock/AppletItemButton.qml

@@ -12,7 +12,9 @@ IconButton {
     id: control
     property bool isActive
     property real radius: 4
+    property point lastSpotlightPoint: Qt.point(0, 0)
     property bool autoClosePopup: false
+    readonly property bool drivesDockSpotlight: Window.window === Panel.rootObject
 
     padding: 4
     topPadding: undefined
@@ -26,6 +28,35 @@ IconButton {
     icon.width: 16
     icon.height: 16
 
+    function mapSpotlightPoint(localPoint) {
+        if (!drivesDockSpotlight) {
+            return Qt.point(0, 0)
+        }
+
+        const point = localPoint || Qt.point(width / 2, height / 2)
+        return mapToItem(null, point.x, point.y)
+    }
+
+    function updateSpotlight(localPoint) {
+        if (!drivesDockSpotlight) {
+            lastSpotlightPoint = Qt.point(0, 0)
+            Panel.reportMousePresence(false)
+            return
+        }
+
+        lastSpotlightPoint = mapSpotlightPoint(localPoint)
+        Panel.reportMousePresence(true, lastSpotlightPoint)
+    }
+
+    function clearSpotlight() {
+        if (!drivesDockSpotlight) {
+            Panel.reportMousePresence(false)
+            return
+        }
+
+        Panel.reportMousePresence(false, lastSpotlightPoint)
+    }
+
     Connections {
         target: control
         enabled: autoClosePopup
@@ -42,4 +73,38 @@ IconButton {
     Component.onCompleted: {
         contentItem.smooth = false
     }
+
+    HoverHandler {
+        id: spotlightHoverHandler
+        acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus
+        enabled: control.enabled && control.visible && control.hoverEnabled
+
+        onPointChanged: {
+            if (hovered) {
+                spotlightClearTimer.stop()
+                control.updateSpotlight(spotlightHoverHandler.point.position)
+            }
+        }
+
+        onHoveredChanged: {
+            if (hovered) {
+                spotlightClearTimer.stop()
+                control.updateSpotlight()
+                return
+            }
+
+            spotlightClearTimer.restart()
+        }
+    }
+
+    Timer {
+        id: spotlightClearTimer
+        interval: 70
+        repeat: false
+        onTriggered: {
+            if (!spotlightHoverHandler.hovered) {
+                control.clearSpotlight()
+            }
+        }
+    }
 }

panels/dock/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -7,7 +7,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 configure_file(environments.h.in environments.h @ONLY)
 
 find_package(PkgConfig REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core DBus Gui Qml WaylandCompositor Widgets WaylandClient)
+find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core DBus Gui Network Qml WaylandCompositor Widgets WaylandClient)
 find_package(DdeTrayLoader REQUIRED)
 find_package(TreelandProtocols REQUIRED)
 pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)
@@ -18,6 +18,8 @@ file(
     dockabstractsettingsconfig.h
     dockdbusproxy.cpp
     dockdbusproxy.h
+    dockiteminfo.cpp
+    dockiteminfo.h
     dockpanel.cpp
     dockpanel.h
     docksettings.cpp
@@ -59,6 +61,25 @@ add_library(dockpanel SHARED
     ${dock_panel_sources}
 )
 
+add_dependencies(dockpanel tray_loader_font_sync)
+
+add_library(tray_loader_font_sync SHARED
+    tray_loader_font_sync.cpp
+    tray_loader_font_sync.qrc
+)
+
+set_target_properties(tray_loader_font_sync PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
+)
+
+target_link_libraries(tray_loader_font_sync PRIVATE
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Gui
+    Qt${QT_VERSION_MAJOR}::Widgets
+)
+
+install(TARGETS tray_loader_font_sync DESTINATION "${CMAKE_INSTALL_LIBDIR}/dde-shell")
+
 qt_generate_wayland_protocol_client_sources(dockpanel
     NO_INCLUDE_CORE_ONLY
     FILES
@@ -72,7 +93,6 @@ target_link_libraries(dockpanel PRIVATE
     Qt${QT_VERSION_MAJOR}::WaylandClientPrivate
     Qt${QT_VERSION_MAJOR}::Widgets
     dde-shell-frame
-    dde-shell-dock
 )
 
 if (BUILD_WITH_X11)
@@ -96,7 +116,6 @@ add_subdirectory(showdesktop)
 add_subdirectory(taskmanager)
 add_subdirectory(tray)
 add_subdirectory(multitaskview)
-add_subdirectory(frame)
 
 #add_subdirectory(appruntimeitem)
 
@@ -106,6 +125,8 @@ file(
     constants.h
     # dockfilterproxymodel.cpp
     # dockfilterproxymodel.h
+    fashionleftpluginprovider.h
+    fashionleftpluginprovider.cpp
     pluginmanagerextension_p.h
     pluginmanagerextension.cpp
     pluginmanagerintegration_p.h
@@ -135,7 +156,6 @@ qt_add_qml_module(dock-plugin
     QML_FILES DockCompositor.qml OverflowContainer.qml MenuHelper.qml DockPalette.qml
     AppletItemButton.qml
     AppletItemBackground.qml
-    AppletDockItem.qml
     OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/
 )
 
@@ -147,7 +167,10 @@ qt_generate_wayland_protocol_server_sources(dock-plugin
 
 target_link_libraries(dock-plugin PUBLIC
     Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Concurrent
+    Qt${QT_VERSION_MAJOR}::DBus
     Qt${QT_VERSION_MAJOR}::Gui
+    Qt${QT_VERSION_MAJOR}::Network
     Qt${QT_VERSION_MAJOR}::Qml
     Qt${QT_VERSION_MAJOR}::Widgets
     Qt${QT_VERSION_MAJOR}::WaylandCompositor
@@ -171,3 +194,7 @@ dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.d
 dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.tray.json) # compat
 dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.json)
 dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.tray.json)
+dtk_add_config_meta_files(APPID org.deepin.dde.dock FILES dconfig/org.deepin.dde.dock.json)
+dtk_add_config_meta_files(APPID org.deepin.dde.dock FILES dconfig/org.deepin.dde.dock.plugin.quick-panel.json)
+dtk_add_config_meta_files(APPID org.deepin.dde.tray-loader FILES dconfig/org.deepin.dde.dock.json)
+dtk_add_config_meta_files(APPID org.deepin.dde.tray-loader FILES dconfig/org.deepin.dde.dock.plugin.quick-panel.json)

panels/dock/OverflowContainer.qml

@@ -19,6 +19,8 @@ Item {
     property alias addDisplaced: listView.addDisplaced
     property alias removeDisplaced: listView.removeDisplaced
     property alias moveDisplaced: listView.moveDisplaced
+    property alias footer: listView.footer
+    property alias footerPositioning: listView.footerPositioning
     ListView {
         id: listView
         anchors.fill: parent
@@ -54,6 +56,30 @@ Item {
         return listView.indexAt(x, y)
     }
 
+    function childTargetImplicitWidth(child) {
+        if (!child) {
+            return 0
+        }
+
+        if (child.targetImplicitWidth !== undefined) {
+            return child.targetImplicitWidth
+        }
+
+        return child.implicitWidth
+    }
+
+    function childTargetImplicitHeight(child) {
+        if (!child) {
+            return 0
+        }
+
+        if (child.targetImplicitHeight !== undefined) {
+            return child.targetImplicitHeight
+        }
+
+        return child.implicitHeight
+    }
+
     implicitWidth: {
         let width = 0
         for (let child of listView.contentItem.visibleChildren) {
@@ -70,4 +96,20 @@ Item {
         }
         return Math.max(height, 1)
     }
+
+    readonly property real targetImplicitWidth: {
+        let width = 0
+        for (let child of listView.contentItem.visibleChildren) {
+            width = calculateImplicitWidth(width, childTargetImplicitWidth(child))
+        }
+        return Math.max(width, 1)
+    }
+
+    readonly property real targetImplicitHeight: {
+        let height = 0
+        for (let child of listView.contentItem.visibleChildren) {
+            height = calculateImplicitHeight(height, childTargetImplicitHeight(child))
+        }
+        return Math.max(height, 1)
+    }
 }

panels/dock/appruntimeitem/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -13,8 +13,8 @@ add_library(dock-appruntimeitem SHARED
     xcbgetinfo.h
     xcbgetinfo.cpp
     qmlappruntime.qrc
-    ${CMAKE_SOURCE_DIR}/frame/dock/dockiteminfo.cpp
-    ${CMAKE_SOURCE_DIR}/frame/dock/dockiteminfo.h
+    ${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.cpp
+    ${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.h
     ${CMAKE_SOURCE_DIR}/panels/dock/constants.h
     ${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.h
     ${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.cpp

panels/dock/appruntimeitem/appruntimeitem.h

@@ -1,14 +1,14 @@
-// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 #include "applet.h"
 #include "dsglobal.h"
-#include "dock/dockiteminfo.h"
+#include "dockiteminfo.h"
 
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QThread>
 #include <QObject>
 #include <QDebug>

panels/dock/constants.h

@@ -38,6 +38,12 @@ enum ItemAlignment {
     LeftAlignment        = 1,
 };
 
+enum ViewMode {
+    CenteredMode         = 0,
+    LeftAlignedMode      = 1,
+    FashionMode          = 2,
+};
+
 enum ColorTheme {
     Light = Dtk::Gui::DGuiApplicationHelper::ColorType::LightType,
     Dark  = Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType,
@@ -148,6 +154,7 @@ const QString DCCIconPath = CMAKE_INSTALL_PREFIX + QString("/share/dde-dock/icon
 Q_ENUM_NS(SIZE)
 Q_ENUM_NS(IndicatorStyle)
 Q_ENUM_NS(ItemAlignment)
+Q_ENUM_NS(ViewMode)
 Q_ENUM_NS(ColorTheme)
 Q_ENUM_NS(HideMode)
 Q_ENUM_NS(Position)
@@ -162,6 +169,7 @@ Q_ENUM_NS(TrayPluginSizePolicy)
 Q_DECLARE_METATYPE(dock::SIZE)
 Q_DECLARE_METATYPE(dock::IndicatorStyle)
 Q_DECLARE_METATYPE(dock::ItemAlignment)
+Q_DECLARE_METATYPE(dock::ViewMode)
 Q_DECLARE_METATYPE(dock::ColorTheme)
 Q_DECLARE_METATYPE(dock::HideMode)
 Q_DECLARE_METATYPE(dock::HideState)