Age | Commit message (Collapse) | Author |
|
CURA-9149 Fix PerObjectSettings remove button layout
|
|
Adjust width of rows when scrollbar is present so they don't overlap.
CURA-9149
|
|
|
|
CURA-9149
|
|
CURA-8640
|
|
# Conflicts:
# cura/CuraApplication.py
# resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
# resources/qml/Preferences/Materials/MaterialsView.qml
|
|
CURA-9005
|
|
CURA-9005
|
|
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
|
|
|
|
settings
CURA-9005
|
|
CURA-9005
|
|
Instead set width of listView smaller so it doesn't overlap.
Update per object setting visibility dialog to have same category design as SettingVisibilityCategory.qml and SettingCategory.qml
CURA-9005
|
|
possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
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
|
|
CURA-8688
|
|
CURA-8688
|
|
CURA-8688
|
|
CURA-8688
|
|
# Conflicts:
# resources/qml/Widgets/Menu.qml
# resources/qml/Widgets/MenuItem.qml
# resources/themes/cura-dark/theme.json
# resources/themes/cura-light/theme.json
|
|
|
|
Conflicts:
cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
|
|
removed. This gives it a fixed width the same as other dialogs.
CURA-8688
|
|
and preferences visibility settings.
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.
CURA-8688
|
|
CURA-8688
|
|
CURA-8688
|
|
CURA-8685-replace_text_and_progress_bars
# Conflicts:
# plugins/PerObjectSettingsTool/PerObjectItem.qml
# plugins/PerObjectSettingsTool/SettingPickDialog.qml
|
|
replace_controls_1_for_controls_2
|
|
CURA-8685
|
|
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.
Contributes to #11455
|
|
|
|
- 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.
|
|
CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
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).
|
|
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field
CURA-8684
|
|
|
|
CURA-8684
|
|
'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
|
|
CURA-8684
|
|
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
|
|
Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component.
|
|
same amount of vertical space.
|
|
|
|
CURA-8684
|
|
CURA-8684
|
|
CURA-8684
|
|
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
|
|
Contributes to issue CURA-8686.
|
|
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar.
Contributes to issue CURA-8686.
|
|
I can't update the buttons (not part of this ticket) so I kept those Controls1.
The ScrollView is no longer necessary, just a ListView now with customised scroll bar.
Contributes to issue CURA-8686.
|
|
|
|
part of upgrading Qt to v6.2: CURA-8591
|