Ian Paschal
8a856f13d2
Re-add config changes in monitor tab
...
Contributes to CL-1152
2018-12-10 11:36:51 +01:00
Diego Prado Gesto
3ca749cdcb
Add a bunch of renderTypes to labels in the DiscoverUM3Action.
2018-12-06 14:31:52 +01:00
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
Ghostkeeper
1bcd134f85
Fix code style
...
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.
Contributes to issue CURA-5784.
2018-10-18 14:30:33 +02:00
Ian Paschal
2c5095befb
Add copyright headers
2018-10-03 09:43:13 +02:00
Ian Paschal
18e0dacda4
Organize files better
...
First things first... organize!
2018-09-07 14:11:37 +02:00
