diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 2ba70268b2..d3e49393c9 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/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 { diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index 484cba2e85..17021661b1 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/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 diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index 23dc914b27..91f351810c 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/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 diff --git a/resources/qml/Widgets/ProgressBar.qml b/resources/qml/Widgets/ProgressBar.qml deleted file mode 100644 index a08c02ebc4..0000000000 --- a/resources/qml/Widgets/ProgressBar.qml +++ /dev/null @@ -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") - } - } -} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 1376262922..eda0411f42 100644 --- a/resources/qml/qmldir +++ b/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