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

83 commits

Author SHA1 Message Date
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
Albert Vaca
4574aa3639 Make the origin also contain the file name, not only the device name 2015-10-17 13:32:57 -07: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
47ee991548 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-01 10:36:43 +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
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
David Edmundson
c37cc90762 Merge branch 'stable' 2015-09-07 18:30:21 +02:00
David Edmundson
6a7edf5f44 Fix literal %1 in i18n 2015-09-07 18:26:50 +02:00
Aleix Pol
d835d01a09 Add a test for file sending, using the loopback device 
Extends unit testing by making sure that file sharing works locally.

REVIEW: 125086
 2015-09-07 15:03:04 +02:00
Boris Egorov
1924173df2 Fix various krazy2 warnings 
Fix following krazy2 warning types:
[explicit], [endswithnewline], [doublequote_chars], [includes], [normalize],
[postfixop], [spelling]

See http://ebn.kde.org/krazy/reports/playground/base/kdeconnect-kde/index.html
for details.

SLOT/SIGNAL normalization done with Qt normalize utility:
https://github.com/qtproject/qtrepotools/tree/master/util/normalize

REVIEW: 124857
 2015-08-21 22:38:54 +06: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
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
326fecad6f 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-05-02 11:45:00 +00:00
Albert Vaca
6072b6cdbe Changed some plugin icons 2015-05-01 23:07:15 -07:00
Albert Vaca
2f7e6f7de2 Fixed compilation warnings in clang (one of them is actually an issue!) 2015-04-19 22:50:12 -07:00
Lukáš Tinkl
e553d97732 fix possibly localized destination dir 
construct the whole QUrl from a local file, not just the default;
entries returned from QStandardPaths are translated on systems with a non
US locale, and this turned the string such as "~/Stažené" into its decoded
form, preventing the transfer from happening
 2015-04-15 17:45:54 +02:00
Lukáš Tinkl
0d6f5e22a4 add xgettext:no-c-format not to confuse i18n() 2015-04-15 17:45:16 +02:00
Albert Vaca
2e58f34e1d Ops. 2015-04-11 23:26:52 -07:00
Aleix Pol
509ab4ce02 Remove unneeded dependency link 2015-04-10 18:03:49 +02:00
Aleix Pol
3caf5e7908 Move some find_package dependencies to the children directories as agreed 2015-04-10 17:48:48 +02:00
l10n daemon script
aa91c6bbd6 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-10 10:24:31 +00:00
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
Albert Vaca
890e54cd4b Removed notification because KIO already provides one. 2015-04-04 17:20:51 -07:00
l10n daemon script
8e729f3ab2 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-04 11:03:11 +00:00
l10n daemon script
ff9d6b336b 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-03 10:36:58 +00:00
Aleix Pol
9379cc34f7 Check if file exists or not, and then call suggestName. 
KIO::suggestName does not checks if file with passed name exists or not. So, we need to check it

REVIEW: 123225
 2015-04-02 14:48:50 +02:00
Aleix Pol
90f5a221fb Make sure we're not automatically casting QString directly into QUrl 
Otherwise we often turn paths into URLs, a fix I pushed previously today
and the ones I detected when adding -DQT_NO_URL_CAST_FROM_STRING.

CCMAIL: kdeconnect@kde.org
 2015-04-01 23:40:29 +02:00
Aleix Pol
15f87cc46d Port to KIO::suggestName 
Removes the duplicated code.

REVIEW: 123215
 2015-04-01 23:32:35 +02:00
Aleix Pol
491b1ed25b Don't treat local paths as Url's 
It could have been fixed by changing QUrl(dir) into QUrl::fromLocalFile(dir)
but this way we get to have a non-local destinationDir.

CCMAIL: bansal.ashish096@gmail.com
 2015-04-01 16:16:03 +02:00
Ashish Bansal
5322bf45cb Show Transfer failed instead of Transfer finished when it fails. 
REVIEW: 123199
 2015-03-31 20:05:58 -07:00
l10n daemon script
cda092d2bb 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-31 13:16:15 +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
98bb1ee564 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-27 09:50:58 +00:00
l10n daemon script
2cb090d2c9 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-26 10:12:56 +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
Aleix Pol
8f777040f7 Remove KNotifications dependency from libkdeconnectcore 
Moves the implementation into the actual daemon. This opens the
possibility for different ways to expose these notifications depending on
where the libkdeconnect will be deployed.

REVIEW: 123076
 2015-03-24 12:26:37 +01:00
Aleix Pol
ccf03f16d1 Merge branch 'frameworks' to master 
The last version using qt/kde4 was moved into the kde4 branch.

CCMAIL: kdeconnect@kde.org
 2015-03-19 17:23:27 +01: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
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
a3decd542c Includes cleanup 2015-03-13 21:20:58 -07:00
Aleix Pol
ede7dd0e84 Drop KIOWidgets dependency from KDEConnectCore 
Removes the usage of RenameDialog by moving the functionality away. In
fact, what it does is make the share dialog try to come up with a different
name rather than asking the user. It's a quite common procedure as makes
the interaction simpler (for example, Chromium and Kamoso work like that).

REVIEW: 122813
 2015-03-09 13:22:10 +01:00
Albert Vaca
5807ec0eb1 Fixed re-encoding already encoded URLs, corrupting them. 
BUG: 344910
 2015-03-08 15:19:21 -07:00
Aleix Pol
72411fc504 Simplify weird code 
Don't assume destination is local, also don't use setPath, which is quite
broken as it still keeps the scheme.
This way, destination can be any valid URL.
Don't add a trailing slash if we're going to remove it afterwards anyway.
Remove some back-and-forth conversions between QUrl and QString.
 2015-03-04 23:20:28 +01:00
Aleix Pol
b06038e60e Prefer the usage of QUrl::toLocalFile to QUrl::path 
QUrl::toLocalFile is portable.
 2015-03-04 22:33:54 +01:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
Albert Vaca
205df05219 Changed share and pausemusic icons 2015-02-23 21:44:08 -08:00
l10n daemon script
5f0811dff8 SVN_SILENT made messages (.desktop file) 2015-02-21 04:46:14 +00:00