Commit e8c72744 authored by Nate Graham's avatar Nate Graham 💤
Browse files

[applets] Show KCMs in System Settings or Info Center, as appropriate

Summary:
CCBUG: 417836

Depends on D29711

As this will depend on Frameworks 5.71, it will be landed on master after branching,
ending up in Plasma 5.20.

Test Plan:
Right-click on applets and activate their configure menu items
Open applets and click on their settings buttons
Observe that the KCMs are opened in System Settings or Info Center
(depending on the context)

Reviewers: mart, #plasma

Reviewed By: mart, #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D29712
parent d8114799
......@@ -5,7 +5,7 @@ set(PROJECT_VERSION "5.19.80")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.14.0")
set(KF5_MIN_VERSION "5.70.0")
set(KF5_MIN_VERSION "5.71.0")
set(INSTALL_SDDM_THEME TRUE)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Network)
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......
......@@ -111,8 +111,7 @@ Item {
"powerdevilglobalconfig.desktop"]
readonly property bool kcmsAuthorized: KCMShell.authorize(batterymonitor.kcms).length > 0
readonly property var kcm_energyinfo: ["kcm_energyinfo.desktop"]
readonly property bool kcmEnergyInformationAuthorized: KCMShell.authorize(kcm_energyinfo).length > 0
readonly property bool kcmEnergyInformationAuthorized: KCMShell.authorize("kcm_energyinfo.desktop").length > 0
property QtObject updateScreenBrightnessJob
onScreenBrightnessChanged: {
......@@ -150,7 +149,7 @@ Item {
}
function action_energyinformationkcm() {
KCMShell.open(batterymonitor.kcm_energyinfo);
KCMShell.openInfoCenter("kcm_energyinfo");
}
Component.onCompleted: {
......
......@@ -241,7 +241,7 @@ Item {
}
function action_openAutomounterKcm() {
KCMShell.open([devicenotifier.automounterKcmName])
KCMShell.openSystemSettings(devicenotifier.automounterKcmName)
}
Plasmoid.onExpandedChanged: {
......
......@@ -133,7 +133,7 @@ QtLayouts.ColumnLayout {
visible: KCMShell.authorize("formats.desktop").length > 0
text: i18n("Change Regional Settings...")
icon.name: "preferences-desktop-locale"
onClicked: KCMShell.open("formats.desktop")
onClicked: KCMShell.openSystemSettings("formats")
}
}
......
......@@ -122,11 +122,11 @@ Item {
}
function action_clockkcm() {
KCMShell.open("clock");
KCMShell.openSystemSettings("clock");
}
function action_formatskcm() {
KCMShell.open("formats");
KCMShell.openSystemSettings("formats");
}
Component.onCompleted: {
......
......@@ -164,7 +164,7 @@ Item {
}
function action_openKcm() {
KQCAddons.KCMShell.open("kcm_notifications");
KQCAddons.KCMShell.openSystemSettings("kcm_notifications");
}
Component.onCompleted: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment