3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-6435_new_style_add_machine

Browse source
This commit is contained in:
Diego Prado Gesto 2019-04-11 12:47:19 +02:00
commit 96301842f2
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/Account/UserOperations.qml
View file

@ -9,10 +9,9 @@ import Cura 1.1 as Cura
Column
{
width: Math.max(title.width,
accountButton.width) * 1.5
width: Math.max(title.width, accountButton.width) + 2 * UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
Label
{
@ -20,17 +19,11 @@ Column
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
renderType: Text.NativeRendering
text: catalog.i18nc("@label The argument is a username.", "Hi %1").format(profile.username)
text: catalog.i18nc("@label The argument is a username.", "Hi %1").arg(profile.username)
font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text")
}
// placeholder
Label
{
text: " "
}
Cura.SecondaryButton
{
id: accountButton