Solved merge conflicts. CURA-3214

This commit is contained in:
Jack Ha 2017-02-21 11:01:20 +01:00
commit 057dc2fd7d
27 changed files with 50293 additions and 588 deletions

View file

@ -14,8 +14,10 @@ Item {
property real progress: UM.Backend.progress;
property int backendState: UM.Backend.state;
property var backend: CuraApplication.getBackend();
property bool activity: Printer.getPlatformActivity;
property bool activity: Printer.platformActivity;
property int totalHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
property string fileBaseName
property string statusText: