mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 14:37:29 -06:00
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts: resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
This commit is contained in:
commit
e0a6cb3383
50 changed files with 1911 additions and 3002 deletions
|
@ -49,6 +49,7 @@ Item
|
|||
Layout.fillWidth: true
|
||||
implicitHeight: createNewProjectButton.height
|
||||
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
|
||||
focus: true
|
||||
|
||||
onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue