[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:03 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=8f0e1a2
The following commit has been merged in the master branch:
commit 8f0e1a227992779abd11ea33d1b6495293c0142f
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Oct 1 03:12:32 2013 +0200
Renamed plugin filetransfer -> sharereceiver
---
kded/networkpackagetypes.h | 2 +-
kded/plugins/CMakeLists.txt | 2 +-
.../filetransfer/kdeconnect_filetransfer.desktop | 27 ----------------------
.../{filetransfer => sharereceiver}/CMakeLists.txt | 12 +++++-----
.../plugins/{filetransfer => sharereceiver}/README | 2 +-
.../autoclosingqfile.cpp | 0
.../autoclosingqfile.h | 0
.../sharereceiver/kdeconnect_sharereceiver.desktop | 15 ++++++++++++
.../sharereceiverplugin.cpp} | 18 +++++++--------
.../sharereceiverplugin.h} | 8 +++----
10 files changed, 37 insertions(+), 49 deletions(-)
diff --git a/kded/networkpackagetypes.h b/kded/networkpackagetypes.h
index f60b8fa..6fa9ff8 100644
--- a/kded/networkpackagetypes.h
+++ b/kded/networkpackagetypes.h
@@ -30,7 +30,7 @@
#define PACKAGE_TYPE_TELEPHONY QString("kdeconnect.telephony")
#define PACKAGE_TYPE_CLIPBOARD QString("kdeconnect.clipboard")
#define PACKAGE_TYPE_MPRIS QString("kdeconnect.mpris")
-#define PACKAGE_TYPE_FILETRANSFER QString("kdeconnect.filetransfer")
+#define PACKAGE_TYPE_SHARE QString("kdeconnect.share")
#endif // NETWORKPACKAGETYPES_H
diff --git a/kded/plugins/CMakeLists.txt b/kded/plugins/CMakeLists.txt
index a8992c2..f0385af 100644
--- a/kded/plugins/CMakeLists.txt
+++ b/kded/plugins/CMakeLists.txt
@@ -7,6 +7,6 @@ add_subdirectory(mpriscontrol)
add_subdirectory(clipboard)
add_subdirectory(telephony)
add_subdirectory(battery)
-add_subdirectory(filetransfer)
+add_subdirectory(sharereceiver)
add_subdirectory(notifications)
diff --git a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop
deleted file mode 100644
index 4a82f63..0000000
--- a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Service
-ServiceTypes=KdeConnect/Plugin
-X-KDE-Library=kdeconnect_filetransfer
-X-KDE-PluginInfo-Author=Albert Vaca
-X-KDE-PluginInfo-Email=albertvaka at gmail.com
-X-KDE-PluginInfo-Name=kdeconnect_filetransfer
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://albertvaka.wordpress.com
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-Icon=folder-downloads
-Name=File transfer
-Name[pt]=Transferência de ficheiros
-Name[pt_BR]=Transferência de arquivos
-Name[sv]=Filöverföring
-Name[uk]=Модуль передавання файлів
-Name[x-test]=xxFile transferxx
-Comment=Send and receive files from dolphin
-Comment[de]=Dateien aus Dolphin senden und empfangen
-Comment[nl]=Bestanden verzenden en ontvangen vanuit dolphin
-Comment[pt]=Enviar e receber ficheiros a partir do Dolphin
-Comment[pt_BR]=Envia e recebe arquivos a partir do Dolphin
-Comment[sv]=Skicka och ta emot filer med Dolphin
-Comment[uk]=Надсилання і отримання файлів з dolphin
-Comment[x-test]=xxSend and receive files from dolphinxx
diff --git a/kded/plugins/filetransfer/CMakeLists.txt b/kded/plugins/sharereceiver/CMakeLists.txt
similarity index 60%
rename from kded/plugins/filetransfer/CMakeLists.txt
rename to kded/plugins/sharereceiver/CMakeLists.txt
index f95a5ff..7b32157 100644
--- a/kded/plugins/filetransfer/CMakeLists.txt
+++ b/kded/plugins/sharereceiver/CMakeLists.txt
@@ -11,8 +11,8 @@ include_directories(
${CMAKE_SOURCE_DIR}
)
-set(kdeconnect_filetransfer_SRCS
- filetransferplugin.cpp
+set(kdeconnect_sharereceiver_SRCS
+ sharereceiverplugin.cpp
autoclosingqfile.cpp
../kdeconnectplugin.cpp
../pluginloader.cpp
@@ -21,9 +21,9 @@ set(kdeconnect_filetransfer_SRCS
../../device.cpp
)
-kde4_add_plugin(kdeconnect_filetransfer ${kdeconnect_filetransfer_SRCS})
+kde4_add_plugin(kdeconnect_sharereceiver ${kdeconnect_sharereceiver_SRCS})
-target_link_libraries(kdeconnect_filetransfer
+target_link_libraries(kdeconnect_sharereceiver
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
@@ -32,5 +32,5 @@ target_link_libraries(kdeconnect_filetransfer
${QCA2_LIBRARIES}
)
-install(TARGETS kdeconnect_filetransfer DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(FILES kdeconnect_filetransfer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install(TARGETS kdeconnect_sharereceiver DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(FILES kdeconnect_sharereceiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/kded/plugins/filetransfer/README b/kded/plugins/sharereceiver/README
similarity index 86%
rename from kded/plugins/filetransfer/README
rename to kded/plugins/sharereceiver/README
index 369170f..e35b188 100644
--- a/kded/plugins/filetransfer/README
+++ b/kded/plugins/sharereceiver/README
@@ -1,5 +1,5 @@
-It receives a packages with type kdeconnect.filetransfer. If they have a payload
+It receives a packages with type kdeconnect.share. If they have a payload
attached, it will download it as a file with the filename set in the field
"filename" (string). If that field is not set it should generate a filename.
diff --git a/kded/plugins/filetransfer/autoclosingqfile.cpp b/kded/plugins/sharereceiver/autoclosingqfile.cpp
similarity index 100%
rename from kded/plugins/filetransfer/autoclosingqfile.cpp
rename to kded/plugins/sharereceiver/autoclosingqfile.cpp
diff --git a/kded/plugins/filetransfer/autoclosingqfile.h b/kded/plugins/sharereceiver/autoclosingqfile.h
similarity index 100%
rename from kded/plugins/filetransfer/autoclosingqfile.h
rename to kded/plugins/sharereceiver/autoclosingqfile.h
diff --git a/kded/plugins/sharereceiver/kdeconnect_sharereceiver.desktop b/kded/plugins/sharereceiver/kdeconnect_sharereceiver.desktop
new file mode 100644
index 0000000..98feecc
--- /dev/null
+++ b/kded/plugins/sharereceiver/kdeconnect_sharereceiver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+ServiceTypes=KdeConnect/Plugin
+X-KDE-Library=kdeconnect_sharereceiver
+X-KDE-PluginInfo-Author=Albert Vaca
+X-KDE-PluginInfo-Email=albertvaka at gmail.com
+X-KDE-PluginInfo-Name=kdeconnect_sharereceiver
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://albertvaka.wordpress.com
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
+Icon=folder-downloads
+Name=Share receiver
+Comment=Receive files and URLs shared from your phone
diff --git a/kded/plugins/filetransfer/filetransferplugin.cpp b/kded/plugins/sharereceiver/sharereceiverplugin.cpp
similarity index 87%
rename from kded/plugins/filetransfer/filetransferplugin.cpp
rename to kded/plugins/sharereceiver/sharereceiverplugin.cpp
index 13b56cb..c301de2 100644
--- a/kded/plugins/filetransfer/filetransferplugin.cpp
+++ b/kded/plugins/sharereceiver/sharereceiverplugin.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "filetransferplugin.h"
+#include "sharereceiverplugin.h"
#include <KIcon>
#include <KLocalizedString>
@@ -32,10 +32,10 @@
#include "../../filetransferjob.h"
#include "autoclosingqfile.h"
-K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< FileTransferPlugin >(); )
-K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_filetransfer", "kdeconnect_filetransfer") )
+K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< ShareReceiverPlugin >(); )
+K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sharereceiver", "kdeconnect_sharereceiver") )
-FileTransferPlugin::FileTransferPlugin(QObject* parent, const QVariantList& args)
+ShareReceiverPlugin::ShareReceiverPlugin(QObject* parent, const QVariantList& args)
: KdeConnectPlugin(parent, args)
{
//TODO: Use downloads user path
@@ -44,7 +44,7 @@ FileTransferPlugin::FileTransferPlugin(QObject* parent, const QVariantList& args
if (!mDestinationDir.endsWith('/')) mDestinationDir.append('/');
}
-bool FileTransferPlugin::receivePackage(const NetworkPackage& np)
+bool ShareReceiverPlugin::receivePackage(const NetworkPackage& np)
{
/*
//TODO: Move this code to a test and add a diff between files
@@ -52,7 +52,7 @@ bool FileTransferPlugin::receivePackage(const NetworkPackage& np)
qDebug() << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc");
- NetworkPackage out(PACKAGE_TYPE_FILETRANSFER);
+ NetworkPackage out(PACKAGE_TYPE_SHARE);
out.set("filename", mDestinationDir + "itworks.txt");
//TODO: Use shared pointers
AutoClosingQFile* file = new AutoClosingQFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc"); //Test file to transfer
@@ -66,7 +66,7 @@ bool FileTransferPlugin::receivePackage(const NetworkPackage& np)
}
*/
- if (np.type() != PACKAGE_TYPE_FILETRANSFER) return false;
+ if (np.type() != PACKAGE_TYPE_SHARE) return false;
qDebug() << "File transfer";
if (np.hasPayload()) {
@@ -103,7 +103,7 @@ bool FileTransferPlugin::receivePackage(const NetworkPackage& np)
}
-void FileTransferPlugin::finished(KJob* job)
+void ShareReceiverPlugin::finished(KJob* job)
{
qDebug() << "File transfer finished";
@@ -118,7 +118,7 @@ void FileTransferPlugin::finished(KJob* job)
notification->sendEvent();
}
-void FileTransferPlugin::openDestinationFolder()
+void ShareReceiverPlugin::openDestinationFolder()
{
QDesktopServices::openUrl(mDestinationDir);
}
diff --git a/kded/plugins/filetransfer/filetransferplugin.h b/kded/plugins/sharereceiver/sharereceiverplugin.h
similarity index 88%
rename from kded/plugins/filetransfer/filetransferplugin.h
rename to kded/plugins/sharereceiver/sharereceiverplugin.h
index 1b49f7a..2def1d8 100644
--- a/kded/plugins/filetransfer/filetransferplugin.h
+++ b/kded/plugins/sharereceiver/sharereceiverplugin.h
@@ -18,21 +18,21 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef FILETRANFERPLUGIN_H
-#define FILETRANFERPLUGIN_H
+#ifndef SHARERECEIVERPLUGIN_H
+#define SHARERECEIVERPLUGIN_H
#include <KNotification>
#include <KIO/Job>
#include "../kdeconnectplugin.h"
-class FileTransferPlugin
+class ShareReceiverPlugin
: public KdeConnectPlugin
{
Q_OBJECT
public:
- explicit FileTransferPlugin(QObject *parent, const QVariantList &args);
+ explicit ShareReceiverPlugin(QObject *parent, const QVariantList &args);
public Q_SLOTS:
virtual bool receivePackage(const NetworkPackage& np);
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list