Skip to content

fix: dock cannot call the dde-control-center #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 13, 2024
Merged

fix: dock cannot call the dde-control-center #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions panels/dock/dcc-dock-plugin/qml/PluginArea.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -33,7 +33,7 @@ DccObject {

DccObject {
name: "pluginAreaView"
parentName: "personalization/taskBar/pluginArea"
parentName: "personalization/dock/pluginArea"
weight: 100
pageType: DccObject.Item
page: DccGroupView {}
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/dcc-dock-plugin/qml/dock.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
20 changes: 10 additions & 10 deletions panels/dock/dcc-dock-plugin/qml/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -172,7 +172,7 @@ DccObject {

DccObject {
name: "positionInScreen"
parentName: "personalization/taskBar/dockSettingsGroup"
parentName: "personalization/dock/dockSettingsGroup"
displayName: qsTr("Status")
weight: 200
pageType: DccObject.Editor
Expand All @@ -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
Expand Down Expand Up @@ -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")

Expand Down
1 change: 1 addition & 0 deletions panels/dock/dcc-dock-plugin/res/dcc-dock-plugin.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<qresource prefix="/dsg">
<file>icons/plugin.dci</file>
<file>icons/dock.dci</file>
</qresource>

<qresource prefix="/icons/deepin/builtin">
Expand Down
Binary file added panels/dock/dcc-dock-plugin/res/icons/dock.dci
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion panels/dock/dockpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Loading