Commit graph

90 commits

Author SHA1 Message Date
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
Aleix Pol
058f7c7c90 Implement the touchpad forwarding into kcapp
This way the computer's cursor can be controlled from the device. Keyboard
is not yet implemented.
2015-07-22 03:21:28 +02:00
Aleix Pol
2b844e59da Improve app mpris interface 2015-07-19 22:20:47 +02:00
l10n daemon script
f86c5e4a4c 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-03 10:06:32 +00:00
l10n daemon script
7d514bdd29 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-30 13:47:48 +00:00
l10n daemon script
f075da1eab 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-29 10:29:47 +00:00
l10n daemon script
320779b719 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-25 10:38:53 +00:00
Aleix Pol
6d83827b18 Don't rely on Q_PROPERTY if we're inheriting QDBusAbstractInterfaceBase
See bug:
https://bugreports.qt.io/browse/QTBUG-46858
2015-06-25 04:08:00 +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
Aleix Pol
d6c779c938 improve navigation button usability 2015-06-24 00:36:57 +02:00
Aleix Pol
c7055cfe15 Adapt to changes in DevicesModel 2015-06-22 06:47:31 +02:00
Aleix Pol
9f4d837b22 Adapt to changes in DevicesModel 2015-06-22 06:45:18 +02:00
l10n daemon script
d8b3d829e4 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-20 11:56:14 +00:00
l10n daemon script
7fb21dec12 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-19 10:41:31 +00:00
Aleix Pol
d741465473 Make it possible to go back from any page by having a back button on the toolbar 2015-06-19 07:22:00 +02:00
Aleix Pol
46b57003cd Display the device model section
This way we can differentiate between the different states
2015-06-19 07:14:02 +02:00
Aleix Pol
4654a61a5f Fix icon placing in the DeviceDelegate 2015-06-19 07:13:04 +02:00
l10n daemon script
700eff446e 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-18 11:49:24 +00:00
Aleix Pol
5c79e8a7a6 Implement an MPRIS client plugin
Makes it possible to control remote MPRIS instances.

REVIEW: 124100
2015-06-18 04:01:01 +02:00
l10n daemon script
0899923dbc 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-16 13:33:29 +00:00
l10n daemon script
d4074b42fa 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-15 09:58:46 +00:00
Aleix Pol
5ccdf931a9 Add desktop file for kcapp 2015-06-13 20:35:09 +02:00
Aleix Pol
de9671e26a Experimental frontend 2015-06-13 01:30:38 +02:00