Merge pull request #72 from OpenVoiceOS/release-1.3.0a1

Release 1.3.0a1

CHANGELOG.md

@@ -1,24 +1,12 @@
 # Changelog
 
-## [1.2.0a1](https://github.com/OpenVoiceOS/ovos-gui/tree/1.2.0a1) (2024-12-26)
+## [1.3.0a1](https://github.com/OpenVoiceOS/ovos-gui/tree/1.3.0a1) (2024-12-26)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-gui/compare/1.1.1a1...1.2.0a1)
-
-**Fixed bugs:**
-
-- Loading icon always stays on. [\#67](https://github.com/OpenVoiceOS/ovos-gui/issues/67)
-
-**Merged pull requests:**
-
-- feat:loading\_status\_templates [\#68](https://github.com/OpenVoiceOS/ovos-gui/pull/68) ([JarbasAl](https://github.com/JarbasAl))
-
-## [1.1.1a1](https://github.com/OpenVoiceOS/ovos-gui/tree/1.1.1a1) (2024-11-25)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-gui/compare/1.1.0...1.1.1a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-gui/compare/1.2.0...1.3.0a1)
 
 **Merged pull requests:**
 
-- Update ovos-config requirement from \<1.0.0,\>=0.0.12 to \>=0.0.12,\<2.0.0 [\#64](https://github.com/OpenVoiceOS/ovos-gui/pull/64) ([dependabot[bot]](https://github.com/apps/dependabot))
+- feat:face\_template [\#70](https://github.com/OpenVoiceOS/ovos-gui/pull/70) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

ovos_gui/res/gui/qt5/Face.qml

@@ -0,0 +1,133 @@
+import QtQuick.Layouts 1.4
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import org.kde.kirigami 2.4 as Kirigami
+
+import Mycroft 1.0 as Mycroft
+
+Item {
+    id: root
+
+    property bool eyesOpen
+    property string mouth
+    property alias mouthItem: mouthItem
+
+    Item {
+        id: fixedProportionsContainer
+
+        anchors.centerIn: parent
+        readonly property real proportion: 1.6
+
+        width: parent.height / parent.width >= proportion ? parent.width : height / 1.6
+        height: parent.height / parent.width >= proportion ? width * 1.6 : parent.height
+
+        Item {
+            anchors {
+                left: parent.left
+                top: parent.top
+                topMargin: parent.height * 0.28
+                leftMargin: parent.width * 0.02
+            }
+
+            width: parent.width * 0.35
+            height: width
+            Image {
+                anchors.fill: parent
+                visible: root.eyesOpen
+                source: Qt.resolvedUrl("face/Eyeball.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+            Image {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                    leftMargin: width * 0.001
+                    rightMargin: width * 0.001
+                }
+                height: width / (sourceSize.width/sourceSize.height)
+                visible: !root.eyesOpen
+                source: Qt.resolvedUrl("face/lid.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+            Image {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    top: parent.top
+                    leftMargin: width * 0.001
+                    rightMargin: width * 0.001
+                }
+                height: width / (sourceSize.width/sourceSize.height)
+                visible: root.eyesOpen
+                source: Qt.resolvedUrl("face/upper-lid.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+        }
+
+        Item {
+            anchors {
+                right: parent.right
+                top: parent.top
+                topMargin: parent.height * 0.28
+                rightMargin: parent.width * 0.02
+            }
+
+            width: parent.width * 0.35
+            height: width
+            Image {
+                anchors.fill: parent
+                visible: root.eyesOpen
+                source: Qt.resolvedUrl("face/Eyeball.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+            Image {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                    leftMargin: width * 0.001
+                    rightMargin: width * 0.001
+                }
+                height: width / (sourceSize.width/sourceSize.height)
+                visible: !root.eyesOpen
+                source: Qt.resolvedUrl("face/lid.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+            Image {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    top: parent.top
+                    leftMargin: width * 0.001
+                    rightMargin: width * 0.001
+                }
+                height: width / (sourceSize.width/sourceSize.height)
+                visible: root.eyesOpen
+                source: Qt.resolvedUrl("face/upper-lid.svg")
+                fillMode: Image.PreserveAspectFit
+            }
+        }
+
+        Item {
+            id: mouthItem
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                bottom: parent.bottom
+                bottomMargin: parent.height * 0.26
+            }
+            width: parent.width / 2
+            height: smile.implicitHeight
+            Image {
+                id: smile
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+                fillMode: Image.PreserveAspectFit
+                source: Qt.resolvedUrl("face/" + root.mouth)
+            }
+        }
+    }
+}

ovos_gui/res/gui/qt5/SYSTEM_Face.qml

@@ -0,0 +1,19 @@
+import QtQuick.Layouts 1.4
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import org.kde.kirigami 2.4 as Kirigami
+
+import Mycroft 1.0 as Mycroft
+
+Mycroft.CardDelegate {
+    id: root
+
+    contentItem: Face {
+        // Set eyesOpen based on sessionData.sleeping
+        eyesOpen: !sessionData.sleeping
+
+        // Set mouth based on sessionData.sleeping
+        mouth: sessionData.sleeping ? "GreySmile.svg" : "Smile.svg"
+    }
+
+}

ovos_gui/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
-VERSION_MINOR = 2
+VERSION_MINOR = 3
 VERSION_BUILD = 0
-VERSION_ALPHA = 0
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK