Alexander Lohnau
0b09fe1bcf
Solve clazy warnings about range based for loops
5 years ago
Laurent Montel
457fd4d232
If include is define in .h remove it if it's defined in .cpp too (scripted)
5 years ago
Alexander Lohnau
29cd276f7e
Do not explicitely define Exec lines for KCMs
...
See https://invent.kde.org/frameworks/kservice/-/merge_requests/16
CCBUG: 398803
5 years ago
Nate Graham
9d252c4071
[kcms/fonts] Fix string puzzle in font chooser tooltips
...
These tooltips' text was built up by embedding one string inside
another, which is a recipe for string puzzles. Instead let's assign
the whole text individually, which will allow translators to
translate the entire string properly.
BUG: 428026
FIXED-IN: 5.21
5 years ago
Heiko Becker
63f1b86005
Make Prison a required dependency
...
7bd9bea072 started using Prison
unconditionally via QML import. So if Prison isn't installed the
clipboard applet stops working, complaining that "org.kde.prison is
not installed".
While it would certainly be possible to add another call to
"find_package(KF5Prison)" with TYPE RUNTIME, the result in
feature_summary would be very confusing, because OPTIONAL has a higher
priority and the runtime hint would vanish if you build with e.g.
-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=TRUE.
5 years ago
l10n daemon script
1917ebdbb2
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"
5 years ago
Benjamin Port
1f61ab2c25
KCM translations : Setup module data
5 years ago
Benjamin Port
ca2765cc11
KCM User feedback: Setup module data
5 years ago
Benjamin Port
dec9a10eb5
KCM: Generate module data using cmake function
5 years ago
l10n daemon script
d414d9699f
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"
6 years ago
Ahmad Samir
3c7d853d02
kio_fonts: remove test_kio_fonts, it's become redundant
...
This tested the old behaviour where kio_fonts used "fonts://", i.e. setting
the host part of the URL, this isn't the case anymore and just "fonts:/" is
used.
ACK'ed by dfaure:
https://invent.kde.org/frameworks/kio/-/merge_requests/127#note_117004
6 years ago
Alexander Lohnau
1359907119
Cleanup unneeded version checks
6 years ago
Ahmad Samir
7fca49ef69
Fix lookandfeel unit test
6 years ago
l10n daemon script
fc4bfe569f
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"
6 years ago
l10n daemon script
180ebece57
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"
6 years ago
l10n daemon script
7371158329
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"
6 years ago
l10n daemon script
11405d7749
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"
6 years ago
Christophe Giboudeaux
f0764d87fe
Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime errors
...
This commit was preventing gitk from starting with
'unknown color name "BACKGROUND"' errors.
This reverts commit d360e3dcb6 .
6 years ago
l10n daemon script
2c3fdcbab4
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"
6 years ago
l10n daemon script
b17696401c
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"
6 years ago
l10n daemon script
6f229f5684
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"
6 years ago
l10n daemon script
f033fdb5ba
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"
6 years ago
l10n daemon script
1d0a9cbcb7
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"
6 years ago
Aleix Pol
c2c648872f
Remove unnecessary include
6 years ago
l10n daemon script
59615cffaa
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"
6 years ago
Fabian Vogt
d360e3dcb6
krdb: Call xrdb with -nocpp
...
Avoids the C preprocessor: fewer dependencies, less overhead.
6 years ago
Carson Black
b529ec7aa7
[kcms/colors]: Improve writing color scheme to kdeglobals
...
The writing subroutine no longer:
- Leaves old groups behind when they don't exist in the new color scheme
- Properly handles writing [Colors:*][Inactive] subgroups
6 years ago
Ahmad Samir
b454aa3c31
KXftConfig: port from KGlobal::dirs to QStandardPaths
...
Drive-by changes: less implicit casting from ASCII
6 years ago
Ahmad Samir
d45e5b2387
KXftConfig: modernize code
...
- Use range-for/for_each algorithim
- Less implicit casting from ASCII
- Use string comparision instead of QRegExp, the former is usually faster
- Replace one letter var names with slightly longer ones
6 years ago
l10n daemon script
70a2186afc
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"
6 years ago
l10n daemon script
20875ff6bb
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"
6 years ago
l10n daemon script
5d1078dff9
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"
6 years ago
l10n daemon script
2aecf659a6
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"
6 years ago
l10n daemon script
3b125e8632
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"
6 years ago
l10n daemon script
02756af97f
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"
6 years ago
l10n daemon script
356d4686e0
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"
6 years ago
l10n daemon script
6d0c45a6bc
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"
6 years ago
l10n daemon script
f0919cb891
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"
6 years ago
l10n daemon script
551f41f03f
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"
6 years ago
l10n daemon script
32e5ee16c0
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"
6 years ago
Alexander Lohnau
ad79bb5dad
Fix KNS deprecations
6 years ago
Alexander Lohnau
76d056dc87
Enable RemoveDeadEntries option for KNS
...
CCBUG: 416255
6 years ago
l10n daemon script
bc96f3e839
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"
6 years ago
l10n daemon script
f738029d2e
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"
6 years ago
l10n daemon script
d8e284ae14
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"
6 years ago
l10n daemon script
d73ad7cb02
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"
6 years ago
Bhushan Shah
7d5806ff1c
kcms: move some of the KCMS to plasma-workspace
...
We currently need the lookandfeel and style kcm in plasma-workspace, but
appearantly they depend on the krdb so best solution is to move all kcms
together
They are taken from plasma-desktop at the commit :
8447c08e878ccbde9c5516ba8a912993ea199cb9
6 years ago
l10n daemon script
333e0de475
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"
6 years ago
Cyril Rossi
a7b49bec6c
KCM Feedback port to ManagedConfigModule and SettingStateBinding
6 years ago
Benjamin Port
0be055332b
[KCM] Use KCModuleData in order to allow settings loading without UI
...
- desktop theme
- icons
6 years ago