Fix layout of General preference page

resources/qml/GeneralPage.qml

@@ -11,7 +11,7 @@ import UM 1.1 as UM
 UM.PreferencesPage
 {
     //: General configuration page title
-    title: catalog.i18nc("@title:tab","General");
+    title: catalog.i18nc("@title:tab","General")
 
     function setDefaultLanguage(languageCode)
     {
@@ -38,15 +38,17 @@ UM.PreferencesPage
         setDefaultLanguage(defaultLanguage)
     }
 
-    GridLayout
+    ColumnLayout
     {
-        columns: 2;
         //: Language selection label
         UM.I18nCatalog{id: catalog; name:"cura"}
+
+        RowLayout
+        {
             Label
             {
                 id: languageLabel
-            text: catalog.i18nc("@label","Language")
+                text: catalog.i18nc("@label","Language:")
             }
 
             ComboBox
@@ -83,10 +85,6 @@ UM.PreferencesPage
                 }
                 onActivated: UM.Preferences.setValue("general/language", model.get(index).code)
 
-            anchors.left: languageLabel.right
-            anchors.top: languageLabel.top
-            anchors.leftMargin: 20
-
                 Component.onCompleted:
                 {
                     // Because ListModel is stupid and does not allow using qsTr() for values.
@@ -101,11 +99,11 @@ UM.PreferencesPage
                     currentIndex -= 1;
                 }
             }
+        }
 
         Label
         {
-            id: languageCaption;
+            id: languageCaption
-            Layout.columnSpan: 2
 
             //: Language change warning
             text: catalog.i18nc("@label", "You will need to restart the application for language changes to have effect.")
@@ -113,103 +111,46 @@ UM.PreferencesPage
             font.italic: true
         }
 
+        UM.TooltipArea {
+            width: childrenRect.width
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect.")
+
             CheckBox
             {
                 id: pushFreeCheckbox
+                text: catalog.i18nc("@option:check", "Ensure objects are kept apart")
                 checked: boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
                 onCheckedChanged: UM.Preferences.setValue("physics/automatic_push_free", checked)
             }
-        Button
+        }
-        {
-            id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
 
-            //: Display Overhang preference checkbox
+        UM.TooltipArea {
-            text: catalog.i18nc("@option:check", "Ensure objects are kept apart");
+            width: childrenRect.width
-            onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip","Should opened files be scaled to the build volume if they are too large?")
 
-            //: Display Overhang preference tooltip
+            CheckBox
-            tooltip: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect.")
+            {
+                id: scaleToFitCheckbox
+                text: catalog.i18nc("@option:check","Scale large files")
+                checked: boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
+                onCheckedChanged: UM.Preferences.setValue("mesh/scale_to_fit", checked)
+            }
+        }
 
-            style: ButtonStyle
+        UM.TooltipArea {
-            {
+            width: childrenRect.width
-                background: Rectangle
+            height: childrenRect.height
-                {
+            text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
-                    border.width: 0
-                    color: "transparent"
-                }
-                label: Text
-                {
-                    renderType: Text.NativeRendering
-                    horizontalAlignment: Text.AlignLeft
-                    text: control.text
-                }
-            }
-        }
 
             CheckBox
             {
                 id: sendDataCheckbox
+                text: catalog.i18nc("@option:check","Send (anonymous) print information")
                 checked: boolCheck(UM.Preferences.getValue("info/send_slice_info"))
                 onCheckedChanged: UM.Preferences.setValue("info/send_slice_info", checked)
             }
-        Button
-        {
-            id: sendDataText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
-
-            //: Display Overhang preference checkbox
-            text: catalog.i18nc("@option:check","Send (Anonymous) Print Information");
-            onClicked: sendDataCheckbox.checked = !sendDataCheckbox.checked
-
-            //: Display Overhang preference tooltip
-            tooltip: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
-
-            style: ButtonStyle
-            {
-                background: Rectangle
-                {
-                    border.width: 0
-                    color: "transparent"
-                }
-                label: Text
-                {
-                    renderType: Text.NativeRendering
-                    horizontalAlignment: Text.AlignLeft
-                    text: control.text
         }
     }
 }
-        CheckBox
-        {
-            id: scaleToFitCheckbox
-            checked: boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
-            onCheckedChanged: UM.Preferences.setValue("mesh/scale_to_fit", checked)
-        }
-        Button
-        {
-            id: scaleToFitText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
-
-            //: Display Overhang preference checkbox
-            text: catalog.i18nc("@option:check","Scale Too Large Files");
-            onClicked: scaleToFitCheckbox.checked = !scaleToFitCheckbox.checked
-
-            //: Display Overhang preference tooltip
-            tooltip: catalog.i18nc("@info:tooltip","Should opened files be scaled to the build volume when they are too large?")
-
-            style: ButtonStyle
-            {
-                background: Rectangle
-                {
-                    border.width: 0
-                    color: "transparent"
-                }
-                label: Text
-                {
-                    renderType: Text.NativeRendering
-                    horizontalAlignment: Text.AlignLeft
-                    text: control.text
-                }
-            }
-        }
-        Item { Layout.fillHeight: true; Layout.columnSpan: 2 }
-    }
-}

resources/qml/ViewPage.qml

@@ -39,7 +39,7 @@ UM.PreferencesPage
                 checked: boolCheck(UM.Preferences.getValue("view/show_overhang"))
                 onClicked: UM.Preferences.setValue("view/show_overhang",  checked)
 
-                text: catalog.i18nc("@option:check","Display Overhang");
+                text: catalog.i18nc("@option:check","Display overhang");
             }
         }