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

Merge branch 'master' into CURA-4248_BAM

Browse source
This commit is contained in:
Diego Prado Gesto 2017-10-19 10:26:25 +02:00
commit d3e8915b30
7 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

0
resources/definitions/dagoma_discoeasy200.def.json Executable file → Normal file
View file

0
resources/definitions/fdmprinter.def.json Executable file → Normal file
View file

0
resources/definitions/helloBEEprusa.def.json Executable file → Normal file
View file

14
resources/qml/SidebarHeader.qml
View file

@ -34,20 +34,6 @@ Column
width: height
}
Item
{
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
visible: extruderSelectionRow.visible
height: UM.Theme.getSize("default_lining").hieght
width: height
}
Item
{
id: extruderSelectionRow

2
resources/qml/SidebarSimple.qml
View file

@ -366,7 +366,7 @@ Item
}
onEntered:
{
var content = catalog.i18nc("@tooltip","You have selected a custom profile. If you want to change it, go to custom mode.")
var content = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
}
onExited: base.hideTooltip()