Version 0.5.4 with new options

MarianArlt · Nov 3, 2018 · b218822 · b218822
1 parent fc8d3bb
commit b218822
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.5.4] - 2018-11-03
+
+### Changed
+
+- Fixes a bug where "FontPointSize" would not affect the size of the power buttons labels
+- Added a new variable "Font" to hard set a specific font for your greeter
+- Added the option "AvatarOutline"" to make your Avatar Image appear with an outline
+- Options for the appearance of the outline: "AvatarOutlineColor" and "AvatarOutlineWidth"
+
 ## [0.5.3] - 2018-10-12
 
 ### Changed

diff --git a/Login.qml b/Login.qml
@@ -48,7 +48,7 @@ SessionManagementScreen {
         Layout.fillWidth: true
         Layout.minimumHeight: 21
         implicitHeight: root.height / 28
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         font.pointSize: usernameFontSize
         opacity: 0.5
         text: lastUserName
@@ -72,7 +72,7 @@ SessionManagementScreen {
         implicitHeight: usernameFontSize * 2.85
         font.pointSize: usernameFontSize * 0.8
         opacity: passwordFieldOutlined ? 0.75 : 0.5
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         placeholderText: config.PasswordFieldPlaceholderText == "Password" ? i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password") : config.PasswordFieldPlaceholderText
         focus: !showUsernamePrompt || lastUserName
         echoMode: TextInput.Password

diff --git a/SessionButton.qml b/SessionButton.qml
@@ -30,7 +30,7 @@ PlasmaComponents.ToolButton {
     property int sessionFontSize
 
     visible: menu.items.length > 1
-    font.family: "Noto Sans"
+    font.family: config.Font || "Noto Sans"
     font.pointSize: sessionFontSize
 
     text: instantiator.objectAt(currentIndex).text || ""

diff --git a/components/ActionButton.qml b/components/ActionButton.qml
@@ -52,8 +52,8 @@ Item {
 
     PlasmaComponents.Label {
         id: label
-        font.family: "Noto Sans"
-        font.pointSize: mainStack.parent.height / 75
+        font.family: config.Font || "Noto Sans"
+        font.pointSize: config.FontPointSize || root.generalFontSize
         renderType: Text.QtRendering
         anchors {
             top: icon.bottom

diff --git a/components/Battery.qml b/components/Battery.qml
@@ -36,7 +36,7 @@ Row {
     PlasmaComponents.Label {
         id: batteryLabel
         height: undefined
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         font.pointSize: root.height/75
         renderType: Text.QtRendering
         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","%1%", battery.percent)

diff --git a/components/Clock.qml b/components/Clock.qml
@@ -30,13 +30,13 @@ RowLayout {
     KeyboardButton {}
     Battery {}
     Label {
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         font.pointSize: clockSize
         text: Qt.formatDateTime(timeSource.data["Local"]["DateTime"], " ddd dd MMMM,")
         renderType: Text.QtRendering
     }
     Label {
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         font.pointSize: clockSize
         text: Qt.formatTime(timeSource.data["Local"]["DateTime"])
         renderType: Text.QtRendering

diff --git a/components/KeyboardButton.qml b/components/KeyboardButton.qml
@@ -11,7 +11,7 @@ PlasmaComponents.ToolButton {
 
     property int currentIndex: -1
 
-    font.family: "Noto Sans"
+    font.family: config.Font || "Noto Sans"
     font.pointSize: root.height/75
     // text: instantiator.objectAt(currentIndex).shortName
     visible: menu.items.length > 1

diff --git a/components/UserDelegate.qml b/components/UserDelegate.qml
@@ -57,6 +57,16 @@ Item {
         }
         anchors.bottomMargin: usernameDelegate.height * 0.5
 
+        Rectangle {
+            id: outline
+            anchors.fill: parent
+            anchors.margins: -(config.AvatarOutlineWidth) || -2
+            color: "transparent"
+            border.width: config.AvatarOutlineWidth || 2
+            border.color: config.AvatarOutlineColor || "white"
+            radius: 1000
+            visible: config.AvatarOutline == "true" ? true : false
+        }
         //Image takes priority, taking a full path to a file, if that doesn't exist we show an icon
         Image {
             id: face
@@ -92,7 +102,7 @@ Item {
 
     PlasmaComponents.Label {
         id: usernameDelegate
-        font.family: "Noto Sans"
+        font.family: config.Font || "Noto Sans"
         font.pointSize: config.FontPointSize ? config.FontPointSize * 1.2 : root.height / 80 * 1.2
         renderType: Text.QtRendering
         font.capitalization: Font.Capitalize

diff --git a/metadata.desktop b/metadata.desktop
@@ -2,9 +2,9 @@
 Name=Chili for Plasma
 Description=The hottest theme for KDE Plasma
 Author=Marian Alexander Arlt
-License=GPLv3
+License=GPL-3.0-or-later
 Type=sddm-theme
-Version=0.5.3
+Version=0.5.4
 Website=https://github.com/MarianArlt/kde-plasma-chili
 Screenshot=preview.png
 MainScript=Main.qml

diff --git a/theme.conf b/theme.conf
@@ -14,8 +14,12 @@ PasswordFieldCharacter=
 PasswordFieldPlaceholderText=Password
 
 UsePngInsteadOfMask=false
+AvatarOutline=false
+AvatarOutlineColor="white"
+AvatarOutlineWidth=2
 
 PowerIconSize=
+Font=
 FontPointSize=
 AvatarPixelSize=