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

plugins/LayerView/LayerView.py

@@ -135,8 +135,6 @@ class LayerView(View):
 
             self.currentLayerNumChanged.emit()
 
-    currentLayerNumChanged = Signal()
-
     def calculateMaxLayers(self):
         scene = self.getController().getScene()
         renderer = self.getRenderer() # TODO: @UnusedVariable

plugins/LayerView/LayerView.qml

@@ -69,7 +69,7 @@ Item
                 // Ensure that the cursor is at the first position. On some systems the text isnt fully visible
                 // Seems to have to do something with different dpi densities that QML doesn't quite handle.
                 // Another option would be to increase the size even further, but that gives pretty ugly results.
-                onTextChanged: cursorPosition = 0
+                onEditingFinished: cursorPosition = 0
                 style: TextFieldStyle
                 {
                     textColor: UM.Theme.getColor("setting_control_text");

resources/qml/Preferences/GeneralPage.qml

@@ -246,7 +246,7 @@ UM.PreferencesPage
         UM.TooltipArea {
             width: childrenRect.width
             height: childrenRect.height
-            text: catalog.i18nc("@info:tooltip","Should objects be scaled up if they are extremely small?")
+            text: catalog.i18nc("@info:tooltip","An object may appear extremely small if its unit is for example in meters rather than millimeters. Should these objects be scaled up?")
 
             CheckBox
             {