4814 Commits

Author SHA1 Message Date
Ghostkeeper
62916cb7d4
Remove outline of background around connectivity badge
After feedback from our designer, this turns out to no longer be desirable.

Contributes to issue CURA-8247.
2021-07-05 17:34:13 +02:00
Konstantinos Karmas
5ae4ad5429 Center the material label if no variant in the ConfigurationMenu header
CURA-8011
2021-07-05 17:33:03 +02:00
Jaime van Kessel
ff19d1dd63
Rename small_black to small_emphasis
Still not a great name, but it's better than the old one

CURA-8011
CURA-8202
2021-07-05 15:44:50 +02:00
Ghostkeeper
43237c91c6
Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour 2021-07-05 15:19:38 +02:00
Ghostkeeper
f9fcbf2492
Add new colour for background of the printer connectivity badge
This should be different from the background colour in case of the dark theme. The design asks for a white background for the badge in the dark theme.

Contributes to issue CURA-8247.
2021-07-05 15:19:15 +02:00
Ghostkeeper
fa4c69cb2b
Merge CloudBlueBG and CloudGreyBG into one icon without colour
We don't use the colour of icons. The colour is determined by the theme, and recoloured by UM.RecolorImage.

Contributes to issue CURA-8247.
2021-07-05 15:09:15 +02:00
Konstantinos Karmas
e7648b654d Fix ExtruderIcon size in the printer settings tab
CURA-8011 and CURA-8202
2021-07-05 14:11:40 +02:00
Konstantinos Karmas
0319fdcc41 Get the opacity of the extruder from the theme
CURA-8011
2021-07-05 12:27:29 +02:00
Konstantinos Karmas
12b844b357 Change extruder icon color to follow the color of the text
As per the review suggestion https://github.com/Ultimaker/Cura/pull/10051#discussion_r661493104.

CURA-8011
2021-07-05 11:38:55 +02:00
Konstantinos Karmas
9c49baa9ce Fix incorrect reference of the handleButton border color
CURA-8011
2021-07-05 10:07:23 +02:00
Konstantinos Karmas
97bb25aef0 Fix Print settings window getting locked in the y direction
Due to a wrong reference, the settings window was getting an incorrect initialY position. This lead to the window being unable to be dragged in the y direction.

CURA-8011
2021-07-05 10:06:16 +02:00
Remco Burema
952e02676f
Tweaks for restyling benefitting the dark theme.
part of CURA-8012
2021-07-02 13:24:02 +02:00
Konstantinos Karmas
a6cd2fe970 Change the extruder icon in the settings dropdown to be a filled circle
This makes it much more distinguishable.

CURA-8011
2021-07-02 12:15:26 +02:00
Konstantinos Karmas
b378e4870a Change the extruder icon in the object list to be a filled circle
CURA-8011
2021-07-02 12:14:10 +02:00
Konstantinos Karmas
cc30510058 Let ExtruderIcon decide its size in the ConfigurationMenu
CURA-8011
2021-07-02 12:12:18 +02:00
Konstantinos Karmas
e249db4477 Fix ExtruderColor and Extruder icons bleeding into each other
CURA-8011
2021-07-02 12:11:04 +02:00
Konstantinos Karmas
7c02e1b5e5 Merge branch 'CURA-8202_Resize_new_icons' into CURA-8011_Replace_extruder_icons 2021-07-02 10:35:35 +02:00
Remco Burema
e3dc5bc460
Adjust color-scheme for button restyle.
Also changed ligh theme.

part of CURA-8012
2021-07-02 09:39:33 +02:00
Konstantinos Karmas
b1ff639fc4 Add border around the checked radio button in the intents and infill
CURA-8202
2021-07-02 09:38:42 +02:00
Konstantinos Karmas
1e0efccd0b Remove the margin from the ViewOrientation buttons
CURA-8202
2021-07-02 09:38:12 +02:00
Konstantinos Karmas
b34dd61172 Align layer height labels with the "Profiles" label
CURA-8202
2021-07-01 16:08:53 +02:00
Konstantinos Karmas
a7446d681f Set header border and color by default in ExpandablePopup and Component
CURA-8202
2021-07-01 14:20:57 +02:00
Konstantinos Karmas
0505842235 Remove DropShadow from ExpandablePopup and ExpandableComponent
Since they are not used anywhere anymore

CURA-8202
2021-07-01 12:07:35 +02:00
Konstantinos Karmas
0472df3814 Change collapse button icon in expandable component to chevron
CURA-8202
2021-07-01 11:42:31 +02:00
Jaime van Kessel
0d64f3383a
Remove silly id from extruderIcon
Whoops. That was a debug thingie.

