Lipu Fei 9575c6b3b3 Fix merge conflicts

2019-04-01 13:28:42 +02:00

..

SettingCategory.qml

Remove another unneeded catalog

2019-02-21 18:42:06 +01:00

SettingCheckBox.qml

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-05 13:56:21 +01:00

SettingComboBox.qml

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

SettingExtruder.qml

Code style

2019-01-23 11:11:40 +01:00

SettingItem.qml

Add some extra info to the tooltip if a setting is not used due to the value of it's children

2019-04-01 10:41:35 +02:00

SettingOptionalExtruder.qml

Merge branch 'CURA-5876_fixes' into 4.0

2018-12-14 16:28:04 +01:00

SettingTextField.qml

Add rounded corners to the settings

2018-12-03 15:56:21 +01:00

SettingUnknown.qml

Add the correct value to the setting viewer when the type is unknown.

2018-03-20 11:42:42 +01:00

SettingView.qml

Removed collapse / expand all

2018-12-17 17:47:33 +01:00