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

Merge branch '4.1'

Browse source
This commit is contained in:
Ghostkeeper 2019-05-02 08:51:22 +02:00
commit d4b17735ad
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
20 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/SliceInfoPlugin/example_data.html
View file

@ -48,7 +48,6 @@
<li><b>Bounding Box:</b> [minimum x, y, z; maximum x, y, z]</li>
<li><b>Is Helper Mesh:</b> no</li>
<li><b>Helper Mesh Type:</b> support mesh</li>
<li>...</li>
</ul>
</li>
</ul>

1
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -69,6 +69,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
}

1
plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml
View file

@ -52,6 +52,7 @@ UM.Dialog
bottomMargin: 56 * screenScaleFactor // TODO: Theme!
}
wrapMode: Text.WordWrap
renderType: Text.NativeRendering
text:
{
if (!printer || !printer.activePrintJob)

1
plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml
View file

@ -23,6 +23,7 @@ Button
horizontalAlignment: Text.AlignHCenter
text: base.text
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering;
}
height: width
hoverEnabled: enabled

2
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -66,6 +66,7 @@ Item
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -95,6 +96,7 @@ Item
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
}

1
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -48,5 +48,6 @@ Item
x: Math.round(size * 0.25)
y: Math.round(size * 0.15625)
visible: position >= 0
renderType: Text.NativeRendering
}
}

1
plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml
View file

@ -40,6 +40,7 @@ Item
width: 240 * screenScaleFactor // TODO: Theme!
color: UM.Theme.getColor("monitor_tooltip_text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
}
}
}

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View file

@ -71,6 +71,7 @@ Item
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -98,6 +99,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -143,6 +145,7 @@ Item
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Row
@ -197,6 +200,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
View file

@ -47,6 +47,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Label
{
@ -99,5 +100,6 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}

6
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -112,6 +112,7 @@ Item
// FIXED-LINE-HEIGHT:
height: parent.height
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -315,6 +316,7 @@ Item
return ""
}
visible: text !== ""
renderType: Text.NativeRendering
}
Item
@ -356,6 +358,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Label
@ -376,6 +379,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -403,6 +407,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -437,6 +442,7 @@ Item
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
height: 18 * screenScaleFactor // TODO: Theme!
renderType: Text.NativeRendering
}
implicitHeight: 32 * screenScaleFactor // TODO: Theme!
implicitWidth: 96 * screenScaleFactor // TODO: Theme!

1
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml
View file

@ -43,5 +43,6 @@ Item
text: tagText
font.pointSize: 10 // TODO: Theme!
visible: text !== ""
renderType: Text.NativeRendering
}
}

5
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -29,6 +29,7 @@ Item
color: UM.Theme.getColor("monitor_text_primary")
font: UM.Theme.getFont("large")
text: catalog.i18nc("@label", "Queued")
renderType: Text.NativeRendering
}
Item
@ -109,6 +110,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Label
@ -123,6 +125,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Label
@ -137,6 +140,7 @@ Item
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
}
@ -213,6 +217,7 @@ Item
text: i18n.i18nc("@info", "All jobs are printed.")
color: UM.Theme.getColor("monitor_text_primary")
font: UM.Theme.getFont("medium") // 14pt, regular
renderType: Text.NativeRendering
}
Item

1
plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml
View file

@ -16,6 +16,7 @@ Button {
text: parent.text
horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignVCenter;
renderType: Text.NativeRendering;
}
height: visible ? 39 * screenScaleFactor : 0; // TODO: Theme!
hoverEnabled: true;

1
plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml
View file

@ -78,6 +78,7 @@ UM.Dialog {
height: 20 * screenScaleFactor;
text: catalog.i18nc("@label", "Printer selection");
wrapMode: Text.Wrap;
renderType: Text.NativeRendering;
}
ComboBox {

1
resources/qml/MachineSettings/GcodeTextArea.qml
View file

@ -69,6 +69,7 @@ UM.TooltipArea
background: Rectangle
{
color: UM.Theme.getColor("main_background")
anchors.fill: parent
border.color:
{

12
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -41,10 +41,7 @@ Item
onClicked:
{
if (contentShown)
{
addLocalPrinterDropDown.contentShown = false
}
addLocalPrinterDropDown.contentShown = !contentShown
}
contentComponent: networkPrinterListComponent
@ -79,16 +76,13 @@ Item
anchors.top: addNetworkPrinterDropDown.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("wide_margin").height
anchors.topMargin: UM.Theme.getSize("default_margin").height
title: catalog.i18nc("@label", "Add a non-networked printer")
onClicked:
{
if (contentShown)
{
addNetworkPrinterDropDown.contentShown = false
}
addNetworkPrinterDropDown.contentShown = !contentShown
}
contentComponent: localPrinterListComponent

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -56,7 +56,7 @@ Item
ScrollBar.vertical.policy: ScrollBar.AsNeeded
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
height: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height)
visible: networkPrinterListView.count > 0

2
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -99,7 +99,7 @@ Item
horizontalAlignment: Text.AlignHCenter
text:
{
var t = catalog.i18nc("@text", "The data that Ultimaker Cura collects will not contain any information about your model.")
var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.")
var t2 = catalog.i18nc("@text", "More information")
t += " <a href='https://notusedref'>" + t2 + "</a>"
return t

3
resources/qml/WelcomePages/DropDownWidget.qml
View file

@ -56,7 +56,8 @@ Item
Cura.RoundedRectangle
{
id: contentRectangle
anchors.top: header.bottom
// Move up a bit (exaclty the width of the border) to avoid double line
y: header.height - UM.Theme.getSize("default_lining").width
anchors.left: header.left
anchors.right: header.right
// Add 2x lining, because it needs a bit of space on the top and the bottom.

1
resources/qml/WelcomePages/WizardDialog.qml
View file

@ -66,6 +66,7 @@ Window
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.leftMargin: UM.Theme.getSize("wide_margin").width
enabled: true
onClicked: dialog.visible = false