From 31ae31737ca48789e842d4cca9bf8b73016964ea Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Thu, 17 Mar 2022 15:57:40 -0400 Subject: [PATCH] quicksettings: Ensure package ids don't conflict with existing applets --- quicksettings/CMakeLists.txt | 20 +++++++++---------- quicksettings/airplanemode/metadata.desktop | 2 +- quicksettings/audio/metadata.desktop | 2 +- quicksettings/battery/metadata.desktop | 2 +- quicksettings/bluetooth/metadata.desktop | 2 +- quicksettings/caffeine/metadata.desktop | 2 +- quicksettings/flashlight/CMakeLists.txt | 2 +- .../flashlight/package/metadata.desktop | 2 +- quicksettings/keyboardtoggle/metadata.desktop | 2 +- quicksettings/location/metadata.desktop | 2 +- quicksettings/mobiledata/metadata.desktop | 2 +- quicksettings/nightcolor/CMakeLists.txt | 2 +- .../nightcolor/package/metadata.desktop | 2 +- quicksettings/powermenu/CMakeLists.txt | 2 +- .../powermenu/package/metadata.desktop | 2 +- quicksettings/screenrotation/CMakeLists.txt | 2 +- .../screenrotation/package/metadata.desktop | 2 +- quicksettings/screenshot/CMakeLists.txt | 2 +- .../screenshot/package/metadata.desktop | 2 +- quicksettings/settingsapp/metadata.desktop | 2 +- quicksettings/wifi/metadata.desktop | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/quicksettings/CMakeLists.txt b/quicksettings/CMakeLists.txt index d74384ae..e4be4649 100644 --- a/quicksettings/CMakeLists.txt +++ b/quicksettings/CMakeLists.txt @@ -1,16 +1,16 @@ # SPDX-FileCopyrightText: 2022 Devin Lin # SPDX-License-Identifier: GPL-2.0-or-later -plasma_install_package(airplanemode org.kde.plasma.airplanemode quicksettings) -plasma_install_package(audio org.kde.plasma.audio quicksettings) -plasma_install_package(battery org.kde.plasma.battery quicksettings) -plasma_install_package(bluetooth org.kde.plasma.bluetooth quicksettings) -plasma_install_package(caffeine org.kde.plasma.caffeine quicksettings) -plasma_install_package(keyboardtoggle org.kde.plasma.keyboardtoggle quicksettings) -plasma_install_package(location org.kde.plasma.location quicksettings) -plasma_install_package(mobiledata org.kde.plasma.mobiledata quicksettings) -plasma_install_package(settingsapp org.kde.plasma.settingsapp quicksettings) -plasma_install_package(wifi org.kde.plasma.wifi quicksettings) +plasma_install_package(airplanemode org.kde.plasma.quicksetting.airplanemode quicksettings) +plasma_install_package(audio org.kde.plasma.quicksetting.audio quicksettings) +plasma_install_package(battery org.kde.plasma.quicksetting.battery quicksettings) +plasma_install_package(bluetooth org.kde.plasma.quicksetting.bluetooth quicksettings) +plasma_install_package(caffeine org.kde.plasma.quicksetting.caffeine quicksettings) +plasma_install_package(keyboardtoggle org.kde.plasma.quicksetting.keyboardtoggle quicksettings) +plasma_install_package(location org.kde.plasma.quicksetting.location quicksettings) +plasma_install_package(mobiledata org.kde.plasma.quicksetting.mobiledata quicksettings) +plasma_install_package(settingsapp org.kde.plasma.quicksetting.settingsapp quicksettings) +plasma_install_package(wifi org.kde.plasma.quicksetting.wifi quicksettings) add_subdirectory(flashlight) add_subdirectory(nightcolor) add_subdirectory(powermenu) diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop index ee148edd..f477fe1b 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -41,7 +41,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Bhushan Shah X-KDE-PluginInfo-Email=bshah@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.airplanemode +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.airplanemode X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/audio/metadata.desktop b/quicksettings/audio/metadata.desktop index 5ab57a1a..a58d4281 100644 --- a/quicksettings/audio/metadata.desktop +++ b/quicksettings/audio/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.audio +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.audio X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/battery/metadata.desktop b/quicksettings/battery/metadata.desktop index b25ffc40..ed0133f9 100644 --- a/quicksettings/battery/metadata.desktop +++ b/quicksettings/battery/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.battery +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.battery X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/bluetooth/metadata.desktop b/quicksettings/bluetooth/metadata.desktop index 7cd01cfe..b31c72c1 100644 --- a/quicksettings/bluetooth/metadata.desktop +++ b/quicksettings/bluetooth/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.bluetooth +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.bluetooth X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop index 1cd70853..98b2a56c 100644 --- a/quicksettings/caffeine/metadata.desktop +++ b/quicksettings/caffeine/metadata.desktop @@ -33,7 +33,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.caffeine +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.caffeine X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL diff --git a/quicksettings/flashlight/CMakeLists.txt b/quicksettings/flashlight/CMakeLists.txt index 2e836e6a..aa19a02d 100644 --- a/quicksettings/flashlight/CMakeLists.txt +++ b/quicksettings/flashlight/CMakeLists.txt @@ -32,6 +32,6 @@ file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/qu install(TARGETS flashlightplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/flashlight) install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/flashlight) -plasma_install_package(package org.kde.plasma.flashlight quicksettings) +plasma_install_package(package org.kde.plasma.quicksetting.flashlight quicksettings) diff --git a/quicksettings/flashlight/package/metadata.desktop b/quicksettings/flashlight/package/metadata.desktop index c8ac780f..906dcf3c 100644 --- a/quicksettings/flashlight/package/metadata.desktop +++ b/quicksettings/flashlight/package/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.flashlight +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.flashlight X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/keyboardtoggle/metadata.desktop b/quicksettings/keyboardtoggle/metadata.desktop index d08c643d..5735b232 100644 --- a/quicksettings/keyboardtoggle/metadata.desktop +++ b/quicksettings/keyboardtoggle/metadata.desktop @@ -29,7 +29,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.keyboardtoggle +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.keyboardtoggle X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL diff --git a/quicksettings/location/metadata.desktop b/quicksettings/location/metadata.desktop index e5822106..5ae20d1d 100644 --- a/quicksettings/location/metadata.desktop +++ b/quicksettings/location/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.location +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.location X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/mobiledata/metadata.desktop b/quicksettings/mobiledata/metadata.desktop index 0abc5e87..9278c0a4 100644 --- a/quicksettings/mobiledata/metadata.desktop +++ b/quicksettings/mobiledata/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.mobiledata +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.mobiledata X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt index 36bf3991..c2947d16 100644 --- a/quicksettings/nightcolor/CMakeLists.txt +++ b/quicksettings/nightcolor/CMakeLists.txt @@ -37,4 +37,4 @@ file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/qu install(TARGETS nightcolorplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/nightcolor) install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/nightcolor) -plasma_install_package(package org.kde.plasma.nightcolor quicksettings) +plasma_install_package(package org.kde.plasma.quicksetting.nightcolor quicksettings) diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop index f890eb40..3411ec12 100644 --- a/quicksettings/nightcolor/package/metadata.desktop +++ b/quicksettings/nightcolor/package/metadata.desktop @@ -41,7 +41,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Aleix Pol X-KDE-PluginInfo-Email=aleixpol@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.nightcolor +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.nightcolor X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL diff --git a/quicksettings/powermenu/CMakeLists.txt b/quicksettings/powermenu/CMakeLists.txt index b20c8f8b..fed5385e 100644 --- a/quicksettings/powermenu/CMakeLists.txt +++ b/quicksettings/powermenu/CMakeLists.txt @@ -30,5 +30,5 @@ file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/qu install(TARGETS powermenuplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/powermenu) install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/powermenu) -plasma_install_package(package org.kde.plasma.powermenu quicksettings) +plasma_install_package(package org.kde.plasma.quicksetting.powermenu quicksettings) diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop index fa4f5b59..c2cd1b74 100644 --- a/quicksettings/powermenu/package/metadata.desktop +++ b/quicksettings/powermenu/package/metadata.desktop @@ -32,7 +32,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.powermenu +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.powermenu X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL diff --git a/quicksettings/screenrotation/CMakeLists.txt b/quicksettings/screenrotation/CMakeLists.txt index cc1f4c3b..bf6e2190 100644 --- a/quicksettings/screenrotation/CMakeLists.txt +++ b/quicksettings/screenrotation/CMakeLists.txt @@ -34,6 +34,6 @@ file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/qu install(TARGETS screenrotationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenrotation) install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenrotation) -plasma_install_package(package org.kde.plasma.screenrotation quicksettings) +plasma_install_package(package org.kde.plasma.quicksetting.screenrotation quicksettings) diff --git a/quicksettings/screenrotation/package/metadata.desktop b/quicksettings/screenrotation/package/metadata.desktop index 045800c0..637feff6 100644 --- a/quicksettings/screenrotation/package/metadata.desktop +++ b/quicksettings/screenrotation/package/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.screenrotation +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.screenrotation X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/screenshot/CMakeLists.txt b/quicksettings/screenshot/CMakeLists.txt index ef2849b1..a0c536d3 100644 --- a/quicksettings/screenshot/CMakeLists.txt +++ b/quicksettings/screenshot/CMakeLists.txt @@ -34,5 +34,5 @@ file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/qu install(TARGETS screenshotplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenshot) install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenshot) -plasma_install_package(package org.kde.plasma.screenshot quicksettings) +plasma_install_package(package org.kde.plasma.quicksetting.screenshot quicksettings) diff --git a/quicksettings/screenshot/package/metadata.desktop b/quicksettings/screenshot/package/metadata.desktop index cdaed230..64f62f1a 100644 --- a/quicksettings/screenshot/package/metadata.desktop +++ b/quicksettings/screenshot/package/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.screenshot +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.screenshot X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/settingsapp/metadata.desktop b/quicksettings/settingsapp/metadata.desktop index 64dde02a..ef76e0af 100644 --- a/quicksettings/settingsapp/metadata.desktop +++ b/quicksettings/settingsapp/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.settingsapp +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.settingsapp X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+ diff --git a/quicksettings/wifi/metadata.desktop b/quicksettings/wifi/metadata.desktop index 6900bebe..7cd9a249 100644 --- a/quicksettings/wifi/metadata.desktop +++ b/quicksettings/wifi/metadata.desktop @@ -11,7 +11,7 @@ X-KDE-ServiceTypes=KPackage/GenericQML X-KDE-PluginInfo-Author=Devin Lin X-KDE-PluginInfo-Email=devin@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.wifi +X-KDE-PluginInfo-Name=org.kde.plasma.quicksetting.wifi X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://kde.org X-KDE-PluginInfo-License=GPL-2.0+