Commit graph

72 commits

Author SHA1 Message Date
Albert Vaca
6a2a0b1c76 Merge branch '1.x'
# Conflicts:
#	plugins/mpriscontrol/mpriscontrolplugin.cpp
#	plugins/sendnotifications/kdeconnect_sendnotifications.json
2016-11-26 16:40:24 +01:00
Albert Vaca
60331ccbf1 Clazy says all this QStringLiteral and QLatin1String were missing/wrong 2016-11-26 16:21:29 +01:00
l10n daemon script
b4e008847a 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-11-25 04:58:17 +01:00
l10n daemon script
73c6e1a306 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-11-24 05:29:38 +01:00
l10n daemon script
f0eb32c350 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-10-19 09:02:51 +00:00
l10n daemon script
3be06839a8 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-10-11 13:08:45 +00:00
l10n daemon script
ec0ca3976d 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-29 12:27:06 +00:00
l10n daemon script
2664b99864 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-08-30 10:03:14 +00:00
Albert Vaca
5ad007a981 Merge branch '1.x' 2016-08-29 20:46:48 +02:00
Aleix Pol
d9e7f308c2 Show the announcedName in the qml app
Makes it possible to display it and modify it
Introduces a DBusProperty component that can be used if we don't want
to go through the QtDBus property generation hell.
2016-08-21 19:38:15 +02:00
Aleix Pol
b69247b4e5 Don't force the creation of a DeviceInterface for every pluginchecker
Create one per device and share it
2016-08-21 18:57:27 +02:00
Aleix Pol
d84a1a108b Mark the current section 2016-08-21 18:45:49 +02:00
Aleix Pol
bbf33f69a6 Use actions rather than visual elements 2016-08-21 17:55:13 +02:00
Aleix Pol
aef02c0cce Add findmyphone 2016-08-21 17:54:25 +02:00
Aleix Pol
64e0250d99 Properly case unpair 2016-08-21 17:54:15 +02:00
Aleix Pol
a89634c2b6 Don't show unavailable plugins 2016-08-21 17:53:58 +02:00
Aleix Pol
f654e75820 Improve how we handle the different plugin pages 2016-08-21 13:05:43 +02:00
l10n daemon script
1e574d18e3 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-08-19 09:28:59 +00:00
l10n daemon script
ae766f5839 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-08-04 12:30:52 +00:00
l10n daemon script
60c3bf9b90 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-06-22 16:33:04 +00:00
Aleix Pol
70b6e5f804 Implement PluginChecker for plugin availability 2016-06-12 22:31:09 +02:00
Aleix Pol
fb8f468535 Unify naming with the Android client 2016-06-08 18:39:16 +02:00
Aleix Pol
e30a2d6bcf Move some of the options into the ContextDrawer 2016-06-08 18:38:48 +02:00
Aleix Pol
794e8c6904 Make the app work a bit more like the Android version 2016-06-08 18:37:57 +02:00
Aleix Pol
d6eb2d07bc Port the experimental application to kirigami 2016-06-06 01:21:37 +02:00
Aleix Pol
cc3f16ef34 Remove unneeded level of depth 2016-06-06 01:21:37 +02:00
l10n daemon script
f6724de704 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-02-14 09:18:22 +00:00
l10n daemon script
5eb9a54bcc 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-02-05 09:16:28 +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
f92534583d 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-13 10:40:06 +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
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
633952b638 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-27 12:30:00 +00:00
l10n daemon script
dda5ec5385 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-26 03:37:32 +00:00
l10n daemon script
4239b0525b 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-25 03:57:27 +00:00
l10n daemon script
9f291d9ef7 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-02 10:15:24 +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
d42bcb25a2 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-19 11:56:19 +00:00
l10n daemon script
933cbd5bfd 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-13 10:31:01 +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
l10n daemon script
af97d4476c 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-08 12:50:45 +00:00
Aleix Pol
661d4579fc Merge branch 'stable' 2015-09-07 17:45:33 +02:00
Martin Gräßlin
cc148cea89 Setup KDeclarative before loading the Qml file
Otherwise methods injected into the engine by KDeclarative are not
available in the loaded qml.

REVIEW: 124419
2015-09-07 17:42:19 +02:00
Martin Gräßlin
e462c386cf Adjust application name to match desktop file
The desktop file is called org.kde.kdeconnect.app - this needs to
be respected in the application name. This is a requirement to match
application windows to applications on Wayland. With a not-matching
name the compositor is not able to show a window icon.

REVIEW: 124418
2015-09-07 17:40:50 +02:00
Aleix Pol
d41eab2fae add i18n for consistency 2015-09-07 15:03:04 +02:00
l10n daemon script
e6a759a071 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-01 12:31:29 +00:00
Aleix Pol
a2aa2ab72b Fix qml touchpad interface
On release, forget about the last position
2015-08-07 15:02:36 +02:00
Martin Gräßlin
208cc573d2 [app] Add a title on the ApplicationWindow
Without a title, it's not possible to identify the window on Wayland.
E.g. KWin doesn't have a title for the application in Present Windows
or application switchers filtering it out.

REVIEW: 124417
2015-07-22 15:50:20 +02:00
Martin Gräßlin
56b6c019dc [app] Do not runtime depend on Qt 5.5
Reviewed-By: apol
2015-07-22 12:06:49 +02:00
Aleix Pol
be2a3252c2 Make it possible to lock the screen from KDE Connect
Connects to freedesktop ScreenSaver interface and un/locks it upon request.

REVIEW: 124170
2015-07-22 03:37:34 +02:00