Commit graph

82 commits

Author SHA1 Message Date
l10n daemon script
2d56c59386 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"
2016-09-14 09:17:50 +00:00
Aleix Pol
596e4484f4 Clean up use of virtual and override keywords
Only use virtual when actually virtual, to override just use override.
2016-06-20 19:22:29 +02:00
Albert Vaca
73f5996f14 Consistent naming of _REQUEST package type macros 2016-06-03 00:47:03 +02:00
Albert Vaca
5f8356b6db Renaming a package type was a bad call 2016-06-03 00:47:03 +02:00
Aleix Pol
e7578cc129 Refactor capabilities together with Albert
He is committing a similar patch to kdeconnect-android
2016-05-31 17:16:01 +02:00
l10n daemon script
45d5068143 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"
2016-01-05 13:22:15 +00:00
Albert Vaca
517c02451b Merge branch '0.9'
# Conflicts:
#	kdeconnect.appdata.xml
#	plugins/mprisremote/kdeconnect_mprisremote.json
#	plugins/ping/kdeconnect_ping.json
#	plugins/remotecontrol/kdeconnect_remotecontrol.json
2016-01-02 12:51:30 -08:00
l10n daemon script
a0c1a57999 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-12-30 09:23:05 +00:00
l10n daemon script
6434909e79 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-12-29 11:22:52 +00:00
l10n daemon script
1473868bc8 SVN_SILENT made messages (.desktop file) 2015-11-17 15:24:49 +00:00
l10n daemon script
fc2bd97e69 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-11-17 12:54:36 +00:00
l10n daemon script
eed4eb66fd SVN_SILENT made messages (.desktop file) 2015-11-13 13:01:51 +00:00
l10n daemon script
04d52fb022 SVN_SILENT made messages (.desktop file) 2015-11-11 13:05:11 +00:00
l10n daemon script
0145c837db 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-11-11 10:30:30 +00:00
l10n daemon script
0b4d36546c SVN_SILENT made messages (.desktop file) 2015-11-04 19:54:08 +00:00
l10n daemon script
e424bcec1a 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-11-04 17:00:05 +00:00
l10n daemon script
7bbd93c024 SVN_SILENT made messages (.desktop file) 2015-10-27 14:38:42 +00:00
l10n daemon script
47ee991548 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-10-01 10:36:43 +00:00
l10n daemon script
f9db1e0fa5 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-22 12:23:31 +00:00
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
David Edmundson
9ca9833e9c Handle strings and better utf8 in mousepad plugin 2015-09-08 10:27:41 +02:00
l10n daemon script
eb5c099661 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-07-22 10:07:40 +00:00
Aleix Pol
c98413d5d1 Fix capabilities of the mousepad plugin
It doesn't send packages, so no need to require kdeconnect.mousepad.
2015-07-22 03:21:28 +02:00
Alexander Potashev
ca1d99e261 plugins/mousepad: At least KF5::Wayland 5.3.90 is required
Fake input interface was added to KF5::Wayland only a couple of weeks
ago, it has not been released yet with this feature.

CCMAIL: mgraesslin@kde.org
2015-07-21 04:48:29 +03:00
Martin Gräßlin
2506f0e78a [mousepad] Integrate with KWayland for fake input support
KWayland provides a FakeInput interface which KWin as a compositor
supports. This can be used to fake input events on Wayland. As it's
a KWin specific interface it won't work with other Wayland compositors.

If the compositor does not support the required interface, the
module just doesn't do anything. Support in the implementation is
completely optional.

Adding fake input events circumvents the Wayland security model.
Because of that the interface is designed in a way that the security
decision can be done by the compositor and can be delegated to the
user.

On first input event kdeconnect tries to "authenticate" with the
compositor. This gives the compositor the possibility to e.g. ask
the user whether it should be allowed. It's not done on startup or
of load module as that would show such a message way to early and
the user would not be able to connect it with his action on the
smartphone.

REVIEW: 124238
2015-07-09 10:48:00 +02:00
Martin Gräßlin
415412e15d [mousepad] Split X11 implementation into dedicated method 2015-07-09 10:48:00 +02:00
Martin Gräßlin
ab5438d338 [mousepad] Use QX11Info to get the Display
Don't open a second Display, we can use the one used by Qt.
Advantages are: we are on the correct Display, we don't open a Display
connection on e.g. Wayland (it would succeed but not work as a connection
to Xwayland would be opened) and we can drop the copy of fixx11h.

It's also a prerequisite to properly split the implementation to support
Wayland in a later change.

REVIEW: 124230
2015-07-03 09:43:01 +02:00
l10n daemon script
69d8a40aa6 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-06-24 10:38:32 +00:00
l10n daemon script
4ed16c9f49 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-06-17 10:08:57 +00:00
l10n daemon script
7546118157 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-18 10:02:50 +00:00
Albert Vaca
5582c479b6 Input plugin icon was not from Breeze 2015-05-17 23:24:25 -07:00
Aleix Pol
509ab4ce02 Remove unneeded dependency link 2015-04-10 18:03:49 +02:00
l10n daemon script
aa91c6bbd6 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-10 10:24:31 +00: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
Albert Vaca Cintora
70e3aec278 Fixed potential array out of bounds crash 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
Albert Vaca
b38939fce8 Renamed "touchpad" plugin to "virtual input" 2015-03-22 22:08:30 -07: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
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
d2e973b351 SVN_SILENT made messages (.desktop file) 2015-02-28 04:22:03 +00: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
Albert Vaca
127a117c62 Added support for Ctrl, Alt and Shift combinations and F keys to keyboard. 2015-01-06 00:11:58 -08:00