- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.
Contributes to issue CURA-8684.
Conflicts:
plugins/ImageReader/ConfigUI.qml
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
plugins/PerObjectSettingsTool/SettingPickDialog.qml
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
resources/qml/Preferences/GeneralPage.qml
resources/qml/Preferences/Materials/MaterialsPage.qml
resources/qml/Preferences/Materials/MaterialsView.qml
resources/qml/Preferences/ProfilesPage.qml
These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
Had to make some more modifications to get it to work again this time, due to the way the width of the table scales with the dialogue. But it's nice now.
Contributes to issue CURA-8686.
We've not been clipping this for so long, but the text really does overlap with the label and the buttons if we don't (and the text is sufficiently large).
Contributes to issue CURA-8686.
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.
When importing only the models of a project file, Cura wasn't checking whether the file should
be added to the recent files list. This commit fixes that.
CURA-7996
Just whenever we need it, please.
This removes a warning from the start-up sequence, but the warning is still there when you open the dialogue. It's complaining that a model has size -13 and another has size -14, but I don't know which model that is. The UserChangesModel seems to be fine at a size of 1 or so.
Contributes to issue CURA-7501.
