From 6a8329a2b7d4af5182a9d343131d9337d82a17f7 Mon Sep 17 00:00:00 2001 From: ferreo Date: Mon, 18 Nov 2024 10:23:10 +0000 Subject: [PATCH] Update changelog for v1.0.0-101pika10; switch to open source font and enhance widget font weight for consistency across the app --- .github/release-nest-v3 | 2 +- pikabar/debian/changelog | 6 ++++++ pikabar/usr/share/pikabar/CommonStyles.qml | 3 ++- pikabar/usr/share/pikabar/widgets/ActiveWindow.qml | 1 + pikabar/usr/share/pikabar/widgets/Calander.qml | 6 ++++-- pikabar/usr/share/pikabar/widgets/Clock.qml | 2 ++ pikabar/usr/share/pikabar/widgets/NowPlaying.qml | 2 ++ pikabar/usr/share/pikabar/widgets/Power.qml | 2 ++ pikabar/usr/share/pikabar/widgets/Stats.qml | 10 ++++++++-- pikabar/usr/share/pikabar/widgets/SystemTray.qml | 1 + pikabar/usr/share/pikabar/widgets/Weather.qml | 2 ++ 11 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file diff --git a/pikabar/debian/changelog b/pikabar/debian/changelog index 5e14744..97ef4f3 100644 --- a/pikabar/debian/changelog +++ b/pikabar/debian/changelog @@ -1,3 +1,9 @@ +pikabar (1.0.0-101pika10) pika; urgency=medium + + * Switch to an open source font + + -- ferrreo Sat, 01 Oct 2022 14:50:00 +0300 + pikabar (1.0.0-101pika9) pika; urgency=medium * Fit laptops better when scaled diff --git a/pikabar/usr/share/pikabar/CommonStyles.qml b/pikabar/usr/share/pikabar/CommonStyles.qml index c4d1b2b..7faa6fe 100644 --- a/pikabar/usr/share/pikabar/CommonStyles.qml +++ b/pikabar/usr/share/pikabar/CommonStyles.qml @@ -5,8 +5,9 @@ QtObject { property string tooltipBackground: "#141418" property string tooltipTextColor: "white" property string textColor: "white" - property string fontFamily: "Torus" + property string fontFamily: "Comfortaa" property string iconFontFamily: "Material Symbols Rounded" + property int fontWeight: 500 property int tooltipFontSize: 14 property int textFontSize: 16 property int smallTextFontSize: 12 diff --git a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml index 5253976..572b977 100644 --- a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml +++ b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml @@ -37,6 +37,7 @@ Row { color: Globals.commonStyles.textColor font.pointSize: Globals.commonStyles.smallTextFontSize font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight elide: Text.ElideRight width: Math.min(implicitWidth, 200) horizontalAlignment: Text.AlignHCenter diff --git a/pikabar/usr/share/pikabar/widgets/Calander.qml b/pikabar/usr/share/pikabar/widgets/Calander.qml index c6d2320..da74054 100644 --- a/pikabar/usr/share/pikabar/widgets/Calander.qml +++ b/pikabar/usr/share/pikabar/widgets/Calander.qml @@ -46,8 +46,9 @@ BarTooltip { text: calendar.title color: Globals.commonStyles.textColor opacity: 0.7 - font.pixelSize: 14 + font.pixelSize: Globals.commonStyles.tooltipFontSize font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight } IconButton { @@ -71,6 +72,7 @@ BarTooltip { opacity: 0.8 font.pixelSize: Globals.commonStyles.smallTextFontSize font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight horizontalAlignment: Text.AlignHCenter width: 32 } @@ -104,7 +106,7 @@ BarTooltip { opacity: model.month === calendar.month ? (mouseArea2.containsMouse ? 1.0 : 0.7) : 0.3 font.pixelSize: Globals.commonStyles.smallTextFontSize font.family: Globals.commonStyles.fontFamily - font.weight: model.today ? Font.Medium : Font.Normal + font.weight: model.today ? Font.Bold : Globals.commonStyles.fontWeight } MouseArea { diff --git a/pikabar/usr/share/pikabar/widgets/Clock.qml b/pikabar/usr/share/pikabar/widgets/Clock.qml index b48493a..eb10653 100644 --- a/pikabar/usr/share/pikabar/widgets/Clock.qml +++ b/pikabar/usr/share/pikabar/widgets/Clock.qml @@ -43,6 +43,7 @@ BarWidget { } font.pixelSize: Globals.commonStyles.textFontSize font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight color: Globals.commonStyles.textColor opacity: 1 } @@ -77,6 +78,7 @@ BarWidget { } font.pixelSize: Globals.commonStyles.smallTextFontSize font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight color: Globals.commonStyles.textColor opacity: 1 } diff --git a/pikabar/usr/share/pikabar/widgets/NowPlaying.qml b/pikabar/usr/share/pikabar/widgets/NowPlaying.qml index f9d782a..bdb5895 100644 --- a/pikabar/usr/share/pikabar/widgets/NowPlaying.qml +++ b/pikabar/usr/share/pikabar/widgets/NowPlaying.qml @@ -175,6 +175,7 @@ BarWidget { color: Globals.commonStyles.textColor font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.textFontSize + font.weight: Globals.commonStyles.fontWeight } Text { @@ -188,6 +189,7 @@ BarWidget { color: Globals.commonStyles.textColor font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.smallTextFontSize + font.weight: Globals.commonStyles.fontWeight } } } diff --git a/pikabar/usr/share/pikabar/widgets/Power.qml b/pikabar/usr/share/pikabar/widgets/Power.qml index 1245d0f..9241003 100644 --- a/pikabar/usr/share/pikabar/widgets/Power.qml +++ b/pikabar/usr/share/pikabar/widgets/Power.qml @@ -46,6 +46,7 @@ Loader { Text { font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight font.pixelSize: Globals.commonStyles.textFontSize color: Globals.commonStyles.textColor text: `${Math.floor(UPower.displayDevice.percentage * 100)}%` @@ -91,6 +92,7 @@ Loader { color: Globals.commonStyles.textColor font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.tooltipFontSize + font.weight: Globals.commonStyles.fontWeight horizontalAlignment: Text.AlignHCenter } } diff --git a/pikabar/usr/share/pikabar/widgets/Stats.qml b/pikabar/usr/share/pikabar/widgets/Stats.qml index 28a9cb3..0cbd308 100644 --- a/pikabar/usr/share/pikabar/widgets/Stats.qml +++ b/pikabar/usr/share/pikabar/widgets/Stats.qml @@ -74,6 +74,8 @@ BarWidget { font.pixelSize: Globals.commonStyles.textFontSize color: Globals.commonStyles.textColor text: root.cpuUsage + font.weight: Globals.commonStyles.fontWeight + verticalAlignment: Text.AlignVCenter } } } @@ -85,6 +87,7 @@ BarWidget { text: "CPU Usage\n" + root.cpuUsage color: Globals.commonStyles.tooltipTextColor font.family: Globals.commonStyles.fontFamily + font.weight: Globals.commonStyles.fontWeight font.pixelSize: Globals.commonStyles.tooltipFontSize horizontalAlignment: Text.AlignHCenter } @@ -120,6 +123,7 @@ BarWidget { color: Globals.commonStyles.textColor text: root.cpuTemp verticalAlignment: Text.AlignVCenter + font.weight: Globals.commonStyles.fontWeight } } } @@ -131,7 +135,7 @@ BarWidget { text: "CPU Temperature\n" + root.cpuTemp color: Globals.commonStyles.tooltipTextColor font.family: Globals.commonStyles.fontFamily - font.weight: Font.Medium + font.weight: Globals.commonStyles.fontWeight font.pixelSize: Globals.commonStyles.tooltipFontSize horizontalAlignment: Text.AlignHCenter } @@ -166,6 +170,8 @@ BarWidget { font.pixelSize: Globals.commonStyles.textFontSize color: Globals.commonStyles.textColor text: root.memoryUsage + font.weight: Globals.commonStyles.fontWeight + verticalAlignment: Text.AlignVCenter } } } @@ -177,7 +183,7 @@ BarWidget { text: "Memory Usage\n" + root.memoryUsage color: Globals.commonStyles.tooltipTextColor font.family: Globals.commonStyles.fontFamily - font.weight: Font.Medium + font.weight: Globals.commonStyles.fontWeight font.pixelSize: Globals.commonStyles.tooltipFontSize horizontalAlignment: Text.AlignHCenter } diff --git a/pikabar/usr/share/pikabar/widgets/SystemTray.qml b/pikabar/usr/share/pikabar/widgets/SystemTray.qml index 6ba818e..be806da 100644 --- a/pikabar/usr/share/pikabar/widgets/SystemTray.qml +++ b/pikabar/usr/share/pikabar/widgets/SystemTray.qml @@ -70,6 +70,7 @@ BarWidget { Label { font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.tooltipFontSize + font.weight: Globals.commonStyles.fontWeight color: Globals.commonStyles.textColor text: delegate.item ? (delegate.item.tooltipTitle || delegate.item.id || "") : "" } diff --git a/pikabar/usr/share/pikabar/widgets/Weather.qml b/pikabar/usr/share/pikabar/widgets/Weather.qml index b8a240e..2a8e7a0 100644 --- a/pikabar/usr/share/pikabar/widgets/Weather.qml +++ b/pikabar/usr/share/pikabar/widgets/Weather.qml @@ -120,6 +120,7 @@ BarWidget { Text { font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.tooltipFontSize + font.weight: Globals.commonStyles.fontWeight color: Globals.commonStyles.tooltipTextColor text: weatherDescription } @@ -147,6 +148,7 @@ BarWidget { font.family: Globals.commonStyles.fontFamily font.pixelSize: Globals.commonStyles.textFontSize color: Globals.commonStyles.textColor + font.weight: Globals.commonStyles.fontWeight } } }