[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a303b73
The following commit has been merged in the master branch:
commit a303b732389130358ea9d58a3be4e7388dd35c89
Merge: e1813b16f3209ae024fc0144b229e1be4d464b5e cd8864fd92f7d624f74a7998a5f4c59e5a698652
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Jul 1 23:59:38 2014 +0200
Merge branch 'master' into frameworks
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
plasmoid/package/contents/ui/FullRepresentation.qml
plugins/ping/pingplugin.cpp
.gitignore | 2 +-
cli/kdeconnect-cli.cpp | 71 ++++++++++++++---
cmake/FindXTest.cmake | 48 +++++++++++
core/CMakeLists.txt | 15 +++-
core/backends/lan/landevicelink.cpp | 4 +-
core/backends/lan/lanlinkprovider.cpp | 22 +++---
core/backends/lan/uploadjob.cpp | 2 +-
core/daemon.cpp | 24 +++---
core/device.cpp | 29 +++----
core/device.h | 1 -
core/filetransferjob.cpp | 16 ++--
core/kdebugnamespace.cpp | 28 -------
core/kdebugnamespace.h | 6 +-
core/networkpackage.cpp | 8 +-
core/pluginloader.cpp | 10 +--
fileitemactionplugin/kdeconnectsendfile.desktop | 4 +
fileitemactionplugin/sendfileitemaction.cpp | 1 +
interfaces/CMakeLists.txt | 1 -
interfaces/devicesmodel.cpp | 21 +++--
interfaces/devicesmodel.h | 11 ++-
interfaces/kdebugnamespace.cpp | 27 -------
interfaces/kdebugnamespace.h | 29 -------
interfaces/notificationsmodel.cpp | 9 ++-
kcm/CMakeLists.txt | 1 -
kcm/devicessortproxymodel.cpp | 7 +-
kcm/kcm.cpp | 6 +-
kcm/kdebugnamespace.cpp | 26 ------
kcm/kdebugnamespace.h | 29 -------
kded/kdeconnectd.cpp | 2 +
kded/kded.cpp | 22 +++---
kio/CMakeLists.txt | 2 +-
kio/kdebugnamespace.cpp | 26 ------
kio/kdebugnamespace.h | 29 -------
kio/kiokdeconnect.cpp | 14 ++--
plasmoid/package/contents/ui/Battery.qml | 4 +-
.../package/contents/ui/FullRepresentation.qml | 15 +---
plasmoid/package/metadata.desktop | 42 +++++-----
plugins/CMakeLists.txt | 1 +
plugins/battery/batterydbusinterface.cpp | 7 +-
plugins/battery/batterydbusinterface.h | 4 +-
plugins/battery/batteryplugin.cpp | 2 +-
plugins/clipboard/kdeconnect_clipboard.desktop | 2 +
plugins/kdeconnect_plugin.desktop | 2 +-
plugins/mousepad/CMakeLists.txt | 15 ++++
plugins/mousepad/README | 5 ++
plugins/mousepad/kdeconnect_mousepad.desktop | 18 +++++
plugins/mousepad/mousepadplugin.cpp | 92 ++++++++++++++++++++++
.../mousepadplugin.h} | 29 ++++---
plugins/mpriscontrol/mpriscontrolplugin.cpp | 20 ++---
.../notifications/notificationsdbusinterface.cpp | 12 ++-
plugins/notifications/notificationsdbusinterface.h | 4 +-
plugins/ping/kdeconnect_ping.desktop | 2 +-
plugins/ping/pingplugin.cpp | 23 +++++-
plugins/ping/pingplugin.h | 7 +-
plugins/sftp/mounter.cpp | 22 +++---
plugins/sftp/sftpplugin.cpp | 16 ++--
plugins/share/shareplugin.cpp | 12 +--
plugins/telephony/telephonyplugin.cpp | 2 +-
58 files changed, 489 insertions(+), 422 deletions(-)
diff --cc cli/kdeconnect-cli.cpp
index be6a65e,08accee..454143e
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@@ -21,17 -21,18 +21,20 @@@
#include <KApplication>
#include <KUrl>
#include <kcmdlineargs.h>
+#include <k4aboutdata.h>
#include <kaboutdata.h>
#include <interfaces/devicesmodel.h>
+ #include <interfaces/notificationsmodel.h>
+ #include <interfaces/dbusinterfaces.h>
#include <iostream>
#include <QDBusMessage>
#include <QDBusConnection>
int main(int argc, char** argv)
{
- K4AboutData about("kctool", 0, ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
- K4AboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
+ KAboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
+ KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
++
about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol at kde.org" );
KCmdLineArgs::init(argc, argv, &about);
KCmdLineOptions options;
diff --cc core/CMakeLists.txt
index b2d0d89,49bcaba..d8ed92c
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@@ -1,8 -1,12 +1,13 @@@
project(KDEConnectCore)
+add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-core\")
+
+ set(KDECONNECT_VERSION_MAJOR 1)
+ set(KDECONNECT_VERSION_MINOR 0)
+ set(KDECONNECT_VERSION_PATCH 1)
+ set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
+
include_directories(
- ${KDE4_KIO_LIBS}
${QJSON_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QCA2_INCLUDE_DIR}
@@@ -24,21 -28,23 +29,23 @@@ set(kded_kdeconnect_SRC
filetransferjob.cpp
daemon.cpp
device.cpp
- kdebugnamespace.cpp
)
-kde4_add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS})
+add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS})
+target_link_libraries(kdeconnectcore
+PUBLIC
+ KF5::KDELibs4Support
-
+PRIVATE
+ KF5::KIOWidgets
+ KF5::KCMUtils
+ Qt5::Network
- ${QJSON_LIBRARIES}
- ${QCA2_LIBRARIES}
+)
++
+ set_target_properties(kdeconnectcore PROPERTIES
+ VERSION ${KDECONNECT_VERSION}
+ SOVERSION ${KDECONNECT_VERSION_MAJOR}
+ )
+
-target_link_libraries(kdeconnectcore
-LINK_PUBLIC
- ${KDE4_KDECORE_LIBS}
-LINK_PRIVATE
- ${KDE4_KIO_LIBS}
- ${QJSON_LIBRARIES}
- ${QT_QTNETWORK_LIBRARY}
- ${QCA2_LIBRARIES}
-)
target_include_directories(kdeconnectcore PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
generate_export_header(kdeconnectcore EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectcore_export.h BASE_NAME KDEConnectCore)
diff --cc core/kdebugnamespace.h
index 037852d,c7a094a..4662097
--- a/core/kdebugnamespace.h
+++ b/core/kdebugnamespace.h
@@@ -22,9 -22,12 +22,13 @@@
#define KDEBUG_KDECONNECT_KDED_H
#include <KDebug>
+#include <kdemacros.h>
- KDE_EXPORT int kdeconnect_kded();
+ inline int debugArea()
+ {
+ static int theArea = KDebug::registerArea("kdeconnect");
+ return theArea;
+ };
#endif
diff --cc kcm/CMakeLists.txt
index 0151b0d,0e30819..7f6d069
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@@ -7,18 -7,17 +7,17 @@@ include_directories(${CMAKE_CURRENT_BIN
set(kcm_SRCS
kcm.cpp
devicessortproxymodel.cpp
- kdebugnamespace.cpp
)
-kde4_add_ui_files(kcm_SRCS kcm.ui)
+qt5_wrap_ui(kcm_SRCS kcm.ui)
-kde4_add_plugin(kcm_kdeconnect ${kcm_SRCS})
+add_library(kcm_kdeconnect MODULE ${kcm_SRCS})
target_link_libraries(kcm_kdeconnect
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${KDE4_KDEUI_LIBRARY}
- ${KDE4_KCMUTILS_LIBS}
+ Qt5::Core
+ Qt5::Gui
+ KF5::KDELibs4Support
+ KF5::KCMUtils
kdeconnectinterfaces
)
diff --cc kcm/kcm.cpp
index fd5fbea,746c7c8..fe45390
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@@ -32,10 -32,10 +32,12 @@@
#include <KServiceTypeTrader>
#include <KPluginInfo>
#include <KPluginFactory>
+#include <KAboutData>
#include <KStandardDirs>
+#include <KLocalizedString>
+ #include <core/kdebugnamespace.h>
+
#include "ui_kcm.h"
#include "interfaces/dbusinterfaces.h"
#include "interfaces/devicesmodel.h"
@@@ -252,8 -251,6 +253,9 @@@ void KdeConnectKcm::save(
void KdeConnectKcm::sendPing()
{
if (!currentDevice) return;
- currentDevice->sendPing();
+ QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+currentDevice->id()+"/ping", "org.kde.kdeconnect.device.ping", "sendPing");
+ QDBusConnection::sessionBus().call(msg);
}
+
+#include "kcm.moc"
+#include "moc_kcm.cpp"
diff --cc kded/kded.cpp
index a08e91b,2ec9062..a7c5c75
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@@ -116,7 -114,5 +114,7 @@@ void Kded::checkIfDaemonTerminated(
}
m_daemon->kill();
- kWarning(theArea) << "Daemon killed";
+ kWarning(debugArea()) << "Daemon killed";
}
+
+#include "kded.moc"
diff --cc kio/CMakeLists.txt
index 96a95a2,b54bb1a..d025307
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@@ -2,15 -2,16 +2,15 @@@ include_directories(${CMAKE_SOURCE_DIR}
set(kio_kdeconnect_PART_SRCS
kiokdeconnect.cpp
- kdebugnamespace.cpp)
+ )
-kde4_add_plugin(kio_kdeconnect ${kio_kdeconnect_PART_SRCS})
+add_library(kio_kdeconnect MODULE ${kio_kdeconnect_PART_SRCS})
target_link_libraries(kio_kdeconnect
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KIO_LIBRARY}
- ${KDE4_KDEUI_LIBRARY}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
+ KF5::KIOCore
+ KF5::KDELibs4Support
+ Qt5::Core
+ Qt5::Gui
kdeconnectinterfaces
)
diff --cc kio/kiokdeconnect.cpp
index 64ba6ff,3b8e84e..e2442a7
--- a/kio/kiokdeconnect.cpp
+++ b/kio/kiokdeconnect.cpp
@@@ -30,10 -30,9 +30,10 @@@
#include <KProcess>
#include <KApplication>
#include <KLocale>
+#include <k4aboutdata.h>
+#include <kdemacros.h>
- #include "kdebugnamespace.h"
+ #include <core/kdebugnamespace.h>
extern "C" int KDE_EXPORT kdemain(int argc, char **argv)
{
@@@ -183,9 -182,9 +183,9 @@@ void KioKdeconnect::listDevice(
-void KioKdeconnect::listDir(const KUrl &url)
+void KioKdeconnect::listDir(const QUrl &url)
{
- kDebug(kdeconnect_kio()) << "Listing..." << url;
+ kDebug(debugArea()) << "Listing..." << url;
/// Url is not used here becuase all we could care about the url is the host, and that's already
/// handled in @p setHost
@@@ -205,9 -204,9 +205,9 @@@
}
}
-void KioKdeconnect::stat(const KUrl &url)
+void KioKdeconnect::stat(const QUrl &url)
{
- kDebug(kdeconnect_kio()) << "Stat: " << url;
+ kDebug(debugArea()) << "Stat: " << url;
KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
@@@ -216,9 -215,9 +216,9 @@@
finished();
}
-void KioKdeconnect::get(const KUrl &url)
+void KioKdeconnect::get(const QUrl &url)
{
- kDebug(kdeconnect_kio()) << "Get: " << url;
+ kDebug(debugArea()) << "Get: " << url;
mimeType("");
finished();
}
diff --cc plasmoid/package/contents/ui/FullRepresentation.qml
index 497f6ec,27a594e..e865c0d
--- a/plasmoid/package/contents/ui/FullRepresentation.qml
+++ b/plasmoid/package/contents/ui/FullRepresentation.qml
@@@ -59,12 -63,12 +59,13 @@@ Item
id: dialogItem
anchors.fill: parent
- flickableItem: ListView {
+ ListView {
id: devicesView
anchors.fill: parent
- model: KdeConnect.DevicesModel {
+ model: DevicesModel {
id: connectDeviceModel
- displayFilter: 0x11
- displayFilter: 3
++ displayFilter: StatusFlags.StatusPaired | StatusFlags.StatusReachable
++
}
delegate: DeviceDelegate { }
onCountChanged: shouldPlasmoidBeShown()
@@@ -72,14 -76,14 +73,4 @@@
}
}
--/*
-- ListView {
-- anchors.fill: parent
-- id: devicesView
-- model: KdeConnect.DevicesModel {
- displayFilter: 0x11
- displayFilter: 3
-- }
-- delegate: DeviceDelegate {}
-- }
--*/
}
diff --cc plugins/mpriscontrol/mpriscontrolplugin.cpp
index 8ad04bf,dba821e..7bd2251
--- a/plugins/mpriscontrol/mpriscontrolplugin.cpp
+++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp
@@@ -89,7 -89,7 +89,7 @@@ void MprisControlPlugin::addPlayer(cons
void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, const QVariantMap& properties)
{
Q_UNUSED(propertyInterface);
--
++
NetworkPackage np(PACKAGE_TYPE_MPRIS);
bool somethingToSend = false;
if (properties.contains("Volume")) {
diff --cc plugins/ping/pingplugin.cpp
index 04972e1,b0616e1..7a2f496
--- a/plugins/ping/pingplugin.cpp
+++ b/plugins/ping/pingplugin.cpp
@@@ -54,4 -55,19 +55,22 @@@ bool PingPlugin::receivePackage(const N
}
+ void PingPlugin::sendPing()
+ {
+ NetworkPackage np(PACKAGE_TYPE_PING);
+ bool success = sendPackage(np);
+ kDebug(debugArea()) << "sendPing:" << success;
+ }
+
+ void PingPlugin::connected()
+ {
+ QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+ }
+
+ QString PingPlugin::dbusPath() const
+ {
+ return "/modules/kdeconnect/devices/" + device()->id() + "/ping";
+ }
++
+#include "pingplugin.moc"
++
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list