Use MMBusyIndicator instead of Qt's one (#3099)

use MMBusyIndicator instead of Qt's BusyIndicator
MerginMaps · Mar 4, 2024 · 64c58ef · 64c58ef · inputapp-bot · Mar 4, 2024
1 parent 0216d3e
commit 64c58ef
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 81 deletions.
diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -6,7 +6,6 @@ set(MM_QML
     Notification.qml
     NotificationBanner.qml
     misc/NoWorkspaceBanner.qml
-
     account/MMAcountPage.qml
     account/MMAcountPageItem.qml
     account/MMSwitchWorkspacePage.qml
@@ -28,7 +27,7 @@ set(MM_QML
     components/MMLinkButton.qml
     components/MMListDrawer.qml
     components/MMListDrawerItem.qml
-    components/MMLoadingSpinner.qml
+    components/MMBusyIndicator.qml
     components/MMMenuDrawer.qml
     components/MMMessage.qml
     components/MMMorePhoto.qml
@@ -120,7 +119,7 @@ set(MM_QML
     map/MMRecordingTools.qml
     map/components/MMBlurBox.qml
     map/components/MMCrosshair.qml
-    map/components/MMLoadingIndicator.qml
+    map/components/MMMapLoadingIndicator.qml
     map/components/MMMapBlurLabel.qml
     map/components/MMMapButton.qml
     map/components/MMMapLabel.qml

diff --git a/app/qml/components/MMLoadingSpinner.qml → app/qml/components/MMBusyIndicator.qml b/app/qml/components/MMLoadingSpinner.qml → app/qml/components/MMBusyIndicator.qml
@@ -12,12 +12,13 @@ import QtQuick
 Item {
   id: root
 
-  property bool running: false
+  property real size: 60 * __dp
+  property alias running: root.visible
   property int speed: 800
 
-  width: __style.row63
-  height: width
-  visible: running
+  width: root.size
+  height: root.size
+  visible: false
 
   Image {
     id: icon

diff --git a/app/qml/gps/MMBluetoothConnectionDrawer.qml b/app/qml/gps/MMBluetoothConnectionDrawer.qml
@@ -248,11 +248,9 @@ Drawer {
         width: parent.width
         height: resultIcon.height
 
-        BusyIndicator {
+        MMBusyIndicator {
           id: loadingSpinner
-          height: parent.height / 2
-          width: parent.height / 2
-
+          size: parent.height / 2
           anchors.centerIn: parent
           running: rootstate.state === "working"
         }

diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml
@@ -131,12 +131,10 @@ Page {
     onTriggered: featuresModel.searchExpression = searchbox.text
   }
 
-  BusyIndicator {
+  MMBusyIndicator {
     id: busyIndicator
-    width: parent.width/8
-    height: width
+    size: parent.width/8
     running: featuresModel.fetchingResults
-    visible: running
     anchors.centerIn: parent
   }
 

diff --git a/app/qml/map/MMMapWrapper.qml b/app/qml/map/MMMapWrapper.qml
@@ -250,13 +250,12 @@ Item {
       }
 
       // TOP elements
-      MMLoadingIndicator {
+      MMMapLoadingIndicator {
         id: loadingIndicator
 
         width: mapCanvas.width
-        height: visible ? 7 * __dp : 0
         anchors.top: canvasRoot.top
-        visible: mapCanvas.isRendering && root.state !== "inactive"
+        running: mapCanvas.isRendering && root.state !== "inactive"
       }
 
       MMMapButton {

diff --git a/...qml/map/components/MMLoadingIndicator.qml → .../map/components/MMMapLoadingIndicator.qml b/...qml/map/components/MMLoadingIndicator.qml → .../map/components/MMMapLoadingIndicator.qml
@@ -12,16 +12,19 @@ import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 
 Rectangle {
-  id: loadingIndicator
+  id: root
   color: __style.forestColor
 
+  height: root.visible ? 7 * __dp : 0
+  property alias running: root.visible
+
   Rectangle {
     id: bar
     width: parent.width
     height: parent.height
 
     PropertyAnimation {
-      running: loadingIndicator.visible
+      running: root.visible
       target: bar
       property: "x"
       from: -bar.width

diff --git a/app/qml/project/MMProjectList.qml b/app/qml/project/MMProjectList.qml
@@ -129,9 +129,10 @@ Item {
   Component {
     id: loadingSpinnerComponent
 
-    MMLoadingSpinner {
+    MMBusyIndicator {
       x: parent.width / 2 - width / 2
       running: controllerModel.isLoading
+      size: __style.row63
     }
   }
 

diff --git a/app/qml/project/MMProjectPanel.qml b/app/qml/project/MMProjectPanel.qml
@@ -187,12 +187,10 @@ Item {
     }
   }
 
-  BusyIndicator {
+  MMBusyIndicator {
     id: busyIndicator
-    width: parent.width/8
-    height: width
+    size: parent.width/8
     running: stackView.pending
-    visible: running
     anchors.centerIn: parent
     z: parent.z + 1
   }

diff --git a/gallery/qml.qrc b/gallery/qml.qrc
@@ -32,7 +32,10 @@
         <file>../app/qml/dialogs/MMDownloadProjectDialog.qml</file>
         <file>../app/qml/dialogs/MMProjectLimitDialog.qml</file>
         <file>../app/qml/components/MMButton.qml</file>
+        <file>../app/qml/components/MMPageHeader.qml</file>
+        <file>../app/qml/components/MMDrawerHeader.qml</file>
         <file>../app/qml/components/MMLinkButton.qml</file>
+        <file>../app/qml/components/MMLine.qml</file>
         <file>../app/qml/components/MMIcon.qml</file>
         <file>../app/qml/components/MMLine.qml</file>
         <file>../app/qml/components/MMRoundButton.qml</file>
@@ -79,7 +82,7 @@
         <file>../app/qml/components/MMPageHeader.qml</file>
         <file>../app/qml/components/MMDrawer.qml</file>
         <file>../app/qml/components/MMDrawerHeader.qml</file>
-        <file>../app/qml/components/MMLoadingSpinner.qml</file>
+        <file>../app/qml/components/MMBusyIndicator.qml</file>
         <file>../app/qml/account/MMAcountPage.qml</file>
         <file>../app/qml/account/MMAcountPageItem.qml</file>
         <file>../app/qml/inputs/MMBaseInput.qml</file>
@@ -111,7 +114,7 @@
         <file>../app/qml/onboarding/MMWhichIndustry.qml</file>
         <file>../app/qml/map/MMPositionMarker.qml</file>
         <file>../app/qml/map/components/MMBlurBox.qml</file>
-        <file>../app/qml/map/components/MMLoadingIndicator.qml</file>
+        <file>../app/qml/map/components/MMMapLoadingIndicator.qml</file>
         <file>../app/qml/map/components/MMMapBlurLabel.qml</file>
         <file>../app/qml/map/components/MMMapButton.qml</file>
         <file>../app/qml/map/components/MMMapLabel.qml</file>

diff --git a/gallery/qml/pages/MapPage.qml b/gallery/qml/pages/MapPage.qml
@@ -67,6 +67,11 @@ Page {
     }
   }
 
+  MMMapLoadingIndicator {
+    running: true
+    width: parent.width
+  }
+
   MMMapScaleBar {
     anchors.horizontalCenter: parent.horizontalCenter
     y: 120

diff --git a/gallery/qml/pages/MiscPage.qml b/gallery/qml/pages/MiscPage.qml
@@ -12,7 +12,6 @@ import QtQuick.Controls
 import QtQuick.Controls.Basic
 
 import "../../app/qml/components"
-import "../../app/qml/misc"
 import "../../app/qml/gps"
 
 ScrollView {
@@ -90,7 +89,7 @@ ScrollView {
     }
 
     GroupBox {
-      title: "MMHeader"
+      title: "MMPageHeader"
 
       width: parent.width
 
@@ -109,7 +108,7 @@ ScrollView {
         spacing: 20
         anchors.fill: parent
 
-        MMHeader {
+        MMPageHeader {
           title: "Only title without anything on left nor right"
           width: parent.width
 
@@ -118,63 +117,18 @@ ScrollView {
           Rectangle { anchors.fill: parent; color: "red"; opacity: .3 }
         }
 
-        MMHeader {
+        MMPageHeader {
           title: "Title with back button"
           width: parent.width
 
           backVisible: true
         }
 
-        MMHeader {
-          title: "Title with progress bar"
-          width: parent.width
-
-          backVisible: false
-          rightMarginShift: progressBar.width
-
-          MMProgressBar {
-            id: progressBar
-
-            anchors.right: parent.right
-            anchors.rightMargin: __style.pageMargins
-            anchors.verticalCenter: parent.verticalCenter
-
-            width: 60 * __dp
-            height: 4 * __dp
-
-            color: __style.grassColor
-            progressColor: __style.forestColor
-            position: 0.5
-          }
-        }
-
-        MMHeader {
-          title: "Title with back button and Progress bar"
-          width: parent.width
-          backVisible: true
-
-          rightMarginShift: progressBar2.width
-
-          MMProgressBar {
-            id: progressBar2
-
-            anchors.right: parent.right
-            anchors.rightMargin: __style.pageMargins
-            anchors.verticalCenter: parent.verticalCenter
-
-            width: 60 * __dp
-            height: 4 * __dp
-
-            color: __style.grassColor
-            progressColor: __style.forestColor
-            position: 0.9
-          }
-        }
       }
     }
 
     GroupBox {
-      title: "MMHeader (bigger title)"
+      title: "MMDrawerHeader"
       width: page.width - 40
 
       background: Rectangle {
@@ -191,7 +145,7 @@ ScrollView {
         spacing: 20
         anchors.fill: parent
 
-        MMHeader {
+        MMDrawerHeader {
           title: "Drawer title"
           titleFont: __style.h3
         }
@@ -221,7 +175,7 @@ ScrollView {
     }
 
     GroupBox {
-      title: "MMLoadingSpinner"
+      title: "MMBusyIndicator"
       background: Rectangle {
         color: "white"
         border.color: "gray"
@@ -235,8 +189,9 @@ ScrollView {
       Column {
         spacing: 20
         anchors.fill: parent
-        MMLoadingSpinner {
+        MMBusyIndicator {
           running: true
+          size: 55
         }
       }
     }
@@ -300,7 +255,8 @@ ScrollView {
         anchors.fill: parent
         MMWarningBubble {
           width: page.width - 64
-          text: "Server is broken, sorry. \n Please wait for tomorrow"
+          title: "Server is broken, sorry"
+          description: "Please wait for tomorrow"
         }
       }
     }