From 5d462fdc3068e817acb3bb80f2ee9e27eecae3f4 Mon Sep 17 00:00:00 2001 From: listenerri Date: Tue, 4 Dec 2018 16:13:17 +0800 Subject: [PATCH] refactor: new dock plugins interface version 1.1 Change-Id: I8f9c36531aab7f04b3ffe656eb2f67516efe736d --- frame/controller/dockpluginscontroller.cpp | 2 +- plugins/datetime/datetime.json | 2 +- plugins/disk-mount/disk-mount.json | 2 +- plugins/keyboard-layout/keyboard.json | 2 +- plugins/network/network.json | 2 +- plugins/plugin-guide/home_monitor/home_monitor.json | 2 +- plugins/power/power.json | 2 +- plugins/shutdown/shutdown.json | 2 +- plugins/sound/sound.json | 2 +- plugins/trash/trash.json | 2 +- plugins/tray/system-trays/systemtrayitem.h | 4 ---- plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +- plugins/tray/tray.json | 2 +- 13 files changed, 12 insertions(+), 16 deletions(-) diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp index c89f954f3..de07dbb6c 100644 --- a/frame/controller/dockpluginscontroller.cpp +++ b/frame/controller/dockpluginscontroller.cpp @@ -28,7 +28,7 @@ #include #include -#define API_VERSION "1.0" +#define API_VERSION "1.1" DockPluginsController::DockPluginsController( DockItemController *itemControllerInter) diff --git a/plugins/datetime/datetime.json b/plugins/datetime/datetime.json index b9b78cb89..a6508f326 100644 --- a/plugins/datetime/datetime.json +++ b/plugins/datetime/datetime.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/disk-mount/disk-mount.json b/plugins/disk-mount/disk-mount.json index b9b78cb89..a6508f326 100644 --- a/plugins/disk-mount/disk-mount.json +++ b/plugins/disk-mount/disk-mount.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/keyboard-layout/keyboard.json b/plugins/keyboard-layout/keyboard.json index b9b78cb89..a6508f326 100644 --- a/plugins/keyboard-layout/keyboard.json +++ b/plugins/keyboard-layout/keyboard.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/network/network.json b/plugins/network/network.json index 9c1158984..104633887 100644 --- a/plugins/network/network.json +++ b/plugins/network/network.json @@ -1,4 +1,4 @@ { - "api": "1.0", + "api": "1.1", "depends-daemon-dbus-service": "com.deepin.daemon.Network" } diff --git a/plugins/plugin-guide/home_monitor/home_monitor.json b/plugins/plugin-guide/home_monitor/home_monitor.json index 3dfdb06db..a239e0d24 100644 --- a/plugins/plugin-guide/home_monitor/home_monitor.json +++ b/plugins/plugin-guide/home_monitor/home_monitor.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/power/power.json b/plugins/power/power.json index 3ad0980b3..e5769689d 100644 --- a/plugins/power/power.json +++ b/plugins/power/power.json @@ -1,4 +1,4 @@ { - "api": "1.0", + "api": "1.1", "depends-daemon-dbus-service": "com.deepin.daemon.Power" } diff --git a/plugins/shutdown/shutdown.json b/plugins/shutdown/shutdown.json index b9b78cb89..a6508f326 100644 --- a/plugins/shutdown/shutdown.json +++ b/plugins/shutdown/shutdown.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/sound/sound.json b/plugins/sound/sound.json index dfa2d6418..1acd42371 100644 --- a/plugins/sound/sound.json +++ b/plugins/sound/sound.json @@ -1,4 +1,4 @@ { - "api": "1.0", + "api": "1.1", "depends-daemon-dbus-service": "com.deepin.daemon.Audio" } diff --git a/plugins/trash/trash.json b/plugins/trash/trash.json index b9b78cb89..a6508f326 100644 --- a/plugins/trash/trash.json +++ b/plugins/trash/trash.json @@ -1,3 +1,3 @@ { - "api": "1.0" + "api": "1.1" } diff --git a/plugins/tray/system-trays/systemtrayitem.h b/plugins/tray/system-trays/systemtrayitem.h index 173e39d92..5f07c52f8 100644 --- a/plugins/tray/system-trays/systemtrayitem.h +++ b/plugins/tray/system-trays/systemtrayitem.h @@ -54,10 +54,6 @@ public: QWidget *centralWidget() const; void detachPluginWidget(); -//Q_SIGNALS: -// void requestWindowAutoHide(const bool autoHide) const; -// void requestRefershWindowVisible() const; - protected: bool event(QEvent *event) Q_DECL_OVERRIDE; void enterEvent(QEvent *event) Q_DECL_OVERRIDE; diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp index 04138f36d..e34e6b93b 100644 --- a/plugins/tray/system-trays/systemtrayscontroller.cpp +++ b/plugins/tray/system-trays/systemtrayscontroller.cpp @@ -26,7 +26,7 @@ #include #include -#define API_VERSION "1.0" +#define API_VERSION "1.1" SystemTraysController::SystemTraysController(QObject *parent) : QObject(parent) diff --git a/plugins/tray/tray.json b/plugins/tray/tray.json index 799c576fb..c34a8cc4a 100644 --- a/plugins/tray/tray.json +++ b/plugins/tray/tray.json @@ -1,4 +1,4 @@ { - "api": "1.0", + "api": "1.1", "depends-daemon-dbus-service": "com.deepin.dde.TrayManager" }