3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature-backup-manager

Browse source
This commit is contained in:
ChrisTerBeke 2018-05-18 17:27:05 +02:00
commit 15ef3d1d10
5 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
View file

@ -15,7 +15,7 @@ Column
Label
{
id: heading
text: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Maker Choices") : catalog.i18nc("@label", "Community Plugins")
text: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Community contributions") : catalog.i18nc("@label", "Community plugins")
width: parent.width
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium")

4
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -354,12 +354,10 @@ Cura.MachineAction
onShowDialog:
{
printerKey = key;
addressText = address;
manualPrinterDialog.show();
addressField.selectAll();
addressField.focus = true;
manualPrinterDialog.show();
}
onAccepted: