29 Commits

Author SHA1 Message Date
Joey de l'Arago
1e6184448c
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-12-12 11:44:21 +01:00
Joey de l'Arago
ce5691c12d
Apply suggestions from code review
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-12-05 14:42:35 +01:00
Joey de l'Arago
741a112282 Remove recommended adhesion selector.
CURA-9793
2022-12-05 14:05:22 +01:00
Joey de l'Arago
62bae7df19 Collapse the setting section when the switch for the section is disabled.
Add collapse animation for setting items and setting section.

Swap out ColumnLayout for Layout. Animating the Layouts does not seem to be possible.

I had to put spacer back into the Column but it is the lesser of two evils.

CURA-9793
2022-12-01 14:03:11 +01:00
Joey de l'Arago
574b1000f6 Add tooltips
CURA-9793
2022-11-30 17:44:58 +01:00
Joey de l'Arago
dbf27a432f Change confusing naming of section enable switch.
CURA-9793
2022-11-30 12:12:41 +01:00
Joey de l'Arago
c356b9d46f Rename ExtruderSelectorBar -> SingleSettingExtruderSelectorBar to be inline with new single setting widgets.
Move common functionality into SingleSettingExtruderSelectorBar

Add adhesion settings

CURA-9793
2022-11-29 17:00:55 +01:00
Joey de l'Arago
eb13ac7f6b Getting setting section sized properly
CURA-9793
2022-11-25 17:42:50 +01:00
Joey de l'Arago
ac2e733ea6 Add Section Header and Section Setting item components.
Upgrade Adhesion to use new components

CURA-9793
2022-11-24 17:24:28 +01:00
j.delarago
7700d01cf3 Fix implicitWidth binding loop.
CURA-8849
2022-06-28 16:39:25 +02:00
j.delarago
cde897ff1e Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip.
The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear.

The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component.

CURA-8849
2022-06-21 11:59:03 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml,
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
2022-06-20 10:52:31 +02:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Konstantinos Karmas
0904324dde Use medium_button instead of toolbar_button
Since it is less specific and can be used in other places too.

CURA-8202
2021-07-01 10:02:09 +02:00
Konstantinos Karmas
6cf25aa540 Make the icons in the recommended window same size as the toolbar icons
CURA-8202
2021-06-30 12:28:46 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02: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
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode
CURA-6182

Move complex logic to Python.
2019-05-21 08:10:49 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.

Contributes to issue CURA-6182.
2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript 2019-05-16 14:28:09 +02:00
Ghostkeeper
44f21b37ac
Make labels on left side of recommended mode larger
Contributes to issue CURA-6025.
2018-12-31 13:49:03 +01:00
Lipu Fei
f7f3c96f81 Fix typo
CURA-5941
2018-12-06 10:53:43 +01:00
Diego Prado Gesto
7dc3320b06 Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them
Contributes to CURA-5941.
2018-12-02 20:32:55 +01:00
Diego Prado Gesto
adabb833e0 Add row for the adhesion setting in the recommended mode
Contributes to CURA-5941.
2018-12-02 19:14:34 +01:00