Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2018-10-03 13:25:09 +02:00
commit dabe747ec0
23 changed files with 1005 additions and 127 deletions

View file

@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2
import UM 1.3 as UM
import Cura 1.0 as Cura
import Cura 1.1 as Cura
import "Menus"
@ -21,7 +21,6 @@ UM.MainWindow
property bool showPrintMonitor: false
backgroundColor: UM.Theme.getColor("viewport_background")
// This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage
// It should be phased out in newer plugin versions.
Connections