264 Commits

Author SHA1 Message Date
Remco Burema
6f651b922a Profile compare-and-save: Add (more) explanatory text(s).
part of CURA-9347
2022-11-30 19:54:41 +01:00
Remco Burema
c13deba1ea Build correct states for safe profiles flow (except actual safe).
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.

part of CURA-9347
2022-11-30 12:40:07 +01:00
Remco Burema
79629e477d Small stuff: Swap Icons. Tooltips. Remove reduntant entries.
part of CURA-9347
2022-11-29 23:39:24 +01:00
Remco Burema
40b7233125 Also add save/reset buttons to custom profile.
part of CURA-9347
2022-11-29 23:18:15 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself.
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
2022-11-29 22:54:30 +01:00
c.lamboo
8e8437eab0 Split of getStringParts function
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.

Cura-9773
2022-11-28 13:10:52 +01:00
c.lamboo
76564f7bc4 Add dash between main, and suffix part of quality display name
Cura-9773
2022-11-25 16:46:21 +01:00
c.lamboo
52ee149edc Unify activeQualityDisplayNameMap string creation
Generation quality display names in `CustomPrintSetup.qml` and `PrintSetupSelectorHeader.qml` were so similar that I decided to combine the logic.

Cura-9773
2022-11-25 16:09:55 +01:00
c.lamboo
e25048d88a Add width to intent tool tips
CURA-9746
2022-10-12 15:29:08 +02:00
Remco Burema
e9b268bc06
Review suggestion; best practices; javascript.
done as part of CURA-9746

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-10-12 14:54:33 +02:00
Remco Burema
8db3f02a4f Re-add tooltips for intent profile selection in recommended.
They where skipped over when transferring the radio bar to the current large button based setup.

CURA-9746
2022-10-12 14:43:55 +02:00
joeydelarago
fd8d6498ee When changing to an intent with infillDensity > 100 in recommended settings the RecommendedInfillDensitySelector would set infillDensity=100.
This is because the onValueChanged function checks if the slider has a different value from the settings and updates the settings if it does. The slider has a max value of 100, so when setting the sliders value to 1000 the slider would update to have a value of 100. This would then update the setting to value to 100.

The fix is as follows. When updating the slider value > 100 just ignore the first onValueChanged. Following onValueChanged, which are triggered by the user sliding the slider, will still trigger.

CURA-9488
2022-08-10 16:45:16 +02:00
c.lamboo
efce84284e Update translation strings
The profile name in the translation string was hard coded to be prepended before the actual string. Put this in the translation string as some languages may change the position of this part of the sentence.
2022-07-15 10:29:56 +02:00
Jaime van Kessel
656a3dc707 Remove stray print 2022-07-11 16:02:17 +02:00
j.delarago
7700d01cf3 Fix implicitWidth binding loop.
CURA-8849
2022-06-28 16:39:25 +02:00
j.delarago
8761a476a6 Fix height binding loops
CURA-8849
2022-06-28 16:33:35 +02:00
j.delarago
c118bd4e29 Adjust space between configuration warning and resolution options to closer match design.
CURA-8849
2022-06-22 11:13:50 +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
j.delarago
f650579799 PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg.
There is no additional margin on the left that can be removed, so instead I've given it a small negative margin

CURA-8849
2022-06-17 15:02:45 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable
Remove debug print statement

CURA-9321
2022-06-16 15:32:33 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names.
CURA-8849
2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available.
This was caused by visible being overridden.

CURA-8849
2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design.
CURA-8849
2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change.
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design
CURA-8849
2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together.
Fix is to have the children fill their width

CURA-8849
2022-06-16 13:12:36 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849
[CURA-8849] Improve intent profile selection
2022-06-15 18:24:18 +02:00
j.delarago
6f8470167f Suggested changes
CURA-8849
2022-06-15 17:40:07 +02:00
j.delarago
8362d4c967 Switch to column layout in RecommendedPrintSetup.qml so that left margins can be put on infill selector and items below it.
Add warning and reset button when custom profile is select and/or settings have been changed

CURA-8849
2022-06-15 10:48:04 +02:00
j.delarago
5fa10b0b8a Add campaign link
CURA-8849
2022-06-15 09:48:08 +02:00
j.delarago
d293855c65 Remove typo
CURA-8849
2022-06-15 09:07:35 +02:00
Ghostkeeper
3acc7bcb1c
Add actual link to help page for when a profile is not supported
Doesn't have UTM tags though. Maybe that's not important here.

Contributes to issue CURA-8849.
2022-06-14 18:20:35 +02:00
Ghostkeeper
b18cb1f649
Show UnsupportedProfileIndication if list of quality types is empty
And otherwise show the intent and quality level selectors.

This is currently quite broken because the list of quality levels is not correct. It should only show a quality type if it is supported by all extruders.

Contributes to issue CURA-8849.
2022-06-14 18:20:00 +02:00
Ghostkeeper
5c15ac68b8
Add a design for the notification when there's no recommended profile
Looks more harsh than it should be, perhaps. I'd prefer if we could add some text that says that you can create your own custom profiles too...

Contributes to issue CURA-8849.
2022-06-14 16:59:23 +02:00
Ghostkeeper
b8e3793631
Fix QML warning about no variable 'transparent' existing
It's a colour name. It should be within quotes here.

Contributes to issue CURA-8849.
2022-06-14 16:19:56 +02:00
Ghostkeeper
aee614ff9b
Hide intent category selector if there's just 'default' intent
It doesn't make sense to let the user choose then.

Contributes to issue CURA-8849.
2022-06-14 16:12:10 +02:00
Ghostkeeper
6b6f41bfe9
Add a horizontal line between sections of recommended set-up
This delimits the selecting of the profile from the few basic settings.

Contributes to issue CURA-8849.
2022-06-14 16:07:05 +02:00
Ghostkeeper
83ea5c2944
Fix triggering first pulse
Before the first pulse, the _previousResolution property was still bound to the activeQualityType property of the MachineManager. When it then checks if it changed, it finds that it didn't change because it checks against that same property, but the _previousResolution automatically updated with it. After that it loses its binding because it's set in the function itself to a fixed value.
Instead, we'll now give it its initial value with the Component.onCompleted function so that it doesn't bind, and then doesn't change along with the first change.

Contributes to issue CURA-8849.
2022-06-14 16:00:14 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
2022-06-14 16:00:13 +02:00
j.delarago
40d473c243 Add circle with letter inside for non default intents
CURA-8849
2022-06-14 15:44:11 +02:00
Ghostkeeper
074e9a8607
Show profile group name in bold
That highlights it relative to the layer height.

Contributes to issue CURA-8849.
2022-06-14 15:36:29 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix.
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
2022-06-14 11:41:38 +02:00
Jaime van Kessel
363d828634 Remove the NoIntentIcon
CURA-8623
2022-06-13 13:33:39 +02:00
Jaime van Kessel
f05e067f39 Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0 2022-05-10 16:24:40 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state
Contributes to issue CURA-9217.
2022-05-10 16:03:55 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
Ghostkeeper
7fda81b678
Show a border around text fields and drop-downs when hovering
And when they are focused.
This applies to the setting text fields, extruder selectors and drop-downs as well as to the machine settings.

Contributes to issue CURA-9217.
2022-05-09 17:48:38 +02:00