l10n daemon script
8349588c77
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-06 09:54:12 +00:00
Albert Vaca
6c6f2b1a03
Fixed uninitialized members
2015-04-04 10:17:08 -07:00
l10n daemon script
8e729f3ab2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-04 11:03:11 +00:00
l10n daemon script
ff9d6b336b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-03 10:36:58 +00:00
l10n daemon script
cda092d2bb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-31 13:16:15 +00:00
l10n daemon script
92cd693566
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-29 09:58:52 +00:00
l10n daemon script
98bb1ee564
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-27 09:50:58 +00:00
l10n daemon script
2cb090d2c9
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-26 10:12:56 +00:00
l10n daemon script
08eaaf11e1
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-25 09:09:47 +00:00
Aleix Pol
c7cee37330
Port away from KServiceTrader
...
Uses KPluginLoader+KPluginMetadata instead.
Describes plugins in json instead of desktop files. These desktop files are
then embedded into the .so file. All the plugins will be in a kdeconnect/
directory, and those will be the ones to look for.
Note it doesn't drop the KService dependency as KIOCore is a KDE Connect
dependency as well.
REVIEW: 123042
2015-03-19 16:36:53 +01:00
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
l10n daemon script
917104ff99
SVN_SILENT made messages (.desktop file)
2014-12-26 04:20:08 +00:00
l10n daemon script
365b2c55b2
SVN_SILENT made messages (.desktop file)
2014-12-25 04:06:46 +00:00
Albert Vaca
c916575311
Better support for seeking long media:
...
-Using miliseconds instead of nanoseconds for time.
-Using longs instead of ints
CCMAIL: zelitomas@gmail.com
2014-12-13 18:44:20 -08:00
Tomáš Zelina
0782682f7b
Implemented current/total time and progress slider in MPRIS plugin
...
CCMAIL: zelitomas@gmail.com .
2014-12-13 14:43:09 -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
l10n daemon script
3b192ea18e
SVN_SILENT made messages (.desktop file)
2014-11-02 04:01:28 +00: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
1e9df65d50
Port mpris from kDebug to qCDebug
2014-09-22 00:44:47 +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
6ce0b6b874
Document in the desktop files the outgoing types for the plugins
...
This way we narrow the things a plugin can send, to its own scope. Still
every plugin can set a list of types, so it should be ok.
2014-06-14 20:35:00 +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