From ac2301a8fd994020fd4d2f6082eed937684568a9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 20 Apr 2018 15:36:32 +0200 Subject: [PATCH] Fix code style: Brackets on new line And one comma without a space after it. Contributes to issue CURA-5204. --- resources/qml/Preferences/GeneralPage.qml | 52 +++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 1ccd4d3382..f4fa7c1557 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -377,7 +377,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width; height: childrenRect.height; text: catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") @@ -391,7 +392,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Should models on the platform be moved so that they no longer intersect?") @@ -404,7 +406,8 @@ UM.PreferencesPage onCheckedChanged: UM.Preferences.setValue("physics/automatic_push_free", checked) } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Should models on the platform be moved down to touch the build plate?") @@ -437,7 +440,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Should layer be forced into compatibility mode?") @@ -464,7 +468,8 @@ UM.PreferencesPage text: catalog.i18nc("@label","Opening and saving files") } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip","Should models be scaled to the build volume if they are too large?") @@ -478,7 +483,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip","An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?") @@ -492,7 +498,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Should a prefix based on the printer name be added to the print job name automatically?") @@ -506,7 +513,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Should a summary be shown when saving a project file?") @@ -519,7 +527,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip", "Default behavior when opening a project file") @@ -542,7 +551,8 @@ UM.PreferencesPage { id: openProjectOptionModel - Component.onCompleted: { + Component.onCompleted: + { append({ text: catalog.i18nc("@option:openProject", "Always ask"), code: "always_ask" }) append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" }) append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" }) @@ -602,7 +612,8 @@ UM.PreferencesPage { id: discardOrKeepProfileListModel - Component.onCompleted: { + Component.onCompleted: + { append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"), code: "always_discard" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" }) @@ -642,7 +653,8 @@ UM.PreferencesPage text: catalog.i18nc("@label","Privacy") } - UM.TooltipArea { + UM.TooltipArea + { visible: pluginExistsAndEnabled("UpdateChecker") width: childrenRect.width height: visible ? childrenRect.height : 0 @@ -657,7 +669,8 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { visible: pluginExistsAndEnabled("SliceInfoPlugin") width: childrenRect.width height: visible ? childrenRect.height : 0 @@ -696,7 +709,8 @@ UM.PreferencesPage text: catalog.i18nc("@label","Experimental") } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height text: catalog.i18nc("@info:tooltip","Use multi build plate functionality") @@ -710,21 +724,23 @@ UM.PreferencesPage } } - UM.TooltipArea { + UM.TooltipArea + { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip","Should newly loaded models be arranged on the build plate? Used in conjunction with multi build plate (EXPERIMENTAL)") + text: catalog.i18nc("@info:tooltip", "Should newly loaded models be arranged on the build plate? Used in conjunction with multi build plate (EXPERIMENTAL)") CheckBox { id: arrangeOnLoadCheckbox - text: catalog.i18nc("@option:check","Do not arrange objects on load") + text: catalog.i18nc("@option:check", "Do not arrange objects on load") checked: boolCheck(UM.Preferences.getValue("cura/not_arrange_objects_on_load")) onCheckedChanged: UM.Preferences.setValue("cura/not_arrange_objects_on_load", checked) } } - Connections { + Connections + { target: UM.Preferences onPreferenceChanged: {