Parameterize colors, sizes, margins

This commit is contained in:
hygienic-books 2022-03-06 21:17:10 +01:00
parent 53de25cc27
commit 79ae3de435
6 changed files with 38 additions and 28 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,22 +14,18 @@ ColumnLayout {
QQC2.Label { QQC2.Label {
text: Qt.formatTime(timeSource.data["Local"]["DateTime"]) text: Qt.formatTime(timeSource.data["Local"]["DateTime"])
color: PlasmaCore.ColorScope.textColor color: config.textColor
// style: softwareRendering ? Text.Outline : Text.Normal
// styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
style: Text.Outline style: Text.Outline
styleColor: "gray" styleColor: config.textOutlineColor
font.pointSize: 48 font.pointSize: config.timeFontPointSize
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
QQC2.Label { QQC2.Label {
text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.DefaultLocaleLongDate) text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.DefaultLocaleLongDate)
color: PlasmaCore.ColorScope.textColor color: config.textColor
// style: softwareRendering ? Text.Outline : Text.Normal
// styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
style: Text.Outline style: Text.Outline
styleColor: "gray" styleColor: config.textOutlineColor
font.pointSize: 24 font.pointSize: config.dateFontPointSize
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
PlasmaCore.DataSource { PlasmaCore.DataSource {

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 * 10 property real faceSize: PlasmaCore.Units.gridUnit * config.faceSizeInGridUnits
opacity: isCurrent ? 1.0 : 0.75 opacity: isCurrent ? 1.0 : config.avatarOpacityWhenNotSelected
Behavior on opacity { Behavior on opacity {
OpacityAnimator { OpacityAnimator {
@ -64,7 +64,7 @@ Item {
duration: PlasmaCore.Units.longDuration; duration: PlasmaCore.Units.longDuration;
} }
} }
width: isCurrent ? faceSize : faceSize * 0.75 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,19 +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 + 10 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
// styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
style: Text.Outline style: Text.Outline
styleColor: "gray" styleColor: config.textOutlineColor
// Text { font.pointSize: 18; text: "hello"; style: Text.Raised; styleColor: "gray" } color: config.textColor
color: 'white'
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 * 11 readonly property int userItemWidth: PlasmaCore.Units.gridUnit * config.faceElemWidthInGridUnits
readonly property int userItemHeight: PlasmaCore.Units.gridUnit * 11 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
@ -20,4 +18,16 @@ 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 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
@ -10,4 +8,16 @@ 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 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