Skip to content

Commit 5dc87b2

Browse files
committed
fix: dock cannot call the dde-control-center
new control center has changed url of dock setting's page update to new url log: as title pms: BUG-294041
1 parent 6798319 commit 5dc87b2

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

panels/dock/dcc-dock-plugin/qml/PluginArea.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DccObject {
1414
DccObject {
1515
name: "pluginAreaTitle"
1616
weight: 10
17-
parentName: "personalization/taskBar/pluginArea"
17+
parentName: "personalization/dock/pluginArea"
1818
pageType: DccObject.Item
1919
displayName: qsTr("Plugin Area")
2020
description: qsTr("Select which icons appear in the Dock")
@@ -33,7 +33,7 @@ DccObject {
3333

3434
DccObject {
3535
name: "pluginAreaView"
36-
parentName: "personalization/taskBar/pluginArea"
36+
parentName: "personalization/dock/pluginArea"
3737
weight: 100
3838
pageType: DccObject.Item
3939
page: DccGroupView {}
@@ -43,7 +43,7 @@ DccObject {
4343
delegate: DccObject {
4444
name: "plugin" + model.itemKey
4545
property real iconSize: 16
46-
parentName: "personalization/taskBar/pluginArea/pluginAreaView"
46+
parentName: "personalization/dock/pluginArea/pluginAreaView"
4747
weight: 10 + index * 10
4848
backgroundType: DccObject.Normal
4949
icon: model.icon

panels/dock/dcc-dock-plugin/qml/dock.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import org.deepin.dcc 1.0
1111
import org.deepin.dtk 1.0 as D
1212

1313
DccObject {
14-
name: "taskBar"
14+
name: "dock"
1515
parentName: "personalization"
1616
displayName: qsTr("Desktop and taskbar")
1717
description: qsTr("Set the display and size of icons on the desktop")
18-
icon: "taskbar"
18+
icon: "dock"
1919
weight: 100
2020
}

panels/dock/dcc-dock-plugin/qml/main.qml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ DccObject {
1414
DccTitleObject {
1515
name: "taskBarTitle"
1616
weight: 500
17-
parentName: "personalization/taskBar"
17+
parentName: "personalization/dock"
1818
displayName: qsTr("Dock")
1919
}
2020

2121
DccObject {
2222
name: "taskBarModeGroup"
23-
parentName: "personalization/taskBar"
23+
parentName: "personalization/dock"
2424
weight: 600
2525
pageType: DccObject.Item
2626
page: DccGroupView {}
2727

2828
DccObject {
2929
name: "dockmode"
30-
parentName: "personalization/taskBar/taskBarModeGroup"
30+
parentName: "personalization/dock/taskBarModeGroup"
3131
displayName: qsTr("Mode")
3232
weight: 10
3333
pageType: DccObject.Item
@@ -99,14 +99,14 @@ DccObject {
9999

100100
DccObject {
101101
name: "dockSettingsGroup"
102-
parentName: "personalization/taskBar"
102+
parentName: "personalization/dock"
103103
weight: 700
104104
pageType: DccObject.Item
105105
page: DccGroupView {}
106106

107107
DccObject {
108108
name: "docksize"
109-
parentName: "personalization/taskBar/dockSettingsGroup"
109+
parentName: "personalization/dock/dockSettingsGroup"
110110
displayName: qsTr("Dock size")
111111
weight: 10
112112
pageType: DccObject.Editor
@@ -146,7 +146,7 @@ DccObject {
146146

147147
DccObject {
148148
name: "positionInScreen"
149-
parentName: "personalization/taskBar/dockSettingsGroup"
149+
parentName: "personalization/dock/dockSettingsGroup"
150150
displayName: qsTr("Position on the screen")
151151
weight: 100
152152
pageType: DccObject.Editor
@@ -172,7 +172,7 @@ DccObject {
172172

173173
DccObject {
174174
name: "positionInScreen"
175-
parentName: "personalization/taskBar/dockSettingsGroup"
175+
parentName: "personalization/dock/dockSettingsGroup"
176176
displayName: qsTr("Status")
177177
weight: 200
178178
pageType: DccObject.Editor
@@ -198,14 +198,14 @@ DccObject {
198198

199199
DccObject {
200200
name: "multiscreenGroup"
201-
parentName: "personalization/taskBar"
201+
parentName: "personalization/dock"
202202
weight: 800
203203
pageType: DccObject.Item
204204
page: DccGroupView {}
205205

206206
DccObject {
207207
name: "multiscreenItem"
208-
parentName: "personalization/taskBar/multiscreenGroup"
208+
parentName: "personalization/dock/multiscreenGroup"
209209
displayName: qsTr("Multiple Displays")
210210
description: qsTr("Set the position of the taskbar on the screen")
211211
visible: Qt.application.screens.length > 1
@@ -234,7 +234,7 @@ DccObject {
234234
name: "pluginArea"
235235
weight:900
236236
icon: "plugin"
237-
parentName: "personalization/taskBar"
237+
parentName: "personalization/dock"
238238
displayName: qsTr("Plugin Area")
239239
description: qsTr("Select which icons appear in the Dock")
240240

panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<qresource prefix="/dsg">
1212
<file>icons/plugin.dci</file>
13+
<file>icons/dock.dci</file>
1314
</qresource>
1415

1516
<qresource prefix="/icons/deepin/builtin">
2.35 KB
Binary file not shown.

panels/dock/dockpanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ void DockPanel::openDockSettings() const
326326
.path(QStringLiteral("/org/deepin/dde/ControlCenter1"))
327327
.interface(QStringLiteral("org.deepin.dde.ControlCenter1"))
328328
.method(QStringLiteral("ShowPage"))
329-
.arg(QStringLiteral("personalization/desktop/dock"))
329+
.arg(QStringLiteral("personalization/dock"))
330330
.call();
331331
}
332332

0 commit comments

Comments
 (0)