File 0002-Use-.face.icon-instead-of-default.face.ico... of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Use-.face.icon-instead-of-default.face.icon-and-rena.patch of Package sddm (Revision d3db36f72b2e4ad5eab3d65c11a1d180)

Currently displaying revision d3db36f72b2e4ad5eab3d65c11a1d180 , Show latest

From 58b794bb2a2fd407a08b6c4d9eb4f156823b34f1 Mon Sep 17 00:00:00 2001
From: Jerome Leclanche <jerome@leclan.ch>
Date: Thu, 5 Nov 2015 17:37:35 +0200
Subject: [PATCH 1/4] Use .face.icon instead of default.face.icon, and rename
 the sources to .png

Touches #174
---
 data/CMakeLists.txt              |  13 ++++++++++++-
 data/faces/README                |   3 ++-
 data/faces/default.face.icon     | Bin 4920 -> 0 bytes
 data/faces/default.face.icon.png | Bin 0 -> 4920 bytes
 data/faces/root.face.icon        | Bin 5111 -> 0 bytes
 data/faces/root.face.icon.png    | Bin 0 -> 5111 bytes
 src/greeter/UserModel.cpp        |   2 +-
 7 files changed, 15 insertions(+), 3 deletions(-)
 delete mode 100644 data/faces/default.face.icon
 create mode 100644 data/faces/default.face.icon.png
 delete mode 100644 data/faces/root.face.icon
 create mode 100644 data/faces/root.face.icon.png

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 51f37ab..f3b5781 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,3 @@
-install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
 install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
 
 install(FILES
@@ -8,6 +7,18 @@ install(FILES
 )
 
 install(FILES
+    "faces/root.face.icon.png"
+    DESTINATION "${DATA_INSTALL_DIR}/faces"
+    RENAME "root.face.icon"
+)
+
+install(FILES
+    "faces/default.face.icon.png"
+    DESTINATION "${DATA_INSTALL_DIR}/faces"
+    RENAME ".face.icon"
+)
+
+install(FILES
     "scripts/Xsession"
     "scripts/Xsetup"
     "scripts/Xstop"
diff --git a/data/faces/README b/data/faces/README
index be871e1..85479ad 100644
--- a/data/faces/README
+++ b/data/faces/README
@@ -1 +1,2 @@
-This files are directly copied from a KDE installation.
\ No newline at end of file
+These are the default avatars.
+They are installed to `.face.icon` and `root.face.icon`. See ../CMakeLists.txt.
diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
index 5c807bc..66ab6fb 100644
--- a/src/greeter/UserModel.cpp
+++ b/src/greeter/UserModel.cpp
@@ -82,7 +82,7 @@ namespace SDDM {
 
             // search for face icon
             QString facesDir = mainConfig.Theme.FacesDir.get();
-            QString defaultFace = QStringLiteral("%1/default.face.icon").arg(facesDir);
+            QString defaultFace = QStringLiteral("%1/.face.icon").arg(facesDir);
             bool avatarsEnabled = mainConfig.Theme.EnableAvatars.get();
 
             if (avatarsEnabled) {
-- 
2.6.2

Places

File 0002-Use-.face.icon-instead-of-default.face.icon-and-rena.patch of Package sddm (Revision d3db36f72b2e4ad5eab3d65c11a1d180)

Places