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

Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding

Browse source
This commit is contained in:
Lipu Fei 2019-04-10 10:40:42 +02:00
commit 0d437e7e96
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -48,17 +48,19 @@ Item
Item
{
width: parent.width
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("default_margin").width
Label
{
id: explainLabel
height: contentHeight
width: parent.width
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
}
@ -66,8 +68,10 @@ Item
{
id: userInputFields
height: childrenRect.height
width: parent.width
anchors.left: parent.left
anchors.right: parent.right
anchors.top: explainLabel.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").width
Cura.TextField
{
@ -76,7 +80,6 @@ Item
height: addPrinterButton.height
anchors.verticalCenter: addPrinterButton.verticalCenter
anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width
validator: RegExpValidator
{
@ -92,8 +95,7 @@ Item
id: addPrinterButton
anchors.top: parent.top
anchors.left: hostnameField.right
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Add")
onClicked:
{

14
resources/qml/Widgets/ScrollableTextArea.qml
View file

@ -15,6 +15,14 @@ ScrollView
{
property alias textArea: _textArea
clip: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
TextArea
{
id: _textArea
@ -22,11 +30,5 @@ ScrollView
textFormat: TextEdit.PlainText
renderType: Text.NativeRendering
selectByMouse: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
}
}