- Text was cutoff instead of wrapped in Save Custom Profile (Rename Dialog).
- Make the placeholder into a proper placeholder text.
- Fix spelling (save -> safe).
- Link didn't work as a link.
- Slightly better tooltips.
part of CURA-9347
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.
part of CURA-9347
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.
part of CURA-9347
It's the same hack that we already use for the other instances where we use the tableModel.
For some reason it wasn't done here, so we also had the not updating bug
CURA-9270
- 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.
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.
As discussed in the CCB this morning. Since the new profile will be the _changed to_ profile rather than the _changed from_ (the latter of which would make the button useful, but since the profile is already switched at that point it would be a lot of work), the 'Create New Profile ...' button (in the Keep/Discard dialog) is redundant, since you can always create a new profile if you select keep changes.
