3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup

Browse source 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
This commit is contained in:
j.delarago 2022-02-28 08:51:42 +01:00
commit e2fe50baf1
155 changed files with 406 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

41
resources/qml/MonitorButton.qml
View file

@ -2,16 +2,13 @@
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.1
import UM 1.5 as UM
import Cura 1.0 as Cura
Item
{
id: base;
id: base
UM.I18nCatalog { id: catalog; name: "cura"}
height: childrenRect.height + UM.Theme.getSize("thick_margin").height
@ -158,7 +155,7 @@ Item
}
}
Label
UM.Label
{
id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
@ -171,7 +168,7 @@ Item
text: statusText
}
Label
UM.Label
{
id: percentageLabel
anchors.top: parent.top
@ -185,20 +182,20 @@ Item
UM.ProgressBar
{
id: progressBar;
minimumValue: 0;
maximumValue: 100;
value: 0;
id: progressBar
from: 0
to: 100
value: 0
//Doing this in an explicit binding since the implicit binding breaks on occasion.
Binding
{
target: progressBar;
property: "value";
value: base.progress;
target: progressBar
property: "value"
value: base.progress
}
visible: showProgress;
visible: showProgress
indeterminate:
{
if(!printerConnected)
@ -218,15 +215,15 @@ Item
return false;
}
}
property string backgroundColor: UM.Theme.getColor("progressbar_background");
property string controlColor: base.statusColor;
property string backgroundColor: UM.Theme.getColor("progressbar_background")
property string controlColor: base.statusColor
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width;
height: UM.Theme.getSize("progressbar").height;
anchors.top: statusLabel.bottom;
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4);
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("thick_margin").width;
width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
height: UM.Theme.getSize("progressbar").height
anchors.top: statusLabel.bottom
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 4)
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("thick_margin").width
}
Row