j.delarago e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup ... # Conflicts: # resources/qml/Widgets/Menu.qml # resources/qml/Widgets/MenuItem.qml # resources/themes/cura-dark/theme.json # resources/themes/cura-light/theme.json		2022-02-28 08:51:42 +01:00
..
CameraButton.qml	Remove some extra unneeded theme stuff for monitor page	2022-02-25 14:12:25 +01:00
DiscoverUM3Action.qml	Replace UM.MessageDialog with newly added Cura.MessageDialog	2022-02-23 14:09:38 +01:00
ExpandableCard.qml	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00
GenericPopUp.qml	Remove unused QtQuick.Dialogs imports	2022-02-09 14:56:06 +01:00
MonitorBuildplateConfiguration.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MonitorCarousel.qml	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00
MonitorConfigOverrideDialog.qml	Remove unused QtQuick.Dialogs imports	2022-02-09 14:56:06 +01:00
MonitorContextMenu.qml	Fix monitor page	2022-02-25 10:54:03 +01:00
MonitorContextMenuButton.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MonitorExtruderConfiguration.qml	Change extruder icon in monitor tab to be same as preview tab	2021-07-05 11:31:23 +02:00
MonitorIconExtruder.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MonitorInfoBlurb.qml	Remove NativeRendering type in the MonitorInfoBlurb	2021-08-03 16:56:05 +02:00
MonitorItem.qml	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00
MonitorPrinterCard.qml	Remove some extra unneeded theme stuff for monitor page	2022-02-25 14:12:25 +01:00
MonitorPrinterConfiguration.qml	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00
MonitorPrinterPill.qml	Remove most of controls 1 references from networking plugin	2021-11-16 15:26:23 +01:00
MonitorPrintJobCard.qml	Replace usage of controls label with our custom label	2021-11-10 16:37:26 +01:00
MonitorPrintJobPreview.qml	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00
MonitorPrintJobProgressBar.qml	Remove unneeded fixed line hight properties	2022-02-25 14:27:47 +01:00
MonitorQueue.qml	Use Controls2 ListView instead of ScrollView for print job list	2022-01-18 17:27:51 +01:00
MonitorStage.qml	Remove more references to old controls	2021-11-10 17:30:42 +01:00
PrinterVideoStream.qml	Remove more references to old controls	2021-11-10 17:30:42 +01:00
PrintJobContextMenuItem.qml	Remove most of controls 1 references from networking plugin	2021-11-16 15:26:23 +01:00
PrintWindow.qml	Remove most of controls 1 references from networking plugin	2021-11-16 15:26:23 +01:00