Browse Source

Move Cura.ProgressBar to Uranium

It is not specific to 3D printing.

Contributes to issue CURA-6057.
Ghostkeeper 6 years ago
parent
commit
df32f3e263

+ 1 - 17
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -22,7 +22,7 @@ Item
     width: childrenRect.width
     height: 18 * screenScaleFactor // TODO: Theme!
 
-    ProgressBar
+    UM.ProgressBar
     {
         id: progressBar
         anchors
@@ -30,22 +30,6 @@ Item
             verticalCenter: parent.verticalCenter
         }
         value: printJob ? printJob.progress : 0
-        style: ProgressBarStyle
-        {
-            background: Rectangle
-            {
-                color: UM.Theme.getColor("monitor_progress_bar_empty")
-                implicitHeight: visible ? 12 * screenScaleFactor : 0 // TODO: Theme!
-                implicitWidth: 180 * screenScaleFactor // TODO: Theme!
-                radius: 2 * screenScaleFactor // TODO: Theme!
-            }
-            progress: Rectangle
-            {
-                id: progressItem;
-                color: printJob && printJob.isActive ? UM.Theme.getColor("monitor_progress_bar_fill") : UM.Theme.getColor("monitor_progress_bar_deactive")
-                radius: 2 * screenScaleFactor // TODO: Theme!
-            }
-        }
     }
     Label
     {

+ 2 - 2
resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -6,7 +6,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 1.4 as Controls1
 
-import UM 1.1 as UM
+import UM 1.3 as UM
 import Cura 1.0 as Cura
 
 
@@ -64,7 +64,7 @@ Column
     }
 
     // Progress bar, only visible when the backend is in the process of slice the printjob
-    Cura.ProgressBar
+    UM.ProgressBar
     {
         id: progressBar
         width: parent.width

+ 1 - 1
resources/qml/WelcomePages/WizardPanel.qml

@@ -44,7 +44,7 @@ Item
         anchors.fill: parent
         radius: UM.Theme.getSize("default_radius").width
         color: UM.Theme.getColor("main_background")
-        Cura.ProgressBar
+        UM.ProgressBar
         {
             id: progressBar
             anchors.top: parent.top

+ 0 - 38
resources/qml/Widgets/ProgressBar.qml

@@ -1,38 +0,0 @@
-// Copyright (c) 2019 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-
-import UM 1.3 as UM
-import Cura 1.0 as Cura
-
-//
-// Cura-style progress bar, with a grey background and a blue indication bar.
-//
-ProgressBar
-{
-    id: progressBar
-    width: parent.width
-    height: UM.Theme.getSize("progressbar").height
-
-    background: Rectangle
-    {
-        anchors.fill: parent
-        radius: UM.Theme.getSize("progressbar_radius").width
-        color: UM.Theme.getColor("progressbar_background")
-    }
-
-    contentItem: Item
-    {
-        anchors.fill: parent
-
-        Rectangle
-        {
-            width: progressBar.visualPosition * parent.width
-            height: parent.height
-            radius: UM.Theme.getSize("progressbar_radius").width
-            color: UM.Theme.getColor("progressbar_control")
-        }
-    }
-}

+ 0 - 1
resources/qml/qmldir

@@ -24,7 +24,6 @@ ToolTip 1.0 ToolTip.qml
 CheckBox            1.0 CheckBox.qml
 ComboBox            1.0 ComboBox.qml
 NotificationIcon    1.0 NotificationIcon.qml
-ProgressBar         1.0 ProgressBar.qml
 RadioButton         1.0 RadioButton.qml
 TabButton           1.0 TabButton.qml