Ghostkeeper 7df4c01814

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ...

Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.

2018-12-03 11:45:05 +01:00

..

CameraButton.qml

Update CameraButton.qml

2018-11-27 10:53:00 +01:00

ClusterControlItem.qml

Rename the color of the sidebar to main_background, since it was deleted

2018-11-20 13:25:15 +01:00

ClusterMonitorItem.qml

Improve monitor tab temporary scroll bar

2018-11-28 12:20:09 +01:00

DiscoverUM3Action.qml

Merge branch 'ui_rework_4_0' into cura4.0_header

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

ExpandableCard.qml

Use bool for expanded or collapsed state

2018-11-22 13:11:59 +01:00

HorizontalLine.qml

Dark mode theme improvements

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

MonitorBuildplateConfiguration.qml

Change all uses of 'small' and 'very small' fonts to default

2018-11-26 17:33:37 +01:00

MonitorExtruderConfiguration.qml

Change all uses of 'small' and 'very small' fonts to default

2018-11-26 17:33:37 +01:00

MonitorIconExtruder.qml

Add printer configuration components

2018-11-20 13:46:41 +01:00

MonitorItem.qml

Replace NetworkCamera with NetworkMJPGImage

2018-10-29 11:18:39 +01:00

MonitorPrinterCard.qml

Remove debug statement

2018-11-28 10:47:34 +01:00

MonitorPrinterConfiguration.qml

Use array for extruder configurations

2018-11-22 13:55:43 +01:00

MonitorPrinterPill.qml

Finalize queue

2018-11-20 15:58:09 +01:00

MonitorPrintJobCard.qml

Use array for extruder configurations

2018-11-22 13:55:43 +01:00

MonitorPrintJobPreview.qml

Add printer configuration components

2018-11-20 13:46:41 +01:00

MonitorPrintJobProgressBar.qml

Handle null print job more elegantly

2018-11-28 10:46:12 +01:00

PrintCoreConfiguration.qml

Round divisions

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

PrinterCard.qml

Don't show camera icon unless printer details are expanded

2018-10-31 13:52:31 +01:00

PrinterCardDetails.qml

Don't show camera icon unless printer details are expanded

2018-10-31 13:52:31 +01: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

Change camera URL to non-optional QUrl

2018-10-29 13:25:23 +01:00

PrintJobContextMenu.qml

Change context menu button size

2018-11-27 10:54:26 +01:00

PrintJobContextMenuItem.qml

Show context menu at the right times

2018-11-06 16:37:47 +01:00

PrintJobInfoBlock.qml

Make text black

2018-11-08 11:48:22 +01: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