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

435 commits

Author SHA1 Message Date
l10n daemon script
0c32010a28 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"
 2020-07-06 05:30:08 +02:00
Nicolas Fella
c8a87db367 Merge branch 'release/20.04' 2020-07-05 15:49:58 +02:00
l10n daemon script
e44e4a4c19 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"
 2020-06-20 05:10:40 +02:00
l10n daemon script
373557cd26 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"
 2020-06-18 08:27:38 +02:00
l10n daemon script
653a708727 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"
 2020-06-18 05:39:20 +02:00
l10n daemon script
5fe8d7ea90 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"
 2020-06-17 16:50:11 +02:00
l10n daemon script
e873eddcde 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"
 2020-06-17 14:06:59 +02:00
l10n daemon script
046a572542 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"
 2020-06-07 08:58:38 +02:00
l10n daemon script
f98953380f 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"
 2020-05-31 20:22:34 +02:00
l10n daemon script
bc08ff79e6 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"
 2020-05-31 14:20:49 +02:00
l10n daemon script
baf52b49ac 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"
 2020-04-08 11:04:09 +02:00
l10n daemon script
43ea8052fe 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"
 2020-04-08 06:32:15 +02:00
l10n daemon script
1634126eb5 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"
 2020-04-07 10:16:35 +02:00
l10n daemon script
0e04769a43 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"
 2020-04-07 06:11:40 +02:00
l10n daemon script
87d58643a2 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"
 2020-03-17 10:05:04 +01:00
l10n daemon script
201be5d898 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"
 2020-03-16 10:21:09 +01:00
l10n daemon script
7eee223dfc 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"
 2020-03-02 05:46:53 +01:00
Nicolas Fella
1a2315cdf7 Move settings app into own folder and make it a KDBusService 2020-01-17 01:32:56 +01:00
l10n daemon script
cb307e16b2 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"
 2019-11-17 05:06:27 +01:00
Nate Graham
5fd0d2327b Use more appropriate icon that's colorful at small sizes 
The current icon does not follow the recommended pattern of using preferences- icons
and has a small version that's monochrome, causing the sidebar in System Settings to
inappropriately display some small monochrome icons.

Ref T10165
 2019-09-10 14:15:01 -06:00
l10n daemon script
392d287b64 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"
 2019-08-11 04:47:22 +02:00
l10n daemon script
5427754e21 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"
 2019-08-01 04:51:32 +02:00
l10n daemon script
e4e4c58b60 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"
 2019-07-31 05:10:13 +02:00
l10n daemon script
c53108bb25 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"
 2019-07-08 04:56:21 +02:00
l10n daemon script
3d0acf15a5 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"
 2019-06-27 05:13:07 +02:00
Nicolas Fella
e601755644 Force usage of QStringLiteral and port remaining offenders 2019-06-10 14:40:28 +00:00
Nicolas Fella
3b8fedea1a Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
Nicolas Fella
1f1462e813 Remove unused includes 2019-02-28 14:11:23 +01:00
Nicolas Fella
fc4da13d64 Add context object 2019-02-28 14:08:17 +01:00
l10n daemon script
1d3368532a 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"
 2019-02-26 05:29:15 +01:00
l10n daemon script
41e13c2e84 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"
 2019-01-31 05:44:46 +01:00
l10n daemon script
71c5a1b248 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"
 2019-01-06 05:29:27 +01:00
Nicolas Fella
d26d2ada78 Don't use kcmshell5 for opening the KCM 
Summary:
kcmshell5 depends on plasma-workspace. By using our own tiny wrapper for opening the KCM we avoid pulling
in plasma-workspace and everything that comes with it on non-Plasma systems.

Test Plan: kdeconnect-settings shows the KCM

Reviewers: #kde_connect, sredman

Reviewed By: #kde_connect, sredman

Subscribers: sredman, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D17383
 2018-12-06 23:10:05 +01:00
l10n daemon script
283211b4eb 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-10-10 06:19:16 +02:00
l10n daemon script
e40312bf5e 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-06-18 05:27:46 +02:00
Nicolas Fella
68d0c5d143 Do not require Frameworks 5.45 
Summary: Ifdef for old KF5 as discussed in D11684.

Test Plan: Can still use feature when above 5.45

Reviewers: apol

Reviewed By: apol

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12810
 2018-05-10 19:48:40 +02:00
