From e714c7e44e435d327597db6890c0814ab96cb6ca Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 1 Jun 2022 21:33:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=80=81?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 所有插件的api版本都改成2.0.0，PluginProxyInterface新增的接口放到最后的位置，保证老插件在加载的时候能调用到正确的函数 Log: 修改老插件的兼容性问题 Influence: 任务栏加载老插件 Bug: https://pms.uniontech.com/bug-view-132961.html Change-Id: I0c2714db6a21f2d246126ce2d9cec96e8c706d80 --- debian/changelog | 6 ++++++ interfaces/constants.h | 2 +- interfaces/pluginproxyinterface.h | 12 ++++++------ plugins/airplane-mode/airplanemode.json | 2 +- plugins/bluetooth/bluetooth.json | 2 +- plugins/datetime/datetime.json | 2 +- plugins/disk-mount/disk-mount.json | 2 +- plugins/keyboard-layout/keyboard.json | 2 +- plugins/multitasking/multitasking.json | 2 +- plugins/onboard/onboard.json | 2 +- plugins/overlay-warning/overlay-warning.json | 2 +- plugins/power/power.json | 2 +- plugins/show-desktop/show-desktop.json | 2 +- plugins/shutdown/shutdown.json | 2 +- plugins/sound/sound.json | 2 +- plugins/trash/trash.json | 2 +- plugins/tray/tray.json | 2 +- 17 files changed, 27 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08420a5b8..a99107e6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-dock (6.0.0.1) unstable; urgency=low + + * release Tag 6.0.0.1 + + -- donghualin Wed, 1 June 2022 21:34:29 +0800 + dde-dock (6.0.0.0) unstable; urgency=low * release Tag 6.0.0.0 diff --git a/interfaces/constants.h b/interfaces/constants.h index dc4bd9a35..3c79060b9 100644 --- a/interfaces/constants.h +++ b/interfaces/constants.h @@ -27,7 +27,7 @@ namespace Dock { #define DOCK_PLUGIN_MIME "dock/plugin" -#define DOCK_PLUGIN_API_VERSION "1.2.3" +#define DOCK_PLUGIN_API_VERSION "2.0.0" #define PROP_DISPLAY_MODE "DisplayMode" diff --git a/interfaces/pluginproxyinterface.h b/interfaces/pluginproxyinterface.h index bf29dc740..037928d2d 100644 --- a/interfaces/pluginproxyinterface.h +++ b/interfaces/pluginproxyinterface.h @@ -60,12 +60,6 @@ public: /// virtual void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey) = 0; - /// - /// update display or information - /// - /// - virtual void updateDockInfo(const DockPart &) = 0; - /// /// \brief requestContextMenu /// request show context menu @@ -102,6 +96,12 @@ public: /// SeeAlse: saveValue /// virtual void removeValue(PluginsItemInterface *const itemInter, const QStringList &keyList) = 0; + + /// + /// update display or information + /// + /// + virtual void updateDockInfo(const DockPart &) = 0; }; #endif // PLUGINPROXYINTERFACE_H diff --git a/plugins/airplane-mode/airplanemode.json b/plugins/airplane-mode/airplanemode.json index cbfdea8e9..cc6819b7a 100644 --- a/plugins/airplane-mode/airplanemode.json +++ b/plugins/airplane-mode/airplanemode.json @@ -1,4 +1,4 @@ { - "api": "1.1.1", + "api": "2.0.0", "depends-daemon-dbus-service": "" } diff --git a/plugins/bluetooth/bluetooth.json b/plugins/bluetooth/bluetooth.json index 5b1e078b2..71ae6746f 100644 --- a/plugins/bluetooth/bluetooth.json +++ b/plugins/bluetooth/bluetooth.json @@ -1,4 +1,4 @@ { - "api": "1.1.1", + "api": "2.0.0", "depends-daemon-dbus-service": "com.deepin.daemon.Bluetooth" } diff --git a/plugins/datetime/datetime.json b/plugins/datetime/datetime.json index 0404bcb19..8c50d97e4 100644 --- a/plugins/datetime/datetime.json +++ b/plugins/datetime/datetime.json @@ -1,4 +1,4 @@ { - "api": "1.2.3", + "api": "2.0.0", "depends-daemon-dbus-service": "com.deepin.daemon.Timedate" } diff --git a/plugins/disk-mount/disk-mount.json b/plugins/disk-mount/disk-mount.json index ad498eeb3..bec81f0da 100644 --- a/plugins/disk-mount/disk-mount.json +++ b/plugins/disk-mount/disk-mount.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/keyboard-layout/keyboard.json b/plugins/keyboard-layout/keyboard.json index ad498eeb3..bec81f0da 100644 --- a/plugins/keyboard-layout/keyboard.json +++ b/plugins/keyboard-layout/keyboard.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/multitasking/multitasking.json b/plugins/multitasking/multitasking.json index fdabbaaaa..bec81f0da 100644 --- a/plugins/multitasking/multitasking.json +++ b/plugins/multitasking/multitasking.json @@ -1,3 +1,3 @@ { - "api": "1.2.2" + "api": "2.0.0" } diff --git a/plugins/onboard/onboard.json b/plugins/onboard/onboard.json index ad498eeb3..bec81f0da 100644 --- a/plugins/onboard/onboard.json +++ b/plugins/onboard/onboard.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/overlay-warning/overlay-warning.json b/plugins/overlay-warning/overlay-warning.json index ad498eeb3..bec81f0da 100644 --- a/plugins/overlay-warning/overlay-warning.json +++ b/plugins/overlay-warning/overlay-warning.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/power/power.json b/plugins/power/power.json index c302e98e7..388147fa0 100644 --- a/plugins/power/power.json +++ b/plugins/power/power.json @@ -1,4 +1,4 @@ { - "api": "1.1.1", + "api": "2.0.0", "depends-daemon-dbus-service": "com.deepin.daemon.Power" } diff --git a/plugins/show-desktop/show-desktop.json b/plugins/show-desktop/show-desktop.json index fdabbaaaa..bec81f0da 100644 --- a/plugins/show-desktop/show-desktop.json +++ b/plugins/show-desktop/show-desktop.json @@ -1,3 +1,3 @@ { - "api": "1.2.2" + "api": "2.0.0" } diff --git a/plugins/shutdown/shutdown.json b/plugins/shutdown/shutdown.json index ad498eeb3..bec81f0da 100644 --- a/plugins/shutdown/shutdown.json +++ b/plugins/shutdown/shutdown.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/sound/sound.json b/plugins/sound/sound.json index c5f05e5a5..2d486b2fa 100644 --- a/plugins/sound/sound.json +++ b/plugins/sound/sound.json @@ -1,4 +1,4 @@ { - "api": "1.1.1", + "api": "2.0.0", "depends-daemon-dbus-service": "com.deepin.daemon.Audio" } diff --git a/plugins/trash/trash.json b/plugins/trash/trash.json index ad498eeb3..bec81f0da 100644 --- a/plugins/trash/trash.json +++ b/plugins/trash/trash.json @@ -1,3 +1,3 @@ { - "api": "1.1.1" + "api": "2.0.0" } diff --git a/plugins/tray/tray.json b/plugins/tray/tray.json index 40c82cea6..bf27feb16 100644 --- a/plugins/tray/tray.json +++ b/plugins/tray/tray.json @@ -1,4 +1,4 @@ { - "api": "1.1.1", + "api": "2.0.0", "depends-daemon-dbus-service": "com.deepin.dde.TrayManager" }