cookie clock: remove useless vars, adjust settings icons

This commit is contained in:
end-4
2025-10-11 18:14:57 +02:00
parent 1f5527164c
commit edc83764c4
5 changed files with 17 additions and 25 deletions
@@ -18,11 +18,6 @@ Item {
readonly property string clockStyle: Config.options.background.clock.style
property real implicitSize: 230
property real hourDotSize: 12
property real hourLineSize: 4
property real minuteLineSize: 2
property real hourNumberSize: 36
property real dateSquareSize: 64
property color colShadow: Appearance.colors.colShadow
property color colBackground: Appearance.colors.colSecondaryContainer
@@ -31,8 +26,6 @@ Item {
property color colHourHand: Appearance.colors.colPrimary
property color colMinuteHand: Appearance.colors.colSecondary
property color colSecondHand: Appearance.colors.colTertiary
property color colOnHourHand: Appearance.colors.colOnPrimary
property color colTimeIndicators: Appearance.colors.colSecondaryContainerHover
readonly property list<string> clockNumbers: DateTime.time.split(/[: ]/)
readonly property int clockHour: parseInt(clockNumbers[0]) % 12
@@ -157,7 +150,6 @@ Item {
sourceComponent: DateIndicator {
color: root.colBackgroundInfo
style: Config.options.background.clock.cookie.dateStyle
dateSquareSize: root.dateSquareSize
}
}
}
@@ -9,14 +9,14 @@ import QtQuick
Item {
id: root
property string style: "rotating"
property string style: "bubble"
property color color: Appearance.colors.colOnSecondaryContainer
property real dateSquareSize: 64
// Rotating date
FadeLoader {
anchors.fill: parent
shown: Config.options.background.clock.cookie.dateStyle === "rotating"
shown: Config.options.background.clock.cookie.dateStyle === "border"
sourceComponent: RotatingDate {
color: root.color
}
@@ -18,7 +18,7 @@ Item {
readonly property string dialStyle: Config.options.background.clock.cookie.dialNumberStyle
readonly property bool timeIndicators: Config.options.background.clock.cookie.timeIndicators
property real radius: style === "rotating" ? 90 : 0
property real radius: style === "border" ? 90 : 0
Behavior on radius {
animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
}
@@ -135,7 +135,7 @@ Singleton {
property string hourHandStyle: "fill" // Options: "classic", "fill", "hollow", "hide"
property string minuteHandStyle: "medium" // Options "classic", "thin", "medium", "bold", "hide"
property string secondHandStyle: "dot" // Options: "dot", "line" , "hide"
property string dateStyle: "bubble" // Options: "rotating", "rect", "bubble" , "hide"
property string dateStyle: "bubble" // Options: "border", "rect", "bubble" , "hide"
property bool timeIndicators: true
property bool hourMarks: true
property bool dateInClock: true
@@ -61,7 +61,7 @@ ContentPage {
title: Translation.tr("Cookie clock settings")
ConfigSpinBox {
visible: Config.options.background.clock.style === "cookie"
icon: "support"
icon: "add_triangle"
text: Translation.tr("Sides")
value: Config.options.background.clock.cookie.sides
from: 1
@@ -106,8 +106,8 @@ ContentPage {
ConfigSwitch {
enabled: Config.options.background.clock.style === "cookie" && Config.options.background.clock.cookie.dialNumberStyle !== "numbers"
buttonIcon: "farsight_digital"
text: Translation.tr("Clock indicator")
buttonIcon: "timer_10"
text: Translation.tr("Digits in the middle")
checked: Config.options.background.clock.cookie.timeIndicators
onEnabledChanged: {
checked = Config.options.background.clock.cookie.timeIndicators;
@@ -149,12 +149,12 @@ ContentPage {
},
{
displayName: Translation.tr("Full"),
icon: "avg_pace",
icon: "history_toggle_off",
value: "full"
},
{
displayName: Translation.tr("Numbers"),
icon: "123",
icon: "counter_1",
value: "numbers"
}
]
@@ -181,13 +181,13 @@ ContentPage {
value: "classic"
},
{
displayName: Translation.tr("Hollow"),
displayName: Translation.tr("circle"),
icon: "stroke_partial",
value: "hollow"
},
{
displayName: Translation.tr("Fill"),
icon: "stroke_full",
icon: "eraser_size_5",
value: "fill"
},
]
@@ -216,17 +216,17 @@ ContentPage {
},
{
displayName: Translation.tr("Thin"),
icon: "pen_size_1",
icon: "line_end",
value: "thin"
},
{
displayName: Translation.tr("Medium"),
icon: "pen_size_3",
icon: "eraser_size_2",
value: "medium"
},
{
displayName: Translation.tr("Bold"),
icon: "pen_size_5",
icon: "eraser_size_4",
value: "bold"
},
]
@@ -288,13 +288,13 @@ ContentPage {
value: "bubble"
},
{
displayName: Translation.tr("Rotating"),
displayName: Translation.tr("Border"),
icon: "rotate_right",
value: "rotating"
value: "border"
},
{
displayName: Translation.tr("Rect"),
icon: "square",
icon: "rectangle",
value: "rect"
}
]