tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into frameworks

Browse source 
Conflicts:
	cli/kdeconnect-cli.cpp
This commit is contained in:
Aleix Pol 2014-06-18 02:46:14 +02:00
commit b618a64f51
20 changed files with 54 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.reviewboardrc Normal file
View file

@ -0,0 +1,3 @@
REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
REPOSITORY = 'git://anongit.kde.org/kdeconnect-kde'
TARGET_GROUPS = 'kdeconnect'

3
cli/Messages.sh Normal file
View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-cli.pot

2
cli/kdeconnect-cli.cpp
View file

@ -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);

10
core/Messages.sh
View file

@ -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

3
core/daemon.cpp
View file

@ -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

3
fileitemactionplugin/Messages.sh Normal file
View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-filetiemaction.pot

18
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -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

2
fileitemactionplugin/sendfileitemaction.cpp
View file

@ -39,7 +39,7 @@
#include <KUrl>
K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin<SendFileItemAction>();)
K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnectfiletiemaction"))
K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnect-filetiemaction"))
SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KFileItemActionPlugin(parent)
{

3
kded/CMakeLists.txt
View file

@ -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)

4
kded/Messages.sh Normal file
View file

@ -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

4
plugins/Messages.sh Normal file
View file

@ -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

2
plugins/battery/batteryplugin.cpp
View file

@ -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)

2
plugins/clipboard/clipboardplugin.cpp
View file

@ -24,7 +24,7 @@
#include <QApplication>
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)

2
plugins/mpriscontrol/mpriscontrolplugin.cpp
View file

@ -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)

2
plugins/notifications/notificationsplugin.cpp
View file

@ -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)

2
plugins/pausemusic/pausemusicplugin.cpp
View file

@ -33,7 +33,7 @@
#include <core/networkpackage.h>
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() {

2
plugins/ping/pingplugin.cpp
View file

@ -28,7 +28,7 @@
#include <core/device.h>
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)

2
plugins/sftp/sftpplugin.cpp
View file

@ -38,7 +38,7 @@
#include <core/kdebugnamespace.h>
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<QString> fields_c = QSet<QString>() << "ip" << "port" << "user" << "port" << "path";

2
plugins/share/shareplugin.cpp
View file

@ -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)

2
plugins/telephony/telephonyplugin.cpp
View file

@ -26,7 +26,7 @@
#include <core/kdebugnamespace.h>
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)