Jack Ha 057dc2fd7d Solved merge conflicts. CURA-3214

2017-02-21 11:01:20 +01:00

..

GeneralPage.qml

Solved merge conflicts. CURA-3214

2017-02-21 11:01:20 +01:00

MachinesPage.qml

Also validate machine name in rename dialogue

2016-10-28 13:33:37 +02:00

MaterialsPage.qml

Remove "Edit" button from materials page

2017-01-03 11:23:31 +01:00

MaterialView.qml

Fix horizontal scrolling/flicking of materialview

2017-01-09 14:19:22 +01:00

ProfilesPage.qml

Change settings to settings/overrides in selected messages. CURA-2898

2016-11-23 13:33:12 +01:00

ProfileTab.qml

Use globalProfileId to check if we need to show changed settings

2016-10-15 17:05:55 +02:00

ReadOnlySpinBox.qml

Change references from Uranium to Cura

2016-10-17 14:17:28 +02:00

ReadOnlyTextArea.qml

Change references from Uranium to Cura

2016-10-17 14:17:28 +02:00

ReadOnlyTextField.qml

Change references from Uranium to Cura

2016-10-17 14:17:28 +02:00

SettingVisibilityPage.qml

Make the other parts of the Cura UI which have a filter, also search on i18n labels.

2016-12-08 16:55:22 +01:00