3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify the machinesettings qml

Browse source
This commit is contained in:
Jaime van Kessel 2019-09-18 11:04:15 +02:00
parent 75c7a6fa62
commit 549eb21a5a
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View file

@ -3,6 +3,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -28,24 +29,25 @@ Item
property var forceUpdateFunction: manager.forceUpdate property var forceUpdateFunction: manager.forceUpdate
Item RowLayout
{ {
id: upperBlock id: upperBlock
anchors.top: parent.top anchors
anchors.left: parent.left {
anchors.right: parent.right top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width left: parent.left
right: parent.right
height: childrenRect.height margins: UM.Theme.getSize("default_margin").width
}
spacing: UM.Theme.getSize("default_margin").width
// ======================================= // =======================================
// Left-side column for "Printer Settings" // Left-side column for "Printer Settings"
// ======================================= // =======================================
Column Column
{ {
anchors.top: parent.top Layout.fillWidth: true
anchors.left: parent.left Layout.alignment: Qt.AlignTop
width: base.columnWidth
spacing: base.columnSpacing spacing: base.columnSpacing
@ -173,9 +175,8 @@ Item
// ======================================= // =======================================
Column Column
{ {
anchors.top: parent.top Layout.fillWidth: true
anchors.right: parent.right Layout.alignment: Qt.AlignTop
width: base.columnWidth
spacing: base.columnSpacing spacing: base.columnSpacing
@ -329,22 +330,23 @@ Item
} }
} }
Item // Start and End G-code RowLayout // Start and End G-code
{ {
id: lowerBlock id: lowerBlock
anchors.top: upperBlock.bottom spacing: UM.Theme.getSize("default_margin").width
anchors.bottom: parent.bottom anchors
anchors.left: parent.left {
anchors.right: parent.right top: upperBlock.bottom
anchors.margins: UM.Theme.getSize("default_margin").width bottom: parent.bottom
left: parent.left
right: parent.right
margins: UM.Theme.getSize("default_margin").width
}
Cura.GcodeTextArea // "Start G-code" Cura.GcodeTextArea // "Start G-code"
{ {
anchors.top: parent.top Layout.fillWidth: true
anchors.bottom: parent.bottom Layout.fillHeight: true
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
anchors.left: parent.left
width: base.columnWidth - UM.Theme.getSize("default_margin").width
labelText: catalog.i18nc("@title:label", "Start G-code") labelText: catalog.i18nc("@title:label", "Start G-code")
containerStackId: machineStackId containerStackId: machineStackId
@ -354,11 +356,8 @@ Item
Cura.GcodeTextArea // "End G-code" Cura.GcodeTextArea // "End G-code"
{ {
anchors.top: parent.top Layout.fillWidth: true
anchors.bottom: parent.bottom Layout.fillHeight: true
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
anchors.right: parent.right
width: base.columnWidth - UM.Theme.getSize("default_margin").width
labelText: catalog.i18nc("@title:label", "End G-code") labelText: catalog.i18nc("@title:label", "End G-code")
containerStackId: machineStackId containerStackId: machineStackId