From 4370e3a13cf66fc8ee8865b09f0f2a8aced49019 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Jun 2017 15:41:17 +0200 Subject: [PATCH 1/2] Added zoom to mouse preference https://github.com/Ultimaker/Cura/issues/1572 --- resources/qml/Preferences/GeneralPage.qml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 59f546279b..92a768051e 100755 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -86,6 +86,8 @@ UM.PreferencesPage centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select")) UM.Preferences.resetPreference("view/invert_zoom"); invertZoomCheckbox.checked = boolCheck(UM.Preferences.getValue("view/invert_zoom")) + UM.Preferences.resetPreference("view/zoom_to_mouse"); + zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) UM.Preferences.resetPreference("view/top_layer_count"); topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count")) @@ -354,6 +356,20 @@ UM.PreferencesPage } } + UM.TooltipArea { + width: childrenRect.width; + height: childrenRect.height; + text: catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") + + CheckBox + { + id: zoomToMouseCheckbox + text: catalog.i18nc("@action:button","Zoom toward mouse direction"); + checked: boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) + onClicked: UM.Preferences.setValue("view/zoom_to_mouse", checked) + } + } + UM.TooltipArea { width: childrenRect.width height: childrenRect.height From ef89fab1269cc595fda15ea03d9760789efc3d29 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 6 Jul 2017 16:13:42 +0200 Subject: [PATCH 2/2] Fix spaces after comma according to code style Contributes to issue CURA-3587. --- resources/qml/Preferences/GeneralPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 92a768051e..260c23c4ba 100755 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -364,9 +364,9 @@ UM.PreferencesPage CheckBox { id: zoomToMouseCheckbox - text: catalog.i18nc("@action:button","Zoom toward mouse direction"); + text: catalog.i18nc("@action:button", "Zoom toward mouse direction"); checked: boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) - onClicked: UM.Preferences.setValue("view/zoom_to_mouse", checked) + onClicked: UM.Preferences.setValue("view/zoom_to_mouse", checked) } }