diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/background/DesktopClock.qml | 2 | ||||
| -rw-r--r-- | modules/bar/components/Clock.qml | 2 | ||||
| -rw-r--r-- | modules/dashboard/dash/DateTime.qml | 95 | ||||
| -rw-r--r-- | modules/lock/Clock.qml | 18 |
4 files changed, 64 insertions, 53 deletions
diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index 380e65a..a0e3f13 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -11,7 +11,7 @@ Item { id: timeText anchors.centerIn: parent - text: Time.format("hh:mm:ss") + text: Time.format(Config.services.useTwelveHourClock ? "hh:mm:ss A" : "hh:mm:ss") font.pointSize: Appearance.font.size.extraLarge font.bold: true } diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index a384f51..f045f9d 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -25,7 +25,7 @@ Column { anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: StyledText.AlignHCenter - text: Time.format("hh\nmm") + text: Time.format(Config.services.useTwelveHourClock ? "hh\nmm\nA" : "hh\nmm") font.pointSize: Appearance.font.size.smaller font.family: Appearance.font.family.mono color: root.colour diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml index b7c7cfd..57fac83 100644 --- a/modules/dashboard/dash/DateTime.qml +++ b/modules/dashboard/dash/DateTime.qml @@ -2,70 +2,67 @@ import qs.widgets import qs.services import qs.config import QtQuick +import QtQuick.Layouts Item { id: root + readonly property list<string> timeComponents: Time.format(Config.services.useTwelveHourClock ? "hh:mm:A" : "hh:mm").split(":") + anchors.top: parent.top anchors.bottom: parent.bottom implicitWidth: Config.dashboard.sizes.dateTimeWidth - StyledText { - id: hours - + ColumnLayout { anchors.left: parent.left anchors.right: parent.right - anchors.top: parent.top - anchors.topMargin: (root.height - (hours.implicitHeight + sep.implicitHeight + sep.anchors.topMargin + mins.implicitHeight + mins.anchors.topMargin + date.implicitHeight + date.anchors.topMargin)) / 2 - - horizontalAlignment: Text.AlignHCenter - text: Time.format("HH") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } + anchors.verticalCenter: parent.verticalCenter + spacing: 0 - StyledText { - id: sep + StyledText { + Layout.alignment: Qt.AlignHCenter + text: root.timeComponents[0] + color: Colours.palette.m3secondary + font.pointSize: Appearance.font.size.extraLarge + font.weight: 600 + } - anchors.left: parent.left - anchors.right: parent.right - anchors.top: hours.bottom - anchors.topMargin: -font.pointSize * 0.5 + StyledText { + Layout.topMargin: -(font.pointSize * 0.2) + Layout.alignment: Qt.AlignHCenter + text: "•••" + color: Colours.palette.m3primary + font.pointSize: Appearance.font.size.extraLarge * 0.9 + } - horizontalAlignment: Text.AlignHCenter - text: "•••" - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge * 0.9 - } + StyledText { + Layout.alignment: Qt.AlignHCenter + text: root.timeComponents[1] + color: Colours.palette.m3secondary + font.pointSize: Appearance.font.size.extraLarge + font.weight: 600 + } - StyledText { - id: mins + StyledText { + visible: Config.services.useTwelveHourClock + Layout.topMargin: Appearance.spacing.small + Layout.alignment: Qt.AlignHCenter - anchors.left: parent.left - anchors.right: parent.right - anchors.top: sep.bottom - anchors.topMargin: -sep.font.pointSize * 0.45 - - horizontalAlignment: Text.AlignHCenter - text: Time.format("mm") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - id: date - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: mins.bottom - anchors.topMargin: Appearance.spacing.normal + text: root.timeComponents[2] + color: Colours.palette.m3secondary + font.pointSize: Appearance.font.size.large + font.weight: 600 + } - horizontalAlignment: Text.AlignHCenter - text: Time.format("ddd, d") - color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.normal - font.weight: 500 + StyledText { + Layout.topMargin: Appearance.spacing.normal + Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + text: Time.format("ddd, d") + color: Colours.palette.m3tertiary + font.pointSize: Appearance.font.size.normal + font.weight: 500 + elide: Text.ElideRight + } } } diff --git a/modules/lock/Clock.qml b/modules/lock/Clock.qml index 43d7d4d..888c877 100644 --- a/modules/lock/Clock.qml +++ b/modules/lock/Clock.qml @@ -1,6 +1,7 @@ import qs.widgets import qs.services import qs.config +import QtQuick import QtQuick.Layouts ColumnLayout { @@ -8,13 +9,15 @@ ColumnLayout { spacing: 0 + readonly property list<string> timeComponents: Time.format(Config.services.useTwelveHourClock ? "hh:mm:A" : "hh:mm").split(":") + RowLayout { Layout.alignment: Qt.AlignHCenter spacing: Appearance.spacing.small StyledText { Layout.alignment: Qt.AlignVCenter - text: Time.format("HH") + text: root.timeComponents[0] color: Colours.palette.m3secondary font.pointSize: Appearance.font.size.extraLarge * 4 font.family: Appearance.font.family.mono @@ -32,12 +35,23 @@ ColumnLayout { StyledText { Layout.alignment: Qt.AlignVCenter - text: Time.format("mm") + text: root.timeComponents[1] color: Colours.palette.m3secondary font.pointSize: Appearance.font.size.extraLarge * 4 font.family: Appearance.font.family.mono font.weight: 800 } + + StyledText { + visible: Config.services.useTwelveHourClock + Layout.leftMargin: Appearance.spacing.normal + Layout.alignment: Qt.AlignVCenter + + text: root.timeComponents[2] + color: Colours.palette.m3primary + font.pointSize: Appearance.font.size.extraLarge * 3 + font.weight: 700 + } } StyledText { |