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 bb20e3307f.
Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""
This reverts commit 70e4e9640e.
Revert "Revert "Fix typo in icon name""
This reverts commit 38ce22ba7c.
Revert "Revert "Add list for deprecated icons""
This reverts commit 119a957e7f.
Revert "Revert "Add Function icon""
This reverts commit 760726cf0b.
Revert "Revert "Switch out inherit icon""
This reverts commit 26afff6093.
Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""
This reverts commit 6483db3d47.
Revert "Fix incorrect icons"
This reverts commit 02a4ade2a5.
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
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
Conflicts:
cura/Settings/MachineManager.py -> rowCount vs. count
resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.
Contributes to issue CURA-5876.
because there is no sidebar anymore.
Several different margins and linings were created depending on the
side, not depending on where it belongs.
Contributes to CURA-5784.
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.
Contributes to issue CURA-5749.
This code was obviously copied from the pre-heat functionality. Let's fix the code duplication next as far as possible.
Contributes to issue CURA-4879.
