Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!
CURA-8943
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
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.
Contributes to issue CURA-6086.
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
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.
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.
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.
Conflicts:
plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
