For instance, the buttons were converted to either primary buttons or secondary buttons. A new CheckBox component was created in Cura in order to reuse it in the future.
Contributes to CURA-6005.
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.