4726 Commits

Author SHA1 Message Date
Remco Burema
e4710dd921
ActionButton is a RoundedRectangle once more.
We want to deprecate the API, not break it (yet).

part of CURA-8012
2021-07-06 09:06:47 +02:00
Remco Burema
952e02676f
Tweaks for restyling benefitting the dark theme.
part of CURA-8012
2021-07-02 13:24:02 +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
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
327acfd49c Align the material and variant labels in the center of the header
CURA-8013
2021-06-30 11:10:25 +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
4d29de4579
Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.
Revert "Change file extension to .umm"

This reverts commit 56db7f7144083df4bca77746d7ee30f2a54fda36.

Revert "Re-enable compression"

This reverts commit 62bc9be22bbc5595dbfce69893163c3a0ebc4415.

Revert "Add documentation"

This reverts commit e9031f1aff5d40f3c69ac625edf11963a3253eb8.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a667f9aa9618005d2a5875383a3658f4f.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068c3ac2cab7f95fb88c5d4d101e28e17.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f556f455f352786123476ec40e3ae4c.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664bf73dd9b1e3c6af6f01321763470d2e.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10a994a1b38bcb426a27ba379febeac7.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b879a8913b25f2a049413ec0721f1c5.
2021-06-24 14:15:54 +02:00
Konstantinos Karmas
06b0d12844 Don't draw tooltip background if height is 0
In some buttons (specifically, the "Manage printers" button), the tooltip arrow is being drawn even though the tooltip text is empty. This commit fixes that by making sure that the background rectangle (PointingRectangle) of the tooltip is not be visible if the height of the tooltip is 0.

CURA-8334
2021-06-21 13:24:22 +02:00
jelle Spijker
abc76e593a Increased the height of the welcome wizard screen.
Discussed with UX what the best approach would be.
Both came to the conclusion that this is the simplest
and more aesthetic approach.

The extra white space at the bottom and height of the
first screen is still acceptable according to UX.

Contributes to CURA-8290_whats_new_text
2021-06-17 14:41:56 +02:00
Ghostkeeper
adf3f51a4e
Use buttons from QtQuick.Controls 2
This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS.

As discussed in the CCB.
2021-06-15 16:28:20 +02:00
Jaime van Kessel
ba9c97a263
Give whats new screen a bit more room
CURA-8290
2021-06-10 16:36:30 +02:00
Ghostkeeper
56db7f7144
Change file extension to .umm
Because that's apparently what the firmware is looking for.

Contributes to issue CURA-8055.
2021-06-09 17:17:33 +02:00
Ghostkeeper
ec727e1068
Hide button entirely if no export is available
Not just disabling it.

Contributes to issue CURA-8055.
2021-06-09 16:42:37 +02:00
Ghostkeeper
bdcaef134f
Basic implementation of exporting all materials in a .zip archive
It seems to complain about the data types though.

Contributes to issue CURA-8055.
2021-06-09 16:35:51 +02:00
Ghostkeeper
e66783664b
Implement default path for exporting all materials
It needs to be a removable drive if one is available, or else just the local file paths.

Contributes to issue CURA-8055.
2021-06-08 17:36:25 +02:00
Ghostkeeper
abba3bdd10
Implement a sync button and file dialogue to export all materials
Contributes to issue CURA-8055.
2021-06-08 16:57:24 +02:00
Ghostkeeper
836e7c0c9b
Fix overlap of unit and setting value with RTL-languages
The unit was hard-coded to be anchored to the right. The text was getting the full width and aligned implicitly by the language. We'll keep the layout of the text properly internationalised, but make sure that the unit is opposite of wherever the text is.

Fixes CURA-8206.
Fixes #9667.
2021-06-07 18:00:59 +02:00
Jaime van Kessel
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +02:00
Jaime van Kessel
fc87c6a90c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 11:41:16 +02:00
Jaime van Kessel
4f49a38168
Fix pre-heat button being ocluded by tooltip
Fixes #9891
2021-06-01 11:40:20 +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
Jaime van Kessel
26afff6093
Revert "Switch out inherit icon"
This reverts commit 672d6c89cf6b12b01fe27c28622806310b063968.
2021-05-27 16:02:46 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
2021-05-27 16:01:17 +02:00
fieldOfView
63a2085379 Fix positioning of setting visibility preset menu popup 2021-05-20 12:24:51 +02:00
fieldOfView
6e803c41f4 Add Cura-styled Menu, MenuItem and MenuSeparator controls 2021-05-20 12:20:19 +02:00
Kostas Karmas
9d284d9c6f Use new icon for "Block support overlap" models in the object menu
CURA-8205
2021-05-14 10:42:37 +02:00
Kostas Karmas
be74d4dd3f Fix warning in Setting Visibility Page 2021-05-11 13:45:14 +02:00
Konstantinos Karmas
08e2687c14
Merge pull request #9774 from Ultimaker/CURA-8010-fallback_icon_names
Add system to deprecate icons in the theme
2021-05-10 14:23:05 +02:00
Ghostkeeper
912a65b0f3
Add missing source argument to onTriggered handler
Otherwise the source variable is always undefined.

Fixes #9621.
2021-05-07 02:25:05 +02:00
Ghostkeeper
b134405b2c
Add bottom camera angle menu item to view menu
It doesn't really clutter the interface in this menu.

Done as a 5 minute fix for #7609.
2021-05-06 11:39:11 +02:00
Jaime van Kessel
672d6c89cf
Switch out inherit icon
CURA-8010
2021-05-05 15:58:42 +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
247412b16a
Implemeted new icons in on-boarding dialog
CURA-8010_new_icons
2021-04-28 16:54:26 +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
5cb56b74e2
Updated the ExtruderIcon to not look completely horrible
This icon is due for a revisit with ticket:
 - CURA-8011 Replace extruder/material icon

Therefore out-of-scope for this ticket.

CURA-8010_new_icons
2021-04-28 11:24:33 +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
196c891331
Merge pull request #9590 from Ultimaker/4.9_smartling_translations
4.9 translations
2021-04-19 13:36:27 +02:00
jelle Spijker
c9b6282a62
Re-enabled Czech translations
Contributes to CURA-8153
2021-04-16 19:43:43 +02:00
Ghostkeeper
2ecdd799c6
Support animated images in what's new pages
Let's hope they don't go too crazy with the file size of these. But animated GIFs are now supported here.

Fixes CURA-8145.
2021-04-16 16:13:52 +02:00
Jaime van Kessel
45f5a222f0
Downgrade version of certain qml impots to as low as they need to be 2021-04-14 10:58:05 +02:00
Remco Burema
e0e77327b5
Dropdown menu wasn't closing on MacOS.
CURA-8172
2021-04-13 13:38:58 +02:00
Kostas Karmas
5d18f697a3 Merge branch '4.9' into CURA-8154_Fix_sizing_of_Whats_New_pages 2021-04-12 12:41:26 +02:00
Kostas Karmas
14c11190fd Minor UI fixes in the What's new pages
* Add a top margin between the image and the text
* Change the text font to default
* Fix line break in the html page

CURA-8154
2021-04-12 12:38:36 +02:00
Kostas Karmas
17a4b40fd7 Change the font size to default in the changelog
So that it is consistent with the What's new pages

CURA-8154
2021-04-12 12:37:57 +02:00