From aced0d6a84716a5d7da919691bb2ab71e73c06f6 Mon Sep 17 00:00:00 2001 From: qewer33 Date: Fri, 17 Dec 2021 17:59:30 +0300 Subject: [PATCH] Fix custom date format config --- ClearClock.files | 0 ClearClock.includes | 1 + build.sh | 1 + package/contents/config/main.xml | 8 ++++---- package/contents/ui/configAppearance.qml | 10 ++++------ package/contents/ui/main.qml | 22 +++++++++++----------- 6 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 ClearClock.files create mode 100644 ClearClock.includes create mode 100644 build.sh diff --git a/ClearClock.files b/ClearClock.files new file mode 100644 index 0000000..e69de29 diff --git a/ClearClock.includes b/ClearClock.includes new file mode 100644 index 0000000..ba3bd78 --- /dev/null +++ b/ClearClock.includes @@ -0,0 +1 @@ +package diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ + diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml index 3a885a0..4d419e7 100644 --- a/package/contents/config/main.xml +++ b/package/contents/config/main.xml @@ -17,7 +17,7 @@ - + ClearClock Default @@ -42,7 +42,7 @@ - + ClearClock Default @@ -61,7 +61,7 @@ true - + d MMMM yyyy @@ -71,7 +71,7 @@ - + ClearClock Default diff --git a/package/contents/ui/configAppearance.qml b/package/contents/ui/configAppearance.qml index 3f12c13..8fbd4b7 100644 --- a/package/contents/ui/configAppearance.qml +++ b/package/contents/ui/configAppearance.qml @@ -66,6 +66,10 @@ Item { id: fontsModel Component.onCompleted: { var arr = [] // use temp array to avoid constant binding stuff + arr.push({ + "text": "ClearClock Default", + "value": "ClearClock Default" + }) arr.push({ "text": i18nc("Use default font", "Default"), "value": "" @@ -139,10 +143,8 @@ Item { QtControls.ComboBox { id: clockFontFamilyComboBox QtLayouts.Layout.fillWidth: true - // ComboBox's sizing is just utterly broken QtLayouts.Layout.minimumWidth: units.gridUnit * 10 model: fontsModel - // doesn't autodeduce from model because we manually populate it textRole: "text" onCurrentIndexChanged: { @@ -239,10 +241,8 @@ Item { QtControls.ComboBox { id: dayFontFamilyComboBox QtLayouts.Layout.fillWidth: true - // ComboBox's sizing is just utterly broken QtLayouts.Layout.minimumWidth: units.gridUnit * 10 model: fontsModel - // doesn't autodeduce from model because we manually populate it textRole: "text" onCurrentIndexChanged: { @@ -363,10 +363,8 @@ Item { QtControls.ComboBox { id: dateFontFamilyComboBox QtLayouts.Layout.fillWidth: true - // ComboBox's sizing is just utterly broken QtLayouts.Layout.minimumWidth: units.gridUnit * 10 model: fontsModel - // doesn't autodeduce from model because we manually populate it textRole: "text" onCurrentIndexChanged: { diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml index ae9f639..2502361 100644 --- a/package/contents/ui/main.qml +++ b/package/contents/ui/main.qml @@ -54,10 +54,10 @@ Item { spacing: -20 TextMetrics { - id: textMetricsTimeLabel - font.family: timeLabel.font.family - font.pixelSize: timeLabel.font.pixelSize - font.bold: timeLabel.font.bold + id: textMetricsClockLabel + font.family: clockLabel.font.family + font.pixelSize: clockLabel.font.pixelSize + font.bold: clockLabel.font.bold text: " 99:99 " } @@ -69,18 +69,18 @@ Item { } Item { - width: max(textMetricsTimeLabel.width, textMetricsDayLabel.width) - height: max(textMetricsTimeLabel.height, textMetricsDayLabel.height) + width: max(textMetricsClockLabel.width, textMetricsDayLabel.width) + height: max(textMetricsClockLabel.height, textMetricsDayLabel.height) Layout.alignment: Qt.AlignCenter PlasmaComponents.Label { - id: timeLabel + id: clockLabel anchors.centerIn: parent text: Qt.formatTime(currentDateTime).replace(":", ".") color: plasmoid.configuration.clockFontColor - font.family: if (plasmoid.configuration.clockFontFamily === "") fontOutfitBold.name + font.family: if (plasmoid.configuration.clockFontFamily === "ClearClock Default") fontOutfitBold.name else plasmoid.configuration.clockFontFamily font.bold: plasmoid.configuration.clockBoldText font.italic: plasmoid.configuration.clockItalicText @@ -95,7 +95,7 @@ Item { text: Qt.formatDate(currentDateTime, "dddd") color: plasmoid.configuration.dayFontColor - font.family: if (plasmoid.configuration.dayFontFamily === "") fontSmooch.name + font.family: if (plasmoid.configuration.dayFontFamily === "ClearClock Default") fontSmooch.name else plasmoid.configuration.dayFontFamily font.bold: plasmoid.configuration.daykBoldText font.italic: plasmoid.configuration.dayItalicText @@ -108,10 +108,10 @@ Item { visible: plasmoid.configuration.showDateDisplay Layout.alignment: Qt.AlignCenter - text: Qt.formatDate(currentDateTime, plasmoid.configuration.customDateFormat) + text: Qt.formatDate(currentDateTime, plasmoid.configuration.dateCustomDateFormat) color: plasmoid.configuration.dateFontColor - font.family: if (plasmoid.configuration.dateFontFamily === "") fontOutfitRegular.name + font.family: if (plasmoid.configuration.dateFontFamily === "ClearClock Default") fontOutfitRegular.name else plasmoid.configuration.dateFontFamily font.bold: plasmoid.configuration.dateBoldText font.italic: plasmoid.configuration.dateItalicText