diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f4053c1..babaffd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(PROJECT_VERSION "5.25.80") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.15.2") -set(KF5_MIN_VERSION "5.94") +set(KF5_MIN_VERSION "5.97") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(CMAKE_CXX_STANDARD 17) diff --git a/kcms/mobileshell/CMakeLists.txt b/kcms/mobileshell/CMakeLists.txt index eba2d530..ca1d248b 100644 --- a/kcms/mobileshell/CMakeLists.txt +++ b/kcms/mobileshell/CMakeLists.txt @@ -27,11 +27,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config ) -set(mobileshellsettings_SRCS - kcm.cpp -) - -add_library(kcm_mobileshell MODULE ${mobileshellsettings_SRCS}) +kcoreaddons_add_plugin(kcm_mobileshell SOURCES kcm.cpp INSTALL_NAMESPACE "plasma/kcms/systemsettings") target_link_libraries(kcm_mobileshell Qt::Core @@ -41,10 +37,6 @@ target_link_libraries(kcm_mobileshell KF5::QuickAddons ) -kcoreaddons_desktop_to_json(kcm_mobileshell "package/metadata.desktop") - -install(TARGETS kcm_mobileshell DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) -install(FILES package/metadata.desktop RENAME kcm_mobileshell.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}) # Install the desktop file - +kcmutils_generate_desktop_file(kcm_mobileshell) kpackage_install_package(package kcm_mobileshell kcms) # Install our QML kpackage. diff --git a/kcms/mobileshell/kcm.cpp b/kcms/mobileshell/kcm.cpp index 4d98812e..49a1cd82 100644 --- a/kcms/mobileshell/kcm.cpp +++ b/kcms/mobileshell/kcm.cpp @@ -7,7 +7,7 @@ #include -K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "metadata.json") +K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "kcm_mobileshell.json") KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data, const QVariantList &args) : KQuickAddons::ManagedConfigModule(parent, data, args) diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json new file mode 100644 index 00000000..a5afd6b9 --- /dev/null +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -0,0 +1,117 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "espidev@gmail.com", + "Name": "Devin Lin" + } + ], + "Category": "System Information", + "Description": "Configure the system shell", + "Description[az]": "Sistem", + "Description[ca@valencia]": "Configura l'intèrpret d'ordres del sistema", + "Description[ca]": "Configura l'intèrpret d'ordres del sistema", + "Description[en_GB]": "Configure the system shell", + "Description[es]": "Configura el intérprete de órdenes del sistema", + "Description[eu]": "Konfiguratu sistemaren oskola", + "Description[fi]": "Aseta järjestelmän komentotulkki", + "Description[fr]": "Configurer le shell du système", + "Description[hi]": "तंत्र शेल विन्यस्त करें", + "Description[hu]": "A rendszerfelület beállítása", + "Description[ia]": "Configura le shell de systema", + "Description[it]": "Configura la shell di sistema", + "Description[ka]": "სისტემური გარსის მორგება", + "Description[ko]": "시스템 셸 설정", + "Description[nl]": "De systeem-shell configureren", + "Description[nn]": "Set opp systemskalet", + "Description[pa]": "ਸਿਸਟਮ ਸ਼ੈੱਲ ਦੀ ਸੰਰਚਨਾ", + "Description[pl]": "Ustawienia powłoki systemowej", + "Description[pt]": "Configurar a consola do sistema", + "Description[pt_BR]": "Configurar o shell do sistema", + "Description[ro]": "Configurează interpretorul sistemului", + "Description[sk]": "Nastaviť systémový shell", + "Description[sl]": "Nastavi sistemski shell", + "Description[sv]": "Anpassa systemskalet", + "Description[tr]": "Sistem kabuğunu yapılandır", + "Description[uk]": "Налаштувати командну оболонку системи", + "Description[x-test]": "xxConfigure the system shellxx", + "Description[zh_CN]": "配置系统外壳程序", + "EnabledByDefault": true, + "FormFactors": [ + "desktop", + "handset", + "tablet", + "mediacenter" + ], + "Icon": "preferences-desktop-plasma", + "License": "GPL", + "Name": "Shell", + "Name[az]": "Örtük", + "Name[ca@valencia]": "Intèrpret d'ordres", + "Name[ca]": "Intèrpret d'ordres", + "Name[cs]": "Shell", + "Name[de]": "Shell", + "Name[en_GB]": "Shell", + "Name[es]": "Intérprete de órdenes", + "Name[eu]": "Oskola", + "Name[fi]": "Komentotulkki", + "Name[fr]": "Shell", + "Name[hi]": "शेल", + "Name[hu]": "Felület", + "Name[ia]": "Shell", + "Name[it]": "Shell", + "Name[ka]": "გარსი", + "Name[ko]": "셸", + "Name[nl]": "Shell", + "Name[nn]": "Skal", + "Name[pa]": "ਸ਼ੈੱਲ", + "Name[pl]": "Powłoka", + "Name[pt]": "Consola", + "Name[pt_BR]": "Shell", + "Name[ro]": "Interpretor", + "Name[sk]": "Shell", + "Name[sl]": "Shell", + "Name[sv]": "Skal", + "Name[tr]": "Kabuk", + "Name[uk]": "Оболонка", + "Name[x-test]": "xxShellxx", + "Name[zh_CN]": "外壳程序", + "ServiceTypes": [ + "KCModule" + ], + "Version": "0.1", + "Website": "https://plasma-mobile.org/" + }, + "X-KDE-Keywords": "system,shell,panel", + "X-KDE-Keywords[az]": "sistem,örtük,panel", + "X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro", + "X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó", + "X-KDE-Keywords[en_GB]": "system,shell,panel", + "X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel", + "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela", + "X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli", + "X-KDE-Keywords[fr]": "système, shell, panneau", + "X-KDE-Keywords[hi]": "तंत्र,शैल,पैनल", + "X-KDE-Keywords[hu]": "rendszer,felület,panel", + "X-KDE-Keywords[ia]": "system,systema,shell,pannello", + "X-KDE-Keywords[it]": "sistema,shell,pannello", + "X-KDE-Keywords[ka]": "system,shell,panel", + "X-KDE-Keywords[ko]": "system,shell,panel,시스템,셸,패널", + "X-KDE-Keywords[nl]": "systeem,shell,paneel", + "X-KDE-Keywords[nn]": "system,skal,shell,panel", + "X-KDE-Keywords[pa]": "ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ", + "X-KDE-Keywords[pl]": "system,powłoka,panel", + "X-KDE-Keywords[pt]": "sistema,consola,painel", + "X-KDE-Keywords[pt_BR]": "sistema,shell,painel", + "X-KDE-Keywords[ro]": "sistem,interpretor,panou", + "X-KDE-Keywords[sk]": "systém,shell,panel", + "X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča", + "X-KDE-Keywords[sv]": "system,skal,panel", + "X-KDE-Keywords[tr]": "sistem,kabuk,panel", + "X-KDE-Keywords[uk]": "system,shell,panel,система,оболонка,панель", + "X-KDE-Keywords[x-test]": "xxsystemxx,xxshellxx,xxpanelxx", + "X-KDE-Keywords[zh_CN]": "system,shell,panel,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板,", + "X-KDE-ParentApp": "kcontrol", + "X-KDE-System-Settings-Parent-Category": "personalization", + "X-Plasma-MainScript": "ui/main.qml" +} diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop deleted file mode 100644 index 27261f74..00000000 --- a/kcms/mobileshell/package/metadata.desktop +++ /dev/null @@ -1,111 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Devin Lin -# SPDX-License-Identifier: GPL-2.0-or-later - -[Desktop Entry] -Name=Shell -Name[az]=Örtük -Name[ca]=Intèrpret d'ordres -Name[ca@valencia]=Intèrpret d'ordres -Name[cs]=Shell -Name[de]=Shell -Name[en_GB]=Shell -Name[es]=Intérprete de órdenes -Name[eu]=Oskola -Name[fi]=Komentotulkki -Name[fr]=Shell -Name[hi]=शेल -Name[hu]=Felület -Name[ia]=Shell -Name[it]=Shell -Name[ka]=გარსი -Name[ko]=셸 -Name[nl]=Shell -Name[nn]=Skal -Name[pa]=ਸ਼ੈੱਲ -Name[pl]=Powłoka -Name[pt]=Consola -Name[pt_BR]=Shell -Name[ro]=Interpretor -Name[sk]=Shell -Name[sl]=Shell -Name[sv]=Skal -Name[tr]=Kabuk -Name[uk]=Оболонка -Name[x-test]=xxShellxx -Name[zh_CN]=外壳程序 -Comment=Configure the system shell -Comment[az]=Sistem -Comment[ca]=Configura l'intèrpret d'ordres del sistema -Comment[ca@valencia]=Configura l'intèrpret d'ordres del sistema -Comment[en_GB]=Configure the system shell -Comment[es]=Configura el intérprete de órdenes del sistema -Comment[eu]=Konfiguratu sistemaren oskola -Comment[fi]=Aseta järjestelmän komentotulkki -Comment[fr]=Configurer le shell du système -Comment[hi]=तंत्र शेल विन्यस्त करें -Comment[hu]=A rendszerfelület beállítása -Comment[ia]=Configura le shell de systema -Comment[it]=Configura la shell di sistema -Comment[ka]=სისტემური გარსის მორგება -Comment[ko]=시스템 셸 설정 -Comment[nl]=De systeem-shell configureren -Comment[nn]=Set opp systemskalet -Comment[pa]=ਸਿਸਟਮ ਸ਼ੈੱਲ ਦੀ ਸੰਰਚਨਾ -Comment[pl]=Ustawienia powłoki systemowej -Comment[pt]=Configurar a consola do sistema -Comment[pt_BR]=Configurar o shell do sistema -Comment[ro]=Configurează interpretorul sistemului -Comment[sk]=Nastaviť systémový shell -Comment[sl]=Nastavi sistemski shell -Comment[sv]=Anpassa systemskalet -Comment[tr]=Sistem kabuğunu yapılandır -Comment[uk]=Налаштувати командну оболонку системи -Comment[x-test]=xxConfigure the system shellxx -Comment[zh_CN]=配置系统外壳程序 -Encoding=UTF-8 -Type=Service -Icon=preferences-desktop-plasma -X-KDE-Library=kcm_mobileshell -X-KDE-ServiceTypes=KCModule -X-KDE-FormFactors=desktop,handset,tablet,mediacenter -X-Plasma-MainScript=ui/main.qml -X-KDE-System-Settings-Parent-Category=personalization -X-KDE-PluginInfo-Author=Devin Lin -X-KDE-PluginInfo-Email=espidev@gmail.com -X-KDE-PluginInfo-Name=kcm_cellular_network -X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-Website=https://plasma-mobile.org/ -X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true -X-KDE-Keywords=system,shell,panel -X-KDE-Keywords[az]=sistem,örtük,panel -X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó -X-KDE-Keywords[ca@valencia]=sistema,intèrpret d'ordres,quadro -X-KDE-Keywords[en_GB]=system,shell,panel -X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel -X-KDE-Keywords[eu]=sistema,shell,oskola,panela -X-KDE-Keywords[fi]=järjestelmä,komentotulkki,paneeli -X-KDE-Keywords[fr]=système, shell, panneau -X-KDE-Keywords[hi]=तंत्र,शैल,पैनल -X-KDE-Keywords[hu]=rendszer,felület,panel -X-KDE-Keywords[ia]=system,systema,shell,pannello -X-KDE-Keywords[it]=sistema,shell,pannello -X-KDE-Keywords[ka]=system,shell,panel -X-KDE-Keywords[ko]=system,shell,panel,시스템,셸,패널 -X-KDE-Keywords[nl]=systeem,shell,paneel -X-KDE-Keywords[nn]=system,skal,shell,panel -X-KDE-Keywords[pa]=ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ -X-KDE-Keywords[pl]=system,powłoka,panel -X-KDE-Keywords[pt]=sistema,consola,painel -X-KDE-Keywords[pt_BR]=sistema,shell,painel -X-KDE-Keywords[ro]=sistem,interpretor,panou -X-KDE-Keywords[sk]=systém,shell,panel -X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča -X-KDE-Keywords[sv]=system,skal,panel -X-KDE-Keywords[tr]=sistem,kabuk,panel -X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель -X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx -X-KDE-Keywords[zh_CN]=system,shell,panel,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板, -X-KDE-ParentApp=kcontrol -X-KDE-PluginInfo-Name=kcm_mobileshell