Commit graph

43 commits

Author SHA1 Message Date
l10n daemon script
5795e27191 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-09-10 11:33:23 +00:00
Aleix Pol
d58f6314fe run Clang Modernize
Minus the auto change
2015-09-08 10:47:37 +02:00
l10n daemon script
397e6f69e3 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-05-26 13:51:37 +00:00
l10n daemon script
ab93807baf 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-05-25 10:12:32 +00:00
l10n daemon script
3efaae6f88 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-05-03 10:29:27 +00:00
Aleix Pol
3caf5e7908 Move some find_package dependencies to the children directories as agreed 2015-04-10 17:48:48 +02:00
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
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
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
Albert Vaca
a5e5b10d9a Code styling 2015-03-21 23:12:04 -07:00
Albert Vaca
4477ff29d9 Fixed Dolphin's extension
It was not working because it used the model (that is now async) instead
of dbus interfaces.

CCMAIL: aleixpol@kde.org
2015-03-21 22:50:00 -07:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
5f0811dff8 SVN_SILENT made messages (.desktop file) 2015-02-21 04:46:14 +00: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
73e3a1d683 SVN_SILENT made messages (.desktop file) 2015-01-02 04:06:52 +00: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
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
l10n daemon script
0b511a73cc SVN_SILENT made messages (.desktop file) 2014-10-05 04:22:42 +00:00
Àlex Fiestas
0c0cfb711d Port fileitemactionplugin free of KDELibs4Support 2014-09-23 19:33:03 +02:00
l10n daemon script
3ea4264652 SVN_SILENT made messages (.desktop file) 2014-09-23 04:52:04 +00: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
02fd748f41 Interfaces no longer depend on kdelibs4support
Also since fileitemactionplugin was using them (and inhering
kdelibs4support) not we have tu explicitly link against it in there.
2014-09-22 00:16:39 +02:00
Àlex Fiestas
101c741266 Make sendfileitemaction ready for qCDebug
We are not using debug statements in this pluging, but for when we do
debugging will be ready.
2014-09-22 00:15:36 +02:00
Àlex Fiestas
53830bfa68 Use QUrl instead of KUrl in fileitemactionplugin
Again, straight forward port, simple replace works.
2014-09-21 22:22:47 +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
l10n daemon script
afc3c33f99 SVN_SILENT made messages (.desktop file) 2014-09-11 04:17:22 +00:00
Lukáš Tinkl
743f7548e0 i18n fixes 2014-09-08 03:09:18 +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
l10n daemon script
a48b066ab4 SVN_SILENT made messages (.desktop file) 2014-06-29 04:35:25 +00:00
Aleix Pol
59cab0dc06 When trying to send file, actually tell the plugin to send the file
Works wonderfully on new apk's. \o/

Reviewed by Albert Vaca
2014-06-27 16:46:49 +02:00
l10n daemon script
7cbd1c0d57 SVN_SILENT made messages (.desktop file) 2014-06-24 05:03:52 +00:00
Aleix Pol
16aaa9f77c Merge branch 'master' into frameworks 2014-06-21 02:06:50 +02:00
l10n daemon script
2da541f5f6 SVN_SILENT made messages (.desktop file) 2014-06-20 04:55:41 +00:00
l10n daemon script
c23b83ea09 SVN_SILENT made messages (.desktop file) 2014-06-19 04:30:11 +00: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
f12a3768b4 Translated sendfileitemaction and the CLI 2014-06-17 22:21:58 +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
l10n daemon script
43267c74cc SVN_SILENT made messages (.desktop file) 2014-06-16 04:30:47 +00:00
Aleix Pol
9459001fbe Use the icon for the device, in the file item actions
This way, we have visual information of what type of file we're sending it
to.
2014-06-14 19:42:34 +02:00
Aleix Pol
61fcf3f4ba Improve exposed actions
If there's no paired devices, show nothing.
If there's one, just one action to send directly from.
If there's more, then show the submenu
2014-06-14 19:42:33 +02:00
Aleix Pol
a2e6632759 Introduce a fileitemactionplugin
This way we can send files to all devices.
2014-06-14 19:42:33 +02:00