216 Commits

Author SHA1 Message Date
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
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
j.delarago
049ab09119 I've changed the dot radius so they are circles again.
I've simplified the dot spacing logic a bit.

For some reason the background does not line up perfectly with the slider. So when it is set to 0 there is still a slight offset on the slider handle.

CURA-9203
2022-04-26 14:59:24 +02:00
Remco Burema
8afb06f7ae Fix infill to 0% on upgrade to Cura 5.0.
This is a weird one, fortunately Jaime had the idea that it had to do with a spurious update to the visual element of the slider.

CURA-9127
2022-04-21 11:55:42 +02:00
Jaime van Kessel
965ecb744d Fix size of print setup selector
CURA-9139
2022-04-19 16:42:43 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
3dc67f387f Height based on implicitHeight/implicitWidth now.
Removed redundant code.

CURA-8640
2022-04-01 11:12:30 +02:00
Jaime van Kessel
ea03236f03 Remove unneeded font assignment
The default font is, you guessed it, already default.
2022-03-14 11:40:05 +01:00
Jaime van Kessel
790c2c23c1 Display profile name correctly in dropdown
CURA-9040
2022-03-14 11:38:31 +01:00
Casper Lamboo
24fc1ae2a2
Merge pull request #11595 from Ultimaker/CURA-8928_menu_visual_fixes
Leftover menu fixes
2022-03-07 10:53:24 +01:00
Casper Lamboo
11d7afe505
Formatting of inline if statement 2022-03-07 10:44:24 +01:00
Casper Lamboo
58ca09e1c6
Remove unused id 2022-03-07 10:43:46 +01:00
j.delarago
1fc6b8ced6 New designs use dark mode border_main for dark theme.
Remove uses of border_main_light. The only puprose of this color was to give dark mode access to the border_main of the light theme.

CURA-8991
2022-03-04 13:22:55 +01:00
Jaime van Kessel
2ed68beb22 Fix display of profile name in header
Without no-wrap, longer names would be put on multiple lines.
These would then spill out of the display element
2022-03-04 10:30:26 +01:00
Jaime van Kessel
cbbe961a44 Let quality intents menu use checkmark to indicate active profile
CURA-8928
2022-03-03 13:46:38 +01:00
Jaime van Kessel
fc577ffcbc Improve margins of qualities menu
CURA-8928
2022-03-03 13:09:09 +01:00
Jaime van Kessel
a0f9febf62 Fix highlight color of quality dropdown
CURA-8928
2022-03-03 12:53:46 +01:00
j.delarago
fc3f0a4ad3 Update setting profile combobox to new style
CURA-8688
2022-03-01 12:44:52 +01:00
casper
ceee0e9b4b Update RecommnededQualityProfileSelector to Controls 2
CURA-8688
2022-03-01 11:38:29 +01:00
casper
a4b8fe23eb Update Infill Slider to qt controls 2
CURA-8688
2022-03-01 11:16:14 +01:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
2022-01-31 17:08:56 +01:00
Ghostkeeper
5f101e8233
Set checked tab for TabRowButton
We're changing this so that the button doesn't set this by itself. This is necessary so that I can use this TabRowButton also when it's not in a repeater (for the global stack in the profile manager).

Contributes to issue CURA-8686.
2022-01-25 11:58:44 +01:00
Ghostkeeper
4f82137035
Customise scrollbar for extruder selectors
Contributes to issue CURA-8686.
2022-01-20 17:26:49 +01:00
Ghostkeeper
5041162a99
Use custom scroll bar for qualities+intents menu
Contributes to issue CURA-8686.
2022-01-19 14:47:55 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Ghostkeeper
1975d053b0
Split solid and 100% infill icons into two icons
Both have different margins for their different use cases.

Contributes to issue CURA-8202.
2021-07-07 11:36:10 +02:00
Konstantinos Karmas
b850d8c18e Center the extruder icon in the tabRowButton in the custom print settings
CURA-8011 and CURA-8202
2021-07-06 14:10:19 +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
9c49baa9ce Fix incorrect reference of the handleButton border color
CURA-8011
2021-07-05 10:07:23 +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
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
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
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
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
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
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
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size)
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
2021-04-28 18:53:32 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size.
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
2021-04-28 15:45: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