Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Derive plugin id from filename, clean up json files

Browse Source 
We ignore the name/description and only display the id in the ui.
To make sure the is are the same, the OUTPUT_NAME cmake target property is set.
Otherwise, we would need a json file with the KPlugin object and then the id in it, which is
unnecessary work for sth. that can be done in a single line.

Having the file base name and id differ is also discouraged, see https://phabricator.kde.org/T14499
This commit is contained in:
Alexander Lohnau
2022-04-18 21:21:21 +02:00
parent 5158d14147
commit fbf4fcbce0
19 changed files with 14 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
events/x11/CMakeLists.txt
View File

@@ -14,5 +14,6 @@ target_link_libraries (krfb_events_x11
KF5::CoreAddons
krfbprivate
)
set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)
install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)

66
events/x11/krfb_events_x11.json
View File

@@ -1,66 +0,0 @@
{
"Encoding": "UTF-8",
"KPlugin": {
"Description": "X11 XFakeInput based event handler for KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per a KRfb",
"Description[ca]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per al KRfb",
"Description[da]": "X11 XFakeInput baseret hændelseshåndtering til KRfb",
"Description[de]": "Ereignis-Modul basierend auf X11 XFakeInput für KRfb",
"Description[el]": "Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb",
"Description[en_GB]": "X11 XFakeInput based event handler for KRfb",
"Description[es]": "Gestor de eventos basado en XFakeInput de X11 para KRfb",
"Description[et]": "KRfb X11 XFakeInput'i põhine sündmuste käitleja",
"Description[eu]": "KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea",
"Description[fi]": "KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä",
"Description[fr]": "Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb",
"Description[gl]": "Xestor de eventos para KRfb baseado no XFakeInput de X11",
"Description[ia]": "Maneator de evento de X11 basate sur XFakeInput per KRfb",
"Description[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb",
"Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러",
"Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb",
"Description[nn]": "X11 XFakeInput-basert hendingshandtering for KRfb",
"Description[pl]": "Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb",
"Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb",
"Description[pt_BR]": "Manipulador de eventos baseado no XFakeInput do X11 para o KRfb",
"Description[sk]": "X11 Spracovateľ udalostí založený na XFakeInput pre KRfb",
"Description[sl]": "Upravljavec dogodkov za KRfb na osnovi X11 XFakeInput",
"Description[sv]": "Händelsehanterare för KRfb baserad på X11 XFakeInput",
"Description[uk]": "Обробник подій для KRfb на основі XFakeInput X11",
"Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx",
"Description[zh_CN]": "基于 X11 XFakeInput 的 KRfb 事件处理器",
"Description[zh_TW]": "KRfb 基於 X11 XFakeInput 的事件處理器",
"EnabledByDefault": true,
"Id": "x11",
"License": "GPL",
"Name": "X11 Event handler for KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per a KRfb",
"Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb",
"Name[da]": "X11 hændelseshåndtering til KRfb",
"Name[de]": "Ereignis-Modul basierend auf X11 für KRfb",
"Name[el]": "Χειριστής γεγονότων X11 για το KRfb",
"Name[en_GB]": "X11 Event handler for KRfb",
"Name[es]": "Gestor de eventos de X11 para KRfb",
"Name[et]": "KRfb X11 sündmuste käitleja",
"Name[eu]": "KRfb-rako X11 gertaera maneiatzailea",
"Name[fi]": "KRfb:n X11-tapahtumakäsittelijä",
"Name[fr]": "Gestionnaire d'évènements X11 pour KRfb",
"Name[gl]": "Xestor de eventos de X11 para KRfb",
"Name[ia]": "Manipulator de evento de X11 per KRfb",
"Name[it]": "Gestore eventi X11 per KRfb",
"Name[ko]": "KRfb X11 이벤트 핸들러",
"Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb",
"Name[nn]": "X11-hendingshandsamar for KRfb",
"Name[pl]": "Obsługa wydarzeń X11 dla KRfb",
"Name[pt]": "Tratamento de eventos do X11 para o KRfb",
"Name[pt_BR]": "Manipulador de eventos do X11 para o KRfb",
"Name[sk]": "X11 Obsluha udalostí pre KRfb",
"Name[sl]": "Upravljavec dogodkov za KRfb na osnovi X11",
"Name[sv]": "X11-händelsehanterare för Krfb",
"Name[uk]": "Обробник подій для KRfb на основі X11",
"Name[x-test]": "xxX11 Event handler for KRfbxx",
"Name[zh_CN]": "X11 KRfb 事件处理器",
"Name[zh_TW]": "KRfb 的 X11 事件處理器",
"Version": "0.1",
"Website": "http://www.kde.org"
}
}

2
events/x11/x11eventsplugin.cpp
View File

