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

Merge branch '4.0'

Browse source 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
This commit is contained in:
Ghostkeeper 2019-02-15 13:58:47 +01:00
commit d42ba9dda0
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
58 changed files with 80 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Account/AvatarImage.qml
View file

@ -22,7 +22,6 @@ Item
{
id: profileImage
anchors.fill: parent
source: UM.Theme.getImage("avatar_default")
fillMode: Image.PreserveAspectCrop
visible: false
mipmap: true

4
resources/qml/ActionPanel/OutputDevicesActionButton.qml
View file

@ -90,6 +90,10 @@ Item
cornerRadius: 0
hoverColor: UM.Theme.getColor("primary")
Layout.fillWidth: true
// The total width of the popup should be defined by the largest button. By stating that each
// button should be minimally the size of it's content (aka; implicitWidth) we can ensure that.
Layout.minimumWidth: implicitWidth
Layout.preferredHeight: widget.height
onClicked:
{
UM.OutputDeviceManager.setActiveDevice(model.id)