3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent

Browse source
This commit is contained in:
Jaime van Kessel 2019-09-24 10:34:21 +02:00
commit 56c7fb9f7d
No known key found for this signature in database
GPG key ID: 3710727397403C91
5 changed files with 76 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -1,10 +1,10 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1
import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
import UM 1.2 as UM
import Cura 1.0 as Cura
@ -256,6 +256,23 @@ UM.Dialog
width: Math.floor(scroll.width / 3) | 0
}
}
// Intent
Row
{
width: parent.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@action:label", "Intent")
width: Math.floor(scroll.width / 3) | 0
}
Label
{
text: Cura.MachineManager.activeIntentCategory
width: Math.floor(scroll.width / 3) | 0
}
}
}
}
}