Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Desktop
Commits
7ed963fa
Verified
Commit
7ed963fa
authored
Dec 02, 2020
by
Luca Beltrame
Browse files
Use DATADIR/plasma/avatars instead of DATADIR/plasma-avatars
Given we have DATADIR/plasma already, this makes more sense.
parent
987cafc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
kcms/users/CMakeLists.txt
View file @
7ed963fa
...
...
@@ -3,5 +3,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_users\")
add_subdirectory
(
src
)
install
(
FILES kcm_users.desktop DESTINATION
${
SERVICES_INSTALL_DIR
}
)
install
(
DIRECTORY avatars/ DESTINATION
${
DATA_INSTALL_DIR
}
/plasma
-
avatars
)
install
(
DIRECTORY avatars/ DESTINATION
${
DATA_INSTALL_DIR
}
/plasma
/
avatars
)
kpackage_install_package
(
package kcm_users kcms
)
kcms/users/src/kcm.cpp
View file @
7ed963fa
...
...
@@ -58,7 +58,7 @@ KCMUser::KCMUser(QObject *parent, const QVariantList &args)
auto
fm
=
QFontMetrics
(
font
);
setColumnWidth
(
fm
.
capHeight
()
*
30
);
const
auto
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"plasma
-
avatars"
),
QStandardPaths
::
LocateDirectory
);
const
auto
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"plasma
/
avatars"
),
QStandardPaths
::
LocateDirectory
);
for
(
const
auto
&
dir
:
dirs
)
{
QDirIterator
it
(
dir
,
...
...
@@ -114,7 +114,7 @@ QString KCMUser::initializeString(const QString& stringToGrabInitialsOf)
if
(
stringToGrabInitialsOf
.
isEmpty
())
return
""
;
auto
normalized
=
stringToGrabInitialsOf
.
normalized
(
QString
::
NormalizationForm_D
);
if
(
normalized
.
contains
(
" "
))
{
if
(
normalized
.
contains
(
" "
))
{
QStringList
split
=
normalized
.
split
(
" "
);
auto
first
=
split
.
first
();
auto
last
=
split
.
last
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment