Albert Vaca
c7c1974ea9
Merge branch 'master' into frameworks
...
Conflicts:
core/backends/lan/lanlinkprovider.cpp
plugins/ping/pingplugin.h
plugins/telephony/telephonyplugin.cpp
2015-01-10 20:14:01 -08:00
Mikhail Ivchenko
f6e7b04514
Added a button to incoming call notifications to mute the phone ringing.
...
REVIEW: 121854
2015-01-05 21:58:23 -08:00
Albert Vaca
a58fab4fb3
Merge branch 'master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
core/device.cpp
core/filetransferjob.cpp
core/filetransferjob.h
core/networkpackage.h
kded/CMakeLists.txt
plugins/share/shareplugin.cpp
plugins/telephony/telephonyplugin.cpp
2014-11-11 21:40:54 -08:00
Lukáš Tinkl
e869fc019f
give missed calls and SMSs persistent status
...
see https://plus.google.com/108821248346337473429/posts/jYbeLLZCL9H
2014-11-10 18:38:24 +01:00
Albert Vaca
7d3fe6239c
Updating .notifyrc file
2014-11-09 20:36:45 -08:00
Aleix Pol
21ab5a4f81
Merge branch 'master' into frameworks
...
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
core/backends/lan/lanlinkprovider.cpp
core/daemon.cpp
core/pluginloader.cpp
interfaces/CMakeLists.txt
kio/kiokdeconnect.cpp
plugins/mousepad/CMakeLists.txt
plugins/mousepad/mousepadplugin.h
plugins/mpriscontrol/mpriscontrolplugin.cpp
plugins/sftp/sftpplugin.cpp
2014-11-04 19:12:29 +01:00
Albert Vaca
279dbe5598
Minor changes
2014-10-10 11:47:35 -07:00
Àlex Fiestas
dbea3171bd
Make kdeconnect core compile without KDELibs4Support
...
This meant to add a lot of dependencies to each plugin since we had
KDELibs4support as PUBLIC link meaning that anything linking against
kdeconnectcore was linking at the same time to mostly all frameworks.
Now each plugin has more or less its dependencies in the CMake some
still depend on KDELibs4Support.
For the mousepad plugin I needed to add a fixX11.h file that basically
undefines/defines again some stuff xlib has that conflcits with normal
C++ and Qt.
Before it was not conflicting because some lib within KDELibs4Support
was including this file, but now we have to do it ourselves.
2014-09-22 02:40:51 +02:00
Àlex Fiestas
677f650216
Removed K_EXPORT_PLUGIN, no longer needed
...
With kf5 this is not longer needed. removing it!
2014-09-22 02:40:51 +02:00
Àlex Fiestas
3b5ab5e83f
Port Telephony plugin from kDebug to qCDebug
2014-09-22 00:46:41 +02:00
Àlex Fiestas
42269a9dda
Port from KIcon to QIcon
...
Executed kcm and some notifications, icons are still shown.
2014-09-13 01:04:48 +02:00
Albert Vaca
a303b73238
Merge branch 'master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
plasmoid/package/contents/ui/FullRepresentation.qml
plugins/ping/pingplugin.cpp
2014-07-01 23:59:38 +02:00
Albert Vaca
cabb0f2f7b
Simplified debug areas so we only have one, called "kdeconnect"
2014-07-01 01:26:08 +02:00
Aleix Pol
b618a64f51
Merge remote-tracking branch 'origin/master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
2014-06-18 02:46:14 +02:00
Albert Vaca
dd43479956
Now plugins load by default the kdeconnect-plugins catalog.
2014-06-17 22:21:20 +02:00
Aleix Pol
a1a560c469
First approach to a KF5 port of KDE Connect
...
Ported using KDELibs4Support, for a smaller delta, so we can keep
developing on master until we decide not to.
At the moment, it builds and installs but tests don't pass because
of a QCA2 initialization problem I didn't manage to debug yet.
CCMAIL: kdeconnect@kde.org
2014-06-16 20:02:07 +02:00
Aleix Pol
741abafaf7
Move the plugins into a different top-ĺevel directory
...
Reviewed by Albert Vaca
2014-06-14 16:34:11 +02:00