Aleix Pol
dd031d3deb Show the KCM with the run commands open when a setup packet is received 
Summary: Depends on D11683.

Test Plan: Tested the `kcmshell kdeconnect --args mydeviceid:kdeconnect_runcommand` works

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D11684
 2018-04-19 03:03:42 +02:00
Friedrich W. H. Kossebau
0c560d9062 Fix ui file hint: KMessageWidget extends QFrame in KF5 times 2018-03-22 17:34:54 +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
Albert Vaca
9aaebd1dd6 Use fallback text if icon is not found 
BUG: 356484
 2018-02-17 15:14:11 +01:00
Nicolas Fella
aeb4eeff73 Tweak KCM 
Summary: Tweaking the text a little leads to a window size that doesn't cut off the refresh button when no device is selected.

Test Plan:
Before:

{F5691067}

After:

{F5691069}

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D10287
 2018-02-04 12:41:30 +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
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
a18f91ccc1 Swapped labels 2017-08-02 02:59:41 +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
Aleix Pol
209e3e2842 Reflect property change when unpairing 
There's no pairStatusChanged when the device is not connected to
anything (be it because it's unreachable at the moment).
 2017-07-14 01:01:15 +02:00
Fabian Vogt
0667c6556f Merge branch '1.x' 2017-07-12 11:37:41 +02:00
Fabian Vogt
5641d818dc Treat device names as plaintext, not rich text 
Summary:
Notifications, QML Text and QLabel accept a HTML subset,
which does not make sense for device names.

BUG: 382243

Test Plan:
Sent a pair request and accepted it, device name
now shown as plain text everywhere.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: #kde_connect

Differential Revision: https://phabricator.kde.org/D6640
 2017-07-12 11:33:21 +02:00
l10n daemon script
ef1bee54e0 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-20 05:46:09 +02:00
l10n daemon script
36269e6506 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-20 04:26:54 +02:00
l10n daemon script
664fd443f0 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-13 05:54:34 +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
c070b4d445 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-04 04:17:49 +02:00
l10n daemon script
5fda0b61e6 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 05:29:51 +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
12d322a0f9 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-09 07:52:59 +01:00
l10n daemon script
c9050ccfe1 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-09 06:05:20 +01:00
Aleix Pol
f65392ca6b Expose pair requests on the KCM 2017-02-20 21:00:26 +01:00
Aleix Pol
b947ef6b60 Use asynchronous calls to the device interface when possible 
Summary:
Use setWhenAvailable for isTrusted calls
Just deal with the pairing buttons state only once.
Unify semantics (paired vs trusted)

Reviewers: albertvaka, #kde_connect

Reviewed By: albertvaka, #kde_connect

Differential Revision: https://phabricator.kde.org/D4125
 2017-01-13 18:36:43 +01:00
Aleix Pol
c822ef8104 Set the device's announcedName when it's available 
No need to block on it
 2017-01-13 17:48:37 +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
Aleix Pol
41fd3d8dd8 Stop enforcing maximum size 2016-11-28 15:32:35 +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
Albert Vaca
a1340c8042 Fixed old style connects with clazy 2016-11-26 15:14:19 +01:00
Albert Vaca
1a1f94fd94 Fixed old style connects with clazy 2016-11-26 15:12:38 +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
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
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
Kai Uwe Broulik
6ca3f98748 [KCM] Don't hardcode hyperlink color 
Let the theme come up with a link color which knows best to ensure contrast and readability.

REVIEW: 129144
 2016-10-11 11:09:19 +02: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
Kai Uwe Broulik
6f7c419baa Merge branch '1.x' 2016-09-10 22:53:37 +02:00
Albert Vaca
3c0f3b9814 Removed unsupported plugins section from KCM 2016-09-06 10:53:19 +02: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
ee7420c8a0 Listen to announcedName changes from the kcm 2016-08-21 19:50:27 +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
Albert Vaca
bd0920d354 Changed string 2016-07-13 18:25:44 +02:00
Aleix Pol
81634303b2 Make capabilities static 
As discussed with Albert, move the population of capabilities into the
identity package, making them static along the execution of the link.

When we receive the identityPackage, we collect the plugins we can use with
the device and stick to those. This should simplify the implementation and
remove the possibility to lose packages if packages are received before the
capabilities are processed in the former approach.

REVIEW: 128386
 2016-07-06 17:37:22 +02: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
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
0c95010c3b Merge branch 'master' into sslrefactor 
# Conflicts:
#	core/device.cpp
#	interfaces/devicesmodel.cpp
 2016-04-14 19:00:42 -07: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
Albert Vaca
1d98bd3cbe Merge branch 'master' into sslrefactor 2016-01-02 12:58:12 -08:00
Albert Vaca
ef6e403219 Fixed typo 2015-12-17 08:49:34 -08:00
Albert Vaca
1848e96a91 Fixed old signal name 2015-12-17 05:54:37 -08:00
Albert Vaca
cf6cbd2925 WIPx3! 2015-12-01 10:45:14 -08:00
Albert Vaca
82bc73dd9b WIPx2 2015-12-01 07:25:34 -08:00
Albert Vaca
16f9af908a WIP 2015-11-30 10:36:01 -08:00
l10n daemon script
ce766fb7ff 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-19 12:12:59 +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
d9c8a7865e 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-07 21:12:54 +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
Aleix Pol
0bca50af93 Merge branch '0.9' 2015-10-19 17:48:13 +02:00
Aleix Pol
661fa098d4 Introduce bare documentation for the KDE Connect kcm 2015-10-19 03:25:17 +02:00
Albert Vaca
e4c5ea646e Added a link to the wiki from the KCM. 2015-10-18 15:08:36 -07:00
l10n daemon script
c0576f76b1 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-13 12:45:08 +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
ba818c743c 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-29 12:23:45 +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
Aleix Pol
13e3bee8f4 Merge branch 'stable' 2015-09-15 02:04:29 +02:00
Aleix Pol
bdc721b7d3 Properly install the renamed files 2015-09-15 02:03:31 +02:00
Aleix Pol
b3425e114a Another application desktop file to rename 2015-09-15 01:47:29 +02:00
l10n daemon script
42a3029b0e 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-14 10:22:08 +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
Aleix Pol
2707d1f0a8 Fix reload when changing current device on the kcm 2015-09-12 19:43:15 +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
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
82d036265c Acquire the discovery mode when refreshing the KCM, in case it's not there 2015-09-11 07:19:07 -07: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
Aleix Pol
a9d2840664 Use acquire and release instead of a boolean property 
This way we hope we won't end up without discovery if 2 instances need
discovery at the same time.

Reviewed by Albert Vaca
 2015-09-09 20:09:04 +02:00
l10n daemon script
a50607939d 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-09 10:15:45 +00:00
Aleix Pol
a0da8ba858 Let the KPluginSelector react to changes in the plugin configuration 
Mainly whenever the remote capabilities change.

Reviewed by The Vaca Man
 2015-09-08 20:03:44 +02:00
Aleix Pol
b9c427a316 fix crash and simplify code 
reviewed by Albert Vaca
 2015-09-08 17:57:55 +02:00
Aleix Pol
6a379e9227 Rename missingPlugins to unsupportedPlugins 2015-09-08 17:38:33 +02: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
817fcbc9d6 Merge branch 'stable' 2015-09-08 10:51:41 +02:00
Aleix Pol
d58f6314fe run Clang Modernize 
Minus the auto change
 2015-09-08 10:47:37 +02:00
Aleix Pol
4023bf0599 Only keep connections alive with unpaired devices when discovery is enabled 
At the moment, we were keeping the connection alive with every reachable
device. While this works optimally for most use-cases, on networks with
several devices with KDE Connect, the amount of connections grows
exponentially.

Reviewed by Albert Vaca

CCBUG: 352424
 2015-09-08 09:30:55 +02:00
Aleix Pol
24d4d19b89 Remove debug 
Sorry Albert :/
 2015-09-08 00:59:17 +02:00
Aleix Pol
91351773fd Mark incompatible plugins as such in the kcm 
If a plugin isn't available, display it as unsupported by the device. This
is figured out through capabilities.

Reviewed by Albert Vaca
 2015-09-07 19:35:07 +02:00
l10n daemon script
8859aa7dc3 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-07 09:52:48 +00:00
Albert Vaca
9837cf012d More descriptive name for menu entries for non-kde desktops. 2015-09-06 15:45:34 -07: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
l10n daemon script
a794d51c4e 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-21 15:07:44 +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
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
Albert Vaca
9fa8538bf1 Removed some assertions that could not be true if using the model filter 
Also fixed ugly hack where the KCM updated the model
 2015-06-21 20:20:40 -07:00
Albert Vaca
c8e0c474ef Fixed crash 2015-06-21 19:43:21 -07:00
Albert Vaca
02bc1bcd90 Fixed progress indicator incorrectly being displayed after unpiring 2015-06-21 19:42:57 -07: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
Albert Vaca
c07c48ee37 Added "about" dialog to KDE Connect settings module. 
BUG: 349186
 2015-06-19 22:48:18 -07: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
l10n daemon script
4ed16c9f49 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-17 10:08:57 +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
l10n daemon script
e31eed3243 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-13 11:32:14 +00:00
Aleix Pol
7c2e2fb726 QML-ify 
Add API to call random public plugin methods
qdbusxml2cpp is not generating the Q_PROPERTY attribute. For now [1], add
it ourselves by addding a proxy signal.

REVIEW: 124077
 2015-06-13 01:28:36 +02:00
l10n daemon script
a0fdfe9c31 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-12 10:28:51 +00:00
Aleix Pol
b592dc99a0 Merge pairingSuccessful and unpaired signals into pairingChanged(bool) 
REVIEW: 124067
 2015-06-11 16:19:00 +02:00
Aleix Pol
a83bf73a4d Move the DevicesSortProxyModel to interfaces/ 
This way it can be used by other parts of the project. It belongs with the
DevicesModel.

REVIEW: 124067
 2015-06-11 16:09:27 +02:00
l10n daemon script
2e5b8ae265 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-10 10:43:22 +00:00
l10n daemon script
e890207d07 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-09 14:10:28 +00:00
Markus S
44965f5157 Unify desktop files 
and bring it in line with official KDE brand guidelines
 2015-06-08 20:37:24 -07:00
Markus S
e6e8106063 Unify desktop files 
and bring it in line with official KDE brand guidelines
 2015-06-08 20:37:24 -07:00
Aleix Pol
05491442e6 Make it possible to fetch the device from the DevicesModel from QML 
Uses the row as the argument instead of the QModelIndex.
Defines the Device type so it can be used from QML.

REVIEW: 123361
 2015-04-15 13:00:23 +02:00
David Rosca
b71b39761d KCM: Use currentChanged signal instead of clicked in deviceList 
Using currentChanged signal it is now possible to select devices
with keyboard.
It also no longer refreshes plugin info when clicking on already
selected device.

REVIEW:123308
 2015-04-09 17:47:01 +02:00
Ashish Bansal
c8eb5e3074 Changed KF5 5.8 to 5.9 2015-04-09 16:22:56 +05:30
l10n daemon script
8349588c77 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-04-06 09:54:12 +00:00
l10n daemon script
92cd693566 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-03-29 09:58:52 +00:00
l10n daemon script
08eaaf11e1 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-03-25 09:09:47 +00:00
Albert Vaca
f237a659ec Added a link to the Android app from the KCM 2015-03-23 00:39:36 -07:00
Albert Vaca
60d85932db Sort devices alphabetically in KCM 2015-03-22 23:08:37 -07:00
Aleix Pol
c7cee37330 Port away from KServiceTrader 
Uses KPluginLoader+KPluginMetadata instead.
Describes plugins in json instead of desktop files. These desktop files are
then embedded into the .so file. All the plugins will be in a kdeconnect/
directory, and those will be the ones to look for.

Note it doesn't drop the KService dependency as KIOCore is a KDE Connect
dependency as well.

REVIEW: 123042
 2015-03-19 16:36:53 +01:00
Aleix Pol
63bb2bda85 Fix build 
We require KF5 5.9 but the frameworks haven't updated the version
name, so keep the last version for sanity.
 2015-03-14 14:33:12 +01:00
Albert Vaca
02a2990720 Added a baseclass for the plugins' KCMs and a class for the plugins' config 
Centralizing the plugins' config will ensure that all the plugins store it
the same way (ie: not in random files scattered around, like until now).
The base KCM class, together with the already existing base plugin class,
will give easy access to all the plugins to this centralized config. Also,
now the settings are not shared across devices (that is: every device can
have different config for a same plugin).

Note: This commit requires KCMUtils 5.9

REVIEW: 122927
 2015-03-13 21:22:21 -07:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
Albert Vaca
b0cc45b52a You can now change your name (the one seen by other devices on the network) 2015-03-01 21:23:05 -08:00
Albert Vaca
c7c91c1289 Added KdeConnectConfig class that aims to be a KConfig abstraction 
Benefits:
- We had config files in different paths, now they will be centralized.
- Daemon, LanLinkProvider and NetworkPackage depend only on Qt now.
- KConfig is accessed with strings as keys, where a typo can go unnoticed.
- Daemon is now thinner, as it doesn't need to initialize config values.
- QCA::Initializer is in a single place now (was in Daemon and Plugin).
 2015-03-01 20:16:07 -08:00
Albert Vaca
7591e783ca Implemented sizeHint for KCM, so it doesn't open in a super small window 2015-03-01 16:09:42 -08:00
Albert Vaca
567796231b Connecting to clicked instead of pressed on KCM's buttons 2015-03-01 16:09:42 -08:00
l10n daemon script
5f0811dff8 SVN_SILENT made messages (.desktop file) 2015-02-21 04:46:14 +00:00
Albert Vaca
dcfec8c593 Merge branch 'master' into frameworks 2015-02-03 19:05:12 -08:00
Albert Vaca
438f9a1846 Added a menu entry for the KCM in non-kde desktops 2015-01-30 22:22:37 -08:00
Albert Vaca
6cc6d287fc Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/filetransferjob.cpp
	core/filetransferjob.h
	interfaces/notificationsmodel.cpp
	plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
	plugins/sftp/sftpplugin.cpp
 2015-01-20 22:44:31 -08:00
l10n daemon script
c805f91411 SVN_SILENT made messages (.desktop file) 2015-01-21 03:54:34 +00:00
l10n daemon script
917104ff99 SVN_SILENT made messages (.desktop file) 2014-12-26 04:20:08 +00:00
l10n daemon script
365b2c55b2 SVN_SILENT made messages (.desktop file) 2014-12-25 04:06:46 +00:00
Albert Vaca
2b13d0825c Merge branch 'master' into frameworks 
Conflicts:
	kded/CMakeLists.txt
 2014-11-22 09:29:05 -08:00
l10n daemon script
e15af622b7 SVN_SILENT made messages (.desktop file) 2014-11-15 04:11:51 +00:00
Lukáš Tinkl
728dab0353 fix memleak 
the Designer UI has to be deleted
 2014-11-10 20:36:12 +01:00
Aleix Pol
21ab5a4f81 Merge branch 'master' into frameworks 
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
 2014-11-04 19:12:29 +01:00
l10n daemon script
3b192ea18e SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
Àlex Fiestas
f961fe0d9f Port kcm free of KDELibs4Support 2014-09-22 09:35:40 +02:00
Àlex Fiestas
677f650216 Removed K_EXPORT_PLUGIN, no longer needed 
With kf5 this is not longer needed. removing it!
 2014-09-22 02:40:51 +02:00
Àlex Fiestas
9c13e92e55 Port KCM to QStandardPaths 
Both core return the same.
 2014-09-22 01:23:47 +02:00
Àlex Fiestas
93054601b9 Removed unused kdebugnamespace, makes kcm kDebug free 2014-09-22 00:17:56 +02:00
Lukáš Tinkl
743f7548e0 i18n fixes 2014-09-08 03:09:18 +02:00
Elias Probst
0b67371b11 Correct kcmshell version in desktop files (4 → 5). 
REVIEW: 119856
 2014-08-20 14:58:48 +02:00
Albert Vaca
e809fa441c Added a refresh button to KCM, just in case. 
We already have a refresh button on Android.
 2014-08-11 18:57:49 +02:00
Albert Vaca
a3b89da9c7 Minor changes 2014-08-11 18:57:48 +02:00
Albert Vaca
a303b73238 Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	plasmoid/package/contents/ui/FullRepresentation.qml
	plugins/ping/pingplugin.cpp
 2014-07-01 23:59:38 +02:00
Albert Vaca
cabb0f2f7b Simplified debug areas so we only have one, called "kdeconnect" 2014-07-01 01:26:08 +02:00
Aleix Pol
c8dbbed685 Move the send ping code to the ping plugin 
turn it into a dbus call to the plugin

Reviewed by Albert Vaca
 2014-06-27 18:21:40 +02:00
Aleix Pol
16aaa9f77c Merge branch 'master' into frameworks 2014-06-21 02:06:50 +02:00
l10n daemon script
c23b83ea09 SVN_SILENT made messages (.desktop file) 2014-06-19 04:30:11 +00:00
Aleix Pol
bf272ea3e7 Remove usage of KDE4_ variables 2014-06-18 02:39:30 +02:00