Merge branch 'master' of github.com:Ultimaker/cura

2025-05-19 02:57:29 +08:00 · 2017-10-31 10:27:35 +01:00 · 2017-10-31 10:27:35 +01:00 · f7ce4cc78a
commit f7ce4cc78a
parent e0c1afe01f 055b6ebaab
10 changed files with 49 additions and 30 deletions
--- a/plugins/ChangeLogPlugin/ChangeLog.txt
+++ b/plugins/ChangeLogPlugin/ChangeLog.txt
@ -1,3 +1,12 @@
+[3.0.4]
+*Bug fixes
+- Fixed OpenGL issue that prevent Cura from starting.
+
+*License agreement on the first startup has been added
+
+[3.0.3]
+*Bug fixes for the MakePrintable plugin.
+
 [3.0.0]
 *Faster start-up
 Start-up speed has been cut in half compared to the previous version.
--- a/plugins/LayerView/LayerSliderLabel.qml
+++ b/plugins/LayerView/LayerSliderLabel.qml
@ -48,7 +48,7 @@ UM.PointingRectangle {

        anchors {
            left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width / 2
+            leftMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
            verticalCenter: parent.verticalCenter
        }

@ -90,7 +90,7 @@ UM.PointingRectangle {

        anchors {
            left: parent.right
-            leftMargin: UM.Theme.getSize("default_margin").width / 2
+            leftMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
            verticalCenter: parent.verticalCenter
        }

--- a/plugins/UM3NetworkPrinting/ClusterControlItem.qml
+++ b/plugins/UM3NetworkPrinting/ClusterControlItem.qml
@ -83,8 +83,7 @@ Component
                anchors.leftMargin: UM.Theme.getSize("default_margin").width
                anchors.right: parent.right
                anchors.rightMargin: UM.Theme.getSize("default_margin").width
-                //TODO; It's probably nicer to do this with a dynamic data model instead of hardcoding this.
-                //But you know the drill; time constraints don't result in elegant code.
+
                Item
                {
                    width: parent.width
--- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
+++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
@ -114,7 +114,7 @@ Cura.MachineAction

            Column
            {
-                width: (parent.width * 0.5) | 0
+                width: Math.floor(parent.width * 0.5)
                spacing: UM.Theme.getSize("default_margin").height

                ScrollView
@ -191,8 +191,6 @@ Cura.MachineAction
                    anchors.left: parent.left
                    anchors.right: parent.right
                    wrapMode: Text.WordWrap
-                    //: Tips label
-                    //TODO: get actual link from webteam
                    text: catalog.i18nc("@label", "If your printer is not listed, read the <a href='%1'>network printing troubleshooting guide</a>").arg("https://ultimaker.com/en/troubleshooting");
                    onLinkActivated: Qt.openUrlExternally(link)
                }
@ -200,7 +198,7 @@ Cura.MachineAction
            }
            Column
            {
-                width: (parent.width * 0.5) | 0
+                width: Math.floor(parent.width * 0.5)
                visible: base.selectedPrinter ? true : false
                spacing: UM.Theme.getSize("default_margin").height
                Label
@ -218,13 +216,13 @@ Cura.MachineAction
                    columns: 2
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text: catalog.i18nc("@label", "Type")
                    }
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text:
                        {
@ -249,25 +247,25 @@ Cura.MachineAction
                    }
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text: catalog.i18nc("@label", "Firmware version")
                    }
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text: base.selectedPrinter ? base.selectedPrinter.firmwareVersion : ""
                    }
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text: catalog.i18nc("@label", "Address")
                    }
                    Label
                    {
-                        width: (parent.width * 0.5) | 0
+                        width: Math.floor(parent.width * 0.5)
                        wrapMode: Text.WordWrap
                        text: base.selectedPrinter ? base.selectedPrinter.ipAddress : ""
                    }
--- a/plugins/UM3NetworkPrinting/MonitorItem.qml
+++ b/plugins/UM3NetworkPrinting/MonitorItem.qml
@ -17,10 +17,10 @@ Component
            }
            return (sourceSize.width / sourceSize.height) > (maximumWidth / maximumHeight);
        }
-        property real _width: Math.min(maximumWidth, sourceSize.width)
-        property real _height: Math.min(maximumHeight, sourceSize.height)
-        width: proportionalHeight ? _width : sourceSize.width * _height / sourceSize.height
-        height: !proportionalHeight ? _height : sourceSize.height * _width / sourceSize.width
+        property real _width: Math.floor(Math.min(maximumWidth, sourceSize.width))
+        property real _height: Math.floor(Math.min(maximumHeight, sourceSize.height))
+        width: proportionalHeight ? _width : Math.floor(sourceSize.width * _height / sourceSize.height)
+        height: !proportionalHeight ? _height : Math.floor(sourceSize.height * _width / sourceSize.width)
        anchors.horizontalCenter: parent.horizontalCenter

        onVisibleChanged:
