l10n daemon script
45388fa383
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"
7 years ago
l10n daemon script
5b63edb807
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"
7 years ago
l10n daemon script
132b85b36d
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"
7 years ago
l10n daemon script
537a9ca3d5
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"
7 years ago
Friedrich W. H. Kossebau
91fbb2e7ef
[kio_applications] Install binary into kf5/kio subdir, like other kio binaries
...
Test Plan: applications: & programs: urls still work.
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18642
7 years ago
Friedrich W. H. Kossebau
bcddc79246
Port away from deprecated KIO::UDSEntry::insert()
...
Summary:
Using replace for DesktopProtocol::prepareUDSEntry(), as we have
no guarantee that certain fields are not set elsewhere in the call chain
Test Plan: Both kio-slave still work
Reviewers: #plasma, chinmoyr
Reviewed By: chinmoyr
Subscribers: chinmoyr, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18632
7 years ago
Friedrich W. H. Kossebau
3431ea6dd1
[kio_applications] Fix last dir item being shown twice
...
Summary:
During porting to the new KIO::SlaveBase::listEntry() API accidentally
the listEntry(entry, true) was turned into a listEntry(), where it
should have been just removed in favour of an existing finished() call.
See 0853202b0c
Test Plan: applications: and programs: no longer show the last entry twice
Reviewers: #plasma, chinmoyr
Reviewed By: chinmoyr
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18641
7 years ago
l10n daemon script
4434af7725
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"
7 years ago
l10n daemon script
5d6410de38
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"
7 years ago
Albert Astals Cid
48c72c349f
Use the nicer K_PLUGIN_CLASS_WITH_JSON
...
Reviewers: apol
Reviewed By: apol
Subscribers: apol, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18027
7 years ago
David Edmundson
c29d2528c1
[kioslave/desktop] Remove more QDBusInterface
...
Summary:
No need to introspect the service and then call a method by a hardcooded
name.
Test Plan: Compiles
Reviewers: #plasma, apol
Reviewed By: apol
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D16657
7 years ago
l10n daemon script
0d1c0e8b9e
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"
7 years ago
l10n daemon script
703f837f6b
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"
7 years ago
l10n daemon script
d2737d2b55
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"
7 years ago
l10n daemon script
65022a01cf
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"
8 years ago
Friedrich W. H. Kossebau
1894d888f7
Remove unused entry X-KDE-DBus-ModuleName from kded plugins' metadata
...
That entry has never been used, instead the plugin id (as by
KPluginMetaData::pluginId()) has been used for the module name in the
D-Bus object path.
8 years ago
l10n daemon script
6816ccdb48
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"
8 years ago
l10n daemon script
887d225c17
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"
8 years ago
l10n daemon script
4332eceebf
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"
8 years ago
l10n daemon script
61c5a248a7
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"
8 years ago
l10n daemon script
8b42997131
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"
8 years ago
l10n daemon script
f696e3d922
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"
8 years ago
l10n daemon script
856caef8e7
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"
8 years ago
l10n daemon script
9e82e3067b
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"
8 years ago
Friedrich W. H. Kossebau
5914517f66
Remove duplicated (X-KDE-)ServiceTypes entries
8 years ago
Friedrich W. H. Kossebau
45a19fa16c
Remove long-time deprecated Encoding=UTF-8 from desktop format files
...
Summary:
The "Encoding" entry had been deprecated in 2006
(https://cgit.freedesktop.org/xdg/xdg-specs/commit/?id=6855384d021d88557f80674798c584c15b547f36 )
and there is no current workspace known which still requires it being set
(incl. Plasma itself).
Also has the usage been incomplete and sometimes not at the beginning as
required if used (once scripty had sorted all entries in desktop files
alphabetically and it was not restored everywhere).
Removing them altogether creates consistency and avoids further confusion
about and wasted resources for this unused data bit.
Removing those entries also from Plasma/5.12 branch avoid conflicts on
merging to master, given the entries are often next to translated entries,
or generous merging which lets the entries slip back into existance.
Reviewers: #plasma, fvogt, broulik, mart
Reviewed By: #plasma, mart
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D11563
8 years ago
Kai Uwe Broulik
ee48796ec5
[DesktopNotifier] Notify change for any link to trash:/
...
With removal of default Trash and D10684 users can add the Trash link back themselves.
The file name isn't neccessarily "Trash.desktop", though, so check all desktop files for that when trash state changes.
Differential Revision: https://phabricator.kde.org/D10686
8 years ago
Laurent Montel
89bf7a2b93
Add Qt5::Nertwork
8 years ago
l10n daemon script
bfc86f245f
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"
8 years ago
Friedrich W. H. Kossebau
1564553705
Remove long-time deprecated Encoding=UTF-8 from desktop format files
8 years ago
Friedrich W. H. Kossebau
2608ccce81
Use nullptr
8 years ago
Jonathan Riddell
240d0d6fe1
No icons on the desktop by default
...
Summary:
Don't add Home.desktop to links folder and don't add trash link.
Closes T7948
Test Plan: Start plasma as new user
Reviewers: #plasma, hein
Reviewed By: #plasma, hein
Subscribers: ngraham, broulik, hein, mart, zzag, plasma-devel
Tags: #plasma
Maniphest Tasks: T7948
Differential Revision: https://phabricator.kde.org/D10588
8 years ago
l10n daemon script
1832948dc9
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"
8 years ago
l10n daemon script
4f9795bd49
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"
8 years ago
l10n daemon script
5cff4a6e4c
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"
8 years ago
Friedrich W. H. Kossebau
6e1946cec7
Remove module prefix from Qt includes
8 years ago
Friedrich W. H. Kossebau
3cffbfa568
Use non-deprecated KDEInstallDirs variables
8 years ago
Friedrich W. H. Kossebau
c2427f3e36
Remove no longer needed code variants for older versions of KF5
8 years ago
Friedrich W. H. Kossebau
05af140081
Fix tests being skipped due to executables not found after ECM min bump
...
ECM, when requiring ECM >=5.38, sets CMAKE_*_OUTPUT_DIRECTORY, so the
tests executables are no longer generated in the current binary dir.
Calling add_test() with the signature
add_test(<name> <command> [...])
will not result in any further processing of the <command> argument,
it will be executed as is. Using instead
add_test(NAME <name> COMMAND <command> [...])
will result in <command> getting some handling, cmp. CMake docs:
"If <command> specifies an executable target (created by add_executable())
it will automatically be replaced by the location of the executable
created at build time."
Which is what is needed now here (and also used in ecm_add_test).
8 years ago
l10n daemon script
d389cde75f
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"
8 years ago
l10n daemon script
6ea0292868
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"
8 years ago
Laurent Montel
bd8f77e9cf
Build test/autotest if BUILD_TESTING is defined
8 years ago
l10n daemon script
116174f442
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"
9 years ago
l10n daemon script
64bc9941fc
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"
9 years ago
David Faure
31bbfe5987
Improve unittest for renaming desktop icons
...
to ensure that the target URL is updated by KDirLister.
This unittest requires the KIO fix 1449ecf136 (KF 5.37).
CCBUG: 382341
The unittest detected a "//" in the UDS_LOCAL_PATH values,
so this commit fixed that as well.
9 years ago
René J.V. Bertin
a5a18f5ac7
kio_desktop: don't use QDesktopServices::storageLocation
...
The method is deprecated and using it can generate build failures (e.g.
with Qt 5.8+ and GCC 7.1+).
BUG: 381566
9 years ago
Luigi Toscano
039bff026c
Rename the translation catalog (avoid conflicts)
...
Avoid the conflict with their still-shipped counterparts from
kdelibs and kde-runtime.
9 years ago
Kai Uwe Broulik
d6121f3f5c
[desktop:/ KIO] Add descriptive name for root item
...
This way Folder View could use the root item for its heading instead of special-casing it for desktop:/
Differential Revision: https://phabricator.kde.org/D5221
9 years ago
Elvis Angelaccio
f81c73b8e2
Drop remote ioslave, which is now in KIO 5.32
...
As discussed on plasma-devel [1], the remote ioslave has been moved to kio [2].
This bumps the minimum KF5 version to 5.32
[1]: https://mail.kde.org/pipermail/plasma-devel/2016-November/061750.html
[2]: https://phabricator.kde.org/D4690
BUG: 371825
FIXED-IN: 5.10
Differential Revision: https://phabricator.kde.org/D3531
9 years ago
Elvis Angelaccio
4c12339852
[kioslave/remote] Cleanup includes
...
GIT_SILENT
9 years ago