3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
This commit is contained in:
Aleksei S 2017-10-31 10:27:35 +01:00
commit f7ce4cc78a
10 changed files with 49 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/qml/AskOpenAsProjectOrModelsDialog.qml
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

2
resources/qml/JobSpecs.qml
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