@@ -24,7 +24,7 @@
#include <KPluginFactory>
#include <QX11Info>
K_PLUGIN_CLASS_WITH_JSON(X11EventsPlugin, "krfb_events_x11.json")
K_PLUGIN_CLASS(X11EventsPlugin)
X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
: EventsPlugin(parent, args)

1
events/xdp/CMakeLists.txt
View File

@@ -21,6 +21,7 @@ target_link_libraries (krfb_events_xdp
Qt5::DBus
krfbprivate
)
set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)
install (TARGETS krfb_events_xdp
DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events

66
events/xdp/krfb_events_xdp.json
View File

@@ -1,66 +0,0 @@
{
"Encoding": "UTF-8",
"KPlugin": {
"Description": "Xdg-desktop-portal based event handler for KRfb",
"Description[ca@valencia]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per a KRfb",
"Description[ca]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per al KRfb",
"Description[da]": "Xdg-desktop-portal baseret hændelseshåndtering til KRfb",
"Description[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",
"Description[el]": "Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb",
"Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb",
"Description[es]": "Gestor de eventos basado en Xdg-desktop-portal para KRfb",
"Description[et]": "KRfb Xdg-desktop-portal'i põhine sündmuste käitleja",
"Description[eu]": "KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea",
"Description[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
"Description[fr]": "Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb",
"Description[gl]": "Xestor de eventos para KRfb baseado en Xdg-desktop-portal",
"Description[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb",
"Description[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb",
"Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러",
"Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb",
"Description[nn]": "Xdg-desktop-portal-basert hendingshandtering for KRfb",
"Description[pl]": "Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb",
"Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb",
"Description[pt_BR]": "Manipulador de eventos baseado no xdg-desktop-portal para o KRfb",
"Description[sk]": "Obsluha udalostí založená na Xdg-desktop-portal pre KRfb",
"Description[sl]": "Upravljavec dogodkov, na osnovi portala Xdg-desktop za KRfb",
"Description[sv]": "Händelsehanterare för KRfb baserad på xdg-desktop-portal",
"Description[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
"Description[x-test]": "xxXdg-desktop-portal based event handler for KRfbxx",
"Description[zh_CN]": "基于 xdg-desktop-portal 的 KRfb 事件处理器",
"Description[zh_TW]": "KRfb 基於 Xdg-desktop-portal 的事件處理器",
"EnabledByDefault": true,
"Id": "xdp",
"License": "GPL",
"Name": "Xdg-desktop-portal Event handler for KRfb",
"Name[ca@valencia]": "Gestor d'esdeveniments «Xdg-desktop-portal» per a KRfb",
"Name[ca]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb",
"Name[da]": "Xdg-desktop-portal hændelseshåndtering til KRfb",
"Name[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",
"Name[el]": "Χειριστής γεγονότων xdg-desktop-portal για το KRfb",
"Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb",
"Name[es]": "Gestor de eventos de Xdg-desktop-portal para KRfb",
"Name[et]": "KRfb Xdg-desktop-portal'i sündmuste käitleja",
"Name[eu]": "KRfb-rako «xdg-desktop-portal» gertaera maneiatzailea",
"Name[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
"Name[fr]": "Gestionnaire d'évènements Xdg-desktop-portal pour KRfb",
"Name[gl]": "Xestor de eventos de Xdg-desktop-portal para KRfb",
"Name[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb",
"Name[it]": "Gestore eventi xdg-desktop-portal per KRfb",
"Name[ko]": "KRfb Xdg-desktop-portal 이벤트 핸들러",
"Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb",
"Name[nn]": "Xdg-desktop-portal-hendingshandtering for KRfb",
"Name[pl]": "Obsługa wydarzeń Xdg-desktop-portal dla KRfb",
"Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb",
"Name[pt_BR]": "Manipulador de eventos xdg-desktop-portal para o KRfb",
"Name[sk]": "Xdg-desktop-portal Obsluha udalostí pre KRfb",
"Name[sl]": "Upravljavec dogodkov za KRfb na osnovi portala Xdg-desktop",
"Name[sv]": "Xdg-desktop-portal händelsehanterare för Krfb",
"Name[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
"Name[x-test]": "xxXdg-desktop-portal Event handler for KRfbxx",
"Name[zh_CN]": "xdg-desktop-portal KRfb 事件处理器",
"Name[zh_TW]": "KRfb 的 Xdg-desktop-portal 事件處理器",
"Version": "0.1",
"Website": "http://www.kde.org"
}
}

2
events/xdp/xdpeventsplugin.cpp
View File

@@ -25,7 +25,7 @@
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(XdpEventsPlugin, "krfb_events_xdp.json")
K_PLUGIN_CLASS(XdpEventsPlugin)
XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
: EventsPlugin(parent, args)