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

Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip

Browse source
This commit is contained in:
Remco Burema 2019-03-20 13:33:19 +01:00
commit ad6603bab8
78 changed files with 271 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -23,7 +23,7 @@ ScrollView
property string preferredCategory: "Ultimaker"
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
ScrollBar.vertical.policy: ScrollBar.AsNeeded
property int maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
@ -100,7 +100,6 @@ ScrollView
{
id: arrow
anchors.left: parent.left
//anchors.verticalCenter: label.verticalCenter
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
@ -162,7 +161,8 @@ ScrollView
border.width: UM.Theme.getSize("default_lining").width
border.color: radioButton.hovered ? UM.Theme.getColor("small_button_text") : UM.Theme.getColor("small_button_text_hover")
Rectangle {
Rectangle
{
width: parent.width / 2
height: width
anchors.centerIn: parent

20
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -56,7 +56,7 @@ Item
anchors.right: parent.right
ScrollBar.horizontal.policy: ScrollBar.AsNeeded
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
ScrollBar.vertical.policy: ScrollBar.AsNeeded
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
@ -165,16 +165,16 @@ Item
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
height: troubleshoortingLinkIcon.height
width: troubleshoortingLinkIcon.width + troubleshoortingLabel.width + UM.Theme.getSize("default_margin").width
height: troubleshootingLinkIcon.height
width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("default_margin").width
UM.RecolorImage
{
id: troubleshoortingLinkIcon
anchors.right: troubleshoortingLabel.left
id: troubleshootingLinkIcon
anchors.right: troubleshootingLabel.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
height: troubleshoortingLabel.height
height: troubleshootingLabel.height
width: height
sourceSize.height: width
color: UM.Theme.getColor("text_link")
@ -183,7 +183,7 @@ Item
Label
{
id: troubleshoortingLabel
id: troubleshootingLabel
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: catalog.i18nc("@label", "Troubleshooting")
@ -199,17 +199,17 @@ Item
hoverEnabled: true
onClicked:
{
// open the throubleshooting URL with web browser
// open the troubleshooting URL with web browser
var url = "https://ultimaker.com/incoming-links/cura/material-compatibilty" // TODO
Qt.openUrlExternally(url)
}
onEntered:
{
troubleshoortingLabel.font.underline = true
troubleshootingLabel.font.underline = true
}
onExited:
{
troubleshoortingLabel.font.underline = false
troubleshootingLabel.font.underline = false
}
}
}