Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog

Cleaner open project dialog & redering on partial pixels fixes
This commit is contained in:
alekseisasin 2017-10-31 09:58:52 +01:00 committed by GitHub
commit 055b6ebaab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 40 additions and 30 deletions

View file

@ -63,11 +63,11 @@ UM.Dialog
anchors.fill: parent
anchors.leftMargin: 20 * screenScaleFactor
anchors.rightMargin: 20 * screenScaleFactor
anchors.bottomMargin: 20 * screenScaleFactor
spacing: 10 * screenScaleFactor
anchors.bottomMargin: 10 * screenScaleFactor
Label
{
id: questionText
text: catalog.i18nc("@text:window", "This is a Cura project file. Would you like to open it as a project or import the models from it?")
anchors.left: parent.left
anchors.right: parent.right
@ -78,15 +78,28 @@ UM.Dialog
CheckBox
{
id: rememberChoiceCheckBox
text: catalog.i18nc("@text:window", "Remember my choice")
anchors.bottom: buttonBar.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").heigth
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
Item
{
id: buttonBar
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
height: childrenRect.height
Button

View file

@ -95,7 +95,7 @@ Item {
{
id: printJobTextfield
anchors.right: printJobPencilIcon.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width/2
anchors.rightMargin: Math.floor(UM.Theme.getSize("default_margin").width/2)
height: UM.Theme.getSize("jobspecs_line").height
width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
maximumLength: 120