--- a/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml
+++ b/plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml
@ -10,7 +10,7 @@ Item
    id: extruderInfo
    property var printCoreConfiguration

-    width: parent.width / 2
+    width: Math.floor(parent.width / 2)
    height: childrenRect.height
    Label
    {
--- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
+++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
@ -86,7 +86,7 @@ Rectangle

        Rectangle
        {
-            width: parent.width / 3
+            width: Math.floor(parent.width / 3)
            height: parent.height

            Label   // Print job name
@ -131,7 +131,7 @@ Rectangle

        Rectangle
        {
-            width: parent.width / 3 * 2
+            width: Math.floor(parent.width / 3 * 2)
            height: parent.height

            Label   // Friendly machine name
@ -139,7 +139,7 @@ Rectangle
                id: printerNameLabel
                anchors.top: parent.top
                anchors.left: parent.left
-                width: parent.width / 2 - UM.Theme.getSize("default_margin").width - showCameraIcon.width
+                width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width - showCameraIcon.width)
                text: printer.friendly_name
                font: UM.Theme.getFont("default_bold")
                elide: Text.ElideRight
@ -149,7 +149,7 @@ Rectangle
            {
                id: printerTypeLabel
                anchors.top: printerNameLabel.bottom
-                width: parent.width / 2 - UM.Theme.getSize("default_margin").width
+                width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
                text: printer.machine_variant
                anchors.left: parent.left
                elide: Text.ElideRight
@ -183,7 +183,7 @@ Rectangle
                id: extruderInfo
                anchors.bottom: parent.bottom

-                width: parent.width / 2 - UM.Theme.getSize("default_margin").width
+                width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
                height: childrenRect.height

                spacing: UM.Theme.getSize("default_margin").width
@ -217,7 +217,7 @@ Rectangle
                anchors.right: parent.right
                anchors.top: parent.top
                height: showExtended ? parent.height: printProgressTitleBar.height
-                width: parent.width / 2 - UM.Theme.getSize("default_margin").width
+                width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
                border.width: UM.Theme.getSize("default_lining").width
                border.color: lineColor
                radius: cornerRadius
--- a/plugins/UM3NetworkPrinting/PrinterVideoStream.qml
+++ b/plugins/UM3NetworkPrinting/PrinterVideoStream.qml
@ -57,7 +57,7 @@ Item
    {
        id: cameraImage
        width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth)
-        height: (sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width
+        height: Math.floor((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width)
        anchors.horizontalCenter: parent.horizontalCenter
        anchors.verticalCenter: parent.verticalCenter
        z: 1
--- a/resources/qml/AskOpenAsProjectOrModelsDialog.qml
+++ b/resources/qml/AskOpenAsProjectOrModelsDialog.qml
@ -63,11 +63,11 @@ UM.Dialog
        anchors.fill: parent
        anchors.leftMargin: 20 * screenScaleFactor
        anchors.rightMargin: 20 * screenScaleFactor
-        anchors.bottomMargin: 20 * screenScaleFactor
-        spacing: 10 * screenScaleFactor
+        anchors.bottomMargin: 10 * screenScaleFactor

        Label
        {
+            id: questionText
            text: catalog.i18nc("@text:window", "This is a Cura project file. Would you like to open it as a project or import the models from it?")
            anchors.left: parent.left
            anchors.right: parent.right
@ -78,15 +78,28 @@ UM.Dialog
        CheckBox
        {
            id: rememberChoiceCheckBox
-            text: catalog.i18nc("@text:window", "Remember my choice")
+            anchors.bottom: buttonBar.top
+            anchors.bottomMargin: UM.Theme.getSize("default_margin").heigth
            checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask"
        }

+        Label
+        {
+            id: checkboxTextWithNiceRendering
+            anchors.left: rememberChoiceCheckBox.right
+            anchors.bottom: rememberChoiceCheckBox.bottom
+            font: UM.Theme.getFont("default")
+            text: catalog.i18nc("@text:window", "Remember my choice")
+        }
+
+
        // Buttons
        Item
        {
+            id: buttonBar
            anchors.right: parent.right
            anchors.left: parent.left
+            anchors.bottom: parent.bottom
            height: childrenRect.height

            Button
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@ -95,7 +95,7 @@ Item {
            {
                id: printJobTextfield
                anchors.right: printJobPencilIcon.left
-                anchors.rightMargin: UM.Theme.getSize("default_margin").width/2
+                anchors.rightMargin: Math.floor(UM.Theme.getSize("default_margin").width/2)
                height: UM.Theme.getSize("jobspecs_line").height
                width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
                maximumLength: 120