bugfix/5-increase-avatar-size-and-font-conrtast #6

Merged
hygienic-books merged 3 commits from bugfix/5-increase-avatar-size-and-font-conrtast into master 2022-03-06 20:18:13 +00:00
7 changed files with 76 additions and 16 deletions

View File

@ -616,9 +616,6 @@ Rectangle {
id: clock id: clock
y: parent.height * config.relativePositionY - clock.height / 2 y: parent.height * config.relativePositionY - clock.height / 2
x: parent.width * config.relativePositionX - clock.width / 2 x: parent.width * config.relativePositionX - clock.width / 2
color: "white"
timeFont.family: textFont.name
dateFont.family: textFont.name
} }
Rectangle { Rectangle {

View File

@ -14,6 +14,7 @@ import QtQuick.Controls 1.3 as QQC
PlasmaComponents.ToolButton { PlasmaComponents.ToolButton {
id: root id: root
property int currentIndex: -1 property int currentIndex: -1
opacity: config.sessionButtonOpacity
implicitWidth: minimumWidth implicitWidth: minimumWidth

37
components/Clock.qml Normal file
View File

@ -0,0 +1,37 @@
/*
SPDX-FileCopyrightText: 2016 David Edmundson <davidedmundson@kde.org>
SPDX-License-Identifier: LGPL-2.0-or-later
*/
import QtQuick 2.8
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.5 as QQC2
import org.kde.plasma.core 2.0 as PlasmaCore
ColumnLayout {
readonly property bool softwareRendering: GraphicsInfo.api === GraphicsInfo.Software
QQC2.Label {
text: Qt.formatTime(timeSource.data["Local"]["DateTime"])
color: config.textColor
style: Text.Outline
styleColor: config.textOutlineColor
font.pointSize: config.timeFontPointSize
Layout.alignment: Qt.AlignHCenter
}
QQC2.Label {
text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.DefaultLocaleLongDate)
color: config.textColor
style: Text.Outline
styleColor: config.textOutlineColor
font.pointSize: config.dateFontPointSize
Layout.alignment: Qt.AlignHCenter
}
PlasmaCore.DataSource {
id: timeSource
engine: "time"
connectedSources: ["Local"]
interval: 1000
}
}

View File

@ -30,9 +30,9 @@ Item {
property int fontSize: PlasmaCore.Theme.defaultFont.pointSize + 2 property int fontSize: PlasmaCore.Theme.defaultFont.pointSize + 2
signal clicked() signal clicked()
property real faceSize: PlasmaCore.Units.gridUnit * 7 property real faceSize: PlasmaCore.Units.gridUnit * config.faceSizeInGridUnits
opacity: isCurrent ? 1.0 : 0.5 opacity: isCurrent ? 1.0 : config.avatarOpacityWhenNotSelected
Behavior on opacity { Behavior on opacity {
OpacityAnimator { OpacityAnimator {
@ -58,13 +58,13 @@ Item {
bottomMargin: PlasmaCore.Units.largeSpacing bottomMargin: PlasmaCore.Units.largeSpacing
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
} }
Behavior on width { Behavior on width {
PropertyAnimation { PropertyAnimation {
from: faceSize from: faceSize
duration: PlasmaCore.Units.longDuration; duration: PlasmaCore.Units.longDuration;
} }
} }
width: isCurrent ? faceSize : faceSize - PlasmaCore.Units.largeSpacing width: isCurrent ? faceSize : faceSize * config.faceSizeFactorWhenNotSelected
height: width height: width
//Image takes priority, taking a full path to a file, if that doesn't exist we show an icon //Image takes priority, taking a full path to a file, if that doesn't exist we show an icon
@ -152,15 +152,16 @@ Item {
id: usernameDelegate id: usernameDelegate
// Make it bigger than other fonts to match the scale of the avatar better // Make it bigger than other fonts to match the scale of the avatar better
font.pointSize: wrapper.fontSize + 4 font.pointSize: config.usernamePointSize
anchors { anchors {
bottom: parent.bottom bottom: parent.bottom
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
} }
width: constrainText ? parent.width : implicitWidth width: constrainText ? parent.width : implicitWidth
text: wrapper.name text: wrapper.name
style: softwareRendering ? Text.Outline : Text.Normal style: Text.Outline
styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter styleColor: config.textOutlineColor
color: config.textColor
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
//make an indication that this has active focus, this only happens when reached with keyboard navigation //make an indication that this has active focus, this only happens when reached with keyboard navigation

View File

@ -10,8 +10,8 @@ import org.kde.plasma.core 2.0 as PlasmaCore
ListView { ListView {
id: view id: view
readonly property string selectedUser: currentItem ? currentItem.userName : "" readonly property string selectedUser: currentItem ? currentItem.userName : ""
readonly property int userItemWidth: PlasmaCore.Units.gridUnit * 8 readonly property int userItemWidth: PlasmaCore.Units.gridUnit * config.faceElemWidthInGridUnits
readonly property int userItemHeight: PlasmaCore.Units.gridUnit * 8 readonly property int userItemHeight: PlasmaCore.Units.gridUnit * config.faceElemHeightInGridUnits
property int fontSize: PlasmaCore.Theme.defaultFont.pointSize + 2 property int fontSize: PlasmaCore.Theme.defaultFont.pointSize + 2
implicitHeight: userItemHeight implicitHeight: userItemHeight

View File

@ -9,8 +9,6 @@ needsFullUserModel=false
background_img_day=background.jpg background_img_day=background.jpg
background_img_night=background.jpg background_img_night=background.jpg
background_vid_day=playlists/day.m3u
background_vid_night=playlists/night.m3u
displayFont="Droid Sans Mono for Powerline" displayFont="Droid Sans Mono for Powerline"
showLoginButton=true showLoginButton=true
passwordLeftMargin=15 passwordLeftMargin=15
@ -19,3 +17,17 @@ relativePositionX=0.3
relativePositionY=0.7 relativePositionY=0.7
showTopBar=true showTopBar=true
autofocusInput=true autofocusInput=true
background_vid_day=playlists/all_sd.m3u
background_vid_night=playlists/all_sd.m3u
sessionButtonOpacity=0.5
textColor=white
textOutlineColor=black
avatarOpacityWhenNotSelected=0.75
faceSizeInGridUnits=10
faceSizeFactorWhenNotSelected=0.75
faceElemWidthInGridUnits=11
faceElemHeightInGridUnits=11
usernamePointSize=20
timeFontPointSize=56
dateFontPointSize=24

View File

@ -1,6 +1,4 @@
[General] [General]
background_vid_day=playlists/day.m3u
background_vid_night=playlists/night.m3u
passwordLeftMargin=15 passwordLeftMargin=15
relativePositionX=0.5 relativePositionX=0.5
relativePositionY=0.75 relativePositionY=0.75
@ -9,3 +7,17 @@ type=color
usernameLeftMargin=15 usernameLeftMargin=15
showTopBar=true showTopBar=true
autofocusInput=true autofocusInput=true
background_vid_day=playlists/all_sd.m3u
background_vid_night=playlists/all_sd.m3u
sessionButtonOpacity=0.5
textColor=white
textOutlineColor=black
avatarOpacityWhenNotSelected=0.75
faceSizeInGridUnits=10
faceSizeFactorWhenNotSelected=0.75
faceElemWidthInGridUnits=11
faceElemHeightInGridUnits=11
usernamePointSize=20
timeFontPointSize=56
dateFontPointSize=24