diff --git a/panels/dock/dcc-dock-plugin/qml/PluginArea.qml b/panels/dock/dcc-dock-plugin/qml/PluginArea.qml index 936568158..57e2cef96 100644 --- a/panels/dock/dcc-dock-plugin/qml/PluginArea.qml +++ b/panels/dock/dcc-dock-plugin/qml/PluginArea.qml @@ -14,7 +14,7 @@ DccObject { DccObject { name: "pluginAreaTitle" weight: 10 - parentName: "personalization/taskBar/pluginArea" + parentName: "personalization/dock/pluginArea" pageType: DccObject.Item displayName: qsTr("Plugin Area") description: qsTr("Select which icons appear in the Dock") @@ -33,7 +33,7 @@ DccObject { DccObject { name: "pluginAreaView" - parentName: "personalization/taskBar/pluginArea" + parentName: "personalization/dock/pluginArea" weight: 100 pageType: DccObject.Item page: DccGroupView {} @@ -43,7 +43,7 @@ DccObject { delegate: DccObject { name: "plugin" + model.itemKey property real iconSize: 16 - parentName: "personalization/taskBar/pluginArea/pluginAreaView" + parentName: "personalization/dock/pluginArea/pluginAreaView" weight: 10 + index * 10 backgroundType: DccObject.Normal icon: model.icon diff --git a/panels/dock/dcc-dock-plugin/qml/dock.qml b/panels/dock/dcc-dock-plugin/qml/dock.qml index fea065a87..c9f2d43a4 100644 --- a/panels/dock/dcc-dock-plugin/qml/dock.qml +++ b/panels/dock/dcc-dock-plugin/qml/dock.qml @@ -11,10 +11,10 @@ import org.deepin.dcc 1.0 import org.deepin.dtk 1.0 as D DccObject { - name: "taskBar" + name: "dock" parentName: "personalization" displayName: qsTr("Desktop and taskbar") description: qsTr("Set the display and size of icons on the desktop") - icon: "taskbar" + icon: "dock" weight: 100 } diff --git a/panels/dock/dcc-dock-plugin/qml/main.qml b/panels/dock/dcc-dock-plugin/qml/main.qml index e0f328639..526f5cae7 100644 --- a/panels/dock/dcc-dock-plugin/qml/main.qml +++ b/panels/dock/dcc-dock-plugin/qml/main.qml @@ -14,20 +14,20 @@ DccObject { DccTitleObject { name: "taskBarTitle" weight: 500 - parentName: "personalization/taskBar" + parentName: "personalization/dock" displayName: qsTr("Dock") } DccObject { name: "taskBarModeGroup" - parentName: "personalization/taskBar" + parentName: "personalization/dock" weight: 600 pageType: DccObject.Item page: DccGroupView {} DccObject { name: "dockmode" - parentName: "personalization/taskBar/taskBarModeGroup" + parentName: "personalization/dock/taskBarModeGroup" displayName: qsTr("Mode") weight: 10 pageType: DccObject.Item @@ -99,14 +99,14 @@ DccObject { DccObject { name: "dockSettingsGroup" - parentName: "personalization/taskBar" + parentName: "personalization/dock" weight: 700 pageType: DccObject.Item page: DccGroupView {} DccObject { name: "docksize" - parentName: "personalization/taskBar/dockSettingsGroup" + parentName: "personalization/dock/dockSettingsGroup" displayName: qsTr("Dock size") weight: 10 pageType: DccObject.Editor @@ -146,7 +146,7 @@ DccObject { DccObject { name: "positionInScreen" - parentName: "personalization/taskBar/dockSettingsGroup" + parentName: "personalization/dock/dockSettingsGroup" displayName: qsTr("Position on the screen") weight: 100 pageType: DccObject.Editor @@ -172,7 +172,7 @@ DccObject { DccObject { name: "positionInScreen" - parentName: "personalization/taskBar/dockSettingsGroup" + parentName: "personalization/dock/dockSettingsGroup" displayName: qsTr("Status") weight: 200 pageType: DccObject.Editor @@ -198,14 +198,14 @@ DccObject { DccObject { name: "multiscreenGroup" - parentName: "personalization/taskBar" + parentName: "personalization/dock" weight: 800 pageType: DccObject.Item page: DccGroupView {} DccObject { name: "multiscreenItem" - parentName: "personalization/taskBar/multiscreenGroup" + parentName: "personalization/dock/multiscreenGroup" displayName: qsTr("Multiple Displays") description: qsTr("Set the position of the taskbar on the screen") visible: Qt.application.screens.length > 1 @@ -234,7 +234,7 @@ DccObject { name: "pluginArea" weight:900 icon: "plugin" - parentName: "personalization/taskBar" + parentName: "personalization/dock" displayName: qsTr("Plugin Area") description: qsTr("Select which icons appear in the Dock") diff --git a/panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc b/panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc index b892ef3d5..883350932 100644 --- a/panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc +++ b/panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc @@ -10,6 +10,7 @@ icons/plugin.dci + icons/dock.dci diff --git a/panels/dock/dcc-dock-plugin/res/icons/dock.dci b/panels/dock/dcc-dock-plugin/res/icons/dock.dci new file mode 100644 index 000000000..51ae9c43b Binary files /dev/null and b/panels/dock/dcc-dock-plugin/res/icons/dock.dci differ diff --git a/panels/dock/dockpanel.cpp b/panels/dock/dockpanel.cpp index edc5bbf30..9c6ee76a9 100644 --- a/panels/dock/dockpanel.cpp +++ b/panels/dock/dockpanel.cpp @@ -326,7 +326,7 @@ void DockPanel::openDockSettings() const .path(QStringLiteral("/org/deepin/dde/ControlCenter1")) .interface(QStringLiteral("org.deepin.dde.ControlCenter1")) .method(QStringLiteral("ShowPage")) - .arg(QStringLiteral("personalization/desktop/dock")) + .arg(QStringLiteral("personalization/dock")) .call(); }