mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-29 05:41:05 -07:00
Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs
# Conflicts: # resources/qml/Account/SyncState.qml # resources/qml/Preferences/ReadOnlySpinBox.qml
This commit is contained in:
commit
1c711129e2
9 changed files with 132 additions and 121 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Copyright (c) 2022 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.2
|
||||
|
|
@ -118,15 +118,18 @@ Menu
|
|||
{
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Label
|
||||
UM.Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "Number of Copies")
|
||||
anchors.verticalCenter: copiesField.verticalCenter
|
||||
width: contentWidth
|
||||
wrapMode: Text.NoWrap
|
||||
}
|
||||
|
||||
SpinBox
|
||||
Cura.SpinBox
|
||||
{
|
||||
id: copiesField
|
||||
editable: true
|
||||
focus: true
|
||||
from: 1
|
||||
to: 99
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue