3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace all old controls 1 comboboxes with UM.Combobox

Browse source
This commit is contained in:
Jaime van Kessel 2021-11-10 14:57:01 +01:00
parent e0ff70dc78
commit 0bb09a4783
7 changed files with 15 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 2.0
import QtQuick.Controls 1.1 as OldControls
import Cura 1.0 as Cura
import UM 1.3 as UM
import UM 1.5 as UM
Item
{
@ -219,12 +219,11 @@ Item
renderType: Text.NativeRendering
}
OldControls.CheckBox
UM.CheckBox
{
id: enabledCheckbox
enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder.
height: parent.height
style: UM.Theme.styles.checkbox
Binding
{

5
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View file

@ -5,7 +5,7 @@ import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
@ -44,7 +44,7 @@ Item
verticalCenter: enableAdhesionRowTitle.verticalCenter
}
CheckBox
UM.CheckBox
{
id: enableAdhesionCheckBox
anchors.verticalCenter: parent.verticalCenter
@ -52,7 +52,6 @@ Item
property alias _hovered: adhesionMouseArea.containsMouse
//: Setting enable printing build-plate adhesion helper checkbox
style: UM.Theme.styles.checkbox
enabled: recommendedPrintSetup.settingsEnabled
visible: platformAdhesionType.properties.enabled == "True"

5
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View file

@ -5,7 +5,7 @@ import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
@ -184,7 +184,7 @@ Item
}
// Gradual Support Infill Checkbox
CheckBox
UM.CheckBox
{
id: enableGradualInfillCheckBox
property alias _hovered: enableGradualInfillMouseArea.containsMouse
@ -194,7 +194,6 @@ Item
anchors.left: infillSliderContainer.left
text: catalog.i18nc("@label", "Gradual infill")
style: UM.Theme.styles.checkbox
enabled: recommendedPrintSetup.settingsEnabled
visible: infillSteps.properties.enabled == "True"
checked: parseInt(infillSteps.properties.value) > 0

5
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Controls 2.3 as Controls2
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
@ -45,14 +45,13 @@ Item
verticalCenter: enableSupportRowTitle.verticalCenter
}
CheckBox
UM.CheckBox
{
id: enableSupportCheckBox
anchors.verticalCenter: parent.verticalCenter
property alias _hovered: enableSupportMouseArea.containsMouse
style: UM.Theme.styles.checkbox
enabled: recommendedPrintSetup.settingsEnabled
visible: supportEnabled.properties.enabled == "True"