Extend and fix fitting in progress label

EasyScience · Mar 30, 2023 · 2fe0df4 · 2fe0df4
1 parent 4eaf4ee
commit 2fe0df4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 32 deletions.
diff --git a/easyApp/Gui/Elements/RunningLabel.qml b/easyApp/Gui/Elements/RunningLabel.qml
@@ -17,31 +17,31 @@ Item {
     anchors.rightMargin: EaStyle.Sizes.fontPixelSize
     anchors.verticalCenter: parent.verticalCenter
 
-    Row {
-        EaElements.Label { text: control.text; color: control.color }
-        EaElements.Label { id: dot1; text: '.'; color: control.color }
-        EaElements.Label { id: dot2; text: '.'; color: control.color }
-        EaElements.Label { id: dot3; text: '.'; color: control.color }
+    EaElements.Label {
+        id: label
+        text: control.text
+        color: control.color
+        font.bold: true
     }
 
     SequentialAnimation {
         running: control.running
         loops: Animation.Infinite
 
-        SequentialAnimation {
-            PropertyAnimation { target: dot1; property: 'opacity'; to: 1; duration: 500 }
-            PropertyAnimation { target: dot2; property: 'opacity'; to: 1; duration: 500 }
-            PropertyAnimation { target: dot3; property: 'opacity'; to: 1; duration: 500 }
+        PropertyAnimation {
+            target: label
+            property: 'opacity'
+            to: 1
+            duration: 750
+            easing: Easing.OutExpo
         }
 
-        PauseAnimation { duration: 250 }
-
-        ParallelAnimation {
-            PropertyAction { target: dot1; property: 'opacity'; value: 0 }
-            PropertyAction { target: dot2; property: 'opacity'; value: 0 }
-            PropertyAction { target: dot3; property: 'opacity'; value: 0 }
+        PropertyAnimation {
+            target: label
+            property: 'opacity'
+            to: 0
+            duration: 750
+            easing: Easing.OutExpo
         }
-
-        PauseAnimation { duration: 250 }
     }
 }
diff --git a/easyApp/Gui/Elements/StatusBar.qml b/easyApp/Gui/Elements/StatusBar.qml
@@ -5,17 +5,11 @@ import easyApp.Gui.Style 1.0 as EaStyle
 import easyApp.Gui.Animations 1.0 as EaAnimations
 import easyApp.Gui.Elements 1.0 as EaElements
 
-import Gui.Globals 1.0 as ExGlobals
-
 Rectangle {
     id: statusBar
 
-    //property alias text: label.text
     property alias model: listView.model
-
-    //visible: EaGlobals.Variables.showAppStatusBar
-
-    //Component.onCompleted: y = visible ? 0 : height
+    property alias fittingInProgress: fittingInProgressLabel.running
 
     width: parent.width
     height: parent.height
@@ -53,6 +47,7 @@ Rectangle {
 
     // Fitting label
     EaElements.RunningLabel {
+        id: fittingInProgressLabel
         text: "Fitting in progress"
         ///running: !ExGlobals.Constants.proxy.fitting.isFitFinished
     }
@@ -69,12 +64,4 @@ Rectangle {
         Behavior on color { EaAnimations.ThemeChange {} }
     }
 
-    /*
-    // Show-hide status bar animation
-    Behavior on visible {
-        InterfaceAnimations.BarShow {
-            parentTarget: statusBar
-        }
-    }
-    */
 }