diff --git a/.reviewboardrc b/.reviewboardrc new file mode 100644 index 000000000..064c03e03 --- /dev/null +++ b/.reviewboardrc @@ -0,0 +1,3 @@ +REVIEWBOARD_URL = "https://git.reviewboard.kde.org" +REPOSITORY = 'git://anongit.kde.org/kdeconnect-kde' +TARGET_GROUPS = 'kdeconnect' diff --git a/cli/Messages.sh b/cli/Messages.sh new file mode 100644 index 000000000..a41563757 --- /dev/null +++ b/cli/Messages.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-cli.pot diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index dcb7b827a..be6a65e71 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -30,7 +30,7 @@ int main(int argc, char** argv) { - K4AboutData about("kctool", 0, ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"), + K4AboutData about("kctool", 0, ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"), K4AboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez")); about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" ); KCmdLineArgs::init(argc, argv, &about); diff --git a/core/Messages.sh b/core/Messages.sh index 2a61de22c..002bda0cf 100755 --- a/core/Messages.sh +++ b/core/Messages.sh @@ -1,10 +1,4 @@ #!/usr/bin/env bash -$EXTRACTRC `find -name '*.ui' -o -name '*.rc'` >> rc.cpp -$XGETTEXT rc.cpp -o $podir/kdeconnect-kded.pot -rm -f rc.cpp - -#.cpp (-j passed to merge into existing file) -$XGETTEXT `find . -name '*.cpp'` -j -o $podir/kdeconnect-kded.pot - -#.desktop and .notifyrc files doesn't need to be included here +$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-core.pot diff --git a/core/daemon.cpp b/core/daemon.cpp index 9b4673359..cc887b62c 100644 --- a/core/daemon.cpp +++ b/core/daemon.cpp @@ -41,6 +41,9 @@ #include "backends/devicelink.h" #include "backends/linkprovider.h" +static const KCatalogLoader loader("kdeconnect-core"); +static const KCatalogLoader loaderPlugins("kdeconnect-plugins"); + struct DaemonPrivate { //Different ways to find devices and connect to them diff --git a/fileitemactionplugin/Messages.sh b/fileitemactionplugin/Messages.sh new file mode 100644 index 000000000..118c91208 --- /dev/null +++ b/fileitemactionplugin/Messages.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-filetiemaction.pot diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index aa65875b4..611a1b3e5 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -1,8 +1,26 @@ [Desktop Entry] Type=Service Name=Send file via KDE Connect service +Name[ca]=Envia un fitxer a través del servei KDE Connect +Name[hu]=Fájl küldése a KDE csatlakozás szolgáltatáson keresztül +Name[nl]=Bestand via de service KDE Connect versturen +Name[pl]=Wyślij plik przez usługę KDE Connect +Name[pt]=Enviar um ficheiro pelo serviço KDE Connect +Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect +Name[sv]=Skicka fil via KDE:s anslutningstjänst +Name[uk]=Надсилання файла за допомогою служби з’єднання KDE +Name[x-test]=xxSend file via KDE Connect servicexx X-KDE-Library=kdeconnectfiletiemaction X-KDE-Submenu=Connect +X-KDE-Submenu[ca]=Connecta +X-KDE-Submenu[hu]=Csatlakozás +X-KDE-Submenu[nl]=Verbinden +X-KDE-Submenu[pl]=Połącz +X-KDE-Submenu[pt]=Ligar +X-KDE-Submenu[pt_BR]=Conectar +X-KDE-Submenu[sv]=Anslut +X-KDE-Submenu[uk]=З’єднання +X-KDE-Submenu[x-test]=xxConnectxx Icon=preferences-system-network ServiceTypes=KFileItemAction/Plugin diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp index 36325c99e..2c3ddf3f1 100644 --- a/fileitemactionplugin/sendfileitemaction.cpp +++ b/fileitemactionplugin/sendfileitemaction.cpp @@ -39,7 +39,7 @@ #include K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin();) -K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnectfiletiemaction")) +K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnect-filetiemaction")) SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KFileItemActionPlugin(parent) { diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 9ccd83dd0..dd2c94146 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -10,4 +10,7 @@ target_link_libraries(kded_kdeconnect KF5::DBusAddons KF5::KDELibs4Support) install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR}) install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) + +#TODO: Split this into several files for core and for each plugin install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect) + diff --git a/kded/Messages.sh b/kded/Messages.sh new file mode 100644 index 000000000..268721e7e --- /dev/null +++ b/kded/Messages.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-kded.pot diff --git a/plugins/Messages.sh b/plugins/Messages.sh new file mode 100644 index 000000000..93278d219 --- /dev/null +++ b/plugins/Messages.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-plugins.pot diff --git a/plugins/battery/batteryplugin.cpp b/plugins/battery/batteryplugin.cpp index ec62c003a..c27f99723 100644 --- a/plugins/battery/batteryplugin.cpp +++ b/plugins/battery/batteryplugin.cpp @@ -28,7 +28,7 @@ #include "batterydbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< BatteryPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_battery", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_battery", "kdeconnect-plugins") ) BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) diff --git a/plugins/clipboard/clipboardplugin.cpp b/plugins/clipboard/clipboardplugin.cpp index eba3421c3..9d51945df 100644 --- a/plugins/clipboard/clipboardplugin.cpp +++ b/plugins/clipboard/clipboardplugin.cpp @@ -24,7 +24,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< ClipboardPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_clipboard", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_clipboard", "kdeconnect-plugins") ) ClipboardPlugin::ClipboardPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index ff7c286b0..8ad04bf1d 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -34,7 +34,7 @@ #include "propertiesdbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< MprisControlPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_mpriscontrol", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_mpriscontrol", "kdeconnect-plugins") ) MprisControlPlugin::MprisControlPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp index 2b7247bf6..c90b50467 100644 --- a/plugins/notifications/notificationsplugin.cpp +++ b/plugins/notifications/notificationsplugin.cpp @@ -26,7 +26,7 @@ #include "notificationsdbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< NotificationsPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_notifications", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_notifications", "kdeconnect-plugins") ) NotificationsPlugin::NotificationsPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/pausemusic/pausemusicplugin.cpp b/plugins/pausemusic/pausemusicplugin.cpp index 46a162764..ed64c6da1 100644 --- a/plugins/pausemusic/pausemusicplugin.cpp +++ b/plugins/pausemusic/pausemusicplugin.cpp @@ -33,7 +33,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PauseMusicPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect-plugins") ) //TODO: Port this away from KMix to use only Pulseaudio int PauseMusicPlugin::isKMixMuted() { diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp index f2de9f501..04972e1de 100644 --- a/plugins/ping/pingplugin.cpp +++ b/plugins/ping/pingplugin.cpp @@ -28,7 +28,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_ping", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_ping", "kdeconnect-plugins") ) PingPlugin::PingPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp index db3eebe92..82dbacd06 100644 --- a/plugins/sftp/sftpplugin.cpp +++ b/plugins/sftp/sftpplugin.cpp @@ -38,7 +38,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SftpPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-plugins") ) static const QSet fields_c = QSet() << "ip" << "port" << "user" << "port" << "path"; diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp index 2f09ad254..a95cd0ac1 100644 --- a/plugins/share/shareplugin.cpp +++ b/plugins/share/shareplugin.cpp @@ -38,7 +38,7 @@ #include "autoclosingqfile.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SharePlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_share", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_share", "kdeconnect-plugins") ) SharePlugin::SharePlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp index b3484e47b..2399d877b 100644 --- a/plugins/telephony/telephonyplugin.cpp +++ b/plugins/telephony/telephonyplugin.cpp @@ -26,7 +26,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< TelephonyPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect-plugins") ) TelephonyPlugin::TelephonyPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args)