Lipu Fei 6db52dde46 Fix merge conflicts from ui_rework_40 ...

CURA-5943

2018-11-29 15:27:06 +01:00

..

ConfigurationMenu

Fix merge conflicts from ui_rework_40

2018-11-29 15:27:06 +01:00

BuildplateMenu.qml

Made some changes so the code also works with lower versions of Qt & pyQt

2018-03-05 15:32:46 +01:00

ContextMenu.qml

Switch most usages of containerStackId to containerStack for settingPropertyProvider

2018-09-07 15:23:09 +02:00

FileMenu.qml

Reduce the size of the ApplicationMenu.qml file by moving some

2018-10-18 17:38:23 +02:00

LocalPrinterMenu.qml

CURA-4870 Adjust colors for the selected configuration

2018-03-07 09:56:38 +01:00

MaterialMenu.qml

Add a "Favorites" heading to materials menu

2018-08-28 11:21:47 +02:00

NetworkPrinterMenu.qml

CURA-4870 Add name of the group and hidden property to the network

2018-03-09 12:42:49 +01:00

NozzleMenu.qml

Rename setVariantGroup() -> setVariant()

2018-03-19 12:27:15 +01:00

PrinterMenu.qml

CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively

2018-03-04 12:53:16 +01:00

PrinterTypeMenu.qml

CURA-4870 Fix some style with brackets in QML

2018-03-13 16:11:51 +01:00

ProfileMenu.qml

Minor codestyle fixes

2018-11-28 11:18:36 +01:00

RecentFilesMenu.qml

Store the dialogs in a folder called Dialogs.

2018-10-09 17:11:01 +02:00

SettingsMenu.qml

Reduce the size of the ApplicationMenu.qml file by moving some

2018-10-18 17:38:23 +02:00

SettingVisibilityPresetsMenu.qml

Fix review comments

2018-10-17 10:47:34 +02:00

ViewMenu.qml

Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage

2018-10-31 13:45:03 +01:00