Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/plugins/PerObjectSettingsTool
AgeCommit message (Collapse)Author
2022-04-21Merge pull request #11833 from Ultimaker/CURA-9149_object_settings_ovelapJelle Spijker
CURA-9149 Fix PerObjectSettings remove button layout
2022-04-21Center remove button in row by giving it the same height as the input.CURA-9149_object_settings_ovelapj.delarago
Adjust width of rows when scrollbar is present so they don't overlap. CURA-9149
2022-04-20Upgrade SDK version to 8.0.0 for Cura 5.0upgrade_sdk_to_800Remco Burema
2022-04-19Remove overlap in perobject setting panelJaime van Kessel
CURA-9149
2022-04-08Replace `RecolorImage` with `ColorImage`c.lamboo
CURA-8640
2022-03-24Merge branch 'master' into CURA-8640_PyQt6Jelle Spijker
# Conflicts: # cura/CuraApplication.py # resources/qml/Preferences/Materials/MaterialsSyncDialog.qml # resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-15Add missing UM importj.delarago
CURA-9005
2022-03-11Move `CategoryButton` to cura repocasper
CURA-9005
2022-03-11Apply suggestions from code reviewCasper Lamboo
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-03-07Merge branch 'master' into CURA-9005_restyle_print_setting_categoryj.delarago
2022-03-07Give PerObjectSettingsPanel.qml the same margin between settings as main ↵j.delarago
settings CURA-9005
2022-03-07Remove redundant reference to spacerj.delarago
CURA-9005
2022-03-07Remove margins that keep listview items from being under the scrollbar. ↵j.delarago
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
2022-03-03Move ToolbarButton and ToolTip from Cura into Uranium. This makes it ↵j.delarago
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
2022-03-02Fix setting visibility styling working in one theme and not the other.j.delarago
CURA-8688
2022-03-01Remove obsolete uses of system palettecasper
CURA-8688
2022-03-01Update settings visibility pages to have correct background color on categoriesj.delarago
CURA-8688
2022-02-28Apply theming to perObjectCategoryJaime van Kessel
CURA-8688
2022-02-28Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanupj.delarago
# Conflicts: # resources/qml/Widgets/Menu.qml # resources/qml/Widgets/MenuItem.qml # resources/themes/cura-dark/theme.json # resources/themes/cura-light/theme.json
2022-02-22Remove number of unused styles importsJaime van Kessel
2022-02-21Merge branch 'master' into PyQt6_upgradeGhostkeeper
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.
2022-02-21SettingPickDialog was very wide due to the screen factor scaling being ↵j.delarago
removed. This gives it a fixed width the same as other dialogs. CURA-8688
2022-02-18Align checkbox with category icon in per object visibility settings dialog ↵j.delarago
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
2022-02-18Align per object settings visibility checkbox with iconj.delarago
CURA-8688
2022-02-18Use cura-styled button in settings pick dialogcasper
CURA-8688
2022-02-18Merge branch 'replace_controls_1_for_controls_2' into ↵casper
CURA-8685-replace_text_and_progress_bars # Conflicts: # plugins/PerObjectSettingsTool/PerObjectItem.qml # plugins/PerObjectSettingsTool/SettingPickDialog.qml
2022-02-17Merge branch 'master' of github.com:Ultimaker/Cura into ↵Jaime van Kessel
replace_controls_1_for_controls_2
2022-02-15Ensure that settingPickDialog uses the themed controlsJaime van Kessel
CURA-8685
2022-02-11Clarify some documentation in the PerObjectSettingVisibilityHandlerJaime van Kessel
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
2022-02-07Center Align Checkbox in per model settings visibilty menuj.delarago
2022-01-31Fix remaining merge conflictsGhostkeeper
- 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.
2022-01-31Merge branch 'replace_controls_1_for_controls_2' into ↵Ghostkeeper
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).
2022-01-31Make texts fields selectable by mouse for various componentscasper
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
2022-01-26Bump UM version for CheckBoxj.delarago
2022-01-26Re-use `Cura.ToolbarButton` in per object settings menucasper
CURA-8684
2022-01-25Merge remote-tracking branch ↵casper
'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
2022-01-25Use Button in tool bar button componentcasper
CURA-8684
2022-01-25Update plugins/PerObjectSettingsTool/ToolBarButton.qmlCasper Lamboo
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-01-24The visibility settings in the preferences is defined in Uranium rather than ↵j.delarago
Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component.
2022-01-21Cura.Checkbox requires vertical alignment since it no longer takes up the ↵j.delarago
same amount of vertical space.
2022-01-21Swap CheckBox for styled Cura.CheckBoxj.delarago
2022-01-21Update Buttons to QtControls 2.0 in per model settings dialogcasper
CURA-8684
2022-01-21Update buttons in per object settings plugin to QtControls 2casper
CURA-8684
2022-01-21Update `PerObjectCategory` to QtQuick.Controls 2.1casper
CURA-8684
2022-01-20Specify width and height in Cura.Checkboxj.delarago
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
2022-01-20Customise scrollbar for extruder selectorsGhostkeeper
Contributes to issue CURA-8686.
2022-01-18Replace ScrollView by ListView in settings picking dialogueGhostkeeper
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar. Contributes to issue CURA-8686.
2022-01-18Replace ScrollView with QtControls2 ListViewGhostkeeper
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.
2022-01-04Remove unneded styles importJaime van Kessel
2021-12-28Search/replace Qt5->Qt6.Remco Burema
part of upgrading Qt to v6.2: CURA-8591
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 15:06:20 +0300