5785 Commits

Author SHA1 Message Date
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
e095d41f0b
Implement pulse animation option for ComboBox widget
You can now call pulse() on it and it'll pulse in the warning colour.

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
Ghostkeeper
28c1291feb
Allow configuring combobox with whether they allow styled text or not
For some models we'd like to have the possibility to have rich text in the combobox. For some we'd like to prevent that, for instance to prevent the user from using colours in their profile names, or boldface, or even images.

Contributes to issue CURA-8849.
2022-06-14 15:36:28 +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
j.delarago
964c566ffb Add spacing option between icon and text in IconWithText.qml 2022-06-13 14:43:23 +02:00
Jaime van Kessel
363d828634 Remove the NoIntentIcon
CURA-8623
2022-06-13 13:33:39 +02:00
Remco Burema
d2381f129f
Merge pull request #12434 from Ultimaker/CURA-6990
Use "required packages" metadata to load a project file with a third party material
2022-06-07 13:26:31 +02:00
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
Ghostkeeper
979c436b6c
Make text area selection use theme colours
Also fix the highlight colour of the border. The highlight colour was changed in a later design but it was not changed here yet.
Without a theme colour it's going to use the system colours for the highlighting of text, which may be a very light grey that matches the background, making it impossible to see what part of the text is selected.

Hopefully fixes issue #12286.
2022-06-03 10:30:17 +02:00
Ghostkeeper
eee3a06743
Allow text to be wider if favourite button is not shown
It can take the space of the favourite button then.
2022-05-19 09:52:25 +02:00
Jaime van Kessel
8b02b4161b Merge branch 'fix_tall_toolbar' of https://github.com/fieldOfView/Cura 2022-05-18 13:29:42 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0'
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
2022-05-16 15:11:39 +02:00
Jaime van Kessel
fc7e0907f7 Merge branch 'CURA-9216_ToolTip' of github.com:Ultimaker/Cura into 5.0 2022-05-13 15:36:16 +02:00
Casper Lamboo
b4ccd690ea
Merge pull request #12161 from Ultimaker/CURA-9106_color_image_weird_scaling
[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
2022-05-11 17:30:55 +02:00
c.lamboo
482d21c642 Fix for tooltip
Problem was that the mouse events were not properly propagated to the underlying mouse area. Fixed by placing the MouseArea on top of the content (instead of under) and allowing the mouse events to propagate through the mouse area.

CURA-9219
2022-05-11 17:23:54 +02:00
Remco Burema
f0d3686ee7 Fix alignment.
CURA-9106

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-05-11 15:36:44 +02:00
Remco Burema
16eb78a5a7 Properly align center.
CURA-9106
2022-05-10 19:12:52 +02:00
Remco Burema
5479479596 Make parent item of ExtruderIcons handle all scaling.
CURA-9106
2022-05-10 17:48:05 +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
fb8f50e6ef
Merge branch '5.0' 2022-05-10 16:04:06 +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
Remco Burema
c4f9669887 Move 'zh_TW' translation to incomplete status for 5.0.0
The volunteer translator who'd normally do this never replied to our email. Hopefully this can be rectified in the next version.
2022-05-10 13:31:37 +02:00
Jaime van Kessel
0ac4fa20fd Fix injection warning for hamburger menu 2022-05-10 13:30:24 +02:00
Jaime van Kessel
5c7423e007 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-10 13:23:28 +02:00
Jaime van Kessel
4819b2484e Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0 2022-05-10 13:11:05 +02:00
Jaime van Kessel
44a616addd Fix storing the "dont show this again" of the project saving 2022-05-10 10:26:39 +02:00
Ghostkeeper
12901e351e
Merge branch '5.0' 2022-05-09 17:48: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
Ghostkeeper
a6698bcc4a
Merge branch '5.0' 2022-05-09 17:12:32 +02:00
Ghostkeeper
efdb21b7a1
Don't override size of extruder icons
Just let them be the default size of Cura.ExtruderIcon, which is the only correct size. It is already properly centred in the tab, too.

Contributes to issue CURA-9180.
2022-05-09 17:12:16 +02:00
Ghostkeeper
815a0b4014 Make buttons in account fill the whole width
That makes them easier to click.
The text of these buttons was going outside of the buttons themselves. That could be a problem, but it's not visible since the button has no background.

Contributes to issue CURA-9143.
2022-05-09 14:22:44 +02:00
Jaime van Kessel
325bf058e0 Merge branch 'CURA-9143_dropdown_item_width' of github.com:Ultimaker/Cura 2022-05-09 14:21:17 +02:00
Ghostkeeper
06c15f08aa
Make buttons in account fill the whole width
That makes them easier to click.
The text of these buttons was going outside of the buttons themselves. That could be a problem, but it's not visible since the button has no background.

Contributes to issue CURA-9143.
2022-05-09 11:59:00 +02:00
Remco Burema
078b2613a5 Merge branch '5.0' 2022-05-06 18:31:54 +02:00