55 Commits

Author SHA1 Message Date
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
Jaime van Kessel
656a3dc707 Remove stray print 2022-07-11 16:02:17 +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
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
j.delarago
40d473c243 Add circle with letter inside for non default intents
CURA-8849
2022-06-14 15:44:11 +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
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
casper
ceee0e9b4b Update RecommnededQualityProfileSelector to Controls 2
CURA-8688
2022-03-01 11:38:29 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Konstantinos Karmas
b34dd61172 Align layer height labels with the "Profiles" label
CURA-8202
2021-07-01 16:08:53 +02: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
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
2019-11-11 10:47:53 +01:00
Remco Burema
da92c36afb
Don't show tooltip immediately. 2019-11-06 17:22:58 +01:00
Nino van Hooff
248f4fc21c Draw the NoIntentIcon over the intent description hover area.
This fixes a bug where the NoIntent tooltip was hidden by the intent
description

CURA-6936

(cherry picked from commit 315b93a1525ba53f520f12b09669668266f12c6c)
2019-11-04 11:13:48 +01:00
Nino van Hooff
2058cf8601 Merge remote-tracking branch 'origin/master' 2019-10-21 13:37:37 +02:00
Nino van Hooff
3d30674465 Clarify "reset quality button" purpose 2019-10-21 13:37:28 +02:00
Nino van Hooff
b182830c21 Add tooltips for intent profiles to the Custom Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 17:17:06 +02:00
Nino van Hooff
3709cfa4ed Add tooltips for intent profiles to the Recommended Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 15:54:03 +02:00
Ghostkeeper
618cbffaa7
Apply screenScaleFactor to implicitWidth (and cleanup) 2019-10-04 12:58:40 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent
CURA-6601
2019-09-26 16:26:55 +02:00
Jaime van Kessel
b7b34eb6f7
Re-add the reset custom settings button to recommended panel
CURA-6810
2019-09-26 13:39:16 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings
CURA-6598
2019-09-03 11:17:20 +02:00
Jaime van Kessel
c80cd9679f Fix RadioCheckbars layout getting out of wack sometimes
CURA-6598
2019-08-29 15:15:35 +02:00
Jaime van Kessel
92be261178 Update the profile selector to new style for the intents
CURA-6598
2019-08-29 11:53:25 +02:00
Jaime van Kessel
c51dfec29f Ensure that the intent category names are displayed coorectly in recommended
CURA-6598
2019-08-29 11:53:25 +02:00
Jaime van Kessel
94c2211e7f Further simplify the recommended print setup
CURA-6598
2019-08-29 11:53:25 +02:00
Jaime van Kessel
a9e09c6f54 Removed unused timer
CURA-6598
2019-08-29 11:53:25 +02:00
Jaime van Kessel
5401a4db15 Ensure that each intent gets it's own bar in recommended
CURA-6598
2019-08-29 11:53:19 +02:00
Jaime van Kessel
8d53ee90b4 Ensure that profile bar has no options selected if a quality_changes is active
CURA-6598
2019-08-29 11:40:02 +02:00
Jaime van Kessel
9e5082a42f Cleanup the qml a bit
CURA-6598
2019-08-29 11:40:02 +02:00
Jaime van Kessel
6b90975391 Replace the old settingSlider with the RadioButtonbar
CURA-6598
2019-08-29 11:40:02 +02:00
Diego Prado Gesto
fceffce56e Show the slider in the middle when there is only one quality profile available.
Contributes to CURA-6121.
2019-03-21 14:18:07 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence
A lot of translators got this wrong.

Contributes to issue CURA-6257.
2019-03-14 14:30:57 +01:00
Ghostkeeper
4be9fbb75e
Give tick marks a font
Otherwise it uses your system's font, which is not consistent.

Contributes to issue CURA-6025.
2018-12-31 13:57:49 +01: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
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality
CURA-6028
2018-12-18 08:56:56 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value
CURA-6028
2018-12-14 16:17:05 +01:00
Jaime van Kessel
c4700b2752 Also update the model if the data changed
CURA-6028
2018-12-13 14:30:00 +01:00
Ghostkeeper
9dc8450db0
Fix typo 2018-12-07 17:37:10 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
2018-12-03 09:45:49 +01:00
Diego Prado Gesto
1238aa7304 Format the slider for the infill in the recommended mode
Contributes to CURA-5941
2018-12-02 12:03:58 +01:00