From 2b5627234a5004ac7284bc443da399e0d969dc36 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 17 Aug 2015 15:18:46 +0200
Subject: [PATCH] Changed selectupgradeparts

---
 resources/qml/AddMachineWizard.qml            |  3 +-
 .../qml/WizardPages/SelectUpgradedParts.qml   | 61 ++++++++-----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/resources/qml/AddMachineWizard.qml b/resources/qml/AddMachineWizard.qml
index 3dc39cf411..c236c6a19d 100644
--- a/resources/qml/AddMachineWizard.qml
+++ b/resources/qml/AddMachineWizard.qml
@@ -8,7 +8,8 @@ import QtQuick.Window 2.1
 
 import UM 1.0 as UM
 
-UM.Wizard{
+UM.Wizard
+{
     //: Add Printer dialog title
     wizardTitle: qsTr("Add Printer")
     wizardPages: [
diff --git a/resources/qml/WizardPages/SelectUpgradedParts.qml b/resources/qml/WizardPages/SelectUpgradedParts.qml
index 567c159cd2..46fdd876af 100644
--- a/resources/qml/WizardPages/SelectUpgradedParts.qml
+++ b/resources/qml/WizardPages/SelectUpgradedParts.qml
@@ -8,79 +8,70 @@ import QtQuick.Window 2.1
 
 import UM 1.0 as UM
 
-ColumnLayout {
+Item
+{
     id: wizardPage
     property string title
-    property int pageWidth
-    property int pageHeight
 
     SystemPalette{id: palette}
-    //signal openFile(string fileName)
-    //signal closeWizard()
 
-    width: wizardPage.pageWidth
-    height: wizardPage.pageHeight
-
-    Connections {
-        target: elementRoot
-        onResize: {
-            wizardPage.width = pageWidth
-            wizardPage.height = pageHeight
-        }
-    }
-
-    ScrollView {
-        implicitHeight: wizardPage.height
-        implicitWidth: wizardPage.width - (UM.Theme.sizes.default_margin.width * 4)
-        ColumnLayout {
+    ScrollView
+    {
+        height: parent.height
+        width: parent.width
+        Column
+        {
             width: wizardPage.width
-            Label {
+            Label
+            {
                 id: pageTitle
                 width: parent.width
                 text: wizardPage.title
                 wrapMode: Text.WordWrap
                 font.pointSize: 18
             }
-            Label {
+            Label
+            {
                 id: pageDescription
                 //: Add UM Original wizard page description
                 width: parent.width
-                //anchors.top: pageTitle.bottom
                 wrapMode: Text.WordWrap
                 text: qsTr("To assist you in having better default settings for your Ultimaker. Cura would like to know which upgrades you have in your machine:")
             }
 
-            Column {
+            Column
+            {
                 id: pageCheckboxes
                 width: parent.width
-                anchors.top: pageDescription.bottom
 
-                CheckBox {
+                CheckBox
+                {
                     text: qsTr("Extruder driver ugrades")
                 }
-                CheckBox {
+                CheckBox
+                {
                     text: qsTr("Heated printer bed (kit)")
                 }
-                CheckBox {
+                CheckBox
+                {
                     text: qsTr("Heated printer bed (self built)")
                 }
-                CheckBox {
+                CheckBox
+                {
                     text: qsTr("Dual extrusion (experimental)")
                     checked: true
                 }
             }
 
-            Label{
-                id: pageCaption1
-                anchors.top: pageCheckboxes.bottom
+            Label
+            {
                 width: parent.width
                 wrapMode: Text.WordWrap
                 text: qsTr("If you have an Ultimaker bought after october 2012 you will have the Extruder drive upgrade. If you do not have this upgrade, it is highly recommended to improve reliability.");
             }
 
-            Label {
-                id: pageCaption2
-                anchors.top: pageCaption1.bottom
+            Label
+            {
                 width: parent.width
                 wrapMode: Text.WordWrap
                 text: qsTr("This upgrade can be bought from the Ultimaker webshop or found on thingiverse as thing:26094");