3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into CURA-5595_add_custom_button_to_menu

Browse source
This commit is contained in:
Aleksei S 2018-08-10 15:51:38 +02:00
commit a1bc2f3ebf
89 changed files with 1210 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Settings/SettingComboBox.qml
View file

@ -20,13 +20,6 @@ SettingItem
anchors.fill: parent
MouseArea
{
anchors.fill: parent
acceptedButtons: Qt.NoButton
onWheel: wheel.accepted = true
}
background: Rectangle
{
color:

7
resources/qml/Settings/SettingExtruder.qml
View file

@ -71,13 +71,6 @@ SettingItem
currentIndex: propertyProvider.properties.value
MouseArea
{
anchors.fill: parent
acceptedButtons: Qt.NoButton
onWheel: wheel.accepted = true;
}
property string color: "#fff"
Binding

7
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -76,13 +76,6 @@ SettingItem
when: control.model.items.length > 0
}
MouseArea
{
anchors.fill: parent
acceptedButtons: Qt.NoButton
onWheel: wheel.accepted = true;
}
property string color: "#fff"
Binding