CURA-8011
2021-07-01 10: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
0478c127bf Increase the size of the auxiliary buttons in the setting items
CURA-8202
2021-07-01 09:54:31 +02:00
Konstantinos Karmas
4ef7fcf6e4 Increase the size of the small buttons in the setting category
Also, fix the misalignment of the background rectangle, which made the category icons seem not-centered.

CURA-8202
2021-07-01 09:53:51 +02:00
Konstantinos Karmas
a996b631bb Increase the size of the hamburger menu
CURA-8202
2021-07-01 09:49:48 +02:00
Konstantinos Karmas
0a2407e6ed Reduce the size of the magnifier in the setting search
CURA-8202
2021-07-01 09:46:24 +02:00
Remco Burema
e5d77a46d6
Remove 'roundedness' and 'shadow' from action-buttons.
Per the new UI design. Keep them as deprecated properties, so we may not need a major API/SDK increase just yet.

contributes to CURA-8012
2021-06-30 17:04:55 +02:00
Konstantinos Karmas
9d70ea8a8a Size the avatar icon with the same height as the marketplace button
CURA-8202
2021-06-30 15:18:12 +02:00
Konstantinos Karmas
3c2e336153 Align the printer status icon properly
CURA-8202
2021-06-30 15:17:37 +02:00
Konstantinos Karmas
061e889371 Fix height binding loop in the account details popup
CURA-8202
2021-06-30 13:09:29 +02:00
Konstantinos Karmas
eb2fe5b139 Change the size of the stage buttons to be same size as the marketplace button
CURA-8202
2021-06-30 12:30:04 +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
Konstantinos Karmas
4583866f57 Add toolbar button icon size
Which is slightly smaller than the button icon

CURA-8202
2021-06-30 12:28:08 +02:00
Konstantinos Karmas
3eafd11587 Fix qml warning about the sourceSize of the ToolbarButton icon
CURA-8202
2021-06-30 12:26:13 +02:00
Konstantinos Karmas
72ca4a9564 Use medium quality Printer icon in the MachineSelector
CURA-8202
2021-06-30 12:25:28 +02:00
Konstantinos Karmas
327acfd49c Align the material and variant labels in the center of the header
CURA-8013
2021-06-30 11:10:25 +02:00
Jaime van Kessel
53fd47e8db
Set opacity of disabled extruder text
CURA-8011
2021-06-29 16:26:59 +02:00
Jaime van Kessel
9735daf497
Replace the extruder icon with the new design
CURA-8011
2021-06-29 16:21:39 +02:00
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +02:00
Konstantinos Karmas
294b67f72f Replace the shadow of the PrepareMenu with a border
In order for that to be possible, the background border of the ExpandablePopup and the ExpandableComponent had to be exposed.

In addition, since in the `RowLayout` the `ConfigurationMenu` and the `MachineSelector` both draw a border around them, it means that there will be a double "divider" (one border line from each button). To overcome that, we set the spacing of the `RowLayout` as a `- border_width`, which ensures then that there will be only a single line of border between the two adjacent buttons.

CURA-8013
2021-06-28 17:50:38 +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
Konstantinos Karmas
77a8f36153 Change the color of a circle around the toolbar button
Instead of changing the color of the entire tool when it is hovered or selected, now a background circle will be drawn and its color will change according to whether the button is hovered/selected or not.

In addition, the button icons will now be half the size of the button itself.

CURA-8013
2021-06-28 14:56:26 +02:00
Konstantinos Karmas
eeccfc32b9 Remove spacing between toolbar buttons
CURA-8013
2021-06-28 14:54:44 +02:00
Konstantinos Karmas
fae5e2cffd Adjust the text of the material according to the size of the window
Now, when the size of the Cura window changes and the configurationSelector gets resized, instead of eliding the material text it will now change as follows:

* If it fits, display "Brand, Color, and Type" of material (e.g. Ultimaker Black PLA)
* If "Brand, Color, and Type" doesn't fit, change it to "Color and Type" of material (e.g. Black PLA)
* If "Color Type" doesn't fit either, display only the type (e.g. PLA)
* If "Type" doesn't fit, elide it

CURA-8013
2021-06-28 14:53:50 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Ghostkeeper
f82384d93c
Revert "Revert CURA-8055 in the 4.10 branch. This should not have been merged in there."
This reverts commit 4d29de45796dc42f76c774a216a0601bb57cf790.
Effectively this re-applies the changes for CURA-8055 / #9957.
2021-06-24 14:20:38 +02:00