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.
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
Although the new way was discussed with our UXers, we got a number of reports that it was confusing.
I also accidentally started a print while using it
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.
Contributes to CURA-6026.
Conflicts:
plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
