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 'ui_rework_4_0' of ssh://github.com/Ultimaker/Cura into ui_rework_4_0

Browse source
This commit is contained in:
Ghostkeeper 2018-12-07 13:04:13 +01:00
commit 2593849798
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
52 changed files with 2338 additions and 2109 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -13,7 +13,7 @@ import Cura 1.0 as Cura
* Menu that allows you to select the configuration of the current printer, such
* as the nozzle sizes and materials in each extruder.
*/
Cura.ExpandableComponent
Cura.ExpandablePopup
{
id: base
@ -34,7 +34,6 @@ Cura.ExpandableComponent
Custom
}
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
headerItem: Item
{
// Horizontal list that shows the extruders
@ -121,7 +120,7 @@ Cura.ExpandableComponent
}
Component.onCompleted: updateEnabled();
popupItem: Column
contentItem: Column
{
id: popupItem
width: base.width - 2 * UM.Theme.getSize("default_margin").width
@ -169,7 +168,7 @@ Cura.ExpandableComponent
{
id: separator
visible: buttonBar.visible
x: -popupPadding
x: -contentPadding
width: base.width
height: UM.Theme.getSize("default_lining").height