diff --git a/Clear Clock v05.tar.gz b/Clear Clock v05.tar.gz deleted file mode 100644 index 247d5fc..0000000 Binary files a/Clear Clock v05.tar.gz and /dev/null differ diff --git a/ClearClock.tar.gz b/ClearClock.tar.gz deleted file mode 100644 index 247d5fc..0000000 Binary files a/ClearClock.tar.gz and /dev/null differ diff --git a/README.md b/README.md index c645c35..382d6a3 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,9 @@
-# 🕒 Clear Clock -A simple but configurable KDE plasmoid/widget for displaying date and time. +# 🕒 Clear Clock KDE plasma widget fork -[KDE Store **Plasma 5**](https://store.kde.org/p/1666554/) | [KDE Store **Plasma 6**](https://store.kde.org/p/2147871/) +Original work :https://github.com/qewer33/ClearClock -If you like this Plasma widget and want to support me, consider getting me a coffee! :D +Fonts updated, user's default locale set -[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/B0B8FQ871) - -
-
- -![screenshot](https://github.com/qewer33/ClearClock/blob/main/assets/screenshot.png?raw=true) +![widget_example_secreenshot](assets/screenshot.png) diff --git a/assets/screenshot.png b/assets/screenshot.png index 4485d81..2fac578 100644 Binary files a/assets/screenshot.png and b/assets/screenshot.png differ diff --git a/install.sh b/install.sh index 675daf0..8a69d81 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ - #!/usr/bin/env bash +#!/usr/bin/env bash get_project_id() { line=$(grep "^X-KDE-PluginInfo-Name" package/metadata.desktop) diff --git a/launch.sh b/launch.sh index f6d63ec..a50ee94 100755 --- a/launch.sh +++ b/launch.sh @@ -1,3 +1,3 @@ - #!/usr/bin/env bash +#!/usr/bin/env bash - plasmoidviewer -a package +plasmoidviewer -a package diff --git a/package/contents/fonts/Caveat-Bold.ttf b/package/contents/fonts/Caveat-Bold.ttf new file mode 100644 index 0000000..64c12c7 Binary files /dev/null and b/package/contents/fonts/Caveat-Bold.ttf differ diff --git a/package/contents/fonts/Outfit-Regular.ttf b/package/contents/fonts/Outfit-Regular.ttf deleted file mode 100644 index 7a60fc6..0000000 Binary files a/package/contents/fonts/Outfit-Regular.ttf and /dev/null differ diff --git a/package/contents/fonts/Play-Regular.ttf b/package/contents/fonts/Play-Regular.ttf new file mode 100644 index 0000000..5b916dd Binary files /dev/null and b/package/contents/fonts/Play-Regular.ttf differ diff --git a/package/contents/fonts/Smooch-Regular.ttf b/package/contents/fonts/Smooch-Regular.ttf deleted file mode 100644 index 6530f04..0000000 Binary files a/package/contents/fonts/Smooch-Regular.ttf and /dev/null differ diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml index 044f2f0..6ff9631 100644 --- a/package/contents/ui/main.qml +++ b/package/contents/ui/main.qml @@ -35,13 +35,13 @@ PlasmoidItem { } FontLoader { - id: fontOutfitRegular - source: "../fonts/Outfit-Regular.ttf" + id: fontPlayRegular + source: "../fonts/Play-Regular.ttf" } FontLoader { - id: fontSmooch - source: "../fonts/Smooch-Regular.ttf" + id: fontCaveat + source: "../fonts/Caveat-Bold.ttf" } fullRepresentation: ColumnLayout { @@ -77,9 +77,9 @@ PlasmoidItem { property var getTextFormat: { var AMPM = plasmoid.configuration.clockUse24hFormat ? "" : " AP" if (plasmoid.configuration.clockShowSeconds) - return Qt.formatTime(currentDateTime, "hh.mm.ss" + AMPM).split(".").join(plasmoid.configuration.clockSeparator) + return Qt.formatTime(currentDateTime, "hh:mm:ss" + AMPM).split(".").join(plasmoid.configuration.clockSeparator) else - return Qt.formatTime(currentDateTime, "hh.mm" + AMPM).split(".").join(plasmoid.configuration.clockSeparator) + return Qt.formatTime(currentDateTime, "hh:mm" + AMPM).split(".").join(plasmoid.configuration.clockSeparator) } text: getTextFormat @@ -106,10 +106,10 @@ PlasmoidItem { visible: plasmoid.configuration.showDayDisplay anchors.centerIn: parent - text: Qt.formatDate(currentDateTime, "dddd") + text: currentDateTime.toLocaleString(Qt.locale(), "dddd") color: plasmoid.configuration.dayFontColor - font.family: if (plasmoid.configuration.dayFontFamily === "ccdefault") fontSmooch.name + font.family: if (plasmoid.configuration.dayFontFamily === "ccdefault") fontCaveat.name else plasmoid.configuration.dayFontFamily font.bold: plasmoid.configuration.dayBoldText font.italic: plasmoid.configuration.dayItalicText @@ -131,10 +131,10 @@ PlasmoidItem { visible: plasmoid.configuration.showDateDisplay Layout.alignment: Qt.AlignHCenter - text: Qt.formatDate(currentDateTime, plasmoid.configuration.dateCustomDateFormat) + text: currentDateTime.toLocaleString(Qt.locale(), plasmoid.configuration.dateCustomDateFormat) color: plasmoid.configuration.dateFontColor - font.family: if (plasmoid.configuration.dateFontFamily === "ccdefault") fontOutfitRegular.name + font.family: if (plasmoid.configuration.dateFontFamily === "ccdefault") fontPlayRegular.name else plasmoid.configuration.dateFontFamily font.bold: plasmoid.configuration.dateBoldText font.italic: plasmoid.configuration.dateItalicText