Commit graph

1409 commits

Author SHA1 Message Date
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
Albert Vaca
f4a3df0a26 Merge branch '0.9' 2015-09-12 14:29:35 -07:00
Albert Vaca
e04bb69f6a Bumped version number 2015-09-12 13:40:05 -07:00
Vineet Garg
73a80f0296 Fixed Lan Link Provider Test
Pairing timer was started even when pair package sending is failed, fixed that
2015-09-13 01:45:19 +05:30
Aleix Pol
f6cb042000 Revert "Add a hack to export auto generated interfaces"
This reverts commit 1501090b41.
2015-09-12 22:12:38 +02:00
Aleix Pol
50b9d331d1 Fix hack
Expose the signal on the exported interface.
2015-09-12 22:12:18 +02:00
David Edmundson
7f794c093a Fixed the CLI
Enter discoverability mode if pairing with an unpaired device.

Use the correct isPaired. This exists as a method and a property,
callign the method returns QDbusPendingReply which shouldn't be checked
immediately
2015-09-12 22:08:12 +02:00
David Edmundson
97034e3bbd Don't cleanup devices if pairing 2015-09-12 22:03:56 +02:00
David Edmundson
f1f3f48aaf Export pairStatus 2015-09-12 22:03:39 +02:00
David Edmundson
1501090b41 Add a hack to export auto generated interfaces 2015-09-12 22:03:26 +02:00
Aleix Pol
2c2cb21ee1 Don't clean the devices that looked us up in the first place 2015-09-12 20:53:05 +02:00
Aleix Pol
2707d1f0a8 Fix reload when changing current device on the kcm 2015-09-12 19:43:15 +02:00
Albert Vaca
217d4b60ff Fixed outging capabilities 2015-09-12 08:51:39 -07:00
Aleix Pol
3269b7a9c2 Fix tests when the Qt mobile app is not built 2015-09-12 15:17:08 +02:00
Aleix Pol
fe2679a8a5 Prevent the kcm from refreshing the UI while interacting with it
Only refresh it when the available plugins actually change.
2015-09-12 15:02:59 +02:00
Aleix Pol
27302c0450 Improve RunCommand configuration display 2015-09-12 13:51:15 +02:00
Aleix Pol
f25dc109f3 Don't lock the daemon when running a process is started 2015-09-12 13:51:15 +02:00
l10n daemon script
71874dbffb 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-12 11:52:20 +00:00
Albert Vaca
0f280b5345 Made the runcommands plugin re-send the config when it changes 2015-09-12 04:50:20 -07:00
Albert Vaca
4230f4fb44 Added a signal so plugins know when we update the config 2015-09-12 04:50:20 -07:00
Aleix Pol
cfe0e60eb9 Remove wrong include 2015-09-12 12:49:43 +02:00
Albert Vaca
cf4a9b8639 First implementation of runcommand plugin 2015-09-12 03:38:44 -07:00
Albert Vaca
b7eefa0388 Fixed warning. 2015-09-12 03:37:05 -07:00
David Edmundson
e5ff128deb Fix typo in library existing check 2015-09-12 11:11:43 +02:00
Aleix Pol
a8a8080248 Prevent detaching temporary objects
For more info see:
https://blogs.kde.org/2015/05/13/simple-qt-container-optimization-you-should-do-your-code
2015-09-12 09:53:05 +02:00
Aleix Pol
c6a157e50a Remove unused variable 2015-09-12 09:48:31 +02:00
Aleix Pol
d8310cb38a Remove unused arguments 2015-09-12 09:48:18 +02:00
Aleix Pol
f7423c6ad6 Better use of error information 2015-09-12 09:47:47 +02:00
Aleix Pol
4730022810 Pass arguments as const-reference 2015-09-12 09:45:59 +02:00
David Edmundson
4a8303f846 Add button to find phone from plasmoid 2015-09-11 22:48:45 +02:00
David Edmundson
d9be8f970c Check for service validity in more places
BUG: 352582
2015-09-11 21:46:25 +02:00
David Edmundson
2824260096 Check for both TpQt and TpQt service
BUG: 352582
2015-09-11 21:19:13 +02:00
David Edmundson
9985a59608 Find my phone plugin
Add a plugin that sends a package to ring an alarm on a phone

Also adjusts plasmoid to have a button to invoke this.
2015-09-11 21:12:12 +02:00
Aleix Pol
67a2c1ffd9 Properly test to wait for signals 2015-09-11 18:21:18 +02:00
Aleix Pol
5e0a7a34b9 Merge branch 'master' into ssl
# Conflicts:
#	cli/kdeconnect-cli.cpp
#	core/backends/lan/landevicelink.cpp
#	core/backends/lan/landevicelink.h
#	core/backends/lan/lanlinkprovider.cpp
#	core/backends/lan/lanlinkprovider.h
#	core/backends/lan/socketlinereader.h
#	core/backends/lan/uploadjob.cpp
#	core/backends/lan/uploadjob.h
#	core/backends/loopback/loopbackdevicelink.h
#	core/daemon.cpp
#	core/daemon.h
#	core/device.cpp
#	core/device.h
2015-09-11 17:25:23 +02:00
Aleix Pol
b62349cae6 Merge branch 'stable' 2015-09-11 17:03:57 +02:00
Aleix Pol
9fedfcdb3d Notify QNAM about the file received size 2015-09-11 17:03:11 +02:00
Albert Vaca
82d036265c Acquire the discovery mode when refreshing the KCM, in case it's not there 2015-09-11 07:19:07 -07:00
Albert Vaca
89afa5b9af Renamed capabilties so we don't clash with KDE4's broken implementation 2015-09-11 06:20:15 -07:00
Aleix Pol
47147c5fa1 Merge branch 'stable' 2015-09-11 14:04:54 +02:00
Aleix Pol
c2acc37da6 Fix filtering of plugins that don't support capabilities 2015-09-11 14:00:15 +02:00
Albert Vaca
ea253b1755 Merge branch 'stable' 2015-09-11 04:35:41 -07:00
Albert Vaca
825a02f76a Fixed compilation error because QCA doesn't include QIODevice 2015-09-11 04:35:22 -07:00
David Edmundson
8d3c5441ed Tone down the debug 2015-09-11 12:57:47 +02:00
Aleix Pol
95f01c4bea Use C++ for setting the default argument 2015-09-11 12:34:52 +02:00
Aleix Pol
ca4a81b8e8 Merge branch 'stable' 2015-09-11 12:24:15 +02:00
Aleix Pol
2b8a54357e Remove redundant copy constructor 2015-09-11 12:22:59 +02:00
Aleix Pol
67c5a2b5f1 Fix variable scope 2015-09-11 12:22:35 +02:00
Aleix Pol
c62fac0bcf Don't join hte interfaces in 1 string
Let NetworkPackage do the serialization
2015-09-11 12:14:19 +02:00
David Edmundson
75b8e24727 Fix compilation on newer TpQt 2015-09-11 12:08:50 +02:00