Albert Vaca
ef0e80c91f
Merge branch 'master' into 1.x
...
# Conflicts:
# indicator/org.kde.kdeconnect.nonplasma.desktop
# org.kde.kdeconnect.kcm.appdata.xml
# plugins/runcommand/kdeconnect_runcommand.json
# urlhandler/org.kde.kdeconnect.telhandler.desktop
2017-07-24 16:49:06 +02:00
Jean Vincent
c864267f04
Replace Q_FOREACH with C++11 range-for
...
Summary:
The use of Q_FOREACH is advised against (https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH ) since Qt 5.7 and will eventually be removed from Qt.
I replaced all occurrences with the range-for loop introduced in C++11 (except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it).
I added const to the container or casted it with qAsConst when appropriate to avoid unnecessary copies.
(This is my first submission. I did all the unit tests, and they all passed but I don't know how to show it here.)
Reviewers: #kde_connect, nicolasfella, apol
Reviewed By: #kde_connect, nicolasfella, apol
Subscribers: albertvaka, apol, nicolasfella
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D6724
2017-07-21 09:57:19 +02:00
l10n daemon script
cc43a72884
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"
2017-07-14 05:43:50 +02:00
Nicolas Fella
732462135f
Show no notification icon if there is no
...
Summary: I think it looks nicer than the kind of angry default icon and is the expected behaviour
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D6089
2017-07-11 23:27:41 +02:00
l10n daemon script
72162bf8c9
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"
2017-06-08 04:52:02 +02:00
Julian Wolff
8aaa18848e
show icon and reply toolbutton in plasmoid
...
Summary:
Show an icon for each notification which has an icon.
Show a toolbutton which can be used to reply to notifications which offer a quick reply.
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka
Maniphest Tasks: T4674, T4658
Differential Revision: https://phabricator.kde.org/D6058
2017-06-01 16:17:45 +02:00
Julian Wolff
4eeb329014
These changes allow replying to any notifications that offer quick reply text fields
...
Summary: These changes allow replying to any notifications that offer quick reply text fields
Reviewers: #kde_connect, apol
Reviewed By: #kde_connect, apol
Subscribers: apol
Maniphest Tasks: T4674
Differential Revision: https://phabricator.kde.org/D5993
2017-05-31 15:36:43 +02:00
l10n daemon script
60fa493171
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"
2017-05-30 04:17:47 +02:00
l10n daemon script
0d217c58e1
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"
2017-05-27 04:22:53 +02:00
l10n daemon script
eddcaddaea
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"
2017-05-15 04:33:11 +02:00
Nicolas Fella
ec2b794ffb
Escape HTML Characters in Notifications.
...
REVIEW: 130114
2017-05-07 20:23:05 +02:00
Nicolas Fella
f0010763e7
Fixed filetransferjob broken after adding icons.
...
The plasmoid didn't know the transfer ended.
REVIEW: 130116
2017-05-07 20:16:19 +02:00
Nicolas Fella
891f1bd355
Notification icons from Android are now displayed
...
- FileTransferJob is now nonblocking.
- Files are stored based on the image MD5.
- Some improvements in displaying the notification, e.g. title is only
displayed when different than the app name.
- Most of the notification display code moved to the Notification class.
REVIEW: 130050
2017-04-13 21:32:03 +02:00
l10n daemon script
be1d43b42d
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"
2017-04-09 03:59:36 +02:00
l10n daemon script
8c6f7582e2
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"
2017-02-11 06:03:33 +01:00
l10n daemon script
f935af6903
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"
2017-01-23 05:43:26 +01:00
Aleix Pol
3734d6ce4d
Reduce API exposed through dbus
...
Summary:
Don't use QDBusConnection::ExportAllContents
No need to make connect and receivedPackage public slots (they're are the
parent's already)
Fixes T4975
Test Plan: Rough manual test
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Maniphest Tasks: T4975
Differential Revision: https://phabricator.kde.org/D3871
2017-01-10 18:15:01 +01:00
l10n daemon script
e6a7df25aa
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-12-20 12:45:03 +01:00
l10n daemon script
5279a64e05
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-12-02 04:30:30 +01:00
l10n daemon script
eabdfc892b
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-30 04:24:23 +01:00
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
Albert Vaca
6124e5273f
Merge branch 'master' (early part) into 1.x
...
# Conflicts:
# plugins/kdeconnect.notifyrc
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/telephony/kdeconnect_telephony.json
2016-11-23 17:29:26 +01:00
l10n daemon script
760c2a8a7e
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-28 11:59:13 +00:00
l10n daemon script
77756ed73e
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-28 09:28:09 +00:00
l10n daemon script
e0f8c4a6ac
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 11:29:39 +00: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
Albert Vaca
c847c99f5a
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/runcommand/kdeconnect_runcommand_config.desktop
# plugins/sftp/kdeconnect_sftp.json
2016-10-18 13:14:22 +02:00
l10n daemon script
f0923134e0
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-17 12:05:57 +00:00
l10n daemon script
63182c205c
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-17 09:29:24 +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
258a844588
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 10:30:54 +00:00
l10n daemon script
7ac6543c61
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-30 09:37:19 +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
Albert Vaca
0dbaceafa3
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/battery/kdeconnect_battery.json
# plugins/clipboard/kdeconnect_clipboard.json
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/kdeconnect.notifyrc
# plugins/lockdevice/kdeconnect_lockdevice.json
# plugins/mousepad/kdeconnect_mousepad.json
# plugins/mpriscontrol/kdeconnect_mpriscontrol.json
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/pausemusic/kdeconnect_pausemusic.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
# plugins/sendnotifications/kdeconnect_sendnotifications.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/sftp/kdeconnect_sftp.json
# plugins/share/kdeconnect_share.json
# plugins/telephony/kdeconnect_telephony.json
2016-09-29 10:53:29 +02:00
l10n daemon script
167fd6cf59
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-28 11:51:45 +00:00
l10n daemon script
e884c4a9ac
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-18 09:32:51 +00:00
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
f9406e8afc
Introduce QVariantMap as an argument of NetworkPackage
...
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.
Also port whenever possible to the initializer-list syntax.
REVIEW: 128269
2016-06-21 20:07:12 +02:00
Albert Vaca
e880e14ed5
Preffer Q_FOREACH to foreach
2016-06-21 14:50:17 +02:00
Aleix Pol
bfd698af36
Fix issues detected by clazy
...
Don't use for(:) on Qt containers. It detaches without need.
2016-06-20 19:22:29 +02: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
aca9cc0ed7
Notifications doesn't need kconf anymore
2016-05-31 18:13:37 +02:00
Aleix Pol
9aa794b0da
Merge branch 'master' into sslrefactor
2016-05-31 17:29:06 +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
Albert Vaca
3f82eb9cc7
Less verbose and more useful logging.
2016-05-25 14:33:58 -06:00
Albert Vaca
0b5fbe00bb
Split plugins for sending and receiving notifications
...
CCMAIL: holger.k@elberer.de
2016-05-25 12:49:13 -06:00
David Kahles
623ca94a0c
Don't hardcode app name to filter notifications
...
The app name used by KNotification is translated, and thus the filtering
doesn't work if the translated app name is different.
REVIEW: 127768
2016-04-28 00:19:19 +02:00