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

Revert "fix merge conflict"

Browse source 
This reverts commit ec03b012a7, reversing
changes made to 2af33738d1.
This commit is contained in:
Daniel Schiavini 2018-12-07 10:22:32 +01:00
parent 3ebefa4f8a
commit 4bffa6d90f
73 changed files with 1223 additions and 3054 deletions
Download patch file Download diff file Expand all files Collapse all files

27
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -51,7 +51,7 @@ Column
text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
source: UM.Theme.getIcon("clock")
font: UM.Theme.getFont("default_bold")
font: UM.Theme.getFont("small")
}
Cura.IconLabel
@ -84,7 +84,7 @@ Column
return totalWeights + "g · " + totalLengths.toFixed(2) + "m"
}
source: UM.Theme.getIcon("spool")
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("very_small")
}
}
@ -101,25 +101,17 @@ Column
}
}
Item
Row
{
id: buttonRow
anchors.right: parent.right
anchors.left: parent.left
height: UM.Theme.getSize("action_button").height
spacing: UM.Theme.getSize("default_margin").width
width: parent.width
Cura.SecondaryButton
{
id: previewStageShortcut
anchors
{
left: parent.left
right: outputDevicesButton.left
rightMargin: UM.Theme.getSize("default_margin").width
}
height: UM.Theme.getSize("action_button").height
height: UM.Theme.getSize("action_panel_button").height
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Preview")
@ -133,11 +125,8 @@ Column
Cura.OutputDevicesActionButton
{
id: outputDevicesButton
anchors.right: parent.right
width: previewStageShortcut.visible ? UM.Theme.getSize("action_button").width : parent.width
height: UM.Theme.getSize("action_button").height
width: previewStageShortcut.visible ? UM.Theme.getSize("action_panel_button").width : parent.width
height: UM.Theme.getSize("action_panel_button").height
}
}
}