rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-06-05 22:19:21 +02:00
Code Issues Releases Wiki Activity

Bump packages and more work on sound architecture

Browse Source
This commit is contained in:
j1nx
2021-02-08 11:19:49 +01:00
parent 3d2532b405
commit 39ef6633f1
11 changed files with 1977 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
buildroot-external/package/python-mycroft/0003-Use-the-correct-delegate-and-fix-layouts.patch
View File

@@ -1,74 +0,0 @@
From 1d29ceca0ac37d881d3755ff65bb11b73d9516a2 Mon Sep 17 00:00:00 2001
From: Aditya Mehra <aix.m@outlook.com>
Date: Thu, 21 Jan 2021 17:49:20 +0530
Subject: [PATCH] Use the correct delegate and fix layouts
---
mycroft/res/ui/SYSTEM_TextFrame.qml | 47 +++++++++++++++--------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/mycroft/res/ui/SYSTEM_TextFrame.qml b/mycroft/res/ui/SYSTEM_TextFrame.qml
index a2d50ed403c..d542a31eca1 100644
--- a/mycroft/res/ui/SYSTEM_TextFrame.qml
+++ b/mycroft/res/ui/SYSTEM_TextFrame.qml
@@ -5,7 +5,7 @@ import org.kde.kirigami 2.4 as Kirigami
import Mycroft 1.0 as Mycroft
-Mycroft.ProportionalDelegate {
+Mycroft.Delegate {
id: systemTextFrame
skillBackgroundColorOverlay: "#000000"
property bool hasTitle: sessionData.title.length > 0 ? true : false
@@ -13,27 +13,30 @@ Mycroft.ProportionalDelegate {
Component.onCompleted: {
console.log(hasTitle)
}
-
- Mycroft.AutoFitLabel {
- id: systemTextFrameTitle
- Layout.fillWidth: true
- Layout.preferredHeight: proportionalGridUnit * 20
- wrapMode: Text.Wrap
- visible: hasTitle
- enabled: hasTitle
- font.family: "Noto Sans"
- font.weight: Font.Bold
- text: sessionData.title
- }
-
- Mycroft.AutoFitLabel {
- id: systemTextFrameMainBody
- Layout.fillWidth: true
- Layout.preferredHeight: proportionalGridUnit * 30
- wrapMode: Text.Wrap
- font.family: "Noto Sans"
- font.weight: Font.Bold
- text: sessionData.text
+
+ contentItem: ColumnLayout {
+ Label {
+ id: systemTextFrameTitle
+ Layout.fillWidth: true
+ font.pixelSize: Math.min(systemTextFrame.height/4, Math.max(systemTextFrame.height/10, systemTextFrameMainBody.fontInfo.pixelSize * 1.4))
+ wrapMode: Text.Wrap
+ horizontalAlignment: Text.AlignHCenter
+ visible: hasTitle
+ enabled: hasTitle
+ font.family: "Noto Sans"
+ font.weight: Font.Bold
+ text: sessionData.title
+ }
+
+ Mycroft.AutoFitLabel {
+ id: systemTextFrameMainBody
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ wrapMode: Text.Wrap
+ font.family: "Noto Sans"
+ font.weight: Font.Bold
+ text: sessionData.text
+ }
}
}

2
buildroot-external/package/python-mycroft/python-mycroft.hash
View File

@@ -1 +1 @@
sha256 675db827f6f990ce07ab6e455cb68969dc237be599d877ea2061092306e042fa python-mycroft-73f0299cfa43f499419d3949fe183cb92da1387e.tar.gz
sha256 82363752716005e082c0533380d5dc11c25a7a1cf595765faa8b8df4b64c666e python-mycroft-bfd6be347f0c88aabad8f287081a860b09359f3d.tar.gz

2
buildroot-external/package/python-mycroft/python-mycroft.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = 73f0299cfa43f499419d3949fe183cb92da1387e
PYTHON_MYCROFT_VERSION = bfd6be347f0c88aabad8f287081a860b09359f3d
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE