Browse Source

Qt5->Qt6: Even more renaming stuff.

part of CURA-8591
Remco Burema 3 years ago
parent
commit
c8ed3634ed

+ 2 - 2
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

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

+ 1 - 1
plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml

@@ -14,7 +14,7 @@ Item
     property int packageCount: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getTotalNumberOfMaterialPackagesByAuthor(model.id) : 1
     property int installedPackages: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0)
     height: childrenRect.height
-    Layout.alignment: Qt.AlignTop | Qt.AlignLeft
+    Layout.alignment: Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft
 
     MouseArea
     {

+ 1 - 1
plugins/Toolbox/resources/qml/components/ToolboxHeader.qml

@@ -90,7 +90,7 @@ Item
             rightMargin: UM.Theme.getSize("default_margin").width
             verticalCenter: parent.verticalCenter
         }
-        acceptedButtons: Qt.LeftButton
+        acceptedButtons: Qt.MouseButton.LeftButton
         onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl("plugins") + "?utm_source=cura&utm_medium=software&utm_campaign=marketplace-button")
         UM.RecolorImage
         {

+ 1 - 1
resources/qml/Preferences/Materials/MaterialsSyncDialog.qml

@@ -574,7 +574,7 @@ Window
                     source: UM.Theme.getImage("3d_printer_faded")
                     sourceSize.width: width
                     fillMode: Image.PreserveAspectFit
-                    Layout.alignment: Qt.AlignHCenter
+                    Layout.alignment: Qt.AlignmentFlag.AlignHCenter
                     Layout.preferredWidth: parent.width / 3
                 }
                 Label

+ 17 - 17
resources/qml/Preferences/Materials/MaterialsView.qml

@@ -125,7 +125,7 @@ TabView
                     onRejected: no()
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }
                 ReadOnlyTextField
                 {
                     id: displayNameTextField;
@@ -135,7 +135,7 @@ TabView
                     onEditingFinished: base.updateMaterialDisplayName(properties.name, text)
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
                 ReadOnlyTextField
                 {
                     id: brandTextField;
@@ -145,7 +145,7 @@ TabView
                     onEditingFinished: base.updateMaterialBrand(properties.brand, text)
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
                 ReadOnlyTextField
                 {
                     id: materialTypeField;
@@ -155,7 +155,7 @@ TabView
                     onEditingFinished: base.updateMaterialType(properties.material, text)
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Color") }
                 Row
                 {
                     width: scrollView.columnWidth
@@ -205,9 +205,9 @@ TabView
 
                 Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
 
-                Label { width: parent.width; height: parent.rowHeight; font.bold: true; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Properties") }
+                Label { width: parent.width; height: parent.rowHeight; font.bold: true; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Properties") }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Density") }
                 ReadOnlySpinBox
                 {
                     id: densitySpinBox
@@ -222,7 +222,7 @@ TabView
                     onValueChanged: updateCostPerMeter()
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
                 ReadOnlySpinBox
                 {
                     id: diameterSpinBox
@@ -256,7 +256,7 @@ TabView
                     onValueChanged: updateCostPerMeter()
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
                 SpinBox
                 {
                     id: spoolCostSpinBox
@@ -273,7 +273,7 @@ TabView
                     }
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
                 SpinBox
                 {
                     id: spoolWeightSpinBox
@@ -291,21 +291,21 @@ TabView
                     }
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
                 Label
                 {
                     width: scrollView.columnWidth
                     text: "~ %1 m".arg(Math.round(base.spoolLength))
-                    verticalAlignment: Qt.AlignVCenter
+                    verticalAlignment: Qt.AlignmentFlag.AlignVCenter
                     height: parent.rowHeight
                 }
 
-                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter") }
+                Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter") }
                 Label
                 {
                     width: scrollView.columnWidth
                     text: "~ %1 %2/m".arg(base.costPerMeter.toFixed(2)).arg(base.currency)
-                    verticalAlignment: Qt.AlignVCenter
+                    verticalAlignment: Qt.AlignmentFlag.AlignVCenter
                     height: parent.rowHeight
                 }
 
@@ -313,7 +313,7 @@ TabView
                 Label
                 {
                     width: 2 * scrollView.columnWidth
-                    verticalAlignment: Qt.AlignVCenter
+                    verticalAlignment: Qt.AlignmentFlag.AlignVCenter
                     text: catalog.i18nc("@label", "This material is linked to %1 and shares some of its properties.").arg(base.linkedMaterialNames)
                     wrapMode: Text.WordWrap
                     visible: unlinkMaterialButton.visible
@@ -332,7 +332,7 @@ TabView
 
                 Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
 
-                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Description") }
+                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Description") }
 
                 ReadOnlyTextArea
                 {
@@ -345,7 +345,7 @@ TabView
                     onEditingFinished: base.setMetaDataEntry("description", properties.description, text)
                 }
 
-                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Adhesion Information") }
+                Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignmentFlag.AlignVCenter; text: catalog.i18nc("@label", "Adhesion Information") }
 
                 ReadOnlyTextArea
                 {
@@ -405,7 +405,7 @@ TabView
                         height: spinBox.height + UM.Theme.getSize("default_lining").height
                         text: model.label
                         elide: Text.ElideRight
-                        verticalAlignment: Qt.AlignVCenter
+                        verticalAlignment: Qt.AlignmentFlag.AlignVCenter
                     }
                     ReadOnlySpinBox
                     {

+ 1 - 1
resources/qml/Settings/SettingItem.qml

@@ -100,7 +100,7 @@ Item
 
         anchors.fill: parent
 
-        acceptedButtons: Qt.RightButton
+        acceptedButtons: Qt.MouseButton.RightButton
         hoverEnabled: true;
 
         onClicked: base.contextMenuRequested()

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

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