From 1de61600a71e5dd04ed11716f88d5a96e7054840 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Wed, 1 Nov 2017 10:45:09 +0100 Subject: [PATCH] Checkbox position and warning in log file CURA-4503 --- .../qml/AskOpenAsProjectOrModelsDialog.qml | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/resources/qml/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/AskOpenAsProjectOrModelsDialog.qml index affef33fb1..a6e818557f 100644 --- a/resources/qml/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/AskOpenAsProjectOrModelsDialog.qml @@ -1,5 +1,5 @@ // Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. +// Cura is released under the terms of the AGPLv3 or higher. import QtQuick 2.2 import QtQuick.Controls 1.1 @@ -58,13 +58,12 @@ UM.Dialog } } - Column + Item { anchors.fill: parent anchors.leftMargin: 20 * screenScaleFactor anchors.rightMargin: 20 * screenScaleFactor anchors.bottomMargin: 10 * screenScaleFactor - spacing: 10 * screenScaleFactor Label { @@ -76,11 +75,30 @@ UM.Dialog wrapMode: Text.WordWrap } - CheckBox + + + Item { - id: rememberChoiceCheckBox - text: catalog.i18nc("@text:window", "Remember my choice") - checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask" + + anchors.left: parent.left + anchors.right: parent.right + anchors.top: questionText.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height * 2 + + CheckBox + { + id: rememberChoiceCheckBox + checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask" + } + + Label + { + id: checkboxTextWithNiceRendering + anchors.left: rememberChoiceCheckBox.right + anchors.bottom: rememberChoiceCheckBox.bottom + font: UM.Theme.getFont("default") + text: catalog.i18nc("@text:window", "Remember my choice") + } } // Buttons @@ -89,6 +107,7 @@ UM.Dialog id: buttonBar anchors.right: parent.right anchors.left: parent.left + anchors.bottom: parent.bottom height: childrenRect.height Button