Diego Prado Gesto 5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header ...

Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json

2018-10-29 11:10:25 +01:00

..

CameraButton.qml

QML Clean-up

2018-10-23 15:41:56 +02:00

ClusterControlItem.qml

Dark mode theme improvements

2018-10-19 16:23:16 +02:00

ClusterMonitorItem.qml

QML Clean-up

2018-10-23 15:41:56 +02:00

DiscoverUM3Action.qml

Merge branch 'ui_rework_4_0' into cura4.0_header

2018-10-29 11:10:25 +01:00

HorizontalLine.qml

Dark mode theme improvements

2018-10-19 16:23:16 +02:00

MonitorItem.qml

WIP: Use CameraView for UM camera feeds

2018-10-24 16:00:22 +02:00

PrintCoreConfiguration.qml

Round divisions

2018-10-22 16:02:55 +02:00

PrinterCard.qml

Use different lengths for loading skeleton and printer name

2018-10-25 16:45:49 +02:00

PrinterCardDetails.qml

Remove binding loops

2018-10-22 15:31:38 +02:00

PrinterCardProgressBar.qml

Dark mode theme improvements

2018-10-19 16:23:16 +02:00

PrinterFamilyPill.qml

Dark mode theme improvements

2018-10-19 16:23:16 +02:00

PrinterInfoBlock.qml

Clean up more errors

2018-10-16 09:34:50 +02:00

PrinterVideoStream.qml

WIP: Use CameraView for UM camera feeds

2018-10-24 16:00:22 +02:00

PrintJobContextMenu.qml

Fix print job context menu height

2018-10-23 16:27:45 +02:00

PrintJobContextMenuItem.qml

Dark mode theme improvements

2018-10-19 16:23:16 +02:00

PrintJobInfoBlock.qml

Fix override dialog box

2018-10-24 11:13:12 +02:00

PrintJobPreview.qml

QML Clean-up

2018-10-23 15:41:56 +02:00

PrintJobTitle.qml

Round divisions

2018-10-22 16:02:55 +02:00

PrintWindow.qml

Hotfix: Show printer selection

2018-10-25 10:54:59 +02:00

UM3InfoComponents.qml

Fix code style

2018-10-18 14:30:33 +02:00