Commit graph

27 commits

Author SHA1 Message Date
Erwan MATHIEU
e69a436942 Fix sometimes wrongly displayed view
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
This required a refactoring of the management of the active view. The previous behavior was that anyone could set the active view, depending on certain conditions. But now we also have a view that is set by a tool, so sometimes the actually set view would be incorrect. Now each Stage requests an active view, and each tool CAN also request an active view. Then the Controller decides which view should actually be active depending on the active stage and tool.
2025-08-06 16:15:05 +02:00
j.delarago
cfad991120 Popup will now resize based on the implicitWidth/implicitHeight of it's children.
This causes a binding loop when using layouts like Column.

To resolve this the height/width of the popup in ExpandablePopup can now be set explicitly with contentWidth and contentHeight

For ExpandablePopups with contentItems that are not Layouts the implicitWidth/implicitHeight can be set directly in the contentItem.

CURA-8640
2022-04-01 09:31:27 +02:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode
It makes more sense.
2019-03-08 15:27:17 +01:00
Ghostkeeper
60a5438db6
Make expandable component header fonts larger
As per the design.

Contributes to issue CURA-6025.
2018-12-31 13:43:31 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ghostkeeper
3a74511d23
Remove padding from views selector
This padding made it break the height of the item for some reason. I guess that is a Qt bug.
In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird.

Contributes to issue CURA-6029.
2018-12-14 15:02:14 +01:00
Diego Prado Gesto
012ee0c02a Use the MouseArea trick to assure that the binding still works for the
checked property of the button.

Contributes to CURA-6028.
2018-12-13 16:44:49 +01:00
Jaime van Kessel
1b3cb32334 Fix the simulation view not being selected as default
CURA-6028
2018-12-13 15:59:15 +01:00
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors
Contributes to CURA-5876.
2018-12-11 16:35:59 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component
This is needed to align with the designs.
2018-12-11 13:53:05 +01:00
Diego Prado Gesto
4fc4aecf17 Avoid the overlapping of text when the name is too long
Normally I happens in other languages other than English.
2018-12-10 15:48:59 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
46c209a993 Add one pixel margin to the view selector. 2018-12-06 14:45:24 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
2018-12-05 09:39:04 +01:00
Diego Prado Gesto
47ff95b1f3 Set contentType to the different expandable components.
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
2018-12-04 13:53:11 +01:00
Diego Prado Gesto
4dcce7616b Fix some leftover renamings
Contributes to CURA-5941
2018-12-04 13:21:26 +01:00
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content'
Contributes to CURA-5941.
2018-12-04 13:14:12 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Diego Prado Gesto
c5d0ed2651 Define the look and feel of the view selector button. Adjust the sizes. 2018-11-25 20:13:56 +01:00
Diego Prado Gesto
68c96a2577 Modify the header item of the view selector. 2018-11-25 19:42:00 +01:00
Diego Prado Gesto
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00