GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect enum usage

Browse Source 
This only needs to happen in code that uses PyQt, not in qml code
This commit is contained in:
Jaime van Kessel 2022-06-17 15:26:30 +02:00
parent d05417f7f0
commit b25e760c53
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/ImageReader/ConfigUI.qml
View File

@ -31,7 +31,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Height (mm)") text: catalog.i18nc("@action:label", "Height (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: peak_height_label id: peak_height_label
@ -64,7 +64,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Base (mm)") text: catalog.i18nc("@action:label", "Base (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea MouseArea
{ {
@ -98,7 +98,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Width (mm)") text: catalog.i18nc("@action:label", "Width (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: width_label id: width_label
@ -132,7 +132,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Depth (mm)") text: catalog.i18nc("@action:label", "Depth (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: depth_label id: depth_label
@ -166,7 +166,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: "" text: ""
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: lighter_is_higher_label id: lighter_is_higher_label
@ -203,7 +203,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Color Model") text: catalog.i18nc("@action:label", "Color Model")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: color_model_label id: color_model_label
@ -240,7 +240,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "1mm Transmittance (%)") text: catalog.i18nc("@action:label", "1mm Transmittance (%)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea { MouseArea {
id: transmittance_label id: transmittance_label
@ -272,7 +272,7 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Smoothing") text: catalog.i18nc("@action:label", "Smoothing")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
MouseArea MouseArea
{ {

4
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View File

@ -47,7 +47,7 @@ Item
Column Column
{ {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignTop Layout.alignment: Qt.AlignTop
spacing: base.columnSpacing spacing: base.columnSpacing
@ -176,7 +176,7 @@ Item
Column Column
{ {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignTop Layout.alignment: Qt.AlignTop
spacing: base.columnSpacing spacing: base.columnSpacing

2
plugins/Marketplace/resources/qml/LicenseDialog.qml
View File

@ -48,7 +48,7 @@ UM.Dialog
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
anchors.verticalCenter: icon.verticalCenter anchors.verticalCenter: icon.verticalCenter
height: UM.Theme.getSize("marketplace_large_icon").height height: UM.Theme.getSize("marketplace_large_icon").height
verticalAlignment: Qt.AlignmentFlag.AlignVCenter verticalAlignment: Qt.AlignVCenter
} }
} }

4
plugins/Marketplace/resources/qml/PackageDetails.qml
View File

@ -31,7 +31,7 @@ Item
Cura.SecondaryButton Cura.SecondaryButton
{ {
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: UM.Theme.getSize("action_button").height Layout.preferredHeight: UM.Theme.getSize("action_button").height
Layout.preferredWidth: height Layout.preferredWidth: height
@ -47,7 +47,7 @@ Item
UM.Label UM.Label
{ {
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true Layout.fillWidth: true
text: detailPage.title text: detailPage.title

4
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
View File

@ -402,7 +402,7 @@ Window
UM.Label UM.Label
{ {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: catalog.i18nc("@text Asking the user whether printers are missing in a list.", "Printers missing?") text: catalog.i18nc("@text Asking the user whether printers are missing in a list.", "Printers missing?")
+ "\n" + "\n"
+ catalog.i18nc("@text", "Make sure all your printers are turned ON and connected to Digital Factory.") + catalog.i18nc("@text", "Make sure all your printers are turned ON and connected to Digital Factory.")
@ -413,7 +413,7 @@ Window
Cura.SecondaryButton Cura.SecondaryButton
{ {
id: refreshListButton id: refreshListButton
Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: catalog.i18nc("@button", "Refresh List") text: catalog.i18nc("@button", "Refresh List")
iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight")
onClicked: Cura.API.account.sync(true) onClicked: Cura.API.account.sync(true)

2
resources/qml/WelcomePages/WhatsNewContent.qml
View File

@ -65,7 +65,7 @@ Item
Rectangle Rectangle
{ {
Layout.alignment: Qt.AlignmentFlag.AlignHCenter Layout.alignment: Qt.AlignHCenter
color: UM.Theme.getColor("viewport_overlay") color: UM.Theme.getColor("viewport_overlay")
width: whatsNewViewport.width width: whatsNewViewport.width
height: whatsNewViewport.height height: whatsNewViewport.height