tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1892 commits 81 branches 117 tags 12 MiB
Commit graph

103 commits

Author SHA1 Message Date
Nicolas Fella
188adfbee7 Always play when call ended 
Summary:
When the music is resumed during the call it was paused again when the call ends

Bug: 400787

Test Plan: Get called, resume music during call, check state after call

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D16809
 2019-03-23 22:13:40 +01:00
Friedrich W. H. Kossebau
bb3ab8b631 Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5 
Summary:
* cmake 2.8.12 is really outdated, 3.0 is minimum in plasma & kf5
* cmake_minimum_required should be at begin of toplevel CMakeLists.txt
* bump qt version to 5.7, matching the min Qt version of kf5 5.42
* with ecm being part of kf5 since early versions, share ${KF5_MIN_VERSION}
* use QT_MIN_VERSION & KF5_MIN_VERSION also for separate find_package calls
* deduplicate all KF5 components searched for in unconditionally included
  subdirs

Test Plan: Still configures and builds with all options OFF & ON

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D11418
 2018-03-17 23:34:33 +01:00
Friedrich W. H. Kossebau
1f0d6b2a62 Remove unused "Encoding": "UTF-8" from plugins' metadata JSON 
Summary:
Had slipped in from conversion of metadata in desktop file format,
but are of no use in the JSON variant.

Test Plan: Plugins load and work as before

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Differential Revision: https://phabricator.kde.org/D11417
 2018-03-17 23:32:27 +01:00
Albert Vaca
f47f517827 Rename NetworkPackage -> NetworkPacket 
Summary: KDE Connect, now with correct naming!

Test Plan: It still builds.

Reviewers: #kde_connect, apol, nicolasfella

Reviewed By: #kde_connect, apol, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D11036
 2018-03-05 20:03:23 +01:00
l10n daemon script
ab006521f8 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"
 2018-01-28 05:06:41 +01:00
Nicolas Fella
9639d5cd03 Use pactl instead of KMix in PauseMusic Plugin 
Summary: Using pulseaudio via pacmd for controlling the system volume is way easier than using KMix. Same could be done to control the system volume in the MPRIS Plugin

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: anthonyfieroni, thomasp, albertvaka, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D7922
 2017-09-23 10:42:04 +02:00
l10n daemon script
057a114629 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-09-19 04:58:52 +02:00
Albert Vaca
84bba9429f Merge branch 'master' into 1.x 
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
 2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48 Make member variable names, & placement and * placement more coherent 
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.

Basically:
 - mFoo -> m_foo
 - foo -> m_foo (if it is a member variable)
 - Type &ref -> Type& ref
 - Type *ptr -> Type* ptr

Reviewers: #kde_connect, nicolasfella, albertvaka

Reviewed By: #kde_connect, nicolasfella, albertvaka

Subscribers: albertvaka, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D7312
 2017-09-03 21:45:08 +02:00
l10n daemon script
dadcc76841 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-08-06 06:02:06 +02:00
l10n daemon script
0356908fc8 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-08-06 04:42:32 +02:00
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
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
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
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
3ed53ea469 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-03-15 05:07:11 +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
fd64a8bcc7 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-06 05:54:14 +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
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
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
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
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
Albert Vaca
6deef8b605 Comment was no longer true 2016-06-21 14:43:33 +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
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
9df0fc1e24 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-31 09:40:47 +00: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