3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-10 15:28:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch 'master' of ssh://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Ghostkeeper 2020-03-02 14:14:51 +01:00
commit 0e564abbea
No known key found for this signature in database
GPG key ID: 37E2020986774393
11 changed files with 114 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/ActionButton.qml
View file

@ -133,7 +133,19 @@ Button
Cura.ToolTip
{
id: tooltip
visible: button.hovered && buttonTextMetrics.elidedText != buttonText.text
visible:
{
if (!button.hovered)
{
return false;
}
if (tooltipText == button.text)
{
return buttonTextMetrics.elidedText != buttonText.text;
}
return true;
}
targetPoint: Qt.point(parent.x, Math.round(parent.y + parent.height / 2))
}
BusyIndicator

7
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -151,9 +151,10 @@ Item
// Create a local printer
const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
const printerName = addLocalPrinterDropDown.contentItem.printerName
Cura.MachineManager.addMachine(localPrinterItem.id, printerName)
base.showNextPage()
if(Cura.MachineManager.addMachine(localPrinterItem.id, printerName))
{
base.showNextPage()
}
}
